[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 2e66c6: WTF...
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 2e66c6: WTF... |
|
Date: |
Tue, 04 Sep 2018 06:59:03 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 2e66c6565086c84e8b89a7bf547e951f01abc1a5
https://github.com/Dolibarr/dolibarr/commit/2e66c6565086c84e8b89a7bf547e951f01abc1a5
Author: Philippe GRAND <address@hidden>
Date: 2018-08-30 (Thu, 30 Aug 2018)
Changed paths:
M .travis.yml
M README.md
M htdocs/accountancy/class/accountancycategory.class.php
M htdocs/accountancy/class/accountingaccount.class.php
M htdocs/adherents/canvas/actions_adherentcard_common.class.php
M htdocs/adherents/class/adherent.class.php
M htdocs/comm/action/card.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/mailing/class/advtargetemailing.class.php
M htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
M htdocs/comm/propal/card.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/card.php
M htdocs/compta/localtax/class/localtax.class.php
M htdocs/compta/salaries/class/paymentsalary.class.php
M htdocs/compta/sociales/class/paymentsocialcontribution.class.php
M htdocs/core/class/comment.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/events.class.php
M htdocs/core/class/menubase.class.php
M htdocs/core/lib/price.lib.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
M htdocs/cron/class/cronjob.class.php
M htdocs/don/class/paymentdonation.class.php
M htdocs/expedition/class/expeditionbatch.class.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/expensereport/class/paymentexpensereport.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.commande.dispatch.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/facture/card.php
M htdocs/install/fileconf.php
M htdocs/install/inc.php
M htdocs/langs/en_US/install.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/en_US/ticket.lang
M htdocs/langs/fr_FR/agenda.lang
M htdocs/langs/fr_FR/other.lang
M htdocs/loan/class/loan.class.php
M htdocs/loan/class/loanschedule.class.php
M htdocs/loan/class/paymentloan.class.php
M htdocs/opensurvey/class/opensurveysondage.class.php
M htdocs/opensurvey/fonctions.php
M htdocs/product/class/productbatch.class.php
M htdocs/product/class/productcustomerprice.class.php
M htdocs/product/class/propalmergepdfproduct.class.php
M htdocs/product/fournisseurs.php
M htdocs/projet/class/project.class.php
M htdocs/projet/class/task.class.php
M htdocs/resource/class/dolresource.class.php
M htdocs/ticket/class/ticket.class.php
M htdocs/ticket/class/ticketlogs.class.php
M htdocs/user/document.php
M htdocs/viewimage.php
Log Message:
-----------
WTF...
Commit: ba6a48360e0e1889cfd4ef4c2350b1d1a6652762
https://github.com/Dolibarr/dolibarr/commit/ba6a48360e0e1889cfd4ef4c2350b1d1a6652762
Author: Philippe GRAND <address@hidden>
Date: 2018-08-30 (Thu, 30 Aug 2018)
Changed paths:
M htdocs/accountancy/class/accountancycategory.class.php
Log Message:
-----------
Standardize and update code
Commit: e96e3bdf42e2b594ac560626b6d0494666ff9141
https://github.com/Dolibarr/dolibarr/commit/e96e3bdf42e2b594ac560626b6d0494666ff9141
Author: Philippe Grand <address@hidden>
Date: 2018-08-30 (Thu, 30 Aug 2018)
Changed paths:
M htdocs/accountancy/class/accountancycategory.class.php
Log Message:
-----------
Update accountancycategory.class.php
Commit: 5ec22d9fadf19a4e79b5caceadc5527b62f7af8d
https://github.com/Dolibarr/dolibarr/commit/5ec22d9fadf19a4e79b5caceadc5527b62f7af8d
Author: Philippe Grand <address@hidden>
Date: 2018-08-30 (Thu, 30 Aug 2018)
Changed paths:
M htdocs/accountancy/class/accountingaccount.class.php
Log Message:
-----------
Update accountingaccount.class.php
Commit: 6474646e4ba573bea1db123cd4be09c142cb5655
https://github.com/Dolibarr/dolibarr/commit/6474646e4ba573bea1db123cd4be09c142cb5655
Author: Philippe GRAND <address@hidden>
Date: 2018-08-31 (Fri, 31 Aug 2018)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/core/lib/functions2.lib.php
M htdocs/fourn/commande/dispatch.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Merge branch 'develop' of github.com:Dolibarr/dolibarr into
new_branch_30_08_2018
Commit: c60c38dfb301842763cee7e4b82c4fd9a478d0fa
https://github.com/Dolibarr/dolibarr/commit/c60c38dfb301842763cee7e4b82c4fd9a478d0fa
Author: Philippe GRAND <address@hidden>
Date: 2018-08-31 (Fri, 31 Aug 2018)
Changed paths:
M htdocs/accountancy/class/accountancycategory.class.php
M htdocs/accountancy/class/accountingaccount.class.php
Log Message:
-----------
Merge branch 'new_branch_30_08_2018' of github.com:grandoc/dolibarr into
new_branch_30_08_2018
Commit: a62a5ab636529e13c9b2073bf08b450923da874e
https://github.com/Dolibarr/dolibarr/commit/a62a5ab636529e13c9b2073bf08b450923da874e
Author: Philippe GRAND <address@hidden>
Date: 2018-08-31 (Fri, 31 Aug 2018)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/core/lib/functions2.lib.php
M htdocs/fourn/commande/dispatch.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/develop' into develop
Commit: cd6ea37ea0ca790a6836281ddb98a2a572caa62f
https://github.com/Dolibarr/dolibarr/commit/cd6ea37ea0ca790a6836281ddb98a2a572caa62f
Author: Philippe GRAND <address@hidden>
Date: 2018-08-31 (Fri, 31 Aug 2018)
Changed paths:
M htdocs/accountancy/class/accountancycategory.class.php
M htdocs/accountancy/class/accountingaccount.class.php
Log Message:
-----------
Merge branch 'new_branch_30_08_2018' of github.com:grandoc/dolibarr into
develop
Commit: 7973489f8a6c363049ec52df606e003c254557e9
https://github.com/Dolibarr/dolibarr/commit/7973489f8a6c363049ec52df606e003c254557e9
Author: Philippe GRAND <address@hidden>
Date: 2018-08-31 (Fri, 31 Aug 2018)
Changed paths:
M htdocs/accountancy/class/accountancycategory.class.php
Log Message:
-----------
fix display comment issue
Commit: 9e880d3e72bc30109b03684eeff332ca879b9615
https://github.com/Dolibarr/dolibarr/commit/9e880d3e72bc30109b03684eeff332ca879b9615
Author: Philippe GRAND <address@hidden>
Date: 2018-08-31 (Fri, 31 Aug 2018)
Changed paths:
M htdocs/comm/action/class/actioncommreminder.class.php
M htdocs/compta/salaries/class/paymentsalary.class.php
M htdocs/core/class/discount.class.php
M htdocs/fourn/class/fournisseur.commande.dispatch.class.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Standardize and update code
Commit: 2f307aae21ee8bf647dbc5939a5b6338989edd1d
https://github.com/Dolibarr/dolibarr/commit/2f307aae21ee8bf647dbc5939a5b6338989edd1d
Author: Philippe GRAND <address@hidden>
Date: 2018-08-31 (Fri, 31 Aug 2018)
Changed paths:
M htdocs/bookmarks/class/bookmark.class.php
M htdocs/compta/deplacement/class/deplacement.class.php
M htdocs/holiday/class/holiday.class.php
M htdocs/product/class/productcustomerprice.class.php
Log Message:
-----------
Standardize and update code
Commit: 70ae8c6081ac20c622823330431b01353b3ed21b
https://github.com/Dolibarr/dolibarr/commit/70ae8c6081ac20c622823330431b01353b3ed21b
Author: Philippe GRAND <address@hidden>
Date: 2018-08-31 (Fri, 31 Aug 2018)
Changed paths:
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/adherents/class/adherent.class.php
M htdocs/core/class/comment.class.php
M htdocs/core/class/emailsenderprofile.class.php
M htdocs/core/class/link.class.php
M htdocs/cron/class/cronjob.class.php
M htdocs/ecm/class/ecmfiles.class.php
M htdocs/hrm/class/establishment.class.php
M htdocs/modulebuilder/template/class/myobject.class.php
M htdocs/multicurrency/class/multicurrency.class.php
M htdocs/product/inventory/class/inventory.class.php
M htdocs/product/stock/class/productlot.class.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/class/societeaccount.class.php
M htdocs/stripe/class/stripe.class.php
M htdocs/user/class/user.class.php
M htdocs/user/class/usergroup.class.php
M htdocs/website/class/website.class.php
Log Message:
-----------
Standardize and update code
Commit: edaa575435228f1226c7db9b274af3d344c4d5f6
https://github.com/Dolibarr/dolibarr/commit/edaa575435228f1226c7db9b274af3d344c4d5f6
Author: Philippe GRAND <address@hidden>
Date: 2018-08-31 (Fri, 31 Aug 2018)
Changed paths:
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/class/paymentvarious.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/notify.class.php
Log Message:
-----------
Standardize and update code
Commit: bb05e80a877a889cd7286e275b515f40c73f4b2c
https://github.com/Dolibarr/dolibarr/commit/bb05e80a877a889cd7286e275b515f40c73f4b2c
Author: Philippe GRAND <address@hidden>
Date: 2018-08-31 (Fri, 31 Aug 2018)
Changed paths:
M htdocs/asset/class/asset.class.php
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
M htdocs/cron/class/cronjob.class.php
M htdocs/ecm/class/ecmdirectory.class.php
M htdocs/ecm/class/ecmfiles.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/hrm/class/establishment.class.php
M htdocs/modulebuilder/template/class/myobject.class.php
M htdocs/product/inventory/class/inventory.class.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Standardize and update code
Commit: 3a8bde227b199167f1c16f3670a675eb7b1560eb
https://github.com/Dolibarr/dolibarr/commit/3a8bde227b199167f1c16f3670a675eb7b1560eb
Author: Philippe GRAND <address@hidden>
Date: 2018-08-31 (Fri, 31 Aug 2018)
Changed paths:
M htdocs/asset/class/asset.class.php
M htdocs/categories/class/categorie.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/comment.class.php
M htdocs/core/class/discount.class.php
M htdocs/core/class/events.class.php
M htdocs/core/modules/action/rapport.pdf.php
M htdocs/ecm/class/ecmdirectory.class.php
M htdocs/ecm/class/ecmfiles.class.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/holiday/class/holiday.class.php
M htdocs/livraison/class/livraison.class.php
M htdocs/opensurvey/class/opensurveysondage.class.php
M htdocs/product/dynamic_price/class/price_global_variable.class.php
M htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
M htdocs/product/stock/class/entrepot.class.php
M htdocs/projet/class/project.class.php
M htdocs/projet/class/task.class.php
M htdocs/ticket/class/actions_ticket.class.php
M htdocs/website/class/websitepage.class.php
Log Message:
-----------
Standardize and update code
Commit: 1944ef0dc3ff5848f52c99600d5887c48dc4ee77
https://github.com/Dolibarr/dolibarr/commit/1944ef0dc3ff5848f52c99600d5887c48dc4ee77
Author: Philippe GRAND <address@hidden>
Date: 2018-09-01 (Sat, 01 Sep 2018)
Changed paths:
M .tx/config
M ChangeLog
M dev/setup/codesniffer/ruleset.xml
M dev/translation/autotranslator.class.php
M htdocs/accountancy/class/accountancycategory.class.php
M htdocs/accountancy/class/accountingaccount.class.php
M htdocs/accountancy/class/accountingjournal.class.php
M htdocs/adherents/canvas/actions_adherentcard_common.class.php
M htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/class/adherentstats.class.php
M htdocs/adherents/class/api_members.class.php
M htdocs/adherents/class/api_memberstypes.class.php
M htdocs/admin/tools/eaccelerator.php
M htdocs/api/class/api_access.class.php
M htdocs/api/class/api_setup.class.php
M htdocs/asset/class/asset_type.class.php
M htdocs/blockedlog/class/authority.class.php
M htdocs/blockedlog/class/blockedlog.class.php
M htdocs/bookmarks/class/bookmark.class.php
M htdocs/cashdesk/class/Auth.class.php
M htdocs/cashdesk/class/Facturation.class.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/class/actioncommreminder.class.php
M htdocs/comm/action/class/api_agendaevents.class.php
M htdocs/comm/action/class/cactioncomm.class.php
M htdocs/comm/action/class/ical.class.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/mailing/class/advtargetemailing.class.php
M htdocs/comm/mailing/class/mailing.class.php
M htdocs/comm/propal/class/api_proposals.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/api_orders.class.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/class/commandestats.class.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/class/bankcateg.class.php
M htdocs/compta/bank/class/paymentvarious.class.php
M htdocs/compta/deplacement/class/deplacement.class.php
M htdocs/compta/facture/class/api_invoices.class.php
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/class/facturestats.class.php
M htdocs/compta/facture/class/paymentterm.class.php
M htdocs/compta/localtax/class/localtax.class.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/prelevement/class/rejetprelevement.class.php
M htdocs/compta/salaries/class/paymentsalary.class.php
M htdocs/compta/sociales/class/cchargesociales.class.php
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/compta/sociales/class/paymentsocialcontribution.class.php
M htdocs/contact/canvas/actions_contactcard_common.class.php
M htdocs/contact/canvas/default/actions_contactcard_default.class.php
M htdocs/contrat/class/api_contracts.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/boxes/box_actions.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_lastlogin.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/CSMSFile.class.php
M htdocs/core/class/antivir.class.php
M htdocs/core/class/canvas.class.php
M htdocs/core/class/ccountry.class.php
M htdocs/core/class/commondocgenerator.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/commonorder.class.php
M htdocs/core/class/commonstickergenerator.class.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/coreobject.class.php
M htdocs/core/class/cstate.class.php
M htdocs/core/class/ctypent.class.php
M htdocs/core/class/ctyperesource.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/emailsenderprofile.class.php
M htdocs/core/class/events.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/fiscalyear.class.php
M htdocs/core/class/genericobject.class.php
M htdocs/core/class/hookmanager.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formactions.class.php
M htdocs/core/class/html.formbarcode.class.php
M htdocs/core/class/html.formcompany.class.php
M htdocs/core/class/html.formcontract.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/class/html.formmargin.class.php
M htdocs/core/class/html.formorder.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/core/class/html.formsms.class.php
M htdocs/core/class/html.formsocialcontrib.class.php
M htdocs/core/class/html.formwebsite.class.php
M htdocs/core/class/infobox.class.php
M htdocs/core/class/interfaces.class.php
M htdocs/core/class/link.class.php
M htdocs/core/class/menubase.class.php
M htdocs/core/class/notify.class.php
M htdocs/core/class/openid.class.php
M htdocs/core/class/rssparser.class.php
M htdocs/core/class/smtps.class.php
M htdocs/core/class/vcard.class.php
M htdocs/core/class/workboardresponse.class.php
M htdocs/core/db/Database.interface.php
M htdocs/core/db/mssql.class.php
M htdocs/core/db/sqlite3.class.php
M htdocs/core/lib/bank.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/resource.lib.php
M htdocs/core/menus/standard/eldy_menu.php
M htdocs/core/menus/standard/empty.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/bank/doc/pdf_ban.modules.php
M htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
M htdocs/core/modules/barcode/doc/phpbarcode.modules.php
M htdocs/core/modules/barcode/mod_barcode_product_standard.php
M htdocs/core/modules/barcode/modules_barcode.class.php
M htdocs/core/modules/cheque/mod_chequereceipt_mint.php
M htdocs/core/modules/cheque/mod_chequereceipt_thyme.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_proforma.modules.php
M htdocs/core/modules/commande/mod_commande_marbre.php
M htdocs/core/modules/commande/mod_commande_saphir.php
M htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
M htdocs/core/modules/contract/mod_contract_magre.php
M htdocs/core/modules/contract/mod_contract_serpis.php
M htdocs/core/modules/dons/html_cerfafr.modules.php
M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/expedition/mod_expedition_ribera.php
M htdocs/core/modules/expedition/mod_expedition_safor.php
M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
M htdocs/core/modules/expensereport/modules_expensereport.php
M htdocs/core/modules/export/export_csv.modules.php
M htdocs/core/modules/export/export_excel2007.modules.php
M htdocs/core/modules/export/export_tsv.modules.php
M htdocs/core/modules/export/modules_export.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/mod_facture_mars.php
M htdocs/core/modules/facture/mod_facture_mercure.php
M htdocs/core/modules/facture/mod_facture_terre.php
M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
M htdocs/core/modules/fichinter/mod_arctic.php
M htdocs/core/modules/fichinter/mod_pacific.php
M htdocs/core/modules/holiday/mod_holiday_madonna.php
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/import/import_xlsx.modules.php
M htdocs/core/modules/import/modules_import.php
M htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
M htdocs/core/modules/livraison/mod_livraison_jade.php
M htdocs/core/modules/livraison/mod_livraison_saphir.php
M htdocs/core/modules/mailings/advthirdparties.modules.php
M htdocs/core/modules/mailings/contacts1.modules.php
M htdocs/core/modules/mailings/example.modules.php
M htdocs/core/modules/mailings/fraise.modules.php
M htdocs/core/modules/mailings/modules_mailings.php
M htdocs/core/modules/mailings/pomme.modules.php
M htdocs/core/modules/mailings/thirdparties.modules.php
M htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
M htdocs/core/modules/mailings/xinputfile.modules.php
M htdocs/core/modules/mailings/xinputuser.modules.php
M htdocs/core/modules/member/doc/pdf_standard.class.php
M htdocs/core/modules/member/modules_cards.php
M htdocs/core/modules/modAccounting.class.php
M htdocs/core/modules/modAdherent.class.php
M htdocs/core/modules/modAgenda.class.php
M htdocs/core/modules/modAsset.class.php
M htdocs/core/modules/modBanque.class.php
M htdocs/core/modules/modBookmark.class.php
M htdocs/core/modules/modComptabilite.class.php
M htdocs/core/modules/modDav.class.php
M htdocs/core/modules/modDon.class.php
M htdocs/core/modules/modDynamicPrices.class.php
M htdocs/core/modules/modExport.class.php
M htdocs/core/modules/modExternalRss.class.php
M htdocs/core/modules/modExternalSite.class.php
M htdocs/core/modules/modFicheinter.class.php
M htdocs/core/modules/modHRM.class.php
M htdocs/core/modules/modImport.class.php
M htdocs/core/modules/modLabel.class.php
M htdocs/core/modules/modLoan.class.php
M htdocs/core/modules/modMailing.class.php
M htdocs/core/modules/modMailmanSpip.class.php
M htdocs/core/modules/modModuleBuilder.class.php
M htdocs/core/modules/modOauth.class.php
M htdocs/core/modules/modPrelevement.class.php
M htdocs/core/modules/modPrinting.class.php
M htdocs/core/modules/modProductBatch.class.php
M htdocs/core/modules/modPropale.class.php
M htdocs/core/modules/modReceiptPrinter.class.php
M htdocs/core/modules/modResource.class.php
M htdocs/core/modules/modStock.class.php
M htdocs/core/modules/modSupplierProposal.class.php
M htdocs/core/modules/modTax.class.php
M htdocs/core/modules/modTicket.class.php
M htdocs/core/modules/modUser.class.php
M htdocs/core/modules/payment/mod_payment_ant.php
M htdocs/core/modules/payment/mod_payment_cicada.php
M htdocs/core/modules/printing/modules_printing.php
M htdocs/core/modules/printing/printgcp.modules.php
M htdocs/core/modules/printing/printipp.modules.php
M htdocs/core/modules/printsheet/modules_labels.php
M htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
M htdocs/core/modules/product/doc/pdf_standard.modules.php
M htdocs/core/modules/product/mod_codeproduct_elephant.php
M htdocs/core/modules/product/modules_product.class.php
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
M htdocs/core/modules/project/doc/pdf_baleine.modules.php
M htdocs/core/modules/project/doc/pdf_beluga.modules.php
M htdocs/core/modules/project/doc/pdf_timespent.modules.php
M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.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/mod_propale_marbre.php
M htdocs/core/modules/propale/mod_propale_saphir.php
M htdocs/core/modules/rapport/pdf_paiement.class.php
M htdocs/core/modules/security/generate/modGeneratePassNone.class.php
M htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
M htdocs/core/modules/security/generate/modules_genpassword.php
M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
M htdocs/core/modules/societe/mod_codeclient_elephant.php
M htdocs/core/modules/societe/mod_codeclient_monkey.php
M htdocs/core/modules/societe/modules_societe.class.php
M htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
M htdocs/core/modules/stock/doc/pdf_standard.modules.php
M htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
M htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/modules_commandefournisseur.php
M 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_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/doc_generic_supplier_proposal_odt.modules.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
M htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
M htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
M htdocs/core/modules/ticket/mod_ticket_simple.php
M htdocs/core/modules/ticket/mod_ticket_universal.php
M htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
M htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
M htdocs/core/triggers/dolibarrtriggers.class.php
M htdocs/core/triggers/interface_20_all_Logevents.class.php
M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
M
htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
M htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
M
htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
M htdocs/core/triggers/interface_50_modNotification_Notification.class.php
M htdocs/dav/dav.class.php
M htdocs/don/class/don.class.php
M htdocs/don/class/paymentdonation.class.php
M htdocs/ecm/class/ecmdirectory.class.php
M htdocs/expedition/class/api_shipments.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/class/expeditionbatch.class.php
M htdocs/expensereport/class/api_expensereports.class.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/expensereport/class/paymentexpensereport.class.php
M htdocs/exports/class/export.class.php
M htdocs/fichinter/class/api_interventions.class.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fichinter/class/fichinterstats.class.php
M htdocs/fourn/class/fournisseur.class.php
M htdocs/fourn/class/fournisseur.commande.dispatch.class.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/fourn/class/paiementfourn.class.php
M htdocs/holiday/class/holiday.class.php
M htdocs/imports/class/import.class.php
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php
M
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php
M htdocs/install/mysql/migration/8.0.0-9.0.0.sql
M htdocs/livraison/class/livraison.class.php
M htdocs/loan/class/loan.class.php
M htdocs/mailmanspip/class/mailmanspip.class.php
M htdocs/modulebuilder/template/class/actions_mymodule.class.php
M htdocs/modulebuilder/template/class/api_mymodule.class.php
M
htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
M htdocs/modulebuilder/template/core/modules/modMyModule.class.php
M htdocs/multicurrency/class/multicurrency.class.php
M htdocs/opensurvey/class/opensurveysondage.class.php
M htdocs/paypal/lib/paypal.lib.php
M htdocs/product/canvas/product/actions_card_product.class.php
M htdocs/product/canvas/service/actions_card_service.class.php
M htdocs/product/class/html.formproduct.class.php
M htdocs/product/class/product.class.php
M htdocs/product/class/productbatch.class.php
M htdocs/product/class/propalmergepdfproduct.class.php
M htdocs/product/inventory/class/inventory.class.php
M htdocs/product/stock/class/entrepot.class.php
M htdocs/product/stock/class/productlot.class.php
M htdocs/product/stock/class/productstockentrepot.class.php
M htdocs/projet/class/api_projects.class.php
M htdocs/projet/class/api_tasks.class.php
M htdocs/projet/class/project.class.php
M htdocs/projet/ganttchart.inc.php
A htdocs/public/onlinesign/index.html
A htdocs/public/test/index.html
A htdocs/public/ticket/img/index.html
M htdocs/public/ticket/index.php
M htdocs/resource/class/dolresource.class.php
M htdocs/resource/class/html.formresource.class.php
M htdocs/societe/canvas/actions_card_common.class.php
M htdocs/societe/canvas/company/actions_card_company.class.php
M htdocs/societe/canvas/individual/actions_card_individual.class.php
M htdocs/societe/class/address.class.php
M htdocs/societe/class/api_thirdparties.class.php
M htdocs/societe/class/client.class.php
M htdocs/societe/class/companybankaccount.class.php
M htdocs/societe/class/companypaymentmode.class.php
M htdocs/societe/class/societe.class.php
M htdocs/stripe/class/actions_stripe.class.php
M htdocs/stripe/class/stripe.class.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M htdocs/ticket/class/ticket.class.php
M htdocs/user/class/user.class.php
M htdocs/user/class/usergroup.class.php
M htdocs/user/logout.php
M htdocs/website/class/website.class.php
M htdocs/website/class/websitepage.class.php
M test/phpunit/AccountingAccountTest.php
M test/phpunit/ActionCommTest.php
M test/phpunit/AdminLibTest.php
M test/phpunit/AllTests.php
M test/phpunit/BankAccountTest.php
M test/phpunit/BonPrelevementTest.php
M test/phpunit/CMailFileTest.php
M test/phpunit/CategorieTest.php
M test/phpunit/ChargeSocialesTest.php
M test/phpunit/CodingSqlTest.php
M test/phpunit/CommandeFournisseurTest.php
M test/phpunit/CommandeTest.php
M test/phpunit/CompanyBankAccountTest.php
M test/phpunit/ContratTest.php
M test/phpunit/DateLibTest.php
M test/phpunit/DateLibTzFranceTest.php
M test/phpunit/EntrepotTest.php
M test/phpunit/ExpenseReportTest.php
M test/phpunit/ExportTest.php
M test/phpunit/FactureFournisseurTest.php
M test/phpunit/FactureTestRounding.php
M test/phpunit/FichinterTest.php
M test/phpunit/FilesLibTest.php
M test/phpunit/FormAdminTest.php
M test/phpunit/Functions2LibTest.php
M test/phpunit/FunctionsLibTest.php
M test/phpunit/HolidayTest.php
M test/phpunit/ImagesLibTest.php
M test/phpunit/ImportTest.php
M test/phpunit/MarginsLibTest.php
M test/phpunit/ModulesTest.php
M test/phpunit/MouvementStockTest.php
M test/phpunit/NumberingModulesTest.php
M test/phpunit/PaypalTest.php
M test/phpunit/PricesTest.php
M test/phpunit/ProjectTest.php
M test/phpunit/PropalTest.php
M test/phpunit/RestAPIUserTest.php
M test/phpunit/SecurityTest.php
M test/phpunit/SocieteTest.php
M test/phpunit/SupplierProposalTest.php
M test/phpunit/UserGroupTest.php
M test/phpunit/UtilsTest.php
M test/phpunit/WebservicesInvoicesTest.php
M test/phpunit/WebservicesOrdersTest.php
M test/phpunit/WebservicesOtherTest.php
M test/phpunit/WebservicesProductsTest.php
M test/phpunit/WebservicesThirdpartyTest.php
M test/phpunit/WebservicesUserTest.php
M test/phpunit/XCalLibTest.php
Log Message:
-----------
conflict resolution
Commit: 0e5d4206c9071b5ddc3809e94380d67467d9a550
https://github.com/Dolibarr/dolibarr/commit/0e5d4206c9071b5ddc3809e94380d67467d9a550
Author: Philippe GRAND <address@hidden>
Date: 2018-09-01 (Sat, 01 Sep 2018)
Changed paths:
M README.md
M htdocs/core/lib/ticket.lib.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/public/onlinesign/newonlinesign.php
M htdocs/public/payment/newpayment.php
A htdocs/stripe/class/index.html
M htdocs/viewimage.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/develop' into develop
Commit: 0dc812cf10d28811a194fcab7b2ad70c29b52166
https://github.com/Dolibarr/dolibarr/commit/0dc812cf10d28811a194fcab7b2ad70c29b52166
Author: Philippe GRAND <address@hidden>
Date: 2018-09-01 (Sat, 01 Sep 2018)
Changed paths:
M htdocs/accountancy/class/accountancycategory.class.php
M htdocs/accountancy/class/accountancysystem.class.php
M htdocs/accountancy/class/accountingjournal.class.php
Log Message:
-----------
precise label comment
Commit: d8e6492e93b82088fccf95968208c66a8046ee5b
https://github.com/Dolibarr/dolibarr/commit/d8e6492e93b82088fccf95968208c66a8046ee5b
Author: Philippe GRAND <address@hidden>
Date: 2018-09-01 (Sat, 01 Sep 2018)
Changed paths:
M dev/setup/codesniffer/ruleset.xml
M htdocs/adherents/admin/website.php
M htdocs/admin/dolistore/ajax/image.php
M htdocs/admin/dolistore/class/dolistore.class.php
M htdocs/admin/oauthlogintokens.php
M htdocs/admin/receiptprinter.php
M htdocs/admin/ticket_extrafields.php
M htdocs/api/class/api_login.class.php
M htdocs/asset/card.php
M htdocs/asset/document.php
M htdocs/asset/info.php
M htdocs/asset/list.php
M htdocs/asset/note.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/core/class/fiscalyear.class.php
M htdocs/core/lib/asset.lib.php
M htdocs/core/lib/fichinter.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/lib/invoice.lib.php
M htdocs/core/lib/resource.lib.php
M htdocs/core/lib/security2.lib.php
M htdocs/core/modules/dons/html_cerfafr.modules.php
M htdocs/core/modules/modVariants.class.php
M htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
M htdocs/dav/dav.class.php
M htdocs/expensereport/class/expensereport_ik.class.php
M htdocs/loan/class/loanschedule.class.php
M htdocs/product/class/propalmergepdfproduct.class.php
M htdocs/product/inventory/lib/inventory.lib.php
M htdocs/projet/class/projectstats.class.php
M htdocs/projet/class/taskstats.class.php
M htdocs/ticket/class/ticket.class.php
M htdocs/user/class/user.class.php
M htdocs/variants/class/ProductAttribute.class.php
M htdocs/variants/class/ProductAttributeValue.class.php
M htdocs/variants/class/ProductCombination.class.php
M htdocs/variants/class/ProductCombination2ValuePair.class.php
M scripts/cron/cron_run_jobs.php
M test/phpunit/BonPrelevementTest.php
M test/phpunit/RestAPIUserTest.php
M test/phpunit/WebservicesInvoicesTest.php
M test/phpunit/functional/InstallTest.php
Log Message:
-----------
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
Commit: 7354e485b0b3e128fabc816debb2b955a263b714
https://github.com/Dolibarr/dolibarr/commit/7354e485b0b3e128fabc816debb2b955a263b714
Author: Philippe GRAND <address@hidden>
Date: 2018-09-01 (Sat, 01 Sep 2018)
Changed paths:
M htdocs/asset/class/asset.class.php
M htdocs/categories/class/categorie.class.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/class/cactioncomm.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/class/bankcateg.class.php
M htdocs/compta/bank/class/paymentvarious.class.php
Log Message:
-----------
precise label comment
Commit: b59d49d3b3ec69fd2d15aeca9889904aebdf16ee
https://github.com/Dolibarr/dolibarr/commit/b59d49d3b3ec69fd2d15aeca9889904aebdf16ee
Author: Philippe GRAND <address@hidden>
Date: 2018-09-01 (Sat, 01 Sep 2018)
Changed paths:
M htdocs/accountancy/admin/export.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/categories/class/categorie.class.php
M htdocs/core/class/ldap.class.php
M htdocs/product/card.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/develop' into develop
Commit: 7b47c79bc38d47379be29039c772153c42e1d9e7
https://github.com/Dolibarr/dolibarr/commit/7b47c79bc38d47379be29039c772153c42e1d9e7
Author: Philippe GRAND <address@hidden>
Date: 2018-09-01 (Sat, 01 Sep 2018)
Changed paths:
M htdocs/compta/localtax/class/localtax.class.php
M htdocs/compta/salaries/class/paymentsalary.class.php
M htdocs/compta/tva/class/tva.class.php
M htdocs/core/class/ccountry.class.php
M htdocs/core/class/ctyperesource.class.php
M htdocs/core/class/fiscalyear.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/class/link.class.php
Log Message:
-----------
precise label comment
Commit: bd473059ae0d8b9d8a3bd831e32d9d2bdf9e4d46
https://github.com/Dolibarr/dolibarr/commit/bd473059ae0d8b9d8a3bd831e32d9d2bdf9e4d46
Author: Philippe GRAND <address@hidden>
Date: 2018-09-01 (Sat, 01 Sep 2018)
Changed paths:
M htdocs/core/modules/export/export_csv.modules.php
M htdocs/core/modules/export/export_excel.modules.php
M htdocs/core/modules/export/export_excel2007.modules.php
M htdocs/core/modules/export/export_tsv.modules.php
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/import/import_xlsx.modules.php
M htdocs/core/modules/import/modules_import.php
M htdocs/ecm/class/ecmdirectory.class.php
M htdocs/livraison/class/livraison.class.php
Log Message:
-----------
precise label comment
Commit: 17e349eba255ae7245c946f2cff9341c3ead26d5
https://github.com/Dolibarr/dolibarr/commit/17e349eba255ae7245c946f2cff9341c3ead26d5
Author: Philippe GRAND <address@hidden>
Date: 2018-09-01 (Sat, 01 Sep 2018)
Changed paths:
M htdocs/adherents/card.php
M htdocs/adherents/ldap.php
M htdocs/admin/stock.php
M htdocs/compta/sociales/card.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
M htdocs/fourn/commande/dispatch.php
M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
M htdocs/langs/en_US/agenda.lang
M htdocs/langs/en_US/blockedlog.lang
M
htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
M htdocs/product/card.php
M htdocs/product/class/product.class.php
M htdocs/public/payment/newpayment.php
Log Message:
-----------
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
Commit: b27358790927ab413b28a97ecd7cd299db7c5300
https://github.com/Dolibarr/dolibarr/commit/b27358790927ab413b28a97ecd7cd299db7c5300
Author: Philippe GRAND <address@hidden>
Date: 2018-09-01 (Sat, 01 Sep 2018)
Changed paths:
M htdocs/livraison/class/livraison.class.php
Log Message:
-----------
translations
Commit: 8d7dfaf98cbc1d259856219b2253f782094e1cee
https://github.com/Dolibarr/dolibarr/commit/8d7dfaf98cbc1d259856219b2253f782094e1cee
Author: Philippe GRAND <address@hidden>
Date: 2018-09-01 (Sat, 01 Sep 2018)
Changed paths:
M htdocs/core/class/discount.class.php
Log Message:
-----------
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
Commit: c013f9cf3d101da27e4c78febcb7adc231bc0575
https://github.com/Dolibarr/dolibarr/commit/c013f9cf3d101da27e4c78febcb7adc231bc0575
Author: Philippe GRAND <address@hidden>
Date: 2018-09-01 (Sat, 01 Sep 2018)
Changed paths:
M htdocs/asset/card.php
M htdocs/comm/propal/card.php
M htdocs/commande/card.php
M htdocs/compta/facture/card.php
M htdocs/expedition/card.php
M htdocs/expedition/shipment.php
M htdocs/modulebuilder/template/myobject_card.php
M htdocs/product/inventory/card.php
M htdocs/product/stock/card.php
M htdocs/supplier_proposal/card.php
M htdocs/website/websiteaccount_card.php
Log Message:
-----------
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
Commit: f77dd2ebc787056dd1886272e7bc25258d79f4c2
https://github.com/Dolibarr/dolibarr/commit/f77dd2ebc787056dd1886272e7bc25258d79f4c2
Author: Philippe GRAND <address@hidden>
Date: 2018-09-01 (Sat, 01 Sep 2018)
Changed paths:
M htdocs/accountancy/class/accountingjournal.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/deplacement/class/deplacement.class.php
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/comment.class.php
M htdocs/core/class/fiscalyear.class.php
M htdocs/don/class/don.class.php
Log Message:
-----------
Standardize and update code
Commit: 45cbc36a1575fbe1a7ffbcd2831ee999cf5097b4
https://github.com/Dolibarr/dolibarr/commit/45cbc36a1575fbe1a7ffbcd2831ee999cf5097b4
Author: Philippe GRAND <address@hidden>
Date: 2018-09-01 (Sat, 01 Sep 2018)
Changed paths:
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/hrm/class/establishment.class.php
M htdocs/livraison/class/livraison.class.php
M htdocs/product/class/product.class.php
M htdocs/projet/class/project.class.php
M htdocs/projet/class/task.class.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Standardize and update code
Commit: df4a4aa6c95d988e5acc6eda827b4fd379497528
https://github.com/Dolibarr/dolibarr/commit/df4a4aa6c95d988e5acc6eda827b4fd379497528
Author: Philippe Grand <address@hidden>
Date: 2018-09-01 (Sat, 01 Sep 2018)
Changed paths:
M .travis.yml
M dev/setup/codesniffer/ruleset.xml
M dev/translation/autotranslator.class.php
M htdocs/accountancy/class/accountingaccount.class.php
M htdocs/accountancy/class/accountingjournal.class.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/adherents/canvas/actions_adherentcard_common.class.php
M htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/class/subscription.class.php
M htdocs/admin/dolistore/class/dolistore.class.php
M htdocs/api/class/api.class.php
M htdocs/api/class/api_access.class.php
M htdocs/asset/class/asset.class.php
M htdocs/asset/class/asset_type.class.php
M htdocs/categories/class/categorie.class.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/class/actioncommreminder.class.php
M htdocs/comm/action/class/cactioncomm.class.php
M htdocs/comm/action/class/ical.class.php
M htdocs/comm/mailing/class/advtargetemailing.class.php
M htdocs/comm/mailing/class/mailing.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/class/paymentvarious.class.php
M htdocs/compta/deplacement/class/deplacement.class.php
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/localtax/class/localtax.class.php
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/prelevement/class/ligneprelevement.class.php
M htdocs/compta/prelevement/class/rejetprelevement.class.php
M htdocs/compta/salaries/class/paymentsalary.class.php
M htdocs/compta/sociales/class/cchargesociales.class.php
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/compta/sociales/class/paymentsocialcontribution.class.php
M htdocs/compta/tva/class/tva.class.php
M htdocs/contact/canvas/actions_contactcard_common.class.php
M htdocs/contact/canvas/default/actions_contactcard_default.class.php
M htdocs/contact/class/contact.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/CMailFile.class.php
M htdocs/core/class/CSMSFile.class.php
M htdocs/core/class/antivir.class.php
M htdocs/core/class/canvas.class.php
M htdocs/core/class/comment.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/commonstickergenerator.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/emailsenderprofile.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/fiscalyear.class.php
M htdocs/core/class/genericobject.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formaccounting.class.php
M htdocs/core/class/html.formactions.class.php
M htdocs/core/class/html.formadmin.class.php
M htdocs/core/class/html.formbarcode.class.php
M htdocs/core/class/html.formcompany.class.php
M htdocs/core/class/html.formcontract.class.php
M htdocs/core/class/html.formcron.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/class/html.formintervention.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/core/class/html.formsms.class.php
M htdocs/core/class/html.formsocialcontrib.class.php
M htdocs/core/class/interfaces.class.php
M htdocs/core/class/ldap.class.php
M htdocs/core/class/menu.class.php
M htdocs/core/class/openid.class.php
M htdocs/core/class/rssparser.class.php
M htdocs/core/class/smtps.class.php
M htdocs/core/class/translate.class.php
M htdocs/core/db/Database.interface.php
M htdocs/core/db/mssql.class.php
M htdocs/core/db/mysqli.class.php
M htdocs/core/db/pgsql.class.php
M htdocs/core/db/sqlite3.class.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/action/modules_action.php
M htdocs/core/modules/action/rapport.pdf.php
M htdocs/core/modules/bank/doc/pdf_ban.modules.php
M htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
M htdocs/core/modules/bank/modules_bank.php
M htdocs/core/modules/barcode/mod_barcode_product_standard.php
M htdocs/core/modules/cheque/doc/pdf_blochet.class.php
M htdocs/core/modules/cheque/mod_chequereceipt_mint.php
M htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
M htdocs/core/modules/cheque/modules_chequereceipts.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_proforma.modules.php
M htdocs/core/modules/commande/mod_commande_marbre.php
M htdocs/core/modules/commande/mod_commande_saphir.php
M htdocs/core/modules/commande/modules_commande.php
M htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
M htdocs/core/modules/contract/mod_contract_magre.php
M htdocs/core/modules/contract/mod_contract_serpis.php
M htdocs/core/modules/contract/modules_contract.php
M htdocs/core/modules/dons/html_cerfafr.modules.php
M htdocs/core/modules/dons/modules_don.php
M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/expedition/mod_expedition_ribera.php
M htdocs/core/modules/expedition/mod_expedition_safor.php
M htdocs/core/modules/expedition/modules_expedition.php
M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
M htdocs/core/modules/expensereport/modules_expensereport.php
M htdocs/core/modules/export/export_csv.modules.php
M htdocs/core/modules/export/export_excel.modules.php
M htdocs/core/modules/export/export_excel2007.modules.php
M htdocs/core/modules/export/export_tsv.modules.php
M htdocs/core/modules/export/modules_export.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/modules_facture.php
M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
M htdocs/core/modules/fichinter/mod_pacific.php
M htdocs/core/modules/fichinter/modules_fichinter.php
M htdocs/core/modules/holiday/mod_holiday_immaculate.php
M htdocs/core/modules/holiday/mod_holiday_madonna.php
M htdocs/core/modules/holiday/modules_holiday.php
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/import/import_xlsx.modules.php
M htdocs/core/modules/import/modules_import.php
M htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
M htdocs/core/modules/livraison/mod_livraison_jade.php
M htdocs/core/modules/livraison/mod_livraison_saphir.php
M htdocs/core/modules/livraison/modules_livraison.php
M htdocs/core/modules/mailings/advthirdparties.modules.php
M htdocs/core/modules/mailings/contacts1.modules.php
M htdocs/core/modules/mailings/example.modules.php
M htdocs/core/modules/mailings/fraise.modules.php
M htdocs/core/modules/mailings/modules_mailings.php
M htdocs/core/modules/mailings/pomme.modules.php
M htdocs/core/modules/mailings/thirdparties.modules.php
M htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
M htdocs/core/modules/mailings/xinputfile.modules.php
M htdocs/core/modules/mailings/xinputuser.modules.php
M htdocs/core/modules/member/doc/pdf_standard.class.php
M htdocs/core/modules/member/modules_cards.php
M htdocs/core/modules/modAsset.class.php
M htdocs/core/modules/modDav.class.php
M htdocs/core/modules/payment/mod_payment_ant.php
M htdocs/core/modules/payment/mod_payment_cicada.php
M htdocs/core/modules/printing/modules_printing.php
M htdocs/core/modules/printing/printgcp.modules.php
M htdocs/core/modules/printing/printipp.modules.php
M htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
M htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
M htdocs/core/modules/printsheet/modules_labels.php
M htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
M htdocs/core/modules/product/doc/pdf_standard.modules.php
M htdocs/core/modules/product/mod_codeproduct_elephant.php
M htdocs/core/modules/product/modules_product.class.php
M htdocs/core/modules/product_batch/modules_product_batch.class.php
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
M htdocs/core/modules/project/doc/pdf_baleine.modules.php
M htdocs/core/modules/project/doc/pdf_beluga.modules.php
M htdocs/core/modules/project/doc/pdf_timespent.modules.php
M htdocs/core/modules/project/mod_project_simple.php
M htdocs/core/modules/project/mod_project_universal.php
M htdocs/core/modules/project/modules_project.php
M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
M htdocs/core/modules/project/task/mod_task_simple.php
M htdocs/core/modules/project/task/mod_task_universal.php
M htdocs/core/modules/project/task/modules_task.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/modules_propale.php
M htdocs/core/modules/rapport/pdf_paiement.class.php
M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
M htdocs/core/modules/societe/mod_codeclient_elephant.php
M htdocs/core/modules/societe/mod_codeclient_monkey.php
M htdocs/core/modules/societe/mod_codecompta_aquarium.php
M htdocs/core/modules/societe/mod_codecompta_panicum.php
M htdocs/core/modules/societe/modules_societe.class.php
M htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
M htdocs/core/modules/stock/doc/pdf_standard.modules.php
M htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
M htdocs/core/modules/stock/modules_movement.php
M htdocs/core/modules/stock/modules_stock.php
M htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
M htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
M htdocs/core/modules/supplier_order/modules_commandefournisseur.php
M 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_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/doc_generic_supplier_proposal_odt.modules.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
M htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
M htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
M htdocs/core/modules/user/modules_user.class.php
M htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
M htdocs/core/modules/usergroup/modules_usergroup.class.php
M htdocs/cron/class/cronjob.class.php
M htdocs/don/class/don.class.php
M htdocs/don/class/donstats.class.php
M htdocs/don/class/paymentdonation.class.php
M htdocs/ecm/class/ecmdirectory.class.php
M htdocs/ecm/class/ecmfiles.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/expensereport/class/paymentexpensereport.class.php
M htdocs/exports/class/export.class.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fourn/class/fournisseur.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.commande.dispatch.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/fourn/class/paiementfourn.class.php
M htdocs/holiday/class/holiday.class.php
M htdocs/hrm/class/establishment.class.php
M htdocs/imports/class/import.class.php
M htdocs/livraison/class/livraison.class.php
M htdocs/loan/class/loan.class.php
M htdocs/loan/class/loanschedule.class.php
M htdocs/loan/class/paymentloan.class.php
M htdocs/mailmanspip/class/mailmanspip.class.php
M htdocs/modulebuilder/template/class/myobject.class.php
M
htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
M htdocs/modulebuilder/template/core/modules/modMyModule.class.php
M htdocs/opensurvey/class/opensurveysondage.class.php
M htdocs/product/canvas/product/actions_card_product.class.php
M htdocs/product/canvas/service/actions_card_service.class.php
M htdocs/product/class/html.formproduct.class.php
M htdocs/product/class/product.class.php
M htdocs/product/class/productbatch.class.php
M htdocs/product/class/productcustomerprice.class.php
M htdocs/product/class/propalmergepdfproduct.class.php
M htdocs/product/dynamic_price/class/price_expression.class.php
M htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
M htdocs/product/dynamic_price/class/price_parser.class.php
M htdocs/product/inventory/class/inventory.class.php
M htdocs/product/stock/class/entrepot.class.php
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/product/stock/class/productlot.class.php
M htdocs/product/stock/class/productstockentrepot.class.php
M htdocs/projet/class/project.class.php
M htdocs/projet/class/task.class.php
M htdocs/resource/class/dolresource.class.php
M htdocs/resource/class/html.formresource.class.php
M htdocs/societe/canvas/actions_card_common.class.php
M htdocs/societe/canvas/company/actions_card_company.class.php
M htdocs/societe/canvas/individual/actions_card_individual.class.php
M htdocs/societe/class/address.class.php
M htdocs/societe/class/client.class.php
M htdocs/societe/class/companypaymentmode.class.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/class/societeaccount.class.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M htdocs/ticket/class/actions_ticket.class.php
M htdocs/ticket/class/ticket.class.php
M htdocs/user/class/user.class.php
M htdocs/user/class/userbankaccount.class.php
M htdocs/user/class/usergroup.class.php
M htdocs/website/class/website.class.php
M htdocs/website/class/websitepage.class.php
M test/phpunit/CoreTest.php
Log Message:
-----------
Merge branch 'develop' into develop
Commit: 5d273960dc681d137172563840143d45f191ae10
https://github.com/Dolibarr/dolibarr/commit/5d273960dc681d137172563840143d45f191ae10
Author: Philippe GRAND <address@hidden>
Date: 2018-09-01 (Sat, 01 Sep 2018)
Changed paths:
M .travis.yml
M dev/setup/codesniffer/ruleset.xml
M dev/translation/autotranslator.class.php
M htdocs/accountancy/class/accountingaccount.class.php
M htdocs/accountancy/class/accountingjournal.class.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/adherents/canvas/actions_adherentcard_common.class.php
M htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/class/subscription.class.php
M htdocs/admin/dolistore/class/dolistore.class.php
M htdocs/api/class/api.class.php
M htdocs/api/class/api_access.class.php
M htdocs/asset/class/asset.class.php
M htdocs/asset/class/asset_type.class.php
M htdocs/categories/class/categorie.class.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/class/actioncommreminder.class.php
M htdocs/comm/action/class/cactioncomm.class.php
M htdocs/comm/action/class/ical.class.php
M htdocs/comm/mailing/class/advtargetemailing.class.php
M htdocs/comm/mailing/class/mailing.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/class/paymentvarious.class.php
M htdocs/compta/deplacement/class/deplacement.class.php
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/localtax/class/localtax.class.php
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/prelevement/class/ligneprelevement.class.php
M htdocs/compta/prelevement/class/rejetprelevement.class.php
M htdocs/compta/salaries/class/paymentsalary.class.php
M htdocs/compta/sociales/class/cchargesociales.class.php
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/compta/sociales/class/paymentsocialcontribution.class.php
M htdocs/compta/tva/class/tva.class.php
M htdocs/contact/canvas/actions_contactcard_common.class.php
M htdocs/contact/canvas/default/actions_contactcard_default.class.php
M htdocs/contact/class/contact.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/CMailFile.class.php
M htdocs/core/class/CSMSFile.class.php
M htdocs/core/class/antivir.class.php
M htdocs/core/class/canvas.class.php
M htdocs/core/class/comment.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/commonstickergenerator.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/emailsenderprofile.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/fiscalyear.class.php
M htdocs/core/class/genericobject.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formaccounting.class.php
M htdocs/core/class/html.formactions.class.php
M htdocs/core/class/html.formadmin.class.php
M htdocs/core/class/html.formbarcode.class.php
M htdocs/core/class/html.formcompany.class.php
M htdocs/core/class/html.formcontract.class.php
M htdocs/core/class/html.formcron.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/class/html.formintervention.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/core/class/html.formsms.class.php
M htdocs/core/class/html.formsocialcontrib.class.php
M htdocs/core/class/interfaces.class.php
M htdocs/core/class/ldap.class.php
M htdocs/core/class/menu.class.php
M htdocs/core/class/openid.class.php
M htdocs/core/class/rssparser.class.php
M htdocs/core/class/smtps.class.php
M htdocs/core/class/translate.class.php
M htdocs/core/db/Database.interface.php
M htdocs/core/db/mssql.class.php
M htdocs/core/db/mysqli.class.php
M htdocs/core/db/pgsql.class.php
M htdocs/core/db/sqlite3.class.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/action/modules_action.php
M htdocs/core/modules/action/rapport.pdf.php
M htdocs/core/modules/bank/doc/pdf_ban.modules.php
M htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
M htdocs/core/modules/bank/modules_bank.php
M htdocs/core/modules/barcode/mod_barcode_product_standard.php
M htdocs/core/modules/cheque/doc/pdf_blochet.class.php
M htdocs/core/modules/cheque/mod_chequereceipt_mint.php
M htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
M htdocs/core/modules/cheque/modules_chequereceipts.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_proforma.modules.php
M htdocs/core/modules/commande/mod_commande_marbre.php
M htdocs/core/modules/commande/mod_commande_saphir.php
M htdocs/core/modules/commande/modules_commande.php
M htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
M htdocs/core/modules/contract/mod_contract_magre.php
M htdocs/core/modules/contract/mod_contract_serpis.php
M htdocs/core/modules/contract/modules_contract.php
M htdocs/core/modules/dons/html_cerfafr.modules.php
M htdocs/core/modules/dons/modules_don.php
M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/expedition/mod_expedition_ribera.php
M htdocs/core/modules/expedition/mod_expedition_safor.php
M htdocs/core/modules/expedition/modules_expedition.php
M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
M htdocs/core/modules/expensereport/modules_expensereport.php
M htdocs/core/modules/export/export_csv.modules.php
M htdocs/core/modules/export/export_excel.modules.php
M htdocs/core/modules/export/export_excel2007.modules.php
M htdocs/core/modules/export/export_tsv.modules.php
M htdocs/core/modules/export/modules_export.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/modules_facture.php
M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
M htdocs/core/modules/fichinter/mod_pacific.php
M htdocs/core/modules/fichinter/modules_fichinter.php
M htdocs/core/modules/holiday/mod_holiday_immaculate.php
M htdocs/core/modules/holiday/mod_holiday_madonna.php
M htdocs/core/modules/holiday/modules_holiday.php
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/import/import_xlsx.modules.php
M htdocs/core/modules/import/modules_import.php
M htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
M htdocs/core/modules/livraison/mod_livraison_jade.php
M htdocs/core/modules/livraison/mod_livraison_saphir.php
M htdocs/core/modules/livraison/modules_livraison.php
M htdocs/core/modules/mailings/advthirdparties.modules.php
M htdocs/core/modules/mailings/contacts1.modules.php
M htdocs/core/modules/mailings/example.modules.php
M htdocs/core/modules/mailings/fraise.modules.php
M htdocs/core/modules/mailings/modules_mailings.php
M htdocs/core/modules/mailings/pomme.modules.php
M htdocs/core/modules/mailings/thirdparties.modules.php
M htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
M htdocs/core/modules/mailings/xinputfile.modules.php
M htdocs/core/modules/mailings/xinputuser.modules.php
M htdocs/core/modules/member/doc/pdf_standard.class.php
M htdocs/core/modules/member/modules_cards.php
M htdocs/core/modules/modAsset.class.php
M htdocs/core/modules/modDav.class.php
M htdocs/core/modules/payment/mod_payment_ant.php
M htdocs/core/modules/payment/mod_payment_cicada.php
M htdocs/core/modules/printing/modules_printing.php
M htdocs/core/modules/printing/printgcp.modules.php
M htdocs/core/modules/printing/printipp.modules.php
M htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
M htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
M htdocs/core/modules/printsheet/modules_labels.php
M htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
M htdocs/core/modules/product/doc/pdf_standard.modules.php
M htdocs/core/modules/product/mod_codeproduct_elephant.php
M htdocs/core/modules/product/modules_product.class.php
M htdocs/core/modules/product_batch/modules_product_batch.class.php
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
M htdocs/core/modules/project/doc/pdf_baleine.modules.php
M htdocs/core/modules/project/doc/pdf_beluga.modules.php
M htdocs/core/modules/project/doc/pdf_timespent.modules.php
M htdocs/core/modules/project/mod_project_simple.php
M htdocs/core/modules/project/mod_project_universal.php
M htdocs/core/modules/project/modules_project.php
M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
M htdocs/core/modules/project/task/mod_task_simple.php
M htdocs/core/modules/project/task/mod_task_universal.php
M htdocs/core/modules/project/task/modules_task.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/modules_propale.php
M htdocs/core/modules/rapport/pdf_paiement.class.php
M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
M htdocs/core/modules/societe/mod_codeclient_elephant.php
M htdocs/core/modules/societe/mod_codeclient_monkey.php
M htdocs/core/modules/societe/mod_codecompta_aquarium.php
M htdocs/core/modules/societe/mod_codecompta_panicum.php
M htdocs/core/modules/societe/modules_societe.class.php
M htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
M htdocs/core/modules/stock/doc/pdf_standard.modules.php
M htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
M htdocs/core/modules/stock/modules_movement.php
M htdocs/core/modules/stock/modules_stock.php
M htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
M htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
M htdocs/core/modules/supplier_order/modules_commandefournisseur.php
M 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_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/doc_generic_supplier_proposal_odt.modules.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
M htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
M htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
M htdocs/core/modules/user/modules_user.class.php
M htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
M htdocs/core/modules/usergroup/modules_usergroup.class.php
M htdocs/cron/class/cronjob.class.php
M htdocs/don/class/don.class.php
M htdocs/don/class/donstats.class.php
M htdocs/don/class/paymentdonation.class.php
M htdocs/ecm/class/ecmdirectory.class.php
M htdocs/ecm/class/ecmfiles.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/expensereport/class/paymentexpensereport.class.php
M htdocs/exports/class/export.class.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fourn/class/fournisseur.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.commande.dispatch.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/fourn/class/paiementfourn.class.php
M htdocs/holiday/class/holiday.class.php
M htdocs/hrm/class/establishment.class.php
M htdocs/imports/class/import.class.php
M htdocs/livraison/class/livraison.class.php
M htdocs/loan/class/loan.class.php
M htdocs/loan/class/loanschedule.class.php
M htdocs/loan/class/paymentloan.class.php
M htdocs/mailmanspip/class/mailmanspip.class.php
M htdocs/modulebuilder/template/class/myobject.class.php
M
htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
M htdocs/modulebuilder/template/core/modules/modMyModule.class.php
M htdocs/opensurvey/class/opensurveysondage.class.php
M htdocs/product/canvas/product/actions_card_product.class.php
M htdocs/product/canvas/service/actions_card_service.class.php
M htdocs/product/class/html.formproduct.class.php
M htdocs/product/class/product.class.php
M htdocs/product/class/productbatch.class.php
M htdocs/product/class/productcustomerprice.class.php
M htdocs/product/class/propalmergepdfproduct.class.php
M htdocs/product/dynamic_price/class/price_expression.class.php
M htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
M htdocs/product/dynamic_price/class/price_parser.class.php
M htdocs/product/inventory/class/inventory.class.php
M htdocs/product/stock/class/entrepot.class.php
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/product/stock/class/productlot.class.php
M htdocs/product/stock/class/productstockentrepot.class.php
M htdocs/projet/class/project.class.php
M htdocs/projet/class/task.class.php
M htdocs/resource/class/dolresource.class.php
M htdocs/resource/class/html.formresource.class.php
M htdocs/societe/canvas/actions_card_common.class.php
M htdocs/societe/canvas/company/actions_card_company.class.php
M htdocs/societe/canvas/individual/actions_card_individual.class.php
M htdocs/societe/class/address.class.php
M htdocs/societe/class/client.class.php
M htdocs/societe/class/companypaymentmode.class.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/class/societeaccount.class.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M htdocs/ticket/class/actions_ticket.class.php
M htdocs/ticket/class/ticket.class.php
M htdocs/user/class/user.class.php
M htdocs/user/class/userbankaccount.class.php
M htdocs/user/class/usergroup.class.php
M htdocs/website/class/website.class.php
M htdocs/website/class/websitepage.class.php
M test/phpunit/CoreTest.php
Log Message:
-----------
fix conflict
Commit: 091b8269a6bb844701c0f9813ee84d390b736eb2
https://github.com/Dolibarr/dolibarr/commit/091b8269a6bb844701c0f9813ee84d390b736eb2
Author: Philippe GRAND <address@hidden>
Date: 2018-09-01 (Sat, 01 Sep 2018)
Changed paths:
M htdocs/accountancy/class/accountingaccount.class.php
Log Message:
-----------
fix conflict
Commit: d86d7323fb03168459f8d154cac2e1bf9faf9952
https://github.com/Dolibarr/dolibarr/commit/d86d7323fb03168459f8d154cac2e1bf9faf9952
Author: Philippe GRAND <address@hidden>
Date: 2018-09-01 (Sat, 01 Sep 2018)
Changed paths:
M htdocs/accountancy/class/accountingaccount.class.php
Log Message:
-----------
Update code
Commit: 7b0d3c32aba6c514a80146c4a7a4b21fa81c368b
https://github.com/Dolibarr/dolibarr/commit/7b0d3c32aba6c514a80146c4a7a4b21fa81c368b
Author: Philippe GRAND <address@hidden>
Date: 2018-09-01 (Sat, 01 Sep 2018)
Changed paths:
M htdocs/accountancy/class/accountingaccount.class.php
M htdocs/accountancy/class/accountingjournal.class.php
M htdocs/asset/class/asset.class.php
M htdocs/core/class/emailsenderprofile.class.php
M htdocs/core/class/fiscalyear.class.php
M htdocs/don/class/paymentdonation.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/hrm/class/establishment.class.php
M htdocs/loan/class/loan.class.php
M htdocs/modulebuilder/template/class/myobject.class.php
M htdocs/product/inventory/class/inventory.class.php
M htdocs/societe/class/companypaymentmode.class.php
M htdocs/stripe/class/stripe.class.php
Log Message:
-----------
Standardize and Update code
Commit: ae2df6be117acebcf826fda0e432772bd5a54e22
https://github.com/Dolibarr/dolibarr/commit/ae2df6be117acebcf826fda0e432772bd5a54e22
Author: Philippe GRAND <address@hidden>
Date: 2018-09-01 (Sat, 01 Sep 2018)
Changed paths:
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/blockedlog/class/blockedlog.class.php
M htdocs/cashdesk/class/Facturation.class.php
M htdocs/comm/action/class/cactioncomm.class.php
M htdocs/compta/bank/class/bankcateg.class.php
M htdocs/compta/facture/class/paymentterm.class.php
M htdocs/core/class/ccountry.class.php
M htdocs/core/class/cstate.class.php
M htdocs/core/class/ctypent.class.php
M htdocs/core/class/discount.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/class/menubase.class.php
M htdocs/stripe/class/stripe.class.php
Log Message:
-----------
Standardize and Update code
Commit: 5cd955731814aaab6f2eb88159f836ff26fd94a9
https://github.com/Dolibarr/dolibarr/commit/5cd955731814aaab6f2eb88159f836ff26fd94a9
Author: Philippe GRAND <address@hidden>
Date: 2018-09-01 (Sat, 01 Sep 2018)
Changed paths:
M htdocs/core/modules/export/export_csv.modules.php
M htdocs/core/modules/export/export_excel.modules.php
M htdocs/core/modules/export/export_excel2007.modules.php
M htdocs/core/modules/export/export_tsv.modules.php
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/import/import_xlsx.modules.php
M htdocs/core/modules/security/generate/modGeneratePassNone.class.php
M htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
M htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
M htdocs/cron/class/cronjob.class.php
M htdocs/ecm/class/ecmdirectory.class.php
Log Message:
-----------
Standardize and Update code
Commit: db32d8903e2d48d8233297db75f31410b01b58af
https://github.com/Dolibarr/dolibarr/commit/db32d8903e2d48d8233297db75f31410b01b58af
Author: Philippe GRAND <address@hidden>
Date: 2018-09-01 (Sat, 01 Sep 2018)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.commande.dispatch.class.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/product/class/productcustomerprice.class.php
M htdocs/product/class/propalmergepdfproduct.class.php
M htdocs/product/dynamic_price/class/price_expression.class.php
M htdocs/product/dynamic_price/class/price_global_variable.class.php
M htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
M htdocs/product/inventory/class/inventory.class.php
M htdocs/societe/class/address.class.php
Log Message:
-----------
Standardize and Update code
Commit: bb18982f7885a74781090face331ad99cdceb8f4
https://github.com/Dolibarr/dolibarr/commit/bb18982f7885a74781090face331ad99cdceb8f4
Author: Philippe GRAND <address@hidden>
Date: 2018-09-01 (Sat, 01 Sep 2018)
Changed paths:
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M htdocs/ticket/class/ticket.class.php
M htdocs/ticket/class/ticketlogs.class.php
Log Message:
-----------
Standardize and Update code
Commit: c4f05aff2866361aa90a37641d1f12a1e5109ba9
https://github.com/Dolibarr/dolibarr/commit/c4f05aff2866361aa90a37641d1f12a1e5109ba9
Author: Philippe GRAND <address@hidden>
Date: 2018-09-02 (Sun, 02 Sep 2018)
Changed paths:
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/class/paymentvarious.class.php
M htdocs/contrat/class/contrat.class.php
Log Message:
-----------
Standardize and update code
Commit: 3de16a145e8b9a6aee84348bd2c8084fbc7f3612
https://github.com/Dolibarr/dolibarr/commit/3de16a145e8b9a6aee84348bd2c8084fbc7f3612
Author: Philippe GRAND <address@hidden>
Date: 2018-09-02 (Sun, 02 Sep 2018)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/deplacement/class/deplacement.class.php
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/fiscalyear.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/hrm/class/establishment.class.php
M htdocs/livraison/class/livraison.class.php
M htdocs/projet/class/project.class.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
Log Message:
-----------
Standardize and update code
Commit: 7a0c19485e2cece3c9eab8a6b7686b90013f30f2
https://github.com/Dolibarr/dolibarr/commit/7a0c19485e2cece3c9eab8a6b7686b90013f30f2
Author: Philippe GRAND <address@hidden>
Date: 2018-09-03 (Mon, 03 Sep 2018)
Changed paths:
M .travis.yml
M dev/setup/codesniffer/ruleset.xml
M htdocs/adherents/admin/website.php
M htdocs/adherents/class/adherent.class.php
M htdocs/admin/system/index.php
M htdocs/comm/action/class/actioncommreminder.class.php
M htdocs/core/actions_setnotes.inc.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/get_info.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/modules/dons/html_cerfafr.modules.php
M htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/dav/dav.class.php
M htdocs/langs/en_US/commercial.lang
M htdocs/langs/en_US/members.lang
M htdocs/langs/en_US/paybox.lang
M htdocs/langs/en_US/stripe.lang
M htdocs/main.inc.php
M htdocs/master.inc.php
M htdocs/modulebuilder/template/class/myobject.class.php
M htdocs/paybox/admin/paybox.php
M htdocs/paypal/admin/paypal.php
M htdocs/product/card.php
M htdocs/public/payment/paymentok.php
M htdocs/societe/paymentmodes.php
M htdocs/stripe/admin/stripe.php
M htdocs/stripe/class/stripe.class.php
M htdocs/user/class/user.class.php
M test/phpunit/AccountingAccountTest.php
M test/phpunit/ActionCommTest.php
M test/phpunit/AdherentTest.php
M test/phpunit/AdminLibTest.php
M test/phpunit/BankAccountTest.php
M test/phpunit/BonPrelevementTest.php
M test/phpunit/BuildDocTest.php
M test/phpunit/CMailFileTest.php
M test/phpunit/CategorieTest.php
M test/phpunit/ChargeSocialesTest.php
M test/phpunit/CodingPhpTest.php
M test/phpunit/CodingSqlTest.php
M test/phpunit/CommandeFournisseurTest.php
M test/phpunit/CommandeTest.php
M test/phpunit/CommonObjectTest.php
M test/phpunit/CompanyBankAccountTest.php
M test/phpunit/CompanyLibTest.php
M test/phpunit/ContactTest.php
M test/phpunit/ContratTest.php
M test/phpunit/CoreTest.php
M test/phpunit/DateLibTest.php
M test/phpunit/DateLibTzFranceTest.php
M test/phpunit/DiscountTest.php
M test/phpunit/EntrepotTest.php
M test/phpunit/ExpenseReportTest.php
M test/phpunit/ExportTest.php
M test/phpunit/FactureFournisseurTest.php
M test/phpunit/FactureRecTest.php
M test/phpunit/FactureTest.php
M test/phpunit/FactureTestRounding.php
M test/phpunit/FichinterTest.php
M test/phpunit/FilesLibTest.php
M test/phpunit/FormAdminTest.php
M test/phpunit/Functions2LibTest.php
M test/phpunit/FunctionsLibTest.php
M test/phpunit/GetUrlLibTest.php
M test/phpunit/HolidayTest.php
M test/phpunit/ImagesLibTest.php
M test/phpunit/ImportTest.php
M test/phpunit/JsonLibTest.php
M test/phpunit/LangTest.php
M test/phpunit/MarginsLibTest.php
M test/phpunit/ModulesTest.php
M test/phpunit/MouvementStockTest.php
M test/phpunit/NumberingModulesTest.php
M test/phpunit/PaypalTest.php
M test/phpunit/PdfDocTest.php
M test/phpunit/PgsqlTest.php
M test/phpunit/PricesTest.php
M test/phpunit/ProductTest.php
M test/phpunit/ProjectTest.php
M test/phpunit/PropalTest.php
M test/phpunit/RestAPIDocumentTest.php
M test/phpunit/RestAPIUserTest.php
M test/phpunit/ScriptsTest.php
M test/phpunit/SecurityTest.php
M test/phpunit/SocieteTest.php
M test/phpunit/SupplierProposalTest.php
M test/phpunit/TicketTest.php
M test/phpunit/UserGroupTest.php
M test/phpunit/UserTest.php
M test/phpunit/UtilsTest.php
M test/phpunit/WebservicesInvoicesTest.php
M test/phpunit/WebservicesOrdersTest.php
M test/phpunit/WebservicesOtherTest.php
M test/phpunit/WebservicesProductsTest.php
M test/phpunit/WebservicesThirdpartyTest.php
M test/phpunit/WebservicesUserTest.php
M test/phpunit/XCalLibTest.php
Log Message:
-----------
fix merge
Commit: 4fba7cdf45e24cdcc83a77fa60623a3951541f13
https://github.com/Dolibarr/dolibarr/commit/4fba7cdf45e24cdcc83a77fa60623a3951541f13
Author: Philippe GRAND <address@hidden>
Date: 2018-09-03 (Mon, 03 Sep 2018)
Changed paths:
M htdocs/core/lib/company.lib.php
Log Message:
-----------
fix : Class Contact not found in htdocs/core/lib/company.lib.php on line 1496
Commit: 0492492df1fc626aee0f9730ace3ce750d5beaf2
https://github.com/Dolibarr/dolibarr/commit/0492492df1fc626aee0f9730ace3ce750d5beaf2
Author: Philippe GRAND <address@hidden>
Date: 2018-09-04 (Tue, 04 Sep 2018)
Changed paths:
M ChangeLog
M htdocs/accountancy/admin/account.php
M htdocs/adherents/list.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/class/events.class.php
M htdocs/core/lib/company.lib.php
M htdocs/core/triggers/interface_20_all_Logevents.class.php
M htdocs/install/mysql/data/llx_accounting_abc.sql
M htdocs/install/mysql/data/llx_accounting_account_be.sql
M htdocs/install/mysql/data/llx_accounting_account_bf.sql
M htdocs/install/mysql/data/llx_accounting_account_bj.sql
M htdocs/install/mysql/data/llx_accounting_account_cd.sql
M htdocs/install/mysql/data/llx_accounting_account_cf.sql
M htdocs/install/mysql/data/llx_accounting_account_cg.sql
M htdocs/install/mysql/data/llx_accounting_account_ch.sql
M htdocs/install/mysql/data/llx_accounting_account_ci.sql
M htdocs/install/mysql/data/llx_accounting_account_cl.sql
M htdocs/install/mysql/data/llx_accounting_account_cm.sql
M htdocs/install/mysql/data/llx_accounting_account_de.sql
M htdocs/install/mysql/data/llx_accounting_account_dk.sql
A htdocs/install/mysql/data/llx_accounting_account_dz.sql
M htdocs/install/mysql/data/llx_accounting_account_es.sql
M htdocs/install/mysql/data/llx_accounting_account_fr.sql
M htdocs/install/mysql/data/llx_accounting_account_ga.sql
M htdocs/install/mysql/data/llx_accounting_account_gb.sql
M htdocs/install/mysql/data/llx_accounting_account_gq.sql
M htdocs/install/mysql/data/llx_accounting_account_km.sql
M htdocs/install/mysql/data/llx_accounting_account_lu.sql
M htdocs/install/mysql/data/llx_accounting_account_ma.sql
M htdocs/install/mysql/data/llx_accounting_account_ml.sql
M htdocs/install/mysql/data/llx_accounting_account_ne.sql
M htdocs/install/mysql/data/llx_accounting_account_ro.sql
M htdocs/install/mysql/data/llx_accounting_account_sn.sql
M htdocs/install/mysql/data/llx_accounting_account_td.sql
M htdocs/install/mysql/data/llx_accounting_account_tg.sql
M htdocs/install/mysql/data/llx_accounting_account_tn.sql
M htdocs/install/mysql/migration/8.0.0-9.0.0.sql
M htdocs/install/mysql/tables/llx_accounting_account.sql
M htdocs/install/mysql/tables/llx_categorie.sql
M htdocs/main.inc.php
M
htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
M htdocs/public/cron/cron_run_jobs.php
M htdocs/ticket/class/ticket.class.php
M htdocs/user/logout.php
M scripts/cron/cron_run_jobs.php
Log Message:
-----------
fix merge
Commit: 42565e722e6c682a978514e98233093042eedd80
https://github.com/Dolibarr/dolibarr/commit/42565e722e6c682a978514e98233093042eedd80
Author: Philippe GRAND <address@hidden>
Date: 2018-09-04 (Tue, 04 Sep 2018)
Changed paths:
M htdocs/asset/class/asset.class.php
M htdocs/core/class/discount.class.php
M htdocs/product/class/productcustomerprice.class.php
M htdocs/societe/class/companypaymentmode.class.php
M htdocs/societe/class/societeaccount.class.php
M htdocs/stripe/class/stripe.class.php
M htdocs/ticket/class/actions_ticket.class.php
M htdocs/ticket/class/ticket.class.php
Log Message:
-----------
Standardize and update code
Commit: 47b6374abcf517bc35d70cb7c5abd1ef7e916d56
https://github.com/Dolibarr/dolibarr/commit/47b6374abcf517bc35d70cb7c5abd1ef7e916d56
Author: Philippe GRAND <address@hidden>
Date: 2018-09-04 (Tue, 04 Sep 2018)
Changed paths:
M htdocs/adherents/class/adherent.class.php
M htdocs/product/class/productcustomerprice.class.php
Log Message:
-----------
Standardize and update code
Commit: d3570317194c7e6275121117fd2eaaa4e2cc58da
https://github.com/Dolibarr/dolibarr/commit/d3570317194c7e6275121117fd2eaaa4e2cc58da
Author: Philippe GRAND <address@hidden>
Date: 2018-09-04 (Tue, 04 Sep 2018)
Changed paths:
M htdocs/accountancy/class/accountingaccount.class.php
M htdocs/accountancy/class/accountingjournal.class.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/class/subscription.class.php
M htdocs/asset/class/asset_type.class.php
M htdocs/bookmarks/class/bookmark.class.php
M htdocs/categories/class/categorie.class.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/class/cactioncomm.class.php
M htdocs/comm/mailing/class/mailing.class.php
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
fix merge
Commit: 707f8b731217f3923167052b038f582c6b70ae78
https://github.com/Dolibarr/dolibarr/commit/707f8b731217f3923167052b038f582c6b70ae78
Author: Philippe GRAND <address@hidden>
Date: 2018-09-04 (Tue, 04 Sep 2018)
Changed paths:
M htdocs/accountancy/class/accountingaccount.class.php
M htdocs/accountancy/class/accountingjournal.class.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/class/subscription.class.php
M htdocs/asset/class/asset_type.class.php
M htdocs/bookmarks/class/bookmark.class.php
M htdocs/categories/class/categorie.class.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/class/cactioncomm.class.php
M htdocs/comm/mailing/class/mailing.class.php
M htdocs/comm/propal/class/propal.class.php
Log Message:
-----------
fix merge
Commit: fada93574db8cd83995989c08e6a2d503c3eded6
https://github.com/Dolibarr/dolibarr/commit/fada93574db8cd83995989c08e6a2d503c3eded6
Author: Philippe GRAND <address@hidden>
Date: 2018-09-04 (Tue, 04 Sep 2018)
Log Message:
-----------
Merge branch 'new_branch_03_09_2018' of github.com:grandoc/dolibarr into
new_branch_03_09_2018
Commit: b3e6d4a9439e2e0ea2a04879ee9c5de57becedeb
https://github.com/Dolibarr/dolibarr/commit/b3e6d4a9439e2e0ea2a04879ee9c5de57becedeb
Author: Laurent Destailleur <address@hidden>
Date: 2018-09-04 (Tue, 04 Sep 2018)
Changed paths:
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/accountingjournal.class.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/class/subscription.class.php
M htdocs/asset/class/asset.class.php
M htdocs/asset/class/asset_type.class.php
M htdocs/blockedlog/class/blockedlog.class.php
M htdocs/bookmarks/class/bookmark.class.php
M htdocs/cashdesk/class/Facturation.class.php
M htdocs/categories/class/categorie.class.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/class/actioncommreminder.class.php
M htdocs/comm/action/class/cactioncomm.class.php
M htdocs/comm/mailing/class/mailing.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/class/bankcateg.class.php
M htdocs/compta/bank/class/paymentvarious.class.php
M htdocs/compta/deplacement/class/deplacement.class.php
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/class/paymentterm.class.php
M htdocs/compta/localtax/class/localtax.class.php
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
M htdocs/compta/salaries/class/paymentsalary.class.php
M htdocs/compta/tva/class/tva.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/ccountry.class.php
M htdocs/core/class/comment.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/cstate.class.php
M htdocs/core/class/ctypent.class.php
M htdocs/core/class/ctyperesource.class.php
M htdocs/core/class/discount.class.php
M htdocs/core/class/emailsenderprofile.class.php
M htdocs/core/class/events.class.php
M htdocs/core/class/fiscalyear.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/class/link.class.php
M htdocs/core/class/menubase.class.php
M htdocs/core/class/notify.class.php
M htdocs/core/modules/action/rapport.pdf.php
M htdocs/core/modules/export/export_csv.modules.php
M htdocs/core/modules/export/export_excel.modules.php
M htdocs/core/modules/export/export_excel2007.modules.php
M htdocs/core/modules/export/export_tsv.modules.php
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/import/import_xlsx.modules.php
M htdocs/core/modules/import/modules_import.php
M htdocs/core/modules/security/generate/modGeneratePassNone.class.php
M htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
M htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
M htdocs/cron/class/cronjob.class.php
M htdocs/don/class/don.class.php
M htdocs/don/class/paymentdonation.class.php
M htdocs/ecm/class/ecmdirectory.class.php
M htdocs/ecm/class/ecmfiles.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.commande.dispatch.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/holiday/class/holiday.class.php
M htdocs/hrm/class/establishment.class.php
M htdocs/livraison/class/livraison.class.php
M htdocs/loan/class/loan.class.php
M htdocs/modulebuilder/template/class/myobject.class.php
M htdocs/multicurrency/class/multicurrency.class.php
M htdocs/opensurvey/class/opensurveysondage.class.php
M htdocs/product/class/product.class.php
M htdocs/product/class/productcustomerprice.class.php
M htdocs/product/class/propalmergepdfproduct.class.php
M htdocs/product/dynamic_price/class/price_expression.class.php
M htdocs/product/dynamic_price/class/price_global_variable.class.php
M htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
M htdocs/product/inventory/class/inventory.class.php
M htdocs/product/stock/class/entrepot.class.php
M htdocs/product/stock/class/productlot.class.php
M htdocs/projet/class/project.class.php
M htdocs/projet/class/task.class.php
M htdocs/societe/class/address.class.php
M htdocs/societe/class/companypaymentmode.class.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/class/societeaccount.class.php
M htdocs/stripe/class/stripe.class.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M htdocs/ticket/class/actions_ticket.class.php
M htdocs/ticket/class/ticket.class.php
M htdocs/ticket/class/ticketlogs.class.php
M htdocs/user/class/user.class.php
M htdocs/user/class/usergroup.class.php
M htdocs/website/class/website.class.php
M htdocs/website/class/websitepage.class.php
Log Message:
-----------
Merge pull request #9399 from grandoc/new_branch_03_09_2018
New branch 03 09 2018
Compare:
https://github.com/Dolibarr/dolibarr/compare/23f4e7cc3660...b3e6d4a9439e
**NOTE:** This service has been marked for deprecation:
https://developer.github.com/changes/2018-04-25-github-services-deprecation/
Functionality will be removed from GitHub.com on January 31st, 2019.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 2e66c6: WTF...,
Laurent Destailleur <=