[Dolibarr-git] [Dolibarr/dolibarr] 9baeee: Fix multicurrency (tags for odt)

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 9baeee893f13a51c153a765254fbbbbd81576158
      
https://github.com/Dolibarr/dolibarr/commit/9baeee893f13a51c153a765254fbbbbd81576158
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-07 (Fri, 07 Jul 2017)

  Changed paths:
    M htdocs/core/class/commondocgenerator.class.php

  Log Message:
  -----------
  Fix multicurrency (tags for odt)


  Commit: de1a7042d455a771ec64bac1a17bf2bbb9244a47
      
https://github.com/Dolibarr/dolibarr/commit/de1a7042d455a771ec64bac1a17bf2bbb9244a47
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-07 (Fri, 07 Jul 2017)

  Changed paths:
    M htdocs/comm/action/listactions.php
    M htdocs/langs/en_US/agenda.lang

  Log Message:
  -----------
  Fix filter on list of actions


  Commit: 2be9f402c6acfa1bdaf6fb89823c7e1e97e1a0db
      
https://github.com/Dolibarr/dolibarr/commit/2be9f402c6acfa1bdaf6fb89823c7e1e97e1a0db
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-07 (Fri, 07 Jul 2017)

  Changed paths:
    M htdocs/admin/agenda_other.php

  Log Message:
  -----------
  Fix order of tab


  Commit: 024c6d2c08a0e59be583ffdaae0b838f27ee5dd1
      
https://github.com/Dolibarr/dolibarr/commit/024c6d2c08a0e59be583ffdaae0b838f27ee5dd1
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-07 (Fri, 07 Jul 2017)

  Changed paths:
    M htdocs/api/index.php

  Log Message:
  -----------
  Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop


  Commit: 8abec461a6908f2d4024df69cf96f3c229eda5d4
      
https://github.com/Dolibarr/dolibarr/commit/8abec461a6908f2d4024df69cf96f3c229eda5d4
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-07 (Fri, 07 Jul 2017)

  Changed paths:
    M htdocs/langs/en_US/main.lang
    M htdocs/product/price.php

  Log Message:
  -----------
  Fix total with tax does not include local taxes. To solve, i show both
totals.


Compare: 
https://github.com/Dolibarr/dolibarr/compare/09e9255ff1f8...8abec461a690