[Dolibarr-git] [Dolibarr/dolibarr] 3e99a4: Update website.lib.php

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 3e99a40b9e09e2e660cbb1cecea5d2acbfd5a9db
      
https://github.com/Dolibarr/dolibarr/commit/3e99a40b9e09e2e660cbb1cecea5d2acbfd5a9db
  Author: Frédéric FRANCE <address@hidden>
  Date:   2019-04-26 (Fri, 26 Apr 2019)

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

  Log Message:
  -----------
  Update website.lib.php


  Commit: 31022e67539b404f45dcd4130224339ef45928ab
      
https://github.com/Dolibarr/dolibarr/commit/31022e67539b404f45dcd4130224339ef45928ab
  Author: Frédéric FRANCE <address@hidden>
  Date:   2019-04-26 (Fri, 26 Apr 2019)

  Changed paths:
    M htdocs/public/stripe/confirm_payment.php

  Log Message:
  -----------
  Update confirm_payment.php


  Commit: 5766bb0b8a73eb522c4bc6cb0025a39c86c481d4
      
https://github.com/Dolibarr/dolibarr/commit/5766bb0b8a73eb522c4bc6cb0025a39c86c481d4
  Author: Frédéric FRANCE <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M htdocs/admin/emailcollector_card.php
    M htdocs/comm/action/card.php
    M htdocs/compta/facture/card.php
    M htdocs/core/actions_massactions.inc.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/class/translate.class.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/price.lib.php
    M htdocs/core/modules/modProduct.class.php
    M htdocs/core/modules/modService.class.php
    M htdocs/core/modules/modWebsite.class.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/core/website.inc.php
    M htdocs/emailcollector/class/emailcollector.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/facture/card.php
    M htdocs/includes/odtphp/odf.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/website.lang
    M htdocs/main.inc.php
    M htdocs/projet/card.php
    M htdocs/projet/element.php
    M htdocs/projet/list.php
    M htdocs/projet/tasks/list.php
    M htdocs/public/payment/newpayment.php
    M htdocs/stripe/class/stripe.class.php
    M htdocs/supplier_proposal/card.php
    M htdocs/theme/eldy/global.inc.php
    M htdocs/viewimage.php
    M htdocs/website/index.php

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/develop' into patch-2


  Commit: ac304f58b078475f6c3c3c04eb9ec41face9bb65
      
https://github.com/Dolibarr/dolibarr/commit/ac304f58b078475f6c3c3c04eb9ec41face9bb65
  Author: Frédéric FRANCE <address@hidden>
  Date:   2019-04-30 (Tue, 30 Apr 2019)

  Changed paths:
    M htdocs/core/lib/price.lib.php
    M htdocs/core/modules/modProduct.class.php
    M htdocs/core/modules/modService.class.php
    M htdocs/core/tpl/objectline_create.tpl.php

  Log Message:
  -----------
  clean new commits


  Commit: 425dd6faf73ef7c96321096dc88a0fda6650d187
      
https://github.com/Dolibarr/dolibarr/commit/425dd6faf73ef7c96321096dc88a0fda6650d187
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-02 (Thu, 02 May 2019)

  Changed paths:
    M htdocs/adherents/card.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/admin/defaultvalues.php
    M htdocs/api/class/api.class.php
    M htdocs/api/index.php
    M htdocs/bom/class/api_boms.class.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.formticket.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/modules/modService.class.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/install/mysql/migration/9.0.0-10.0.0.sql
    M htdocs/install/mysql/tables/llx_actioncomm.sql
    R htdocs/install/mysql/tables/llx_ticket_msg.key.sql
    R htdocs/install/mysql/tables/llx_ticket_msg.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/modulebuilder.lang
    M htdocs/langs/en_US/ticket.lang
    M htdocs/modulebuilder/index.php
    M htdocs/modulebuilder/template/class/api_mymodule.class.php
    M htdocs/modulebuilder/template/core/modules/modMyModule.class.php
    M 
htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
    M htdocs/product/list.php
    M htdocs/ticket/agenda.php
    M htdocs/ticket/card.php
    M htdocs/ticket/class/actions_ticket.class.php
    M htdocs/ticket/class/api_tickets.class.php
    M htdocs/ticket/class/ticket.class.php
    M htdocs/ticket/img/statut0.png
    M htdocs/ticket/img/statut1.png
    A htdocs/ticket/img/statut2.png
    M htdocs/ticket/img/statut3.png
    R htdocs/ticket/img/statut4.png
    M htdocs/ticket/img/statut5.png
    M htdocs/ticket/img/statut6.png
    M htdocs/ticket/img/statut8.png
    A htdocs/ticket/img/statut9.png

  Log Message:
  -----------
  Merge branch 'develop' into patch-2


  Commit: c049ba79003ab6f287c679a2043167295fd5d32e
      
https://github.com/Dolibarr/dolibarr/commit/c049ba79003ab6f287c679a2043167295fd5d32e
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-02 (Thu, 02 May 2019)

  Changed paths:
    M htdocs/core/lib/price.lib.php
    M htdocs/core/modules/modProduct.class.php
    M htdocs/core/modules/modService.class.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/public/stripe/confirm_payment.php

  Log Message:
  -----------
  Merge pull request #11076 from frederic34/patch-2

phpcs fix


Compare: 
https://github.com/Dolibarr/dolibarr/compare/86f5889a72db...c049ba79003a