[Dolibarr/dolibarr] bf281b: Comment

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: bf281b7dabd1d398a953ffb17ba2688a151d0197
      
https://github.com/Dolibarr/dolibarr/commit/bf281b7dabd1d398a953ffb17ba2688a151d0197
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-17 (Mon, 17 Feb 2020)

  Changed paths:
    M htdocs/core/lib/functions.lib.php

  Log Message:
  -----------
  Comment


  Commit: 549bf076d7e00b5c7907590ceafa2d35412f847d
      
https://github.com/Dolibarr/dolibarr/commit/549bf076d7e00b5c7907590ceafa2d35412f847d
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-17 (Mon, 17 Feb 2020)

  Changed paths:
    M htdocs/core/class/commonobject.class.php
    M htdocs/exports/class/export.class.php
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  Fix prefix of log


  Commit: 1904ae0e82beb5c179b60bda2c5edd0e49eec555
      
https://github.com/Dolibarr/dolibarr/commit/1904ae0e82beb5c179b60bda2c5edd0e49eec555
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-17 (Mon, 17 Feb 2020)

  Changed paths:
    M htdocs/contact/card.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.formcompany.class.php
    M htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
    M htdocs/langs/en_US/main.lang
    M htdocs/supplier_proposal/class/supplier_proposal.class.php

  Log Message:
  -----------
  FIX Type of contact for event does not exists and not supported
FIX Type of contact not saved when creating a contact
FIX SQL Overload in default contact trigger.
FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER

Conflicts:
        htdocs/supplier_proposal/class/supplier_proposal.class.php


  Commit: 504a67daee53b9fdc85c91d34774844d6f73975d
      
https://github.com/Dolibarr/dolibarr/commit/504a67daee53b9fdc85c91d34774844d6f73975d
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-17 (Mon, 17 Feb 2020)

  Changed paths:
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.formaccounting.class.php
    M htdocs/core/modules/mailings/modules_mailings.php
    M htdocs/product/class/propalmergepdfproduct.class.php
    M htdocs/user/class/user.class.php
    M test/phpunit/CodingPhpTest.php

  Log Message:
  -----------
  FIX duplicate class name into some log lines


  Commit: a6b0fec90b29acb6960cf8e2f89cd38da565ad08
      
https://github.com/Dolibarr/dolibarr/commit/a6b0fec90b29acb6960cf8e2f89cd38da565ad08
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-17 (Mon, 17 Feb 2020)

  Changed paths:
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.formaccounting.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/modules/mailings/modules_mailings.php
    M htdocs/exports/class/export.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/class/propalmergepdfproduct.class.php
    M htdocs/supplier_proposal/class/supplier_proposal.class.php
    M htdocs/user/class/user.class.php
    M test/phpunit/CodingPhpTest.php

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

Conflicts:
        htdocs/exports/class/export.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/a02f5cde9246...a6b0fec90b29