[Dolibarr/dolibarr] d36bf4: Fix php error

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: d36bf43d2d3f1a2684549f9f82d5b711290a7b5b
      
https://github.com/Dolibarr/dolibarr/commit/d36bf43d2d3f1a2684549f9f82d5b711290a7b5b
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-11-14 (Thu, 14 Nov 2019)

  Changed paths:
    M htdocs/expedition/card.php

  Log Message:
  -----------
  Fix php error


  Commit: 0b947cddaef1a8f8fb9438ae4be9f35576d2a7c0
      
https://github.com/Dolibarr/dolibarr/commit/0b947cddaef1a8f8fb9438ae4be9f35576d2a7c0
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-11-14 (Thu, 14 Nov 2019)

  Changed paths:
    M htdocs/accountancy/admin/categories_list.php
    M htdocs/accountancy/admin/defaultaccounts.php
    M htdocs/accountancy/admin/journals_list.php
    M htdocs/accountancy/bookkeeping/list.php
    M htdocs/accountancy/class/accountancyexport.class.php
    M htdocs/accountancy/journal/expensereportsjournal.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/adherents/index.php
    M htdocs/adherents/tpl/linkedobjectblock.tpl.php
    M htdocs/admin/agenda_other.php
    M htdocs/admin/barcode.php
    M htdocs/admin/commande.php
    M htdocs/admin/company.php
    M htdocs/admin/contract.php
    M htdocs/admin/fichinter.php
    M htdocs/admin/livraison.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/database-tables.php
    M htdocs/barcode/printsheet.php
    M htdocs/blockedlog/class/authority.class.php
    M htdocs/blockedlog/class/blockedlog.class.php
    M htdocs/cashdesk/tpl/liste_articles.tpl.php
    M htdocs/cashdesk/tpl/validation1.tpl.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/photos.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/localtax/card.php
    M htdocs/compta/paiement_charge.php
    M htdocs/compta/prelevement/bons.php
    M htdocs/compta/prelevement/list.php
    M htdocs/compta/sociales/class/paymentsocialcontribution.class.php
    M htdocs/core/boxes/box_goodcustomers.php
    M htdocs/core/boxes/box_task.php
    M htdocs/core/class/link.class.php
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/reception/doc/pdf_squille.modules.php
    M htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
    M htdocs/core/tools.php
    M htdocs/core/tpl/contacts.tpl.php
    M htdocs/core/tpl/object_discounts.tpl.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/expensereport/tpl/linkedobjectblock.tpl.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/index.php
    M htdocs/holiday/card.php
    M htdocs/holiday/class/holiday.class.php
    M htdocs/hrm/index.php
    M htdocs/index.php
    M htdocs/install/upgrade2.php
    M htdocs/loan/calcmens.php
    M htdocs/opensurvey/wizard/choix_autre.php
    M htdocs/product/ajax/products.php
    M htdocs/product/canvas/product/tpl/card_create.tpl.php
    M htdocs/product/canvas/service/tpl/card_create.tpl.php
    M htdocs/product/class/productcustomerprice.class.php
    M htdocs/product/document.php
    M htdocs/product/reassort.php
    M htdocs/projet/index.php
    M htdocs/public/onlinesign/newonlinesign.php
    M htdocs/resource/class/html.formresource.class.php
    M htdocs/societe/class/api_thirdparties.class.php
    M htdocs/societe/class/companybankaccount.class.php
    M htdocs/stripe/payment.php
    M htdocs/stripe/payout.php
    M htdocs/stripe/transaction.php
    M htdocs/takepos/admin/receipt.php
    M htdocs/takepos/admin/setup.php
    M htdocs/takepos/phone.php
    M htdocs/takepos/receipt.php
    M htdocs/theme/eldy/btn.inc.php
    M htdocs/theme/eldy/timeline.inc.php
    M htdocs/user/passwordforgotten.php
    M htdocs/variants/card.php
    M htdocs/variants/combinations.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/8db4eff1080a...0b947cddaef1