[Dolibarr-git] [Dolibarr/dolibarr] e75dea: Merge remote-tracking branch 'refs/remotes/Dolibar...

[Laurent Destailleur]

  Branch: refs/heads/5.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: e75dea4f8dfa8d68ed4cf0b2e42f47ec33f4663a
      
https://github.com/Dolibarr/dolibarr/commit/e75dea4f8dfa8d68ed4cf0b2e42f47ec33f4663a
  Author: fappels <address@hidden>
  Date:   2017-03-24 (Fri, 24 Mar 2017)

  Changed paths:
    M README.md
    M htdocs/accountancy/admin/categories_list.php
    M htdocs/accountancy/admin/index.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/admin/dict.php
    M htdocs/admin/index.php
    M htdocs/admin/modules.php
    M htdocs/categories/class/api_categories.class.php
    M htdocs/categories/class/api_deprecated_category.class.php
    M htdocs/comm/propal/card.php
    M htdocs/comm/remise.php
    M htdocs/commande/card.php
    M htdocs/commande/info.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/bank/bankentries.php
    M htdocs/compta/bank/ligne.php
    M htdocs/compta/facture.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/actions_massactions.inc.php
    M htdocs/core/boxes/box_factures_imp.php
    M htdocs/core/boxes/box_produits.php
    M htdocs/core/boxes/box_produits_alerte_stock.php
    M htdocs/core/boxes/box_project.php
    M htdocs/core/boxes/box_services_contracts.php
    M htdocs/core/boxes/box_services_expired.php
    M htdocs/core/boxes/modules_boxes.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/class/interfaces.class.php
    M htdocs/core/db/Database.interface.php
    M htdocs/core/lib/accounting.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/project.lib.php
    M htdocs/core/lib/security.lib.php
    M htdocs/core/login/functions_dolibarr.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/dons/html_cerfafr.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/import/import_csv.modules.php
    M htdocs/core/modules/modNotification.class.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/resource_add.tpl.php
    M htdocs/expedition/card.php
    M htdocs/expensereport/info.php
    M htdocs/exports/class/export.class.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/commande/orderstoinvoice.php
    M htdocs/fourn/facture/card.php
    M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
    M htdocs/install/mysql/tables/llx_supplier_proposaldet.sql
    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/banks.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/loan.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/propal.lang
    M htdocs/langs/en_US/sendings.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/langs/en_US/supplier_proposal.lang
    M htdocs/main.inc.php
    M htdocs/product/admin/price_rules.php
    M htdocs/product/class/api_products.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/reassortlot.php
    M htdocs/product/stock/class/productlot.class.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/productlot_card.php
    M htdocs/projet/activity/perday.php
    M htdocs/projet/activity/perweek.php
    M htdocs/projet/card.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/element.php
    M htdocs/projet/list.php
    M htdocs/societe/class/api_contacts.class.php
    M htdocs/societe/class/api_thirdparties.class.php
    M htdocs/societe/rib.php
    M htdocs/societe/soc.php
    M htdocs/supplier_proposal/card.php
    M htdocs/supplier_proposal/class/supplier_proposal.class.php
    M htdocs/theme/eldy/img/object_bookmark.png
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/img/object_bookmark.png
    M htdocs/theme/md/style.css.php
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/Dolibarr/5.0' into 5.0


  Commit: 8a1ab35b87c11adaad0de6c6f7a128196c36611b
      
https://github.com/Dolibarr/dolibarr/commit/8a1ab35b87c11adaad0de6c6f7a128196c36611b
  Author: fappels <address@hidden>
  Date:   2017-03-25 (Sat, 25 Mar 2017)

  Changed paths:
    M htdocs/expedition/card.php

  Log Message:
  -----------
  Fix fetch shipment object on cancel modification


  Commit: 0f883b44c06258caf6c07e8e999dc6ac21ccb158
      
https://github.com/Dolibarr/dolibarr/commit/0f883b44c06258caf6c07e8e999dc6ac21ccb158
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-03-25 (Sat, 25 Mar 2017)

  Changed paths:
    M htdocs/expedition/card.php

  Log Message:
  -----------
  Merge pull request #6582 from fappels/5.0_fix_6550

Fix issue #6550


Compare: 
https://github.com/Dolibarr/dolibarr/compare/3c2e0b267f81...0f883b44c062