[Dolibarr/dolibarr] f1cce2: FIX need weight short label in shipping doc

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f1cce26ef07e066e12b6687fb4258221dcac9eb4
      
https://github.com/Dolibarr/dolibarr/commit/f1cce26ef07e066e12b6687fb4258221dcac9eb4
  Author: ptibogxiv <address@hidden>
  Date:   2020-02-06 (Thu, 06 Feb 2020)

  Changed paths:
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php

  Log Message:
  -----------
  FIX need weight short label in shipping doc

need short label because value + term is too long


  Commit: 2ca6b8f6339eeef5f8f6ea13ba88cc608ebfe6a7
      
https://github.com/Dolibarr/dolibarr/commit/2ca6b8f6339eeef5f8f6ea13ba88cc608ebfe6a7
  Author: ptibogxiv <address@hidden>
  Date:   2020-02-06 (Thu, 06 Feb 2020)

  Changed paths:
    M htdocs/core/modules/expedition/doc/pdf_espadon.modules.php

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


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

  Changed paths:
    A .github/ISSUE_TEMPLATE/custom.md
    M .travis.yml
    M ChangeLog
    M build/docker/Dockerfile
    A dev/initdata/dbf/import-dbf.php
    A dev/initdata/dbf/importdb-products.php
    A dev/initdata/dbf/importdb-thirdparties.php
    A dev/initdata/dbf/includes/dbase.class.php
    M dev/initdata/generate-invoice.php
    M dev/initdata/generate-order.php
    M dev/initdata/generate-product.php
    M dev/initdata/generate-proposal.php
    M dev/initdata/generate-thirdparty.php
    M dev/initdata/import-products.php
    M dev/initdata/import-thirdparties.php
    M dev/initdata/import-users.php
    M dev/setup/codesniffer/ruleset.xml
    M htdocs/accountancy/admin/account.php
    M htdocs/accountancy/admin/card.php
    M htdocs/accountancy/bookkeeping/list.php
    M htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
    M htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
    M htdocs/accountancy/class/accountingaccount.class.php
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/accountancy/class/lettering.class.php
    M htdocs/adherents/card.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/class/subscription.class.php
    M htdocs/adherents/subscription.php
    M htdocs/adherents/type.php
    M htdocs/admin/agenda_other.php
    M htdocs/admin/agenda_xcal.php
    M htdocs/admin/bom.php
    M htdocs/admin/commande.php
    M htdocs/admin/company.php
    M htdocs/admin/contract.php
    M htdocs/admin/delais.php
    M htdocs/admin/facture.php
    M htdocs/admin/fichinter.php
    M htdocs/admin/holiday.php
    M htdocs/admin/ihm.php
    M htdocs/admin/limits.php
    M htdocs/admin/mails.php
    M htdocs/admin/mails_senderprofile_list.php
    M htdocs/admin/mrp.php
    M htdocs/admin/notification.php
    M htdocs/admin/order_extrafields.php
    M htdocs/admin/orderdet_extrafields.php
    M htdocs/admin/perms.php
    M htdocs/admin/propal.php
    M htdocs/admin/reception_setup.php
    M htdocs/admin/stock.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/admin/system/phpinfo.php
    M htdocs/admin/ticket.php
    M htdocs/admin/tools/dolibarr_export.php
    M htdocs/admin/tools/listevents.php
    M htdocs/asset/class/asset.class.php
    M htdocs/asset/class/asset_type.class.php
    M htdocs/asset/list.php
    M htdocs/bom/class/bom.class.php
    M htdocs/categories/class/api_categories.class.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/index.php
    M htdocs/categories/viewcat.php
    M htdocs/comm/action/card.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/index.php
    M htdocs/comm/action/list.php
    M htdocs/comm/card.php
    M htdocs/comm/index.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/list.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/list.php
    M htdocs/compta/bank/card.php
    M htdocs/compta/bank/various_payment/list.php
    M htdocs/compta/cashcontrol/report.php
    M htdocs/compta/facture/card.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/paiement.php
    M htdocs/compta/paiement/class/paiement.class.php
    M htdocs/compta/prelevement/card.php
    M htdocs/compta/prelevement/create.php
    M htdocs/compta/prelevement/demandes.php
    M htdocs/compta/recap-compta.php
    M htdocs/compta/sociales/card.php
    M htdocs/compta/sociales/class/chargesociales.class.php
    M htdocs/compta/tva/document.php
    M htdocs/contact/card.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/services_list.php
    M htdocs/core/actions_setmoduleoptions.inc.php
    M htdocs/core/boxes/box_factures_fourn_imp.php
    M htdocs/core/boxes/box_factures_imp.php
    M htdocs/core/boxes/box_services_expired.php
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/class/commoninvoice.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/class/discount.class.php
    M htdocs/core/class/doleditor.class.php
    M htdocs/core/class/dolgraph.class.php
    M htdocs/core/class/dolreceiptprinter.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formaccounting.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/class/html.formticket.class.php
    M htdocs/core/class/smtps.class.php
    M htdocs/core/class/translate.class.php
    M htdocs/core/class/utils.class.php
    A htdocs/core/customreports.php
    M htdocs/core/db/mssql.class.php
    M htdocs/core/extrafieldsinexport.inc.php
    M htdocs/core/lib/date.lib.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/lib/functionsnumtoword.lib.php
    M htdocs/core/lib/invoice.lib.php
    M htdocs/core/lib/multicurrency.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/modules/DolibarrModules.class.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/doc/pdf_eratosthene.modules.php
    M htdocs/core/modules/commande/doc/pdf_proforma.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/expedition/doc/pdf_espadon.modules.php
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
    R htdocs/core/modules/export/export_excel.modules.php
    R htdocs/core/modules/export/export_excel2007.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/facture/doc/pdf_sponge.modules.php
    M htdocs/core/modules/facture/modules_facture.php
    M htdocs/core/modules/import/import_csv.modules.php
    M htdocs/core/modules/import/import_xlsx.modules.php
    M htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
    M htdocs/core/modules/mailings/contacts1.modules.php
    M htdocs/core/modules/modAgenda.class.php
    M htdocs/core/modules/modCashDesk.class.php
    M htdocs/core/modules/modContrat.class.php
    M htdocs/core/modules/modLabel.class.php
    M htdocs/core/modules/modMrp.class.php
    M htdocs/core/modules/modReceiptPrinter.class.php
    M htdocs/core/modules/modTakePos.class.php
    M htdocs/core/modules/modTicket.class.php
    M htdocs/core/modules/modUser.class.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/propale/doc/pdf_cyan.modules.php
    M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
    A htdocs/core/modules/supplier_invoice/doc/index.html
    A htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
    R htdocs/core/modules/supplier_invoice/pdf/index.html
    R htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    A 
htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
    A htdocs/core/modules/supplier_order/doc/index.html
    A htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
    A htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
    R 
htdocs/core/modules/supplier_order/pdf/doc_generic_supplier_order_odt.modules.php
    R htdocs/core/modules/supplier_order/pdf/index.html
    R htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
    R htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
    M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
    M htdocs/core/tpl/massactions_pre.tpl.php
    M htdocs/cron/class/cronjob.class.php
    M htdocs/dav/dav.class.php
    M htdocs/expedition/list.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereportstats.class.php
    M htdocs/exports/class/export.class.php
    M htdocs/exports/export.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/ajax/getSupplierPrices.php
    M htdocs/fourn/card.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/dispatch.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/fourn/recap-fourn.php
    M htdocs/holiday/card.php
    M htdocs/index.php
    M htdocs/install/check.php
    M htdocs/install/default.css
    M htdocs/install/fileconf.php
    M htdocs/install/mysql/data/llx_00_c_country.sql
    M htdocs/install/mysql/data/llx_10_c_regions.sql
    M htdocs/install/mysql/data/llx_20_c_departements.sql
    M htdocs/install/mysql/data/llx_accounting_abc.sql
    M htdocs/install/mysql/data/llx_accounting_account_fr.sql
    M htdocs/install/mysql/data/llx_c_forme_juridique.sql
    A htdocs/install/mysql/data/llx_c_ticket_resolution.sql
    M htdocs/install/mysql/migration/10.0.0-11.0.0.sql
    A htdocs/install/mysql/migration/11.0.0-12.0.0.sql
    M htdocs/install/mysql/tables/llx_accounting_account.sql
    M htdocs/install/mysql/tables/llx_bookmark.key.sql
    M htdocs/install/mysql/tables/llx_bookmark.sql
    M htdocs/install/mysql/tables/llx_c_country.sql
    A htdocs/install/mysql/tables/llx_c_ticket_resolution.key.sql
    A htdocs/install/mysql/tables/llx_c_ticket_resolution.sql
    A htdocs/install/mysql/tables/llx_categorie_actioncomm.key.sql
    A htdocs/install/mysql/tables/llx_categorie_actioncomm.sql
    M htdocs/install/mysql/tables/llx_contrat.sql
    M htdocs/install/mysql/tables/llx_facture.sql
    M htdocs/install/mysql/tables/llx_holiday_users.key.sql
    M htdocs/install/mysql/tables/llx_holiday_users.sql
    A htdocs/install/mysql/tables/llx_object_lang.key.sql
    A htdocs/install/mysql/tables/llx_object_lang.sql
    M htdocs/install/mysql/tables/llx_societe_rib.sql
    M htdocs/install/mysql/tables/llx_subscription.sql
    M htdocs/install/mysql/tables/llx_ticket.sql
    M htdocs/install/upgrade2.php
    M htdocs/langs/de_DE/holiday.lang
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/agenda.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/cashdesk.lang
    M htdocs/langs/en_US/categories.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/en_US/exports.lang
    M htdocs/langs/en_US/install.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/orders.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/propal.lang
    M htdocs/langs/en_US/receiptprinter.lang
    M htdocs/langs/en_US/ticket.lang
    M htdocs/langs/fr_FR/projects.lang
    M htdocs/loan/class/loan.class.php
    M htdocs/loan/list.php
    M htdocs/main.inc.php
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php
    M htdocs/modulebuilder/index.php
    M htdocs/modulebuilder/template/class/actions_mymodule.class.php
    M htdocs/modulebuilder/template/class/myobject.class.php
    M 
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
    M 
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
    M htdocs/modulebuilder/template/myobject_list.php
    M htdocs/mrp/class/mo.class.php
    M htdocs/mrp/lib/mrp_mo.lib.php
    M htdocs/mrp/mo_card.php
    M htdocs/mrp/mo_production.php
    M htdocs/product/card.php
    M htdocs/product/class/product.class.php
    M htdocs/product/inventory/class/inventory.class.php
    M htdocs/product/list.php
    M htdocs/product/reassortlot.php
    M htdocs/product/stats/card.php
    M htdocs/product/stock/card.php
    M htdocs/product/stock/class/api_stockmovements.class.php
    M htdocs/product/stock/class/entrepot.class.php
    M htdocs/product/stock/class/mouvementstock.class.php
    M htdocs/product/stock/product.php
    M htdocs/product/stock/productlot_list.php
    M htdocs/projet/activity/perday.php
    A htdocs/projet/activity/permonth.php
    M htdocs/projet/activity/perweek.php
    M htdocs/projet/card.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/class/task.class.php
    M htdocs/projet/comment.php
    M htdocs/projet/contact.php
    M htdocs/projet/element.php
    M htdocs/projet/ganttview.php
    M htdocs/projet/tasks.php
    M htdocs/projet/tasks/time.php
    M htdocs/public/agenda/agendaexport.php
    M htdocs/public/demo/index.php
    M htdocs/public/payment/newpayment.php
    M htdocs/resource/class/dolresource.class.php
    M htdocs/salaries/list.php
    M htdocs/societe/card.php
    M htdocs/societe/class/companypaymentmode.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/paymentmodes.php
    M htdocs/stripe/admin/stripe.php
    M htdocs/stripe/charge.php
    M htdocs/stripe/class/stripe.class.php
    M htdocs/stripe/config.php
    R htdocs/stripe/payment.php
    M htdocs/supplier_proposal/class/supplier_proposal.class.php
    M htdocs/takepos/admin/setup.php
    M htdocs/takepos/ajax/ajax.php
    A htdocs/takepos/css/colorful.css
    R htdocs/takepos/css/pos.css
    A htdocs/takepos/css/pos.css.php
    M htdocs/takepos/floors.php
    M htdocs/takepos/freezone.php
    M htdocs/takepos/invoice.php
    M htdocs/takepos/pay.php
    M htdocs/takepos/receipt.php
    M htdocs/takepos/send.php
    M htdocs/takepos/takepos.php
    M htdocs/theme/eldy/global.inc.php
    M htdocs/theme/eldy/info-box.inc.php
    M htdocs/theme/md/style.css.php
    M htdocs/ticket/card.php
    M htdocs/ticket/class/ticket.class.php
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php
    M htdocs/user/home.php
    M htdocs/user/list.php
    M htdocs/user/perms.php
    M htdocs/website/class/websitepage.class.php
    M phpstan.neon
    M scripts/odt2pdf/odt2pdf.sh
    M test/phpunit/ExportTest.php
    M test/phpunit/FunctionsLibTest.php

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


  Commit: 9a21aa1722526c41d70aa37bd4396913e73856bd
      
https://github.com/Dolibarr/dolibarr/commit/9a21aa1722526c41d70aa37bd4396913e73856bd
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-08 (Sat, 08 Feb 2020)

  Changed paths:
    M htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php

  Log Message:
  -----------
  Merge pull request #13036 from ptibogxiv/patch-301

FIX : short label in shipping pdf


Compare: 
https://github.com/Dolibarr/dolibarr/compare/9c12c4be08b6...9a21aa172252