[Dolibarr-git] [Dolibarr/dolibarr] 6d38f5: FIX #11369

[Laurent Destailleur]

  Branch: refs/heads/10.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 6d38f5ec9cb1fe927106243ab6463c3a39e6d630
      
https://github.com/Dolibarr/dolibarr/commit/6d38f5ec9cb1fe927106243ab6463c3a39e6d630
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-06-20 (Thu, 20 Jun 2019)

  Changed paths:
    M htdocs/bom/class/bom.class.php
    M htdocs/emailcollector/class/emailcollector.class.php
    M htdocs/emailcollector/class/emailcollectoraction.class.php
    M htdocs/emailcollector/class/emailcollectorfilter.class.php
    M htdocs/modulebuilder/template/class/myobject.class.php

  Log Message:
  -----------
  FIX #11369


  Commit: a70dfa17a4e7b0efc9a4d842975474bccc9002d4
      
https://github.com/Dolibarr/dolibarr/commit/a70dfa17a4e7b0efc9a4d842975474bccc9002d4
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-06-20 (Thu, 20 Jun 2019)

  Changed paths:
    M htdocs/accountancy/customer/index.php
    M htdocs/accountancy/customer/lines.php
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/expensereport/index.php
    M htdocs/accountancy/expensereport/lines.php
    M htdocs/accountancy/expensereport/list.php
    M htdocs/accountancy/supplier/index.php
    M htdocs/accountancy/supplier/lines.php
    M htdocs/accountancy/supplier/list.php
    M htdocs/compta/bank/treso.php
    M htdocs/compta/resultat/index.php
    M htdocs/core/boxes/box_activity.php
    M htdocs/core/boxes/box_commandes.php
    M htdocs/core/boxes/box_factures_fourn_imp.php
    M htdocs/core/boxes/box_factures_imp.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/925314c71020...a70dfa17a4e7