[Dolibarr-git] [Dolibarr/dolibarr] f59ac8: Merge remote-tracking branch 'origin/new_branch_20...

[Laurent Destailleur]

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

  Changed paths:
    M htdocs/blockedlog/class/blockedlog.class.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/class/CSMSFile.class.php
    M htdocs/core/class/commonstickergenerator.class.php
    M htdocs/core/class/cstate.class.php
    M htdocs/core/modules/action/rapport.pdf.php
    M htdocs/core/modules/bank/doc/pdf_ban.modules.php
    M htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
    M htdocs/core/modules/barcode/doc/phpbarcode.modules.php
    M htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
    M htdocs/core/modules/barcode/mod_barcode_product_standard.php
    M htdocs/core/modules/cheque/doc/pdf_blochet.class.php
    M htdocs/core/modules/cheque/mod_chequereceipt_mint.php
    M htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
    M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/commande/mod_commande_marbre.php
    M htdocs/core/modules/commande/mod_commande_saphir.php
    M htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
    M htdocs/core/modules/contract/mod_contract_magre.php
    M htdocs/core/modules/contract/mod_contract_olive.php
    M htdocs/core/modules/contract/mod_contract_serpis.php
    M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
    M htdocs/core/modules/expedition/mod_expedition_ribera.php
    M htdocs/core/modules/expedition/mod_expedition_safor.php
    M htdocs/core/modules/expensereport/mod_expensereport_jade.php
    M htdocs/core/modules/expensereport/mod_expensereport_sand.php
    M htdocs/core/modules/export/export_csv.modules.php
    M htdocs/core/modules/export/export_excel.modules.php
    M htdocs/core/modules/export/export_excel2007.modules.php
    M htdocs/core/modules/export/export_tsv.modules.php
    M htdocs/core/modules/export/modules_export.php
    M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/facture/mod_facture_mars.php
    M htdocs/core/modules/facture/mod_facture_mercure.php
    M htdocs/core/modules/facture/mod_facture_terre.php
    M htdocs/core/modules/fichinter/mod_arctic.php
    M htdocs/core/modules/fichinter/mod_pacific.php
    M htdocs/core/modules/holiday/mod_holiday_immaculate.php
    M htdocs/core/modules/holiday/mod_holiday_madonna.php
    M htdocs/core/modules/import/import_csv.modules.php
    M htdocs/core/modules/import/import_xlsx.modules.php
    M htdocs/core/modules/import/modules_import.php
    M htdocs/core/modules/livraison/mod_livraison_jade.php
    M htdocs/core/modules/livraison/mod_livraison_saphir.php
    M htdocs/core/modules/payment/mod_payment_ant.php
    M htdocs/core/modules/payment/mod_payment_cicada.php
    M htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
    M htdocs/core/modules/product/doc/pdf_standard.modules.php
    M htdocs/core/modules/product/mod_codeproduct_elephant.php
    M htdocs/core/modules/product/mod_codeproduct_leopard.php
    M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
    M htdocs/core/modules/project/doc/pdf_beluga.modules.php
    M htdocs/core/modules/project/doc/pdf_timespent.modules.php
    M htdocs/core/modules/project/mod_project_simple.php
    M htdocs/core/modules/project/mod_project_universal.php
    M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
    M htdocs/core/modules/project/task/mod_task_simple.php
    M htdocs/core/modules/project/task/mod_task_universal.php
    M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
    M htdocs/core/modules/propale/mod_propale_marbre.php
    M htdocs/core/modules/propale/mod_propale_saphir.php
    M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
    M htdocs/core/modules/societe/mod_codeclient_elephant.php
    M htdocs/core/modules/societe/mod_codeclient_leopard.php
    M htdocs/core/modules/societe/mod_codeclient_monkey.php
    M htdocs/core/modules/societe/mod_codecompta_aquarium.php
    M htdocs/core/modules/societe/mod_codecompta_panicum.php
    M htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
    M htdocs/core/modules/stock/doc/pdf_standard.modules.php
    M htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
    M htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
    M htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
    M htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
    M htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
    M 
htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
    M htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
    M htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
    M htdocs/core/modules/ticket/mod_ticket_simple.php
    M htdocs/core/modules/ticket/mod_ticket_universal.php
    M htdocs/core/modules/ticket/modules_ticket.php
    M htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
    M htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
    M htdocs/core/triggers/interface_20_all_Logevents.class.php
    M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
    M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
    M 
htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
    M htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
    M 
htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
    M htdocs/core/triggers/interface_50_modNotification_Notification.class.php
    M htdocs/expedition/shipment.php
    M htdocs/langs/en_US/deliveries.lang
    M htdocs/modulebuilder/template/class/actions_mymodule.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/user/class/usergroup.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/new_branch_20_09_2018' into 
