[Dolibarr-git] [Dolibarr/dolibarr] 804bad: Merge remote-tracking branch 'upstream/develop' in...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 804badd561da9ecc16cac55486b45bdce4bac623
      
https://github.com/Dolibarr/dolibarr/commit/804badd561da9ecc16cac55486b45bdce4bac623
  Author: Philippe GRAND <address@hidden>
  Date:   2018-09-09 (Sun, 09 Sep 2018)

  Changed paths:
    M htdocs/compta/bank/class/paymentvarious.class.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/website.lib.php
    R htdocs/install/doctemplates/shipment/index.html
    R htdocs/install/doctemplates/shipment/template_shipment.odt
    A htdocs/install/doctemplates/shipments/index.html
    A htdocs/install/doctemplates/shipments/template_shipment.odt
    R htdocs/install/doctemplates/supplier_proposal/index.html
    R 
htdocs/install/doctemplates/supplier_proposal/template_supplier_proposal.odt
    A htdocs/install/doctemplates/supplier_proposals/index.html
    A 
htdocs/install/doctemplates/supplier_proposals/template_supplier_proposal.odt
    A htdocs/install/doctemplates/websites/index.html
    A htdocs/install/doctemplates/websites/website_template-forinit.zip
    M htdocs/install/step1.php
    M htdocs/langs/en_US/website.lang
    M htdocs/modulebuilder/template/class/api_mymodule.class.php
    M htdocs/website/class/website.class.php
    M htdocs/website/index.php

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


  Commit: f0a3d6449243d8de6ebee13e08ba440c3a8a77a3
      
https://github.com/Dolibarr/dolibarr/commit/f0a3d6449243d8de6ebee13e08ba440c3a8a77a3
  Author: Philippe GRAND <address@hidden>
  Date:   2018-09-11 (Tue, 11 Sep 2018)

  Changed paths:
    M ChangeLog
    M htdocs/admin/company.php
    M htdocs/admin/ihm.php
    M htdocs/cashdesk/index.php
    M htdocs/cashdesk/tpl/ticket.tpl.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/security.lib.php
    M htdocs/core/lib/security2.lib.php
    M htdocs/core/lib/ticket.lib.php
    M htdocs/core/lib/website.lib.php
    M htdocs/core/menus/standard/auguria.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/tpl/login.tpl.php
    M htdocs/core/tpl/passwordforgotten.tpl.php
    M htdocs/document.php
    M htdocs/langs/en_US/website.lang
    M htdocs/opensurvey/fonctions.php
    M htdocs/paypal/lib/paypal.lib.php
    M htdocs/public/members/new.php
    M htdocs/public/onlinesign/newonlinesign.php
    M htdocs/public/payment/newpayment.php
    M htdocs/public/payment/paymentko.php
    M htdocs/public/payment/paymentok.php
    M htdocs/public/website/styles.css.php
    M htdocs/societe/list.php
    M htdocs/societe/paymentmodes.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/user/passwordforgotten.php
    M htdocs/viewimage.php
    M htdocs/website/class/website.class.php
    M htdocs/website/class/websitepage.class.php
    M htdocs/website/index.php

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


  Commit: b4cbb0561d0ccf8a0e77dadbf71d101025c3a0de
      
https://github.com/Dolibarr/dolibarr/commit/b4cbb0561d0ccf8a0e77dadbf71d101025c3a0de
  Author: Philippe GRAND <address@hidden>
  Date:   2018-09-11 (Tue, 11 Sep 2018)

  Changed paths:
    M htdocs/core/boxes/box_project.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/class/html.formticket.class.php
    M htdocs/core/lib/categories.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/lib/payments.lib.php

  Log Message:
  -----------
  Standardize and update code


  Commit: 05772f5327b0442113b94a9eee690914b8a5e1c3
      
