[Dolibarr-git] [Dolibarr/dolibarr] 02af7c: fix pb with multicompny payment dictionnary on fax...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 02af7ca25eaeaae0f56acb88e02e7ec257cbb86f
      
https://github.com/Dolibarr/dolibarr/commit/02af7ca25eaeaae0f56acb88e02e7ec257cbb86f
  Author: florian HENRY <address@hidden>
  Date:   2019-05-18 (Sat, 18 May 2019)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/card.php
    M htdocs/core/class/html.form.class.php
    M htdocs/projet/class/project.class.php

  Log Message:
  -----------
  fix pb with multicompny payment dictionnary on faxcture card


  Commit: 730820bb2604ad015acf6cf4ed6193f863748043
      
https://github.com/Dolibarr/dolibarr/commit/730820bb2604ad015acf6cf4ed6193f863748043
  Author: florian HENRY <address@hidden>
  Date:   2019-05-18 (Sat, 18 May 2019)

  Changed paths:
    M ChangeLog
    A htdocs/bom/bom_agenda.php
    M htdocs/compta/facture/class/api_invoices.class.php
    M htdocs/core/class/html.formmargin.class.php
    M htdocs/core/lib/usergroups.lib.php
    M htdocs/core/modules/project/doc/pdf_beluga.modules.php
    M htdocs/debugbar/class/DebugBar.php
    M htdocs/install/mysql/tables/llx_asset.sql
    M htdocs/install/mysql/tables/llx_bom_bom.sql
    M htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql
    M htdocs/install/mysql/tables/llx_emailcollector_emailcollectoraction.sql
    M htdocs/install/mysql/tables/llx_emailcollector_emailcollectorfilter.sql
    M htdocs/install/mysql/tables/llx_pos_cash_fence.sql
    M htdocs/install/mysql/tables/llx_societe_account.sql
    M htdocs/install/pgsql/functions/functions.sql
    M 
htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
    M htdocs/modulebuilder/template/myobject_card.php
    M htdocs/modulebuilder/template/sql/llx_mymodule_myobject.sql
    M htdocs/public/payment/newpayment.php
    M htdocs/resource/class/dolresource.class.php
    M htdocs/societe/card.php
    M htdocs/takepos/pay.php
    M htdocs/takepos/takepos.php

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop


  Commit: c2b1c8d4392bea85e4ad394d6e0a10b6c127d5a4
      
https://github.com/Dolibarr/dolibarr/commit/c2b1c8d4392bea85e4ad394d6e0a10b6c127d5a4
  Author: florian HENRY <address@hidden>
  Date:   2019-05-18 (Sat, 18 May 2019)

  Changed paths:
    M htdocs/projet/class/project.class.php

  Log Message:
  -----------
  remove bad fix


  Commit: 9ef5767fd558a84864750171aec3a68c87cafc33
      
https://github.com/Dolibarr/dolibarr/commit/9ef5767fd558a84864750171aec3a68c87cafc33
  Author: florian HENRY <address@hidden>
  Date:   2019-05-18 (Sat, 18 May 2019)

  Changed paths:
    M htdocs/core/class/html.form.class.php

  Log Message:
  -----------
  phpcs


  Commit: f3315bb8f59125c2b5f4fd84cd125766b8adddca
      
https://github.com/Dolibarr/dolibarr/commit/f3315bb8f59125c2b5f4fd84cd125766b8adddca
  Author: florian HENRY <address@hidden>
  Date:   2019-05-18 (Sat, 18 May 2019)

  Changed paths:
    M htdocs/compta/facture/card.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/index.php

  Log Message:
  -----------
  fix: bad sql request


  Commit: f1aad766ca5e2905409ef7016c576711a32288b2
      
https://github.com/Dolibarr/dolibarr/commit/f1aad766ca5e2905409ef7016c576711a32288b2
  Author: florian HENRY <address@hidden>
  Date:   2019-05-18 (Sat, 18 May 2019)

  Changed paths:
    M htdocs/projet/class/project.class.php
    M htdocs/projet/index.php

  Log Message:
  -----------
  fix: bad sql request


  Commit: c519906c9e9b9a5a4cd7549f510eeea2eac90721
      
https://github.com/Dolibarr/dolibarr/commit/c519906c9e9b9a5a4cd7549f510eeea2eac90721
  Author: florian HENRY <address@hidden>
  Date:   2019-05-18 (Sat, 18 May 2019)

  Changed paths:
    M htdocs/resource/class/dolresource.class.php

  Log Message:
  -----------
  fix scrunitizer


  Commit: 263919c49c1e9dab5aa42bbf0c819f61e2bb2ac4
      
https://github.com/Dolibarr/dolibarr/commit/263919c49c1e9dab5aa42bbf0c819f61e2bb2ac4
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-18 (Sat, 18 May 2019)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/projet/index.php
    M htdocs/resource/class/dolresource.class.php

  Log Message:
  -----------
  Merge pull request #11206 from atm-florian/develop

 fix: bad sql request


Compare: 
https://github.com/Dolibarr/dolibarr/compare/26d4875f8ff1...263919c49c1e