new_branch_21_09_2018


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

  Changed paths:
    M htdocs/adherents/card.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/subscription.php

  Log Message:
  -----------
  Comment and typo


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

  Changed paths:
    M htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php
    M htdocs/core/modules/dons/html_cerfafr.modules.php
    M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php

  Log Message:
  -----------
  Comment and typo


  Commit: d5003c9d3c507b5064a1f8e96a1ae9a019b6a5e9
      
https://github.com/Dolibarr/dolibarr/commit/d5003c9d3c507b5064a1f8e96a1ae9a019b6a5e9
  Author: Philippe Grand <address@hidden>
  Date:   2018-09-21 (Fri, 21 Sep 2018)

  Changed paths:
    M htdocs/admin/dict.php
    M htdocs/core/lib/company.lib.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/facture/doc/doc_generic_invoice_odt.modules.php
    M htdocs/core/modules/modModuleBuilder.class.php
    M htdocs/core/modules/modSocialNetworks.class.php
    M htdocs/core/modules/modSyslog.class.php
    M htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
    M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
    M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
    M htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
    M 
htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
    M htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
    M htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/modulebuilder/admin/setup.php
    M htdocs/stripe/charge.php
    M htdocs/stripe/transaction.php
    M test/phpunit/LoanTest.php

  Log Message:
  -----------
  Merge branch 'develop' into new_branch_21_09_2018


  Commit: 48c3a1e1bcb499da82e6528542f8ee2c1d529b8d
      
https://github.com/Dolibarr/dolibarr/commit/48c3a1e1bcb499da82e6528542f8ee2c1d529b8d
  Author: Philippe GRAND <address@hidden>
  Date:   2018-09-21 (Fri, 21 Sep 2018)

  Changed paths:
    M htdocs/admin/dict.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/modules/modModuleBuilder.class.php
    M htdocs/core/modules/modSocialNetworks.class.php
    M htdocs/core/modules/modSyslog.class.php
    M htdocs/core/modules/ticket/mod_ticket_universal.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/modulebuilder/admin/setup.php
    M htdocs/stripe/charge.php
    M htdocs/stripe/transaction.php
    M test/phpunit/LoanTest.php

  Log Message:
  -----------
  fix merging


  Commit: de6fca0844604a4ff67c417e970111ea96cca736
      