https://github.com/Dolibarr/dolibarr/commit/05772f5327b0442113b94a9eee690914b8a5e1c3
  Author: Philippe GRAND <address@hidden>
  Date:   2018-09-11 (Tue, 11 Sep 2018)

  Changed paths:
    M htdocs/core/lib/product.lib.php
    M htdocs/core/lib/sendings.lib.php
    M htdocs/core/lib/signature.lib.php
    M htdocs/core/lib/supplier_proposal.lib.php
    M htdocs/core/menus/standard/eldy.lib.php

  Log Message:
  -----------
  Standardize and update code


  Commit: c51a0ef90155be192540342bb886b743129f40cf
      
https://github.com/Dolibarr/dolibarr/commit/c51a0ef90155be192540342bb886b743129f40cf
  Author: Philippe GRAND <address@hidden>
  Date:   2018-09-12 (Wed, 12 Sep 2018)

  Changed paths:
    M htdocs/core/modules/action/rapport.pdf.php
    M htdocs/core/modules/bank/doc/pdf_ban.modules.php

  Log Message:
  -----------
  Standardize and update code


  Commit: 69bf43f8512ebe5dc2ec9fd291ea2e96a43d4769
      
https://github.com/Dolibarr/dolibarr/commit/69bf43f8512ebe5dc2ec9fd291ea2e96a43d4769
  Author: Philippe GRAND <address@hidden>
  Date:   2018-09-12 (Wed, 12 Sep 2018)

  Changed paths:
    M htdocs/comm/card.php
    M htdocs/commande/card.php
    M htdocs/compta/charges/index.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/salaries/card.php
    M htdocs/compta/salaries/document.php
    M htdocs/compta/salaries/index.php
    M htdocs/compta/salaries/stats/index.php
    M htdocs/compta/sociales/payments.php
    M htdocs/core/actions_sendmails.inc.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/modSalaries.class.php
    R htdocs/core/modules/modSkype.class.php
    A htdocs/core/modules/modSocialNetworks.class.php
    M htdocs/fourn/card.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/index.php
    M htdocs/install/mysql/migration/8.0.0-9.0.0.sql
    M htdocs/install/mysql/tables/llx_societe.sql
    M htdocs/install/mysql/tables/llx_socpeople.sql
    M htdocs/install/upgrade2.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/projet/list.php
    M htdocs/societe/consumption.php
    M htdocs/societe/list.php
    M htdocs/societe/paymentmodes.php
    M htdocs/societe/tpl/linesalesrepresentative.tpl.php
    M htdocs/user/bank.php

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


  Commit: b8df44167aef5ecb81d463e7d9453dd4f1b979b9
      
https://github.com/Dolibarr/dolibarr/commit/b8df44167aef5ecb81d463e7d9453dd4f1b979b9
  Author: Philippe GRAND <address@hidden>
  Date:   2018-09-12 (Wed, 12 Sep 2018)

  Changed paths:
    M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
    M htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
    M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
    M htdocs/core/modules/mailings/contacts1.modules.php
    M htdocs/core/modules/mailings/fraise.modules.php

  Log Message:
  -----------
  Standardize and update code


  Commit: 81f4bae1598fd7bccefe1dd8d54dc824d18ea404
      
https://github.com/Dolibarr/dolibarr/commit/81f4bae1598fd7bccefe1dd8d54dc824d18ea404
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-09-12 (Wed, 12 Sep 2018)

  Changed paths:
    M htdocs/core/boxes/box_project.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/class/html.formticket.class.php
    M htdocs/core/lib/categories.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/lib/payments.lib.php
    M htdocs/core/lib/product.lib.php
    M htdocs/core/lib/sendings.lib.php
    M htdocs/core/lib/signature.lib.php
    M htdocs/core/lib/supplier_proposal.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/action/rapport.pdf.php
    M htdocs/core/modules/bank/doc/pdf_ban.modules.php
    M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
    M htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
    M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
    M htdocs/core/modules/mailings/contacts1.modules.php
    M htdocs/core/modules/mailings/fraise.modules.php

  Log Message:
  -----------
  Merge pull request #9461 from grandoc/new_branch_11_09_2018

New branch 11 09 2018


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b5d866f4d529...81f4bae1598f
      **NOTE:** This service has been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.