[Dolibarr-git] [Dolibarr/dolibarr] 6e5ab0: Merge remote-tracking branch 'Upstream/develop' in...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 6e5ab06a3d358a6b7fa71e44592ba5390441aec4
      
https://github.com/Dolibarr/dolibarr/commit/6e5ab06a3d358a6b7fa71e44592ba5390441aec4
  Author: aspangaro <address@hidden>
  Date:   2016-11-02 (Wed, 02 Nov 2016)

  Changed paths:
    M ChangeLog
    M README.md
    M build/debian/README.howto
    M build/launchpad/README
    M build/makepack-dolibarr.pl
    M build/obs/README
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M dev/setup/codesniffer/ruleset.xml
    M htdocs/admin/dict.php
    M htdocs/admin/translation.php
    M htdocs/admin/websites.php
    M htdocs/admin/workflow.php
    M htdocs/comm/action/card.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/class/cactioncomm.class.php
    M htdocs/comm/action/listactions.php
    M htdocs/comm/card.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/remx.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/list.php
    M htdocs/compta/bank/bankentries.php
    M htdocs/compta/bank/releve.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/actions_massactions.inc.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.formactions.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/price.lib.php
    M htdocs/core/lib/sendings.lib.php
    M htdocs/core/modules/modMultiCurrency.class.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/contact.php
    M htdocs/expedition/list.php
    M htdocs/expedition/note.php
    M htdocs/expedition/shipment.php
    M htdocs/expedition/stats/index.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/install/mysql/tables/llx_c_actioncomm.sql
    M htdocs/install/mysql/tables/llx_expedition.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/deliveries.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/sendings.lang
    M htdocs/langs/en_US/workflow.lang
    M htdocs/langs/es_ES/accountancy.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/agenda.lang
    M htdocs/langs/es_ES/banks.lang
    M htdocs/langs/es_ES/bills.lang
    M htdocs/langs/es_ES/boxes.lang
    M htdocs/langs/es_ES/categories.lang
    M htdocs/langs/es_ES/companies.lang
    M htdocs/langs/es_ES/compta.lang
    M htdocs/langs/es_ES/contracts.lang
    M htdocs/langs/es_ES/deliveries.lang
    M htdocs/langs/es_ES/donations.lang
    M htdocs/langs/es_ES/ecm.lang
    M htdocs/langs/es_ES/errors.lang
    M htdocs/langs/es_ES/exports.lang
    M htdocs/langs/es_ES/help.lang
    M htdocs/langs/es_ES/holiday.lang
    M htdocs/langs/es_ES/install.lang
    M htdocs/langs/es_ES/interventions.lang
    M htdocs/langs/es_ES/link.lang
    M htdocs/langs/es_ES/mails.lang
    M htdocs/langs/es_ES/main.lang
    M htdocs/langs/es_ES/members.lang
    M htdocs/langs/es_ES/oauth.lang
    M htdocs/langs/es_ES/other.lang
    M htdocs/langs/es_ES/productbatch.lang
    M htdocs/langs/es_ES/products.lang
    M htdocs/langs/es_ES/projects.lang
    M htdocs/langs/es_ES/propal.lang
    M htdocs/langs/es_ES/sms.lang
    M htdocs/langs/es_ES/supplier_proposal.lang
    M htdocs/langs/es_ES/suppliers.lang
    M htdocs/langs/es_ES/users.lang
    M htdocs/langs/es_ES/withdrawals.lang
    M htdocs/langs/fr_FR/compta.lang
    M htdocs/langs/fr_FR/main.lang
    M htdocs/langs/fr_FR/salaries.lang
    M htdocs/langs/nb_NO/accountancy.lang
    M htdocs/langs/nb_NO/admin.lang
    M htdocs/langs/nb_NO/agenda.lang
    M htdocs/langs/nb_NO/banks.lang
    M htdocs/langs/nb_NO/bills.lang
    M htdocs/langs/nb_NO/categories.lang
    M htdocs/langs/nb_NO/companies.lang
    M htdocs/langs/nb_NO/compta.lang
    M htdocs/langs/nb_NO/contracts.lang
    M htdocs/langs/nb_NO/deliveries.lang
    M htdocs/langs/nb_NO/ecm.lang
    M htdocs/langs/nb_NO/errors.lang
    M htdocs/langs/nb_NO/exports.lang
    M htdocs/langs/nb_NO/ftp.lang
    M htdocs/langs/nb_NO/hrm.lang
    M htdocs/langs/nb_NO/install.lang
    M htdocs/langs/nb_NO/interventions.lang
    M htdocs/langs/nb_NO/link.lang
    M htdocs/langs/nb_NO/mails.lang
    M htdocs/langs/nb_NO/main.lang
    M htdocs/langs/nb_NO/members.lang
    M htdocs/langs/nb_NO/oauth.lang
    M htdocs/langs/nb_NO/orders.lang
    M htdocs/langs/nb_NO/other.lang
    M htdocs/langs/nb_NO/paypal.lang
    M htdocs/langs/nb_NO/productbatch.lang
    M htdocs/langs/nb_NO/products.lang
    M htdocs/langs/nb_NO/projects.lang
    M htdocs/langs/nb_NO/propal.lang
    M htdocs/langs/nb_NO/salaries.lang
    M htdocs/langs/nb_NO/sendings.lang
    M htdocs/langs/nb_NO/sms.lang
    M htdocs/langs/nb_NO/stocks.lang
    M htdocs/langs/nb_NO/supplier_proposal.lang
    M htdocs/langs/nb_NO/suppliers.lang
    M htdocs/langs/nb_NO/trips.lang
    M htdocs/langs/nb_NO/users.lang
    M htdocs/langs/nb_NO/withdrawals.lang
    M htdocs/langs/pt_BR/accountancy.lang
    M htdocs/langs/pt_BR/admin.lang
    M htdocs/langs/pt_BR/agenda.lang
    M htdocs/langs/pt_BR/banks.lang
    M htdocs/langs/pt_BR/bills.lang
    M htdocs/langs/pt_BR/bookmarks.lang
    M htdocs/langs/pt_BR/boxes.lang
    M htdocs/langs/pt_BR/cashdesk.lang
    M htdocs/langs/pt_BR/categories.lang
    M htdocs/langs/pt_BR/commercial.lang
    M htdocs/langs/pt_BR/companies.lang
    M htdocs/langs/pt_BR/compta.lang
    M htdocs/langs/pt_BR/contracts.lang
    M htdocs/langs/pt_BR/cron.lang
    M htdocs/langs/pt_BR/deliveries.lang
    M htdocs/langs/pt_BR/dict.lang
    M htdocs/langs/pt_BR/donations.lang
    M htdocs/langs/pt_BR/ecm.lang
    M htdocs/langs/pt_BR/errors.lang
    M htdocs/langs/pt_BR/exports.lang
    M htdocs/langs/pt_BR/externalsite.lang
    M htdocs/langs/pt_BR/ftp.lang
    M htdocs/langs/pt_BR/help.lang
    M htdocs/langs/pt_BR/holiday.lang
    M htdocs/langs/pt_BR/hrm.lang
    M htdocs/langs/pt_BR/incoterm.lang
    M htdocs/langs/pt_BR/install.lang
    M htdocs/langs/pt_BR/interventions.lang
    M htdocs/langs/pt_BR/languages.lang
    M htdocs/langs/pt_BR/ldap.lang
    M htdocs/langs/pt_BR/link.lang
    M htdocs/langs/pt_BR/loan.lang
    M htdocs/langs/pt_BR/mailmanspip.lang
    M htdocs/langs/pt_BR/mails.lang
    M htdocs/langs/pt_BR/main.lang
    M htdocs/langs/pt_BR/margins.lang
    M htdocs/langs/pt_BR/members.lang
    M htdocs/langs/pt_BR/oauth.lang
    M htdocs/langs/pt_BR/opensurvey.lang
    M htdocs/langs/pt_BR/orders.lang
    M htdocs/langs/pt_BR/other.lang
    M htdocs/langs/pt_BR/paybox.lang
    M htdocs/langs/pt_BR/paypal.lang
    M htdocs/langs/pt_BR/printing.lang
    M htdocs/langs/pt_BR/productbatch.lang
    M htdocs/langs/pt_BR/products.lang
    M htdocs/langs/pt_BR/projects.lang
    M htdocs/langs/pt_BR/propal.lang
    M htdocs/langs/pt_BR/receiptprinter.lang
    M htdocs/langs/pt_BR/resource.lang
    M htdocs/langs/pt_BR/salaries.lang
    M htdocs/langs/pt_BR/sendings.lang
    M htdocs/langs/pt_BR/sms.lang
    M htdocs/langs/pt_BR/stocks.lang
    M htdocs/langs/pt_BR/supplier_proposal.lang
    M htdocs/langs/pt_BR/suppliers.lang
    M htdocs/langs/pt_BR/trips.lang
    M htdocs/langs/pt_BR/users.lang
    M htdocs/langs/pt_BR/website.lang
    M htdocs/langs/pt_BR/withdrawals.lang
    M htdocs/langs/pt_BR/workflow.lang
    M htdocs/livraison/card.php
    M htdocs/livraison/class/livraison.class.php
    M htdocs/margin/tabs/thirdpartyMargins.php
    M htdocs/multicurrency/class/multicurrency.class.php
    M htdocs/product/class/html.formproduct.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/reassortlot.php
    M htdocs/product/stock/class/entrepot.class.php
    M htdocs/product/stock/list.php
    M htdocs/product/stock/massstockmove.php
    M htdocs/product/stock/productlot_list.php
    M htdocs/societe/agenda.php
    M htdocs/societe/soc.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M test/phpunit/FunctionsLibTest.php

  Log Message:
  -----------
  Merge remote-tracking branch 'Upstream/develop' into 5.0-p34


  Commit: a794033daeb8d7f0a580b9bc682802f2d6188a62
      
https://github.com/Dolibarr/dolibarr/commit/a794033daeb8d7f0a580b9bc682802f2d6188a62
  Author: aspangaro <address@hidden>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    M ChangeLog
    M dev/skeletons/skeleton_list.php
    M htdocs/.gitignore
    M htdocs/accountancy/admin/account.php
    M htdocs/accountancy/admin/defaultaccounts.php
    M htdocs/accountancy/admin/importaccounts.php
    M htdocs/accountancy/admin/index.php
    M htdocs/accountancy/admin/productaccount.php
    M htdocs/accountancy/class/html.formventilation.class.php
    M htdocs/accountancy/customer/lines.php
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/expensereport/lines.php
    M htdocs/accountancy/expensereport/list.php
    M htdocs/accountancy/supplier/lines.php
    M htdocs/accountancy/supplier/list.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/list.php
    M htdocs/admin/agenda_other.php
    M htdocs/admin/confexped.php
    M htdocs/admin/expedition.php
    M htdocs/admin/supplier_order.php
    M htdocs/admin/system/database.php
    M htdocs/admin/system/dolibarr.php
    M htdocs/comm/action/card.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/class/cactioncomm.class.php
    M htdocs/comm/action/index.php
    M htdocs/comm/action/listactions.php
    M htdocs/comm/action/pertype.php
    M htdocs/comm/action/peruser.php
    M htdocs/comm/mailing/list.php
    M htdocs/comm/propal/card.php
    M htdocs/comm/propal/stats/index.php
    M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
    M htdocs/commande/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/list.php
    M htdocs/commande/stats/index.php
    M htdocs/commande/tpl/linkedobjectblock.tpl.php
    M htdocs/compta/bank/bankentries.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/index.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/apercu.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/compta/facture/prelevement.php
    M htdocs/compta/facture/stats/index.php
    M htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
    M htdocs/compta/index.php
    M htdocs/compta/sociales/index.php
    M htdocs/conf/conf.php.example
    M htdocs/contact/card.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/list.php
    M htdocs/contrat/card.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formactions.class.php
    M htdocs/core/class/html.formcompany.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formpropal.class.php
    R htdocs/core/class/html.formsupplier_proposal.class.php
    M htdocs/core/db/DoliDB.class.php
    M htdocs/core/db/mysqli.class.php
    M htdocs/core/lib/agenda.lib.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/donation.lib.php
    M htdocs/core/lib/functions.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/menus/standard/eldy.lib.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/modAccounting.class.php
    M htdocs/core/tpl/admin_extrafields_edit.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/don/document.php
    A htdocs/don/note.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/index.php
    M htdocs/expedition/shipment.php
    M htdocs/expedition/tpl/linkedobjectblock.tpl.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/tpl/linkedobjectblock.tpl.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
    M htdocs/install/inc.php
    M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/langs/de_AT/agenda.lang
    M htdocs/langs/en_GB/admin.lang
    M htdocs/langs/en_GB/banks.lang
    M htdocs/langs/en_GB/main.lang
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/commercial.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/orders.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/sendings.lang
    M htdocs/langs/en_US/supplier_proposal.lang
    M htdocs/langs/es_CL/admin.lang
    M htdocs/langs/es_CL/other.lang
    M htdocs/langs/es_MX/accountancy.lang
    M htdocs/langs/es_MX/banks.lang
    M htdocs/langs/es_MX/install.lang
    M htdocs/langs/es_MX/main.lang
    M htdocs/langs/es_MX/other.lang
    M htdocs/langs/es_PE/accountancy.lang
    M htdocs/langs/fr_CA/admin.lang
    M htdocs/langs/fr_FR/accountancy.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/agenda.lang
    M htdocs/langs/fr_FR/banks.lang
    M htdocs/langs/fr_FR/bills.lang
    M htdocs/langs/fr_FR/companies.lang
    M htdocs/langs/fr_FR/compta.lang
    M htdocs/langs/fr_FR/ecm.lang
    M htdocs/langs/fr_FR/errors.lang
    M htdocs/langs/fr_FR/install.lang
    M htdocs/langs/fr_FR/loan.lang
    M htdocs/langs/fr_FR/main.lang
    M htdocs/langs/fr_FR/members.lang
    M htdocs/langs/fr_FR/orders.lang
    M htdocs/langs/fr_FR/products.lang
    M htdocs/langs/fr_FR/sendings.lang
    M htdocs/langs/fr_FR/stocks.lang
    M htdocs/langs/fr_FR/supplier_proposal.lang
    M htdocs/langs/fr_FR/trips.lang
    M htdocs/langs/fr_FR/workflow.lang
    M htdocs/langs/nl_BE/accountancy.lang
    M htdocs/langs/pt_BR/accountancy.lang
    M htdocs/langs/pt_BR/admin.lang
    M htdocs/langs/pt_BR/agenda.lang
    M htdocs/langs/pt_BR/banks.lang
    M htdocs/langs/pt_BR/bills.lang
    M htdocs/langs/pt_BR/bookmarks.lang
    M htdocs/langs/pt_BR/boxes.lang
    M htdocs/langs/pt_BR/cashdesk.lang
    M htdocs/langs/pt_BR/categories.lang
    M htdocs/langs/pt_BR/commercial.lang
    M htdocs/langs/pt_BR/companies.lang
    M htdocs/langs/pt_BR/compta.lang
    M htdocs/langs/pt_BR/contracts.lang
    M htdocs/langs/pt_BR/cron.lang
    M htdocs/langs/pt_BR/deliveries.lang
    M htdocs/langs/pt_BR/dict.lang
    M htdocs/langs/pt_BR/donations.lang
    M htdocs/langs/pt_BR/ecm.lang
    M htdocs/langs/pt_BR/errors.lang
    M htdocs/langs/pt_BR/exports.lang
    M htdocs/langs/pt_BR/externalsite.lang
    M htdocs/langs/pt_BR/ftp.lang
    M htdocs/langs/pt_BR/help.lang
    M htdocs/langs/pt_BR/holiday.lang
    M htdocs/langs/pt_BR/hrm.lang
    M htdocs/langs/pt_BR/incoterm.lang
    M htdocs/langs/pt_BR/install.lang
    M htdocs/langs/pt_BR/interventions.lang
    M htdocs/langs/pt_BR/languages.lang
    M htdocs/langs/pt_BR/ldap.lang
    M htdocs/langs/pt_BR/link.lang
    M htdocs/langs/pt_BR/loan.lang
    M htdocs/langs/pt_BR/mailmanspip.lang
    M htdocs/langs/pt_BR/mails.lang
    M htdocs/langs/pt_BR/main.lang
    M htdocs/langs/pt_BR/margins.lang
    M htdocs/langs/pt_BR/members.lang
    M htdocs/langs/pt_BR/opensurvey.lang
    M htdocs/langs/pt_BR/orders.lang
    M htdocs/langs/pt_BR/other.lang
    M htdocs/langs/pt_BR/paybox.lang
    M htdocs/langs/pt_BR/paypal.lang
    M htdocs/langs/pt_BR/printing.lang
    M htdocs/langs/pt_BR/productbatch.lang
    M htdocs/langs/pt_BR/products.lang
    M htdocs/langs/pt_BR/projects.lang
    M htdocs/langs/pt_BR/propal.lang
    M htdocs/langs/pt_BR/receiptprinter.lang
    M htdocs/langs/pt_BR/resource.lang
    M htdocs/langs/pt_BR/salaries.lang
    M htdocs/langs/pt_BR/sendings.lang
    M htdocs/langs/pt_BR/sms.lang
    M htdocs/langs/pt_BR/stocks.lang
    M htdocs/langs/pt_BR/suppliers.lang
    M htdocs/langs/pt_BR/trips.lang
    M htdocs/langs/pt_BR/users.lang
    M htdocs/langs/pt_BR/website.lang
    M htdocs/langs/pt_BR/withdrawals.lang
    M htdocs/langs/ru_UA/banks.lang
    M htdocs/langs/ru_UA/install.lang
    M htdocs/langs/ru_UA/other.lang
    M htdocs/main.inc.php
    M htdocs/product/card.php
    M htdocs/product/class/product.class.php
    M htdocs/product/list.php
    M htdocs/projet/element.php
    M htdocs/projet/info.php
    M htdocs/projet/list.php
    M htdocs/projet/tasks/list.php
    M htdocs/public/test/test_arrays.php
    M htdocs/public/test/test_forms.php
    M htdocs/societe/list.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/supplier_proposal/list.php
    M htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
    M htdocs/support/inc.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/user/index.php
    M scripts/cron/cron_run_jobs.php

  Log Message:
  -----------
  Merge remote-tracking branch 'Upstream/develop' into 5.0-p34


  Commit: 77eaa635fe3275fbda1bf49699163ce4e5e6d86e
      
https://github.com/Dolibarr/dolibarr/commit/77eaa635fe3275fbda1bf49699163ce4e5e6d86e
  Author: aspangaro <address@hidden>
  Date:   2016-11-10 (Thu, 10 Nov 2016)

  Changed paths:
    M htdocs/fourn/facture/card.php

  Log Message:
  -----------
  Align actions buttons


  Commit: f3da39c0a76184affa2312ec6b5e1708842c43a4
      
https://github.com/Dolibarr/dolibarr/commit/f3da39c0a76184affa2312ec6b5e1708842c43a4
  Author: aspangaro <address@hidden>
  Date:   2016-11-10 (Thu, 10 Nov 2016)

  Changed paths:
    M htdocs/fourn/facture/card.php

  Log Message:
  -----------
  Add buttons to convert to reduction or money back


  Commit: be65515aa97700828184fc34b7ed70d709edc218
      
https://github.com/Dolibarr/dolibarr/commit/be65515aa97700828184fc34b7ed70d709edc218
  Author: aspangaro <address@hidden>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

  Changed paths:
    M build/debian/README.howto
    M htdocs/accountancy/admin/productaccount.php
    M htdocs/api/class/api.class.php
    M htdocs/api/index.php
    M htdocs/comm/mailing/card.php
    M htdocs/comm/mailing/cibles.php
    M htdocs/comm/mailing/class/mailing.class.php
    M htdocs/comm/mailing/index.php
    M htdocs/comm/mailing/info.php
    M htdocs/commande/class/api_orders.class.php
    M htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
    M htdocs/compta/index.php
    M htdocs/contrat/services.php
    M htdocs/contrat/tpl/linkedobjectblock.tpl.php
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/smtps.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/tpl/contacts.tpl.php
    M htdocs/core/tpl/notes.tpl.php
    M htdocs/don/index.php
    M htdocs/ecm/search.php
    M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
    M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
    M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
    M htdocs/install/mysql/migration/repair.sql
    A htdocs/install/mysql/tables/llx_links.key.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/mails.lang
    M htdocs/langs/en_US/members.lang
    M htdocs/langs/en_US/users.lang
    M htdocs/product/stock/tpl/stockcorrection.tpl.php
    M htdocs/product/stock/tpl/stocktransfer.tpl.php
    M htdocs/projet/card.php
    A htdocs/projet/class/api_projects.class.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/class/task.class.php
    M htdocs/projet/list.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'Upstream/develop' into 5.0-p34


  Commit: 60219fa84d97349250cd18f7213b487ea13f3faf
      
https://github.com/Dolibarr/dolibarr/commit/60219fa84d97349250cd18f7213b487ea13f3faf
  Author: aspangaro <address@hidden>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

  Changed paths:
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php

  Log Message:
  -----------
  Update tulip model


  Commit: c65678d00a718bfa6779eb742a5be0475df444ce
      
https://github.com/Dolibarr/dolibarr/commit/c65678d00a718bfa6779eb742a5be0475df444ce
  Author: aspangaro <address@hidden>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

  Changed paths:
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
    M htdocs/langs/en_US/bills.lang

  Log Message:
  -----------
  Update cactus numbering model


  Commit: 5ed2f633ebbff0954df3f0e1557638da557472cd
      
https://github.com/Dolibarr/dolibarr/commit/5ed2f633ebbff0954df3f0e1557638da557472cd
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

  Changed paths:
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
    M htdocs/fourn/facture/card.php
    M htdocs/langs/en_US/bills.lang

  Log Message:
  -----------
  Merge pull request #5969 from aspangaro/5.0-p34

Work on supplier credit/deposit note


Compare: 
https://github.com/Dolibarr/dolibarr/compare/da387db166d6...5ed2f633ebbf