https://github.com/Dolibarr/dolibarr/commit/de6fca0844604a4ff67c417e970111ea96cca736
  Author: Philippe GRAND <address@hidden>
  Date:   2018-09-21 (Fri, 21 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/facture/doc/doc_generic_invoice_odt.modules.php
    M htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
    M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
    M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
    M htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
    M 
htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
    M htdocs/core/modules/ticket/mod_ticket_universal.php
    M htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
    M htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php

  Log Message:
  -----------
  fix merging


  Commit: 9fab0a1d457a76bdffecb2ba8ad367278ba6d773
      
https://github.com/Dolibarr/dolibarr/commit/9fab0a1d457a76bdffecb2ba8ad367278ba6d773
  Author: Philippe GRAND <address@hidden>
  Date:   2018-09-21 (Fri, 21 Sep 2018)

  Changed paths:
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
    M htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
    M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
    M htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php

  Log Message:
  -----------
  Update comments


  Commit: 2afaccf09923aa021608ddc415d2aa9ddf1816d0
      
https://github.com/Dolibarr/dolibarr/commit/2afaccf09923aa021608ddc415d2aa9ddf1816d0
  Author: Philippe Grand <address@hidden>
  Date:   2018-09-21 (Fri, 21 Sep 2018)

  Changed paths:
    M htdocs/core/modules/ticket/mod_ticket_universal.php

  Log Message:
  -----------
  Update mod_ticket_universal.php


  Commit: 0bcec6c923098a9297d34baeb63a431e8ffcb8f5
      
https://github.com/Dolibarr/dolibarr/commit/0bcec6c923098a9297d34baeb63a431e8ffcb8f5
  Author: Philippe Grand <address@hidden>
  Date:   2018-09-21 (Fri, 21 Sep 2018)

  Changed paths:
    M htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php

  Log Message:
  -----------
  Update doc_generic_user_odt.modules.php


  Commit: 870f504633ac8ac688d5ebce2aad3546c4d6cab8
      
https://github.com/Dolibarr/dolibarr/commit/870f504633ac8ac688d5ebce2aad3546c4d6cab8
  Author: Philippe Grand <address@hidden>
  Date:   2018-09-21 (Fri, 21 Sep 2018)

  Changed paths:
    M htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php

  Log Message:
  -----------
  Update doc_generic_usergroup_odt.modules.php


  Commit: 1690ed86a7aa48ce75f3879befcd6cd7924f1715
      
https://github.com/Dolibarr/dolibarr/commit/1690ed86a7aa48ce75f3879befcd6cd7924f1715
  Author: Philippe GRAND <address@hidden>
  Date:   2018-09-21 (Fri, 21 Sep 2018)

  Changed paths:
    M htdocs/stripe/transaction.php

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


  Commit: 3355004e5df480320bde449ae45d8874654e4ffe
      
https://github.com/Dolibarr/dolibarr/commit/3355004e5df480320bde449ae45d8874654e4ffe
  Author: Philippe GRAND <address@hidden>
  Date:   2018-09-21 (Fri, 21 Sep 2018)

  Changed paths:
    M htdocs/core/modules/ticket/mod_ticket_universal.php
    M htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
    M htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php

  Log Message:
  -----------
  Merge branch 'new_branch_21_09_2018' of github.com:grandoc/dolibarr into 
new_branch_21_09_2018


  Commit: 3464afe391f8d536fdbbf6fc544985651aadf7d2
      
https://github.com/Dolibarr/dolibarr/commit/3464afe391f8d536fdbbf6fc544985651aadf7d2
  Author: Philippe GRAND <address@hidden>
  Date:   2018-09-21 (Fri, 21 Sep 2018)

  Changed paths:
    M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
    M htdocs/core/tpl/card_presend.tpl.php
    M htdocs/public/members/new.php
    M htdocs/public/payment/paymentok.php

  Log Message:
  -----------
  Update comment


  Commit: b7304e3d82978d08c2c61150da45ce9f8cf7d543
      
https://github.com/Dolibarr/dolibarr/commit/b7304e3d82978d08c2c61150da45ce9f8cf7d543
  Author: Philippe Grand <address@hidden>
  Date:   2018-09-27 (Thu, 27 Sep 2018)

  Changed paths:
    M dev/translation/sanity_check_en_langfiles.php
    M htdocs/admin/pdf.php
    M htdocs/comm/mailing/card.php
    M htdocs/comm/mailing/class/mailing.class.php
    M htdocs/comm/mailing/list.php
    M htdocs/compta/bank/card.php
    M htdocs/compta/bank/treso.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/list.php
    M htdocs/contact/card.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/class/antivir.class.php
    M htdocs/core/class/canvas.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/dolgraph.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/utils.class.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/website.lib.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
    M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    M htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
    M htdocs/core/modules/project/doc/pdf_baleine.modules.php
    M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
    M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
    M htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
    M htdocs/core/tpl/filemanager.tpl.php
    M htdocs/core/tpl/login.tpl.php
    M htdocs/core/website.inc.php
    M htdocs/ecm/tpl/enablefiletreeajax.tpl.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/install/doctemplates/websites/website_template-forinit.zip
    M htdocs/install/mysql/migration/8.0.0-9.0.0.sql
    M htdocs/install/mysql/tables/llx_website.sql
    M htdocs/install/mysql/tables/llx_website_page.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/boxes.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/website.lang
    M htdocs/modulebuilder/template/admin/setup.php
    M htdocs/multicurrency/class/multicurrency.class.php
    M htdocs/societe/card.php
    M htdocs/societe/class/societe.class.php
    M htdocs/stripe/transaction.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/user/class/user.class.php
    M htdocs/website/class/website.class.php
    M htdocs/website/class/websitepage.class.php
    M htdocs/website/index.php

  Log Message:
  -----------
  Merge branch 'develop' into new_branch_21_09_2018


  Commit: 60c74a625551da4d22d01730939e86cacf98ca3f
      
https://github.com/Dolibarr/dolibarr/commit/60c74a625551da4d22d01730939e86cacf98ca3f
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-09-27 (Thu, 27 Sep 2018)

  Changed paths:
    M htdocs/adherents/card.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/subscription.php
    M htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php
    M htdocs/core/modules/dons/html_cerfafr.modules.php
    M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    M htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
    M htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
    M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
    M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
    M htdocs/core/modules/ticket/mod_ticket_universal.php
    M htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
    M htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
    M htdocs/core/tpl/card_presend.tpl.php
    M htdocs/public/members/new.php
    M htdocs/public/payment/paymentok.php

  Log Message:
  -----------
  Merge pull request #9582 from grandoc/new_branch_21_09_2018

Standardize and update code from New branch 21 09 2018


Compare: 
https://github.com/Dolibarr/dolibarr/compare/26d20d0b76e8...60c74a625551
      **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.