[Dolibarr-git] [Dolibarr/dolibarr] 7c722d: FIX #7312

[Laurent Destailleur]

  Branch: refs/heads/6.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 7c722def0fad9e5b4d7d4fff491a04adcef53652
      
https://github.com/Dolibarr/dolibarr/commit/7c722def0fad9e5b4d7d4fff491a04adcef53652
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-09-02 (Sat, 02 Sep 2017)

  Changed paths:
    M htdocs/margin/customerMargins.php

  Log Message:
  -----------
  FIX #7312


  Commit: 09e9254f354a220d8557119d52f33e2e0cfb1049
      
https://github.com/Dolibarr/dolibarr/commit/09e9254f354a220d8557119d52f33e2e0cfb1049
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-09-02 (Sat, 02 Sep 2017)

  Changed paths:
    M ChangeLog
    M build/generate_filelist_xml.php
    M build/perl/virtualmin/README
    M build/perl/virtualmin/dolibarr.pl
    A dev/initdemo/mysqldump_dolibarr_6.0.0.sql
    M dev/initdemo/savedemo.sh
    M htdocs/accountancy/admin/fiscalyear_card.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/expensereportsjournal.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/subscription.php
    M htdocs/admin/agenda.php
    M htdocs/admin/agenda_extrafields.php
    M htdocs/admin/agenda_extsites.php
    M htdocs/admin/agenda_other.php
    M htdocs/admin/agenda_xcal.php
    M htdocs/admin/bank.php
    M htdocs/admin/chequereceipts.php
    M htdocs/admin/commande.php
    M htdocs/admin/contract.php
    M htdocs/admin/expedition.php
    M htdocs/admin/expensereport.php
    M htdocs/admin/fichinter.php
    M htdocs/admin/livraison.php
    M htdocs/admin/mails.php
    M htdocs/admin/modules.php
    M htdocs/admin/payment.php
    M htdocs/admin/pdf.php
    M htdocs/admin/prelevement.php
    M htdocs/admin/propal.php
    M htdocs/admin/supplier_invoice.php
    M htdocs/admin/supplier_order.php
    M htdocs/admin/supplier_payment.php
    M htdocs/admin/supplier_proposal.php
    M htdocs/comm/action/card.php
    M htdocs/comm/mailing/card.php
    M htdocs/comm/propal/document.php
    M htdocs/commande/document.php
    M htdocs/compta/bank/document.php
    M htdocs/compta/bank/index.php
    M htdocs/compta/bank/transfer.php
    M htdocs/compta/facture/card.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/document.php
    M htdocs/compta/facture/info.php
    M htdocs/compta/sociales/info.php
    M htdocs/contact/agenda.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/info.php
    M htdocs/contrat/services.php
    M htdocs/core/actions_linkedfiles.inc.php
    M htdocs/core/actions_massactions.inc.php
    M htdocs/core/actions_sendmails.inc.php
    M htdocs/core/boxes/box_activity.php
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/class/CSMSFile.class.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/dolgraph.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/class/html.formsms.class.php
    M htdocs/core/class/smtps.class.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/security.lib.php
    M htdocs/core/lib/security2.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/auguria.lib.php
    M htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.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/supplier_proposal/doc/pdf_aurore.modules.php
    M htdocs/core/tpl/document_actions_post_headers.tpl.php
    M htdocs/core/tpl/login.tpl.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/core/tpl/passwordforgotten.tpl.php
    M htdocs/cron/admin/cron.php
    M htdocs/cron/list.php
    M htdocs/don/admin/donation.php
    M htdocs/expedition/card.php
    M htdocs/expensereport/ajax/ajaxprojet.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/list.php
    M htdocs/fichinter/info.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/card.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/commande/dispatch.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/info.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/holiday/list.php
    M htdocs/index.php
    M htdocs/install/mysql/data/llx_accounting.sql
    M htdocs/install/mysql/data/llx_c_currencies.sql
    M htdocs/install/mysql/data/llx_c_tva.sql
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/install/mysql/tables/llx_facturedet_rec.key.sql
    M htdocs/install/mysql/tables/llx_holiday_config.sql
    M htdocs/install/step1.php
    M htdocs/langs/ca_ES/stocks.lang
    M htdocs/langs/cs_CZ/admin.lang
    M htdocs/langs/cs_CZ/exports.lang
    M htdocs/langs/de_AT/admin.lang
    M htdocs/langs/de_AT/projects.lang
    M htdocs/langs/de_AT/stocks.lang
    M htdocs/langs/de_CH/projects.lang
    M htdocs/langs/el_CY/admin.lang
    M htdocs/langs/en_AU/admin.lang
    M htdocs/langs/en_CA/admin.lang
    M htdocs/langs/en_GB/accountancy.lang
    M htdocs/langs/en_GB/admin.lang
    M htdocs/langs/en_GB/projects.lang
    M htdocs/langs/en_GB/stocks.lang
    M htdocs/langs/en_GB/website.lang
    M htdocs/langs/en_GB/withdrawals.lang
    M htdocs/langs/en_GB/workflow.lang
    M htdocs/langs/en_IN/admin.lang
    M htdocs/langs/en_IN/projects.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/other.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/sms.lang
    M htdocs/langs/es_AR/admin.lang
    M htdocs/langs/es_BO/admin.lang
    M htdocs/langs/es_CL/admin.lang
    M htdocs/langs/es_CL/projects.lang
    M htdocs/langs/es_CL/stocks.lang
    M htdocs/langs/es_CO/admin.lang
    M htdocs/langs/es_CO/cron.lang
    M htdocs/langs/es_CO/stocks.lang
    M htdocs/langs/es_DO/admin.lang
    M htdocs/langs/es_EC/admin.lang
    M htdocs/langs/es_MX/admin.lang
    M htdocs/langs/es_MX/cron.lang
    M htdocs/langs/es_PA/admin.lang
    M htdocs/langs/es_PE/admin.lang
    M htdocs/langs/es_PY/admin.lang
    M htdocs/langs/es_VE/projects.lang
    M htdocs/langs/es_VE/stocks.lang
    M htdocs/langs/fr_BE/admin.lang
    M htdocs/langs/fr_BE/agenda.lang
    M htdocs/langs/fr_CA/cron.lang
    M htdocs/langs/fr_CA/stocks.lang
    M htdocs/langs/fr_CA/website.lang
    M htdocs/langs/fr_CH/admin.lang
    M htdocs/langs/fr_FR/agenda.lang
    M htdocs/langs/fr_FR/bills.lang
    M htdocs/langs/fr_FR/compta.lang
    M htdocs/langs/fr_FR/install.lang
    M htdocs/langs/fr_FR/main.lang
    M htdocs/langs/fr_FR/modulebuilder.lang
    M htdocs/langs/fr_FR/multicurrency.lang
    M htdocs/langs/fr_FR/salaries.lang
    M htdocs/langs/fr_FR/trips.lang
    M htdocs/langs/fr_FR/website.lang
    M htdocs/langs/it_IT/bills.lang
    M htdocs/langs/it_IT/products.lang
    M htdocs/langs/ko_KR/admin.lang
    M htdocs/langs/ko_KR/agenda.lang
    M htdocs/langs/ko_KR/banks.lang
    M htdocs/langs/ko_KR/bills.lang
    M htdocs/langs/ko_KR/boxes.lang
    M htdocs/langs/ko_KR/cashdesk.lang
    M htdocs/langs/ko_KR/commercial.lang
    M htdocs/langs/ko_KR/companies.lang
    M htdocs/langs/ko_KR/compta.lang
    M htdocs/langs/ko_KR/contracts.lang
    M htdocs/langs/ko_KR/cron.lang
    M htdocs/langs/ko_KR/deliveries.lang
    M htdocs/langs/ko_KR/dict.lang
    M htdocs/langs/ko_KR/donations.lang
    M htdocs/langs/ko_KR/ecm.lang
    M htdocs/langs/ko_KR/help.lang
    M htdocs/langs/ko_KR/holiday.lang
    M htdocs/langs/ko_KR/interventions.lang
    M htdocs/langs/ko_KR/languages.lang
    M htdocs/langs/ko_KR/ldap.lang
    M htdocs/langs/ko_KR/loan.lang
    M htdocs/langs/ko_KR/mails.lang
    M htdocs/langs/ko_KR/main.lang
    M htdocs/langs/ko_KR/members.lang
    A htdocs/langs/ko_KR/multicurrency.lang
    M htdocs/langs/ko_KR/opensurvey.lang
    M htdocs/langs/ko_KR/orders.lang
    M htdocs/langs/ko_KR/other.lang
    M htdocs/langs/ko_KR/paybox.lang
    M htdocs/langs/ko_KR/printing.lang
    M htdocs/langs/ko_KR/productbatch.lang
    M htdocs/langs/ko_KR/products.lang
    M htdocs/langs/ko_KR/projects.lang
    M htdocs/langs/ko_KR/propal.lang
    M htdocs/langs/ko_KR/resource.lang
    M htdocs/langs/ko_KR/sendings.lang
    M htdocs/langs/ko_KR/sms.lang
    M htdocs/langs/ko_KR/stocks.lang
    M htdocs/langs/ko_KR/stripe.lang
    M htdocs/langs/ko_KR/supplier_proposal.lang
    M htdocs/langs/ko_KR/suppliers.lang
    M htdocs/langs/ko_KR/trips.lang
    M htdocs/langs/ko_KR/users.lang
    M htdocs/langs/ko_KR/website.lang
    M htdocs/langs/ko_KR/withdrawals.lang
    M htdocs/langs/pl_PL/accountancy.lang
    M htdocs/langs/pl_PL/admin.lang
    M htdocs/langs/pl_PL/agenda.lang
    M htdocs/langs/pl_PL/banks.lang
    M htdocs/langs/pl_PL/bills.lang
    M htdocs/langs/pl_PL/companies.lang
    M htdocs/langs/pl_PL/compta.lang
    M htdocs/langs/pl_PL/install.lang
    M htdocs/langs/pl_PL/loan.lang
    M htdocs/langs/pl_PL/mailmanspip.lang
    M htdocs/langs/pl_PL/mails.lang
    M htdocs/langs/pl_PL/main.lang
    M htdocs/langs/pl_PL/modulebuilder.lang
    M htdocs/langs/pl_PL/multicurrency.lang
    M htdocs/langs/pl_PL/oauth.lang
    M htdocs/langs/pl_PL/orders.lang
    M htdocs/langs/pl_PL/other.lang
    M htdocs/langs/pl_PL/productbatch.lang
    M htdocs/langs/pl_PL/products.lang
    M htdocs/langs/pl_PL/resource.lang
    M htdocs/langs/pl_PL/stocks.lang
    M htdocs/langs/pl_PL/stripe.lang
    M htdocs/langs/pl_PL/supplier_proposal.lang
    M htdocs/langs/pl_PL/trips.lang
    M htdocs/langs/pl_PL/website.lang
    M htdocs/langs/pl_PL/withdrawals.lang
    M htdocs/langs/pt_BR/other.lang
    M htdocs/langs/pt_PT/admin.lang
    M htdocs/langs/pt_PT/salaries.lang
    M htdocs/langs/ru_RU/agenda.lang
    M htdocs/langs/ru_RU/cashdesk.lang
    M htdocs/langs/ru_RU/opensurvey.lang
    M htdocs/langs/tr_TR/accountancy.lang
    M htdocs/langs/tr_TR/admin.lang
    M htdocs/langs/tr_TR/agenda.lang
    M htdocs/langs/tr_TR/bills.lang
    M htdocs/langs/tr_TR/contracts.lang
    M htdocs/langs/tr_TR/cron.lang
    M htdocs/langs/tr_TR/deliveries.lang
    M htdocs/langs/tr_TR/donations.lang
    M htdocs/langs/tr_TR/ecm.lang
    M htdocs/langs/tr_TR/errors.lang
    M htdocs/langs/tr_TR/exports.lang
    M htdocs/langs/tr_TR/help.lang
    M htdocs/langs/tr_TR/holiday.lang
    M htdocs/langs/tr_TR/hrm.lang
    M htdocs/langs/tr_TR/install.lang
    M htdocs/langs/tr_TR/interventions.lang
    M htdocs/langs/tr_TR/languages.lang
    M htdocs/langs/tr_TR/ldap.lang
    M htdocs/langs/tr_TR/loan.lang
    M htdocs/langs/tr_TR/mails.lang
    M htdocs/langs/tr_TR/main.lang
    M htdocs/langs/tr_TR/members.lang
    M htdocs/langs/tr_TR/multicurrency.lang
    M htdocs/langs/tr_TR/orders.lang
    M htdocs/langs/tr_TR/other.lang
    M htdocs/langs/tr_TR/paypal.lang
    M htdocs/langs/tr_TR/products.lang
    M htdocs/langs/tr_TR/salaries.lang
    M htdocs/langs/tr_TR/sendings.lang
    M htdocs/langs/tr_TR/users.lang
    M htdocs/langs/tr_TR/website.lang
    M htdocs/loan/info.php
    M htdocs/main.inc.php
    M htdocs/modulebuilder/template/myobject_list.php
    M htdocs/product/admin/product.php
    M htdocs/product/class/productcustomerprice.class.php
    M htdocs/product/list.php
    M htdocs/projet/activity/perday.php
    M htdocs/projet/activity/perweek.php
    M htdocs/projet/admin/project.php
    M htdocs/projet/ganttview.php
    M htdocs/projet/tasks.php
    M htdocs/societe/admin/societe.php
    M htdocs/societe/card.php
    M htdocs/societe/list.php
    M htdocs/societe/tpl/linesalesrepresentative.tpl.php
    M htdocs/supplier_proposal/card.php
    M htdocs/supplier_proposal/document.php
    M htdocs/supplier_proposal/info.php
    M htdocs/support/index.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/user/card.php
    M htdocs/user/passwordforgotten.php
    M htdocs/webservices/server_order.php
    M scripts/cron/cron_run_jobs.php
    M test/phpunit/FunctionsLibTest.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/227c8a96c8ff...09e9254f354a