[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] d5b7b7: Merge remote-tracking branch
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] d5b7b7: Merge remote-tracking branch 'refs/remotes/Dolibar... |
|
Date: |
Mon, 30 Oct 2017 10:22:45 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: d5b7b7ec524083ce54842842272abea0a8a447cd
https://github.com/Dolibarr/dolibarr/commit/d5b7b7ec524083ce54842842272abea0a8a447cd
Author: fappels <address@hidden>
Date: 2017-09-11 (Mon, 11 Sep 2017)
Changed paths:
M .travis.yml
M ChangeLog
M README.md
M build/debian/control
M build/debian/dolibarr.postinst
M build/debian/install.forced.php.install
M build/debian/source/lintian-overrides
M build/exe/doliwamp/doliwamp.iss
M build/exe/doliwamp/install.forced.php.install
M build/generate_filelist_xml.php
M build/makepack-dolibarr.pl
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 build/rpm/install.forced.php.fedora
M build/rpm/install.forced.php.generic
M build/rpm/install.forced.php.mandriva
M build/rpm/install.forced.php.opensuse
A
dev/initdemo/documents_demo/societe/contact/11/photos/ldestailleur_200x200.png
A
dev/initdemo/documents_demo/societe/contact/11/photos/thumbs/ldestailleur_200x200_mini.png
A
dev/initdemo/documents_demo/societe/contact/11/photos/thumbs/ldestailleur_200x200_small.png
A dev/initdemo/documents_demo/societe/contact/12/photos/Einstein.jpg
A
dev/initdemo/documents_demo/societe/contact/12/photos/thumbs/Einstein_mini.jpg
A
dev/initdemo/documents_demo/societe/contact/12/photos/thumbs/Einstein_small.jpg
M dev/initdemo/mysqldump_dolibarr_5.0.0.sql
M dev/skeletons/build_class_from_table.php
M dev/skeletons/skeleton_card.php
M dev/skeletons/skeleton_list.php
M dev/translation/sanity_check_en_langfiles.php
M htdocs/.gitignore
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/admin/card.php
M htdocs/accountancy/admin/categories.php
M htdocs/accountancy/admin/categories_list.php
M htdocs/accountancy/admin/defaultaccounts.php
M htdocs/accountancy/admin/index.php
M htdocs/accountancy/class/accountancycategory.class.php
M htdocs/accountancy/class/accountancysystem.class.php
M htdocs/accountancy/class/accountingaccount.class.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/class/html.formventilation.class.php
M htdocs/accountancy/customer/card.php
M htdocs/accountancy/expensereport/card.php
M htdocs/accountancy/expensereport/lines.php
M htdocs/accountancy/expensereport/list.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/accountancy/supplier/card.php
M htdocs/adherents/agenda.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/list.php
M htdocs/adherents/subscription.php
M htdocs/adherents/subscription/card.php
M htdocs/admin/agenda_other.php
M htdocs/admin/bank.php
M htdocs/admin/chequereceipts.php
M htdocs/admin/commande.php
M htdocs/admin/contract.php
M htdocs/admin/dict.php
M htdocs/admin/expedition.php
M htdocs/admin/expensereport.php
M htdocs/admin/facture.php
M htdocs/admin/fichinter.php
M htdocs/admin/index.php
M htdocs/admin/livraison.php
M htdocs/admin/modules.php
M htdocs/admin/payment.php
M htdocs/admin/perms.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/admin/tools/export.php
M htdocs/admin/tools/index.php
M htdocs/admin/translation.php
M htdocs/api/admin/index.php
M htdocs/barcode/printsheet.php
M htdocs/bookmarks/bookmarks.lib.php
M htdocs/cashdesk/affContenu.php
M htdocs/cashdesk/class/Facturation.class.php
M htdocs/cashdesk/facturation.php
M htdocs/cashdesk/facturation_verif.php
M htdocs/cashdesk/tpl/facturation1.tpl.php
M htdocs/cashdesk/validation_verif.php
M htdocs/categories/class/api_categories.class.php
M htdocs/categories/class/api_deprecated_category.class.php
M htdocs/categories/class/categorie.class.php
M htdocs/comm/action/card.php
M htdocs/comm/action/class/api_agendaevents.class.php
M htdocs/comm/action/index.php
M htdocs/comm/card.php
M htdocs/comm/index.php
M htdocs/comm/mailing/list.php
M htdocs/comm/propal/card.php
M htdocs/comm/propal/class/api_proposals.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/document.php
M htdocs/comm/propal/list.php
M htdocs/comm/remise.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/info.php
M htdocs/commande/list.php
M htdocs/commande/orderstoinvoice.php
M htdocs/compta/bank/annuel.php
M htdocs/compta/bank/bankentries.php
M htdocs/compta/bank/card.php
M htdocs/compta/bank/categ.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/graph.php
M htdocs/compta/bank/index.php
M htdocs/compta/bank/ligne.php
M htdocs/compta/bank/treso.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/facture/list.php
M htdocs/compta/localtax/class/localtax.class.php
M htdocs/compta/localtax/quadri_detail.php
M htdocs/compta/paiement/card.php
M htdocs/compta/paiement/cheque/card.php
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
M htdocs/compta/paiement/class/cpaiement.class.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/salaries/class/paymentsalary.class.php
M htdocs/compta/salaries/index.php
M htdocs/compta/sociales/card.php
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/compta/sociales/index.php
M htdocs/compta/tva/class/tva.class.php
M htdocs/compta/tva/clients.php
M htdocs/contact/list.php
M htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/list.php
M htdocs/contrat/services.php
M htdocs/core/actions_linkedfiles.inc.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/ajax/ajaxdirpreview.php
M htdocs/core/ajax/bankconciliate.php
M htdocs/core/ajax/box.php
M htdocs/core/ajax/constantonoff.php
M htdocs/core/ajax/contacts.php
M htdocs/core/ajax/extraparams.php
M htdocs/core/ajax/loadinplace.php
M htdocs/core/ajax/objectonoff.php
M htdocs/core/ajax/price.php
M htdocs/core/ajax/row.php
M htdocs/core/ajax/saveinplace.php
M htdocs/core/ajax/security.php
M htdocs/core/ajax/vatrates.php
M htdocs/core/ajax/ziptown.php
M htdocs/core/boxes/box_actions.php
M htdocs/core/boxes/box_activity.php
M htdocs/core/boxes/box_bookmarks.php
M htdocs/core/boxes/box_clients.php
M htdocs/core/boxes/box_commandes.php
M htdocs/core/boxes/box_comptes.php
M htdocs/core/boxes/box_contacts.php
M htdocs/core/boxes/box_contracts.php
M htdocs/core/boxes/box_external_rss.php
M htdocs/core/boxes/box_factures.php
M htdocs/core/boxes/box_factures_fourn.php
M htdocs/core/boxes/box_factures_fourn_imp.php
M htdocs/core/boxes/box_factures_imp.php
M htdocs/core/boxes/box_ficheinter.php
M htdocs/core/boxes/box_fournisseurs.php
M htdocs/core/boxes/box_goodcustomers.php
M htdocs/core/boxes/box_graph_invoices_permonth.php
M htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
M htdocs/core/boxes/box_graph_orders_permonth.php
M htdocs/core/boxes/box_graph_orders_supplier_permonth.php
M htdocs/core/boxes/box_graph_product_distribution.php
M htdocs/core/boxes/box_graph_propales_permonth.php
M htdocs/core/boxes/box_members.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_propales.php
M htdocs/core/boxes/box_prospect.php
M htdocs/core/boxes/box_services_contracts.php
M htdocs/core/boxes/box_services_expired.php
M htdocs/core/boxes/box_supplier_orders.php
M htdocs/core/boxes/box_task.php
M htdocs/core/boxes/modules_boxes.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/events.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/hookmanager.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formaccounting.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/core/class/infobox.class.php
M htdocs/core/class/interfaces.class.php
M htdocs/core/class/smtps.class.php
M htdocs/core/class/translate.class.php
M htdocs/core/class/vcard.class.php
M htdocs/core/datepicker.php
M htdocs/core/db/Database.interface.php
M htdocs/core/get_menudiv.php
M htdocs/core/lib/accounting.lib.php
M htdocs/core/lib/admin.lib.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/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/geturl.lib.php
M htdocs/core/lib/images.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/lib/tax.lib.php
M htdocs/core/login/functions_dolibarr.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/menus/standard/empty.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/dons/html_cerfafr.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.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/import/import_xlsx.modules.php
M htdocs/core/modules/modAgenda.class.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_payment/mod_supplier_payment_brodator.php
M htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
M htdocs/core/modules/supplier_payment/modules_supplier_payment.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
M htdocs/core/search_page.php
M htdocs/core/tpl/admin_extrafields_view.tpl.php
M htdocs/core/tpl/ajax/fileupload_main.tpl.php
M htdocs/core/tpl/ajaxrow.tpl.php
M htdocs/core/tpl/login.tpl.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/core/tpl/passwordforgotten.tpl.php
M htdocs/core/tpl/resource_add.tpl.php
M htdocs/core/triggers/interface_20_all_Logevents.class.php
M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
M htdocs/core/triggers/interface_50_modNotification_Notification.class.php
M htdocs/cron/class/cronjob.class.php
M htdocs/cron/list.php
M htdocs/don/admin/donation.php
M htdocs/don/card.php
M htdocs/don/list.php
M htdocs/ecm/ajax/ecmdatabase.php
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/list.php
M htdocs/expensereport/ajax/ajaxprojet.php
M htdocs/expensereport/card.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/expensereport/class/paymentexpensereport.class.php
M htdocs/expensereport/document.php
M htdocs/expensereport/index.php
M htdocs/expensereport/info.php
M htdocs/expensereport/list.php
M htdocs/expensereport/note.php
M htdocs/expensereport/payment/payment.php
M htdocs/exports/class/export.class.php
M htdocs/externalsite/frames.php
M htdocs/fichinter/list.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/class/fournisseur.product.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/commande/dispatch.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/commande/orderstoinvoice.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/facture/document.php
M htdocs/fourn/facture/list.php
M htdocs/fourn/facture/paiement.php
M htdocs/fourn/paiement/card.php
M htdocs/holiday/card.php
M htdocs/holiday/list.php
M htdocs/hrm/index.php
M htdocs/includes/odtphp/Segment.php
M htdocs/includes/odtphp/odf.php
M htdocs/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php
M htdocs/index.php
M htdocs/install/fileconf.php
M htdocs/install/inc.php
M htdocs/install/mysql/data/llx_accounting.sql
M htdocs/install/mysql/data/llx_c_action_trigger.sql
M htdocs/install/mysql/data/llx_c_currencies.sql
M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
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_accounting_account.sql
M htdocs/install/mysql/tables/llx_bank_account.sql
M htdocs/install/mysql/tables/llx_contratdet.sql
M htdocs/install/mysql/tables/llx_events.sql
M htdocs/install/mysql/tables/llx_facturedet_rec.sql
M htdocs/install/mysql/tables/llx_product_customer_price.sql
M htdocs/install/mysql/tables/llx_product_customer_price_log.sql
M htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
M htdocs/install/mysql/tables/llx_product_price.sql
M htdocs/install/mysql/tables/llx_projet.sql
M htdocs/install/mysql/tables/llx_supplier_proposaldet.sql
M htdocs/install/mysql/tables/llx_user.sql
M htdocs/install/repair.php
M htdocs/install/step1.php
M htdocs/install/upgrade2.php
M htdocs/langs/ar_SA/admin.lang
M htdocs/langs/ar_SA/main.lang
M htdocs/langs/bg_BG/admin.lang
M htdocs/langs/bg_BG/main.lang
M htdocs/langs/bn_BD/admin.lang
M htdocs/langs/bn_BD/main.lang
M htdocs/langs/bs_BA/admin.lang
M htdocs/langs/bs_BA/main.lang
M htdocs/langs/ca_ES/admin.lang
M htdocs/langs/ca_ES/bills.lang
M htdocs/langs/ca_ES/boxes.lang
M htdocs/langs/ca_ES/mails.lang
M htdocs/langs/ca_ES/main.lang
M htdocs/langs/ca_ES/members.lang
M htdocs/langs/ca_ES/orders.lang
M htdocs/langs/ca_ES/other.lang
M htdocs/langs/ca_ES/projects.lang
M htdocs/langs/ca_ES/stocks.lang
M htdocs/langs/ca_ES/suppliers.lang
M htdocs/langs/cs_CZ/admin.lang
M htdocs/langs/cs_CZ/main.lang
M htdocs/langs/da_DK/admin.lang
M htdocs/langs/da_DK/main.lang
M htdocs/langs/de_AT/admin.lang
M htdocs/langs/de_AT/main.lang
M htdocs/langs/de_CH/admin.lang
M htdocs/langs/de_CH/main.lang
M htdocs/langs/de_DE/admin.lang
M htdocs/langs/de_DE/banks.lang
M htdocs/langs/de_DE/bills.lang
M htdocs/langs/de_DE/cashdesk.lang
M htdocs/langs/de_DE/companies.lang
M htdocs/langs/de_DE/compta.lang
M htdocs/langs/de_DE/main.lang
M htdocs/langs/el_CY/admin.lang
M htdocs/langs/el_CY/main.lang
M htdocs/langs/el_GR/admin.lang
M htdocs/langs/el_GR/main.lang
M htdocs/langs/en_AU/admin.lang
M htdocs/langs/en_AU/main.lang
M htdocs/langs/en_CA/admin.lang
M htdocs/langs/en_CA/main.lang
M htdocs/langs/en_GB/admin.lang
M htdocs/langs/en_GB/main.lang
M htdocs/langs/en_IN/admin.lang
M htdocs/langs/en_IN/main.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/banks.lang
M htdocs/langs/en_US/bills.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/errors.lang
M htdocs/langs/en_US/holiday.lang
M htdocs/langs/en_US/loan.lang
M htdocs/langs/en_US/mails.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/langs/en_US/suppliers.lang
M htdocs/langs/en_US/trips.lang
M htdocs/langs/en_US/users.lang
M htdocs/langs/es_AR/admin.lang
M htdocs/langs/es_AR/main.lang
M htdocs/langs/es_BO/admin.lang
M htdocs/langs/es_BO/main.lang
M htdocs/langs/es_CL/admin.lang
M htdocs/langs/es_CL/main.lang
M htdocs/langs/es_CO/admin.lang
M htdocs/langs/es_CO/main.lang
M htdocs/langs/es_DO/admin.lang
M htdocs/langs/es_DO/main.lang
M htdocs/langs/es_EC/admin.lang
M htdocs/langs/es_EC/main.lang
M htdocs/langs/es_ES/accountancy.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/bills.lang
M htdocs/langs/es_ES/boxes.lang
M htdocs/langs/es_ES/companies.lang
M htdocs/langs/es_ES/compta.lang
M htdocs/langs/es_ES/cron.lang
M htdocs/langs/es_ES/errors.lang
M htdocs/langs/es_ES/holiday.lang
M htdocs/langs/es_ES/ldap.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/orders.lang
M htdocs/langs/es_ES/other.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/stocks.lang
M htdocs/langs/es_ES/supplier_proposal.lang
M htdocs/langs/es_ES/suppliers.lang
M htdocs/langs/es_ES/withdrawals.lang
M htdocs/langs/es_MX/accountancy.lang
M htdocs/langs/es_MX/admin.lang
M htdocs/langs/es_MX/main.lang
M htdocs/langs/es_PA/admin.lang
M htdocs/langs/es_PA/main.lang
M htdocs/langs/es_PE/admin.lang
M htdocs/langs/es_PE/main.lang
M htdocs/langs/es_PY/admin.lang
M htdocs/langs/es_PY/main.lang
M htdocs/langs/es_VE/admin.lang
M htdocs/langs/es_VE/main.lang
M htdocs/langs/et_EE/admin.lang
M htdocs/langs/et_EE/main.lang
M htdocs/langs/eu_ES/admin.lang
M htdocs/langs/eu_ES/main.lang
M htdocs/langs/fa_IR/admin.lang
M htdocs/langs/fa_IR/hrm.lang
M htdocs/langs/fa_IR/main.lang
M htdocs/langs/fi_FI/admin.lang
M htdocs/langs/fi_FI/main.lang
M htdocs/langs/fr_BE/admin.lang
M htdocs/langs/fr_BE/main.lang
M htdocs/langs/fr_CA/admin.lang
M htdocs/langs/fr_CA/main.lang
M htdocs/langs/fr_CH/admin.lang
M htdocs/langs/fr_CH/main.lang
M htdocs/langs/fr_FR/accountancy.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/banks.lang
M htdocs/langs/fr_FR/bills.lang
M htdocs/langs/fr_FR/boxes.lang
M htdocs/langs/fr_FR/companies.lang
M htdocs/langs/fr_FR/compta.lang
M htdocs/langs/fr_FR/cron.lang
M htdocs/langs/fr_FR/errors.lang
M htdocs/langs/fr_FR/holiday.lang
M htdocs/langs/fr_FR/ldap.lang
M htdocs/langs/fr_FR/mails.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/other.lang
M htdocs/langs/fr_FR/printing.lang
M htdocs/langs/fr_FR/products.lang
M htdocs/langs/fr_FR/projects.lang
M htdocs/langs/fr_FR/propal.lang
M htdocs/langs/fr_FR/stocks.lang
M htdocs/langs/fr_FR/supplier_proposal.lang
M htdocs/langs/fr_FR/suppliers.lang
M htdocs/langs/fr_FR/trips.lang
M htdocs/langs/fr_FR/withdrawals.lang
M htdocs/langs/he_IL/admin.lang
M htdocs/langs/he_IL/main.lang
M htdocs/langs/hr_HR/admin.lang
M htdocs/langs/hr_HR/main.lang
M htdocs/langs/hu_HU/admin.lang
M htdocs/langs/hu_HU/main.lang
M htdocs/langs/id_ID/admin.lang
M htdocs/langs/id_ID/main.lang
M htdocs/langs/is_IS/admin.lang
M htdocs/langs/is_IS/main.lang
M htdocs/langs/it_IT/admin.lang
M htdocs/langs/it_IT/main.lang
M htdocs/langs/ja_JP/admin.lang
M htdocs/langs/ja_JP/main.lang
M htdocs/langs/ka_GE/admin.lang
M htdocs/langs/ka_GE/main.lang
M htdocs/langs/km_KH/admin.lang
M htdocs/langs/km_KH/main.lang
M htdocs/langs/kn_IN/admin.lang
M htdocs/langs/kn_IN/main.lang
M htdocs/langs/ko_KR/admin.lang
M htdocs/langs/ko_KR/main.lang
M htdocs/langs/lo_LA/admin.lang
M htdocs/langs/lo_LA/main.lang
M htdocs/langs/lt_LT/admin.lang
M htdocs/langs/lt_LT/main.lang
M htdocs/langs/lv_LV/admin.lang
M htdocs/langs/lv_LV/main.lang
M htdocs/langs/mk_MK/admin.lang
M htdocs/langs/mk_MK/main.lang
M htdocs/langs/mn_MN/admin.lang
M htdocs/langs/mn_MN/main.lang
M htdocs/langs/nb_NO/accountancy.lang
M htdocs/langs/nb_NO/admin.lang
M htdocs/langs/nb_NO/bills.lang
M htdocs/langs/nb_NO/companies.lang
M htdocs/langs/nb_NO/holiday.lang
M htdocs/langs/nb_NO/ldap.lang
M htdocs/langs/nb_NO/main.lang
M htdocs/langs/nb_NO/members.lang
M htdocs/langs/nb_NO/projects.lang
M htdocs/langs/nl_BE/admin.lang
M htdocs/langs/nl_BE/main.lang
M htdocs/langs/nl_NL/admin.lang
M htdocs/langs/nl_NL/main.lang
M htdocs/langs/pl_PL/admin.lang
M htdocs/langs/pl_PL/main.lang
M htdocs/langs/pt_BR/admin.lang
M htdocs/langs/pt_BR/main.lang
M htdocs/langs/pt_PT/admin.lang
M htdocs/langs/pt_PT/main.lang
M htdocs/langs/ro_RO/admin.lang
M htdocs/langs/ro_RO/main.lang
M htdocs/langs/ru_RU/admin.lang
M htdocs/langs/ru_RU/main.lang
M htdocs/langs/sk_SK/admin.lang
M htdocs/langs/sk_SK/main.lang
M htdocs/langs/sl_SI/admin.lang
M htdocs/langs/sl_SI/main.lang
M htdocs/langs/sq_AL/admin.lang
M htdocs/langs/sq_AL/main.lang
M htdocs/langs/sr_RS/admin.lang
M htdocs/langs/sr_RS/main.lang
M htdocs/langs/sv_SE/admin.lang
M htdocs/langs/sv_SE/main.lang
M htdocs/langs/sw_SW/admin.lang
M htdocs/langs/sw_SW/main.lang
M htdocs/langs/th_TH/admin.lang
M htdocs/langs/th_TH/main.lang
M htdocs/langs/tr_TR/admin.lang
M htdocs/langs/tr_TR/main.lang
M htdocs/langs/uk_UA/admin.lang
M htdocs/langs/uk_UA/main.lang
M htdocs/langs/uz_UZ/admin.lang
M htdocs/langs/uz_UZ/main.lang
M htdocs/langs/vi_VN/admin.lang
M htdocs/langs/vi_VN/main.lang
M htdocs/langs/zh_CN/admin.lang
M htdocs/langs/zh_CN/main.lang
M htdocs/langs/zh_TW/admin.lang
M htdocs/langs/zh_TW/main.lang
M htdocs/loan/card.php
M htdocs/main.inc.php
M htdocs/master.inc.php
M htdocs/product/admin/price_rules.php
M htdocs/product/admin/product.php
M htdocs/product/admin/product_tools.php
M htdocs/product/ajax/products.php
M htdocs/product/canvas/product/actions_card_product.class.php
M htdocs/product/card.php
M htdocs/product/class/api_products.class.php
M htdocs/product/class/product.class.php
M htdocs/product/class/productcustomerprice.class.php
M htdocs/product/class/service.class.php
M htdocs/product/composition/card.php
M htdocs/product/document.php
M htdocs/product/fournisseurs.php
M htdocs/product/index.php
M htdocs/product/info.php
M htdocs/product/list.php
M htdocs/product/note.php
M htdocs/product/price.php
M htdocs/product/reassort.php
M htdocs/product/reassortlot.php
M htdocs/product/stats/card.php
M htdocs/product/stats/commande.php
M htdocs/product/stats/commande_fournisseur.php
M htdocs/product/stats/contrat.php
M htdocs/product/stats/facture.php
M htdocs/product/stats/facture_fournisseur.php
M htdocs/product/stats/propal.php
M htdocs/product/stock/card.php
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/product/stock/class/productlot.class.php
M htdocs/product/stock/info.php
M htdocs/product/stock/list.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/product.php
M htdocs/product/stock/productlot_card.php
M htdocs/product/stock/productlot_list.php
M htdocs/product/stock/replenish.php
M htdocs/product/stock/replenishorders.php
M htdocs/product/stock/valo.php
M htdocs/product/traduction.php
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/projet/admin/project.php
M htdocs/projet/card.php
M htdocs/projet/class/api_projects.class.php
M htdocs/projet/class/project.class.php
M htdocs/projet/element.php
M htdocs/projet/ganttchart.inc.php
M htdocs/projet/graph_opportunities.inc.php
M htdocs/projet/list.php
M htdocs/projet/tasks/list.php
M htdocs/projet/tasks/time.php
M htdocs/public/cron/cron_run_jobs.php
M htdocs/public/members/new.php
M htdocs/public/paybox/paymentko.php
M htdocs/public/paybox/paymentok.php
M htdocs/public/paypal/paymentko.php
M htdocs/public/paypal/paymentok.php
M htdocs/resource/class/dolresource.class.php
M htdocs/resource/list.php
M htdocs/societe/admin/societe.php
M htdocs/societe/ajax/company.php
M htdocs/societe/ajaxcompanies.php
M htdocs/societe/ajaxcountries.php
M htdocs/societe/canvas/company/tpl/card_create.tpl.php
M htdocs/societe/canvas/individual/tpl/card_create.tpl.php
M htdocs/societe/class/api_contacts.class.php
M htdocs/societe/class/api_thirdparties.class.php
M htdocs/societe/class/companybankaccount.class.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/list.php
M htdocs/societe/price.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/support/inc.php
M htdocs/theme/eldy/img/object_bookmark.png
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/img/object_bookmark.png
A htdocs/theme/md/img/object_multicurrency.png
M htdocs/theme/md/style.css.php
M htdocs/user/agenda_extsites.php
M htdocs/user/bank.php
M htdocs/user/card.php
M htdocs/user/class/user.class.php
M htdocs/user/class/usergroup.class.php
M htdocs/user/clicktodial.php
M htdocs/user/document.php
M htdocs/user/group/card.php
M htdocs/user/group/index.php
M htdocs/user/hierarchy.php
M htdocs/user/index.php
M htdocs/user/info.php
M htdocs/user/ldap.php
M htdocs/user/note.php
M htdocs/user/param_ihm.php
M htdocs/user/passwordforgotten.php
M htdocs/user/perms.php
M scripts/cron/cron_run_jobs.php
M scripts/product/migrate_picture_path.php
M test/phpunit/DateLibTest.php
M test/phpunit/FunctionsLibTest.php
M test/phpunit/SecurityTest.php
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/Dolibarr/5.0' into 5.0
Commit: 6ba7fe26a7a168f244ba036ea953f72e05180c84
https://github.com/Dolibarr/dolibarr/commit/6ba7fe26a7a168f244ba036ea953f72e05180c84
Author: fappels <address@hidden>
Date: 2017-10-17 (Tue, 17 Oct 2017)
Changed paths:
M htdocs/adherents/list.php
M htdocs/admin/multicurrency.php
M htdocs/comm/mailing/class/advtargetemailing.class.php
M htdocs/commande/card.php
M htdocs/compta/bank/bankentries.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/facture/stats/index.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/json.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/lib/price.lib.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.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/fichinter/doc/pdf_soleil.modules.php
M htdocs/core/modules/modFournisseur.class.php
M htdocs/core/modules/modProduct.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/fichinter/card.php
M htdocs/fourn/card.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/facture/list.php
M htdocs/holiday/card.php
M htdocs/includes/tcpdi/tcpdi.php
M htdocs/install/check.php
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
M htdocs/install/mysql/migration/repair.sql
M htdocs/public/members/new.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
M test/phpunit/PricesTest.php
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/Dolibarr/5.0' into 5.0
Commit: 6b557fd92f75e4ce8783f2ed647658472e87546a
https://github.com/Dolibarr/dolibarr/commit/6b557fd92f75e4ce8783f2ed647658472e87546a
Author: fappels <address@hidden>
Date: 2017-10-17 (Tue, 17 Oct 2017)
Changed paths:
M htdocs/expedition/card.php
Log Message:
-----------
Fix old batches not displayed in multi warehouse shipping
Old batches not available in product_lot table are not shown for
shipping from multiple warehouses
Commit: 3793ae323a8bf3ad7521cd272db6f3e8ba2d3f23
https://github.com/Dolibarr/dolibarr/commit/3793ae323a8bf3ad7521cd272db6f3e8ba2d3f23
Author: gauthier <address@hidden>
Date: 2017-10-19 (Thu, 19 Oct 2017)
Changed paths:
M htdocs/core/lib/project.lib.php
M htdocs/projet/class/task.class.php
Log Message:
-----------
FIX : wrong personnal project time spent
Commit: 75580f253e93898c49ff8635bf23741fb5ac02a5
https://github.com/Dolibarr/dolibarr/commit/75580f253e93898c49ff8635bf23741fb5ac02a5
Author: Juanjo Menent <address@hidden>
Date: 2017-10-20 (Fri, 20 Oct 2017)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
Log Message:
-----------
FIX: Agenda events are not exported in the ICAL, VCAL if begin exactly with
the same $datestart
Commit: 8ac7dd8e9a6fc8fe109f619632ab49588a6edac1
https://github.com/Dolibarr/dolibarr/commit/8ac7dd8e9a6fc8fe109f619632ab49588a6edac1
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-22 (Sun, 22 Oct 2017)
Changed paths:
M htdocs/core/lib/project.lib.php
M htdocs/projet/class/task.class.php
Log Message:
-----------
Merge pull request #7660 from atm-gauthier/fix_project_time_spent
FIX : wrong personnal project time spent
Commit: c387436a680b85de1d8d5e8838b2bb7664165d46
https://github.com/Dolibarr/dolibarr/commit/c387436a680b85de1d8d5e8838b2bb7664165d46
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-22 (Sun, 22 Oct 2017)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
Log Message:
-----------
Merge pull request #7671 from simnandez/4.0
FIX: Agenda events are not exported in the ICAL, VCAL if begin exactly with the
same $datestart
Commit: eaafe83ae4d55799c6744284f1e63e44d088f73a
https://github.com/Dolibarr/dolibarr/commit/eaafe83ae4d55799c6744284f1e63e44d088f73a
Author: fappels <address@hidden>
Date: 2017-10-24 (Tue, 24 Oct 2017)
Changed paths:
M htdocs/expedition/card.php
Log Message:
-----------
Only show old batch number and qty
Commit: 78e3c63eade6c0391daccfa7d1d7779f1e07e2d0
https://github.com/Dolibarr/dolibarr/commit/78e3c63eade6c0391daccfa7d1d7779f1e07e2d0
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-27 (Fri, 27 Oct 2017)
Changed paths:
M htdocs/expedition/card.php
Log Message:
-----------
Update card.php
Commit: 07b25e457b077790d9cc62f30aefefd1d065e057
https://github.com/Dolibarr/dolibarr/commit/07b25e457b077790d9cc62f30aefefd1d065e057
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-27 (Fri, 27 Oct 2017)
Changed paths:
M htdocs/expedition/card.php
Log Message:
-----------
Merge pull request #7652 from
fappels/5.0_Fix_old_batch_not_shown_multi_shipping
FIX old batch not shown in multi shipping
Commit: fed0f3d09e8c992e695b30b5f63b34fd52efa9f4
https://github.com/Dolibarr/dolibarr/commit/fed0f3d09e8c992e695b30b5f63b34fd52efa9f4
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-27 (Fri, 27 Oct 2017)
Changed paths:
M htdocs/core/lib/project.lib.php
M htdocs/projet/class/task.class.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 4.0
Conflicts:
htdocs/core/lib/project.lib.php
htdocs/projet/class/task.class.php
Commit: 9bcf01bf3f3d08b86b391bc67ac2d66a1ded4248
https://github.com/Dolibarr/dolibarr/commit/9bcf01bf3f3d08b86b391bc67ac2d66a1ded4248
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-27 (Fri, 27 Oct 2017)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: f02e731c67da4d14fdf5a5a6aed8f16e71453c00
https://github.com/Dolibarr/dolibarr/commit/f02e731c67da4d14fdf5a5a6aed8f16e71453c00
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-27 (Fri, 27 Oct 2017)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/core/lib/project.lib.php
M htdocs/projet/class/task.class.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/core/lib/project.lib.php
Commit: 8e18d5906debf5bd0ac8e2e0944a7136bcde0e2c
https://github.com/Dolibarr/dolibarr/commit/8e18d5906debf5bd0ac8e2e0944a7136bcde0e2c
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-27 (Fri, 27 Oct 2017)
Changed paths:
M htdocs/expedition/card.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Commit: bc8127d68597d6db1702687f2208260da29ab132
https://github.com/Dolibarr/dolibarr/commit/bc8127d68597d6db1702687f2208260da29ab132
Author: Ferran Marcet <address@hidden>
Date: 2017-10-27 (Fri, 27 Oct 2017)
Changed paths:
M htdocs/societe/consumption.php
Log Message:
-----------
Fix: paid supplier invoices are shown as abandoned on the consumption card.
Commit: 9178d80349f6366ac1a0365b49747d923da9f28a
https://github.com/Dolibarr/dolibarr/commit/9178d80349f6366ac1a0365b49747d923da9f28a
Author: Ferran Marcet <address@hidden>
Date: 2017-10-27 (Fri, 27 Oct 2017)
Changed paths:
M htdocs/holiday/card.php
Log Message:
-----------
Merge remote-tracking branch 'origin/4.0' into 4.0
Commit: 7c1d6251f7acc38c3a7b5b82eacfd8e4eb191467
https://github.com/Dolibarr/dolibarr/commit/7c1d6251f7acc38c3a7b5b82eacfd8e4eb191467
Author: Maxime Kohlhaas <address@hidden>
Date: 2017-10-27 (Fri, 27 Oct 2017)
Changed paths:
M htdocs/contrat/card.php
Log Message:
-----------
Fix : contract lines from origin were containing all lines desc
Commit: 92c33b76dc0e0bd5bf0b67e4d45d88d04135686e
https://github.com/Dolibarr/dolibarr/commit/92c33b76dc0e0bd5bf0b67e4d45d88d04135686e
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-28 (Sat, 28 Oct 2017)
Changed paths:
M htdocs/core/ajax/selectsearchbox.php
Log Message:
-----------
Fix position of search element in quick search
Commit: 5313d61847bc773192ef0884b8e63a925360add5
https://github.com/Dolibarr/dolibarr/commit/5313d61847bc773192ef0884b8e63a925360add5
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-28 (Sat, 28 Oct 2017)
Changed paths:
M htdocs/expedition/card.php
M htdocs/fourn/facture/document.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Commit: 783efd1a71725116d9d67a5e92d0ab72c2368205
https://github.com/Dolibarr/dolibarr/commit/783efd1a71725116d9d67a5e92d0ab72c2368205
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-28 (Sat, 28 Oct 2017)
Changed paths:
M htdocs/societe/consumption.php
Log Message:
-----------
Merge pull request #7722 from fmarcet/4.0
FIX: paid supplier invoices are shown as abandoned
Commit: 0630542e2096b452d72d8708532465b6c0634e75
https://github.com/Dolibarr/dolibarr/commit/0630542e2096b452d72d8708532465b6c0634e75
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-28 (Sat, 28 Oct 2017)
Changed paths:
M htdocs/contrat/card.php
Log Message:
-----------
Merge pull request #7723 from atm-maxime/fix_contract_desc
Fix : contract lines from origin were containing all lines desc
Commit: 4feecbeab881f255c1b533e34d9621fecbde3f93
https://github.com/Dolibarr/dolibarr/commit/4feecbeab881f255c1b533e34d9621fecbde3f93
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-28 (Sat, 28 Oct 2017)
Changed paths:
M htdocs/societe/consumption.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Commit: 02f47b5a9106c0696c438294c2cf367bd4239a8a
https://github.com/Dolibarr/dolibarr/commit/02f47b5a9106c0696c438294c2cf367bd4239a8a
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-28 (Sat, 28 Oct 2017)
Changed paths:
M htdocs/contrat/card.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Commit: cd5e43483e5e54c63631f1ef528ba594a164f5ce
https://github.com/Dolibarr/dolibarr/commit/cd5e43483e5e54c63631f1ef528ba594a164f5ce
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-28 (Sat, 28 Oct 2017)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/contrat/card.php
M htdocs/core/lib/project.lib.php
M htdocs/expedition/card.php
M htdocs/societe/consumption.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/contrat/card.php
htdocs/core/lib/project.lib.php
htdocs/expedition/card.php
htdocs/projet/class/task.class.php
Commit: 985a268477bff7479e890a4f709ba1549e32ac43
https://github.com/Dolibarr/dolibarr/commit/985a268477bff7479e890a4f709ba1549e32ac43
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-28 (Sat, 28 Oct 2017)
Changed paths:
M ChangeLog
Log Message:
-----------
Update doc
Commit: 78645c718f44106edd5d00398003ec77bf0e4f2c
https://github.com/Dolibarr/dolibarr/commit/78645c718f44106edd5d00398003ec77bf0e4f2c
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-29 (Sun, 29 Oct 2017)
Changed paths:
M htdocs/core/ajax/selectsearchbox.php
Log Message:
-----------
Fix position of quick search
Commit: 0de1b878bd50209849bb39b26c6df2fa8b2a4e12
https://github.com/Dolibarr/dolibarr/commit/0de1b878bd50209849bb39b26c6df2fa8b2a4e12
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-29 (Sun, 29 Oct 2017)
Changed paths:
M htdocs/filefunc.inc.php
Log Message:
-----------
Prepare 6.0.4
Commit: 007783cf76a10e9925d869ea1e339a9d1992ccd2
https://github.com/Dolibarr/dolibarr/commit/007783cf76a10e9925d869ea1e339a9d1992ccd2
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-30 (Mon, 30 Oct 2017)
Changed paths:
M htdocs/admin/translation.php
Log Message:
-----------
FIX Searching translation should not be case sensitive
Commit: 892798bf79fc477cdfade20c22d8858344c13996
https://github.com/Dolibarr/dolibarr/commit/892798bf79fc477cdfade20c22d8858344c13996
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-30 (Mon, 30 Oct 2017)
Changed paths:
M htdocs/api/index.php
Log Message:
-----------
Code comment
Commit: b7c5844d355c42e3e4303109043aef427d27e082
https://github.com/Dolibarr/dolibarr/commit/b7c5844d355c42e3e4303109043aef427d27e082
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-30 (Mon, 30 Oct 2017)
Changed paths:
M htdocs/modulebuilder/template/ChangeLog.md
Log Message:
-----------
Update template
Commit: b29f32171c4cfab0a0c4bbd68cfa41b45bf86bf4
https://github.com/Dolibarr/dolibarr/commit/b29f32171c4cfab0a0c4bbd68cfa41b45bf86bf4
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-30 (Mon, 30 Oct 2017)
Changed paths:
M ChangeLog
M htdocs/api/index.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/contrat/card.php
M htdocs/core/lib/project.lib.php
M htdocs/expedition/card.php
M htdocs/societe/consumption.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/comm/action/class/actioncomm.class.php
htdocs/contrat/card.php
htdocs/core/lib/project.lib.php
htdocs/filefunc.inc.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/b74399abf62a...b29f32171c4c