[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 7107fb: Merge branch 'NEW_Add_Region_
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 7107fb: Merge branch 'NEW_Add_Region_to_third_party_societ... |
|
Date: |
Wed, 11 Oct 2017 02:33:30 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 7107fba8c554abb00074321245fc853d2ecc4a7d
https://github.com/Dolibarr/dolibarr/commit/7107fba8c554abb00074321245fc853d2ecc4a7d
Author: Rui Strecht <address@hidden>
Date: 2017-09-01 (Fri, 01 Sep 2017)
Changed paths:
M htdocs/societe/list.php
Log Message:
-----------
Merge branch 'NEW_Add_Region_to_third_party_societe_list' into develop
Commit: 9b65578ff720411f9ce33a1524eabd9f49a4a5d8
https://github.com/Dolibarr/dolibarr/commit/9b65578ff720411f9ce33a1524eabd9f49a4a5d8
Author: Rui Strecht <address@hidden>
Date: 2017-09-01 (Fri, 01 Sep 2017)
Changed paths:
M htdocs/core/class/html.formcompany.class.php
Log Message:
-----------
Merge branch 'NEW_Add_region_to_state/province_form_field' into develop
Commit: ceafef56b3e0e28cf3d8e887fd4efeb9a3ec8171
https://github.com/Dolibarr/dolibarr/commit/ceafef56b3e0e28cf3d8e887fd4efeb9a3ec8171
Author: Rui Strecht <address@hidden>
Date: 2017-09-02 (Sat, 02 Sep 2017)
Changed paths:
M ChangeLog
M htdocs/accountancy/admin/categories_list.php
M htdocs/admin/dolistore/ajax/image.php
M htdocs/admin/dolistore/class/dolistore.class.php
M htdocs/admin/dolistore/class/init.php
M htdocs/admin/pdf.php
M htdocs/cashdesk/css/style.css
M htdocs/cashdesk/javascript/dhtml.js
M htdocs/cashdesk/tpl/facturation1.tpl.php
M htdocs/comm/propal/document.php
M htdocs/commande/document.php
M htdocs/compta/bank/class/paymentvarious.class.php
M htdocs/compta/bank/index.php
M htdocs/compta/bank/various_payment/card.php
M htdocs/compta/bank/various_payment/index.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/document.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/core/actions_builddoc.inc.php
M htdocs/core/actions_linkedfiles.inc.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/holiday/list.php
M htdocs/install/mysql/data/llx_accounting_category.sql
M htdocs/install/mysql/data/llx_c_tva.sql
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/migration/repair.sql
M htdocs/install/mysql/tables/llx_payment_various.sql
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/banks.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/projects.lang
M htdocs/projet/element.php
M htdocs/public/payment/newpayment.php
M htdocs/public/payment/paymentko.php
M htdocs/public/payment/paymentok.php
M htdocs/societe/admin/societe.php
M htdocs/societe/canvas/company/tpl/card_create.tpl.php
M htdocs/societe/canvas/company/tpl/card_edit.tpl.php
M htdocs/societe/canvas/individual/tpl/card_create.tpl.php
M htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
M htdocs/societe/card.php
M htdocs/societe/class/api_deprecated_thirdparty.class.php
M htdocs/societe/class/api_thirdparties.class.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/tpl/linesalesrepresentative.tpl.php
M htdocs/supplier_proposal/document.php
A htdocs/theme/common/credit_card.png
M htdocs/theme/eldy/style.css.php
M htdocs/websites/index.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: a22824891812dba492bab230602d9721bdd755a1
https://github.com/Dolibarr/dolibarr/commit/a22824891812dba492bab230602d9721bdd755a1
Author: Rui Strecht <address@hidden>
Date: 2017-09-02 (Sat, 02 Sep 2017)
Changed paths:
M htdocs/core/class/extrafields.class.php
M htdocs/core/db/mysqli.class.php
M htdocs/core/db/pgsql.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/tpl/admin_extrafields_add.tpl.php
M htdocs/core/tpl/admin_extrafields_edit.tpl.php
M htdocs/societe/card.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 96521af778fae872650896c5c6c3488a3e79b03e
https://github.com/Dolibarr/dolibarr/commit/96521af778fae872650896c5c6c3488a3e79b03e
Author: Rui Strecht <address@hidden>
Date: 2017-09-03 (Sun, 03 Sep 2017)
Changed paths:
M ChangeLog
M htdocs/comm/card.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/db/mysqli.class.php
M htdocs/core/db/pgsql.class.php
M htdocs/core/modules/modCron.class.php
M htdocs/core/modules/modFacture.class.php
M htdocs/core/modules/modGravatar.class.php
M htdocs/core/modules/modMultiCurrency.class.php
M htdocs/langs/en_US/contracts.lang
M htdocs/societe/card.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/list.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 94e6900662e722e542dfb4843dd5e14c76356f85
https://github.com/Dolibarr/dolibarr/commit/94e6900662e722e542dfb4843dd5e14c76356f85
Author: Rui Strecht <address@hidden>
Date: 2017-09-04 (Mon, 04 Sep 2017)
Log Message:
-----------
Merge remote-tracking branch 'origin/develop' into develop
Commit: e8221b8a816d588600878a842f7de97458ee9cda
https://github.com/Dolibarr/dolibarr/commit/e8221b8a816d588600878a842f7de97458ee9cda
Author: Rui Strecht <address@hidden>
Date: 2017-09-04 (Mon, 04 Sep 2017)
Changed paths:
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
M htdocs/contact/canvas/actions_contactcard_common.class.php
M htdocs/core/lib/json.lib.php
M htdocs/expensereport/class/expensereport.class.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 75ce9742e430659e2a040fba49349a77c462d945
https://github.com/Dolibarr/dolibarr/commit/75ce9742e430659e2a040fba49349a77c462d945
Author: Rui Strecht <address@hidden>
Date: 2017-09-05 (Tue, 05 Sep 2017)
Changed paths:
M htdocs/accountancy/admin/categories_list.php
M htdocs/accountancy/class/accountancycategory.class.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/compta/journal/purchasesjournal.php
M htdocs/compta/journal/sellsjournal.php
M htdocs/compta/localtax/clients.php
M htdocs/compta/localtax/quadri_detail.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.php
M htdocs/compta/resultat/result.php
M htdocs/compta/stats/cabyprodserv.php
M htdocs/compta/stats/cabyuser.php
M htdocs/compta/stats/casoc.php
M htdocs/compta/stats/index.php
M htdocs/compta/tva/clients.php
M htdocs/compta/tva/quadri_detail.php
M htdocs/compta/tva/quarter_report.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/report.lib.php
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/compta.lang
M htdocs/langs/en_US/main.lang
M scripts/accountancy/export-thirdpartyaccount.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 4d060a273f3557cb03855491009c489c24e169db
https://github.com/Dolibarr/dolibarr/commit/4d060a273f3557cb03855491009c489c24e169db
Author: Rui Strecht <address@hidden>
Date: 2017-09-06 (Wed, 06 Sep 2017)
Changed paths:
M htdocs/accountancy/admin/accountmodel.php
M htdocs/accountancy/admin/categories_list.php
M htdocs/accountancy/admin/journals_list.php
M htdocs/accountancy/admin/productaccount.php
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/class/accountancycategory.class.php
M htdocs/accountancy/customer/index.php
M htdocs/accountancy/customer/lines.php
M htdocs/accountancy/expensereport/index.php
M htdocs/accountancy/index.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/index.php
M htdocs/admin/dict.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/result.php
M htdocs/core/lib/modulebuilder.lib.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/langs/en_US/main.lang
M htdocs/modulebuilder/index.php
M htdocs/modulebuilder/template/class/myobject.class.php
M htdocs/modulebuilder/template/myobject_card.php
M htdocs/modulebuilder/template/sql/llx_myobject.sql
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 114105cd54b461800ce6383253da5df1406755bf
https://github.com/Dolibarr/dolibarr/commit/114105cd54b461800ce6383253da5df1406755bf
Author: Rui Strecht <address@hidden>
Date: 2017-09-06 (Wed, 06 Sep 2017)
Changed paths:
M htdocs/accountancy/admin/categories_list.php
M htdocs/admin/company.php
M htdocs/admin/menus/edit.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/commande/mod_commande_saphir.php
M htdocs/core/modules/expedition/mod_expedition_ribera.php
M htdocs/core/modules/propale/mod_propale_saphir.php
M htdocs/document.php
M htdocs/don/card.php
M htdocs/don/document.php
M htdocs/don/info.php
M htdocs/don/list.php
M htdocs/don/note.php
M htdocs/install/mysql/data/llx_accounting.sql
M htdocs/install/mysql/data/llx_accounting_category.sql
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/migration/repair.sql
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/compta.lang
M htdocs/langs/en_US/main.lang
M htdocs/main.inc.php
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/viewimage.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: e1c54664d1d692a8aa9c52a33eb408dece9cb368
https://github.com/Dolibarr/dolibarr/commit/e1c54664d1d692a8aa9c52a33eb408dece9cb368
Author: Rui Strecht <address@hidden>
Date: 2017-09-06 (Wed, 06 Sep 2017)
Changed paths:
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/admin/card.php
M htdocs/accountancy/admin/categories.php
M htdocs/core/lib/accounting.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 9b64b064ce67c1f1de1579dff17ae6fd843b4225
https://github.com/Dolibarr/dolibarr/commit/9b64b064ce67c1f1de1579dff17ae6fd843b4225
Author: Rui Strecht <address@hidden>
Date: 2017-09-07 (Thu, 07 Sep 2017)
Changed paths:
M htdocs/core/modules/modCron.class.php
M htdocs/core/modules/modFacture.class.php
M htdocs/core/modules/modGravatar.class.php
M htdocs/core/modules/modMultiCurrency.class.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/main.inc.php
M htdocs/user/logout.php
M test/phpunit/CoreTest.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: bddf29288150960e8f2df4e3dc276faa6cb799d8
https://github.com/Dolibarr/dolibarr/commit/bddf29288150960e8f2df4e3dc276faa6cb799d8
Author: Rui Strecht <address@hidden>
Date: 2017-09-11 (Mon, 11 Sep 2017)
Changed paths:
M dev/initdemo/mysqldump_dolibarr_6.0.0.sql
M htdocs/accountancy/class/accountancycategory.class.php
M htdocs/accountancy/index.php
M htdocs/adherents/list.php
M htdocs/adherents/type.php
M htdocs/admin/defaultvalues.php
M htdocs/admin/dict.php
M htdocs/admin/fichinter.php
M htdocs/admin/mails_templates.php
M htdocs/admin/pdf.php
M htdocs/admin/security_file.php
M htdocs/admin/system/filecheck.php
M htdocs/admin/system/web.php
M htdocs/admin/tools/dolibarr_export.php
M htdocs/admin/translation.php
M htdocs/bookmarks/class/bookmark.class.php
M htdocs/comm/card.php
M htdocs/comm/mailing/class/advtargetemailing.class.php
M htdocs/comm/propal/list.php
M htdocs/comm/propal/stats/index.php
M htdocs/commande/list.php
M htdocs/commande/stats/index.php
M htdocs/compta/bank/bankentries.php
M htdocs/compta/bank/index.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/facture/stats/index.php
M htdocs/contact/list.php
M htdocs/contrat/index.php
M htdocs/contrat/list.php
M htdocs/core/actions_extrafields.inc.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/lib/date.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/payments.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/cron/list.php
M htdocs/don/list.php
M htdocs/expedition/list.php
M htdocs/expensereport/list.php
M htdocs/expensereport/stats/index.php
M htdocs/fichinter/card.php
M htdocs/fichinter/list.php
M htdocs/fichinter/stats/index.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/list.php
M htdocs/includes/tcpdi/tcpdi.php
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/migration/repair.sql
M htdocs/install/mysql/tables/llx_bookmark.sql
M htdocs/install/mysql/tables/llx_c_email_templates.sql
M htdocs/install/mysql/tables/llx_facture_rec.sql
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/interventions.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/en_US/paybox.lang
M htdocs/langs/en_US/stripe.lang
M htdocs/langs/fr_FR/interventions.lang
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/paybox/admin/paybox.php
M htdocs/paypal/admin/paypal.php
M htdocs/product/ajax/products.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/inventory/list.php
R htdocs/product/list-with-listview.php
M htdocs/product/list.php
M htdocs/product/reassort.php
M htdocs/product/reassortlot.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/productlot_list.php
M htdocs/projet/list.php
M htdocs/projet/tasks/list.php
M htdocs/public/paybox/newpayment.php
M htdocs/public/paybox/paymentko.php
M htdocs/public/paybox/paymentok.php
M htdocs/public/payment/newpayment.php
M htdocs/public/payment/paymentko.php
M htdocs/public/payment/paymentok.php
M htdocs/public/paypal/newpayment.php
M htdocs/public/paypal/paymentko.php
M htdocs/public/paypal/paymentok.php
M htdocs/public/stripe/newpayment.php
M htdocs/public/stripe/paymentko.php
M htdocs/public/stripe/paymentok.php
M htdocs/resource/list.php
M htdocs/societe/card.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/list.php
M htdocs/stripe/admin/stripe.php
M htdocs/supplier_proposal/list.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
M htdocs/user/class/user.class.php
M htdocs/user/index.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 5213ce60c55885f5c58e6c4a0b9ff20ec943ddf6
https://github.com/Dolibarr/dolibarr/commit/5213ce60c55885f5c58e6c4a0b9ff20ec943ddf6
Author: Rui Strecht <address@hidden>
Date: 2017-09-11 (Mon, 11 Sep 2017)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/install/mysql/data/llx_accounting.sql
M htdocs/install/mysql/data/llx_accounting_category.sql
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/tables/llx_c_exp_tax_cat.sql
M htdocs/install/mysql/tables/llx_c_exp_tax_range.sql
M htdocs/install/mysql/tables/llx_expensereport_ik.sql
M htdocs/install/mysql/tables/llx_payment_various.sql
A htdocs/install/mysql/tables/llx_projet_task_comment.sql
M htdocs/langs/en_US/projects.lang
M htdocs/langs/fr_FR/projects.lang
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/projet/admin/project.php
M htdocs/projet/class/task.class.php
M htdocs/projet/element.php
A htdocs/projet/tasks/comment.php
M htdocs/public/onlinesign/newonlinesign.php
M htdocs/public/paybox/newpayment.php
M htdocs/public/payment/newpayment.php
M htdocs/public/paypal/newpayment.php
M htdocs/public/stripe/newpayment.php
M htdocs/societe/class/societe.class.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: bafd64e5fa22cec6d9f2d3d5770df4e902a2c588
https://github.com/Dolibarr/dolibarr/commit/bafd64e5fa22cec6d9f2d3d5770df4e902a2c588
Author: Rui Strecht <address@hidden>
Date: 2017-09-12 (Tue, 12 Sep 2017)
Changed paths:
M htdocs/accountancy/bookkeeping/balance.php
M htdocs/accountancy/customer/index.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/expensereport/index.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/index.php
M htdocs/accountancy/supplier/list.php
M htdocs/adherents/admin/adherent.php
A htdocs/adherents/admin/adherent_emails.php
R htdocs/adherents/admin/public.php
A htdocs/adherents/admin/website.php
M htdocs/adherents/card.php
M htdocs/adherents/subscription.php
M htdocs/adherents/subscription/card.php
M htdocs/admin/company.php
M htdocs/admin/dict.php
M htdocs/admin/index.php
M htdocs/categories/class/categorie.class.php
M htdocs/comm/propal/card.php
M htdocs/comm/propal/list.php
M htdocs/commande/card.php
M htdocs/compta/facture/card.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/tpl/linkedobjectblockForRec.tpl.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.php
M htdocs/compta/resultat/result.php
M htdocs/contact/list.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/discount.class.php
M htdocs/core/db/mysqli.class.php
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/member.lib.php
M htdocs/core/lib/payments.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/syslog/mod_syslog_syslog.php
M htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
M htdocs/core/tpl/contacts.tpl.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/tables/llx_contrat.sql
M htdocs/install/upgrade2.php
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/banks.lang
M htdocs/langs/en_US/compta.lang
M htdocs/langs/en_US/members.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/en_US/projects.lang
M htdocs/main.inc.php
M htdocs/margin/checkMargins.php
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/public/members/new.php
M htdocs/societe/card.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/card.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 5c81443a9fe7be833023d2454fb9b1b703f43a62
https://github.com/Dolibarr/dolibarr/commit/5c81443a9fe7be833023d2454fb9b1b703f43a62
Author: Rui Strecht <address@hidden>
Date: 2017-09-13 (Wed, 13 Sep 2017)
Changed paths:
M htdocs/accountancy/admin/journals_list.php
M htdocs/accountancy/class/accountancycategory.class.php
M htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
M htdocs/adherents/card.php
M htdocs/adherents/subscription/card.php
M htdocs/admin/dolistore/class/dolistore.class.php
M htdocs/admin/dolistore/css/dolistore.css
M htdocs/admin/modules.php
M htdocs/categories/class/categorie.class.php
M htdocs/comm/action/card.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/mailing/class/advtargetemailing.class.php
M htdocs/comm/propal/card.php
M htdocs/commande/card.php
M htdocs/compta/facture/card.php
M htdocs/contact/canvas/default/actions_contactcard_default.class.php
M htdocs/contrat/card.php
M htdocs/core/class/html.formactions.class.php
M htdocs/core/class/html.formwebsite.class.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/lib/payments.lib.php
M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
M htdocs/expedition/card.php
M htdocs/fichinter/card.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/commande/info.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/paiement/card.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/main.lang
M
htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
M htdocs/modulebuilder/template/myobject_card.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/inventory/card.php
M htdocs/projet/card.php
M htdocs/projet/class/task.class.php
M htdocs/projet/info.php
M htdocs/projet/tasks/task.php
M htdocs/public/payment/newpayment.php
M htdocs/supplier_proposal/card.php
M htdocs/user/card.php
M htdocs/user/group/card.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 70a881ad47c0aa068291f5a338e54342a4c3a29e
https://github.com/Dolibarr/dolibarr/commit/70a881ad47c0aa068291f5a338e54342a4c3a29e
Author: Rui Strecht <address@hidden>
Date: 2017-09-14 (Thu, 14 Sep 2017)
Changed paths:
M .travis.yml
M ChangeLog
M htdocs/adherents/class/adherent.class.php
M htdocs/admin/defaultvalues.php
M htdocs/admin/dolistore/class/dolistore.class.php
M htdocs/comm/card.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/paiement.php
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/lib/price.lib.php
M htdocs/core/menus/standard/eldy.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/product/doc/pdf_standard.modules.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/fourn/class/api_supplier_invoices.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/projects.lang
M htdocs/langs/en_US/stocks.lang
M htdocs/langs/fr_FR/projects.lang
M htdocs/product/list.php
M htdocs/projet/class/task.class.php
M htdocs/projet/tasks/comment.php
M htdocs/projet/tasks/time.php
M htdocs/public/payment/newpayment.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/rib.php
M htdocs/supplier_proposal/list.php
M htdocs/theme/eldy/style.css.php
M test/phpunit/CodingPhpTest.php
M test/phpunit/PricesTest.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: fd27c29354bb356eb1ea030998a0d982afe83ba6
https://github.com/Dolibarr/dolibarr/commit/fd27c29354bb356eb1ea030998a0d982afe83ba6
Author: Rui Strecht <address@hidden>
Date: 2017-09-15 (Fri, 15 Sep 2017)
Changed paths:
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/admin/card.php
M htdocs/accountancy/admin/categories.php
M htdocs/accountancy/admin/productaccount.php
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/expensereport/list.php
M htdocs/accountancy/supplier/list.php
M htdocs/adherents/list.php
M htdocs/adherents/subscription/card.php
M htdocs/adherents/subscription/list.php
M htdocs/admin/defaultvalues.php
M htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
M htdocs/admin/ihm.php
M htdocs/admin/mails_templates.php
M htdocs/admin/translation.php
M htdocs/bookmarks/card.php
M htdocs/categories/edit.php
M htdocs/comm/address.php
M htdocs/comm/card.php
M htdocs/comm/mailing/card.php
M htdocs/comm/mailing/class/advtargetemailing.class.php
M htdocs/comm/propal/card.php
M htdocs/comm/propal/list.php
M htdocs/comm/remise.php
M htdocs/comm/remx.php
M htdocs/commande/card.php
M htdocs/commande/list.php
M htdocs/compta/bank/bankentries.php
M htdocs/compta/bank/index.php
M htdocs/compta/bank/ligne.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/facture/list.php
M htdocs/contact/agenda.php
M htdocs/contact/card.php
M htdocs/contact/list.php
M htdocs/contrat/card.php
M htdocs/contrat/list.php
M htdocs/contrat/services.php
M htdocs/core/actions_setnotes.inc.php
M htdocs/core/class/doleditor.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/security2.lib.php
M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
M htdocs/core/photos_resize.php
M htdocs/cron/card.php
M htdocs/don/card.php
M htdocs/ecm/docfile.php
M htdocs/ecm/docmine.php
M htdocs/expedition/list.php
M htdocs/expensereport/card.php
M htdocs/expensereport/list.php
M htdocs/fichinter/list.php
M htdocs/fourn/card.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/list.php
M htdocs/fourn/product/list.php
M htdocs/holiday/define_holiday.php
M htdocs/install/check.php
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
M htdocs/langs/en_US/main.lang
M htdocs/livraison/card.php
M htdocs/margin/checkMargins.php
M htdocs/master.inc.php
M htdocs/modulebuilder/template/myobject_agenda.php
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/opensurvey/card.php
M htdocs/opensurvey/results.php
M htdocs/product/card.php
M htdocs/product/class/productbatch.class.php
M htdocs/product/inventory/list.php
M htdocs/product/list.php
M htdocs/product/reassortlot.php
M htdocs/product/stock/card.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/projet/list.php
M htdocs/projet/tasks.php
M htdocs/projet/tasks/list.php
M htdocs/public/members/new.php
M htdocs/resource/element_resource.php
M htdocs/societe/agenda.php
M htdocs/societe/card.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/card.php
M htdocs/supplier_proposal/list.php
M htdocs/user/card.php
M htdocs/user/clicktodial.php
M htdocs/user/group/index.php
M htdocs/user/index.php
M htdocs/user/passwordforgotten.php
M htdocs/variants/combinations.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 06b01462322b01d34ab90962b1b17532b7fa7668
https://github.com/Dolibarr/dolibarr/commit/06b01462322b01d34ab90962b1b17532b7fa7668
Author: Rui Strecht <address@hidden>
Date: 2017-09-15 (Fri, 15 Sep 2017)
Changed paths:
M htdocs/comm/mailing/card.php
M htdocs/core/class/html.formmail.class.php
A htdocs/core/tpl/onlinepaymentlinks.tpl.php
M htdocs/paybox/admin/paybox.php
M htdocs/paypal/admin/paypal.php
M htdocs/stripe/admin/stripe.php
M scripts/emailings/mailing-send.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 1b30af4d0a463e3016110bfc23c6090e43f4c879
https://github.com/Dolibarr/dolibarr/commit/1b30af4d0a463e3016110bfc23c6090e43f4c879
Author: Rui Strecht <address@hidden>
Date: 2017-09-15 (Fri, 15 Sep 2017)
Changed paths:
M htdocs/accountancy/admin/fiscalyear_card.php
M htdocs/accountancy/index.php
M htdocs/core/class/fiscalyear.class.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 33d00d508e28e552117b849e4491b87881aa1714
https://github.com/Dolibarr/dolibarr/commit/33d00d508e28e552117b849e4491b87881aa1714
Author: Rui Strecht <address@hidden>
Date: 2017-09-15 (Fri, 15 Sep 2017)
Changed paths:
M build/makepack-dolibarrmodule.pl
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/compta/prelevement/bons.php
M htdocs/compta/prelevement/card.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/prelevement/create.php
M htdocs/compta/prelevement/factures.php
M htdocs/compta/prelevement/fiche-rejet.php
M htdocs/compta/prelevement/fiche-stat.php
M htdocs/product/composition/card.php
Log Message:
-----------
Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into develop
Commit: 36e634ae4c893c0b15c229d026b891a7df4d88b7
https://github.com/Dolibarr/dolibarr/commit/36e634ae4c893c0b15c229d026b891a7df4d88b7
Author: Rui Strecht <address@hidden>
Date: 2017-09-15 (Fri, 15 Sep 2017)
Changed paths:
M ChangeLog
M htdocs/accountancy/class/accountancysystem.class.php
M htdocs/accountancy/class/accountingaccount.class.php
M htdocs/adherents/class/adherent.class.php
M htdocs/admin/ldap.php
M htdocs/admin/modules.php
M htdocs/api/index.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/mailing/class/advtargetemailing.class.php
M htdocs/comm/propal/card.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/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/salaries/class/paymentsalary.class.php
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/compta/tva/class/tva.class.php
M htdocs/contact/class/contact.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/services.php
M htdocs/core/class/ccountry.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/discount.class.php
M htdocs/core/class/events.class.php
M htdocs/core/class/link.class.php
M htdocs/core/class/menubase.class.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/lib/ldap.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/cheque/mod_chequereceipt_mint.php
M htdocs/core/modules/commande/mod_commande_marbre.php
M htdocs/core/modules/contract/mod_contract_serpis.php
M htdocs/core/modules/expedition/mod_expedition_safor.php
M htdocs/core/modules/expensereport/mod_expensereport_jade.php
M htdocs/core/modules/facture/mod_facture_mars.php
M htdocs/core/modules/facture/mod_facture_terre.php
M htdocs/core/modules/fichinter/mod_pacific.php
M htdocs/core/modules/livraison/mod_livraison_jade.php
M htdocs/core/modules/payment/mod_payment_cicada.php
M htdocs/core/modules/project/mod_project_simple.php
M htdocs/core/modules/project/task/mod_task_simple.php
M htdocs/core/modules/propale/mod_propale_marbre.php
M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
M htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
M htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
M htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
M htdocs/cron/class/cronjob.class.php
M htdocs/don/list.php
M htdocs/ecm/class/ecmdirectory.class.php
M htdocs/expedition/class/expedition.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/holiday/class/holiday.class.php
M htdocs/imports/class/import.class.php
M htdocs/modulebuilder/template/class/myobject.class.php
M htdocs/modulebuilder/template/myobject_list.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/composition/card.php
M htdocs/projet/class/task.class.php
M htdocs/resource/class/dolresource.class.php
M htdocs/societe/class/societe.class.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M htdocs/user/class/usergroup.class.php
M htdocs/websites/class/website.class.php
M test/phpunit/CodingPhpTest.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 39341f0095d576ab317fc7c23bd9a7404319c55f
https://github.com/Dolibarr/dolibarr/commit/39341f0095d576ab317fc7c23bd9a7404319c55f
Author: Rui Strecht <address@hidden>
Date: 2017-09-15 (Fri, 15 Sep 2017)
Changed paths:
M htdocs/core/modules/cheque/mod_chequereceipt_mint.php
M htdocs/core/modules/commande/mod_commande_marbre.php
M htdocs/core/modules/contract/mod_contract_serpis.php
M htdocs/core/modules/expedition/mod_expedition_safor.php
M htdocs/core/modules/expensereport/mod_expensereport_jade.php
M htdocs/core/modules/facture/mod_facture_mars.php
M htdocs/core/modules/facture/mod_facture_terre.php
M htdocs/core/modules/fichinter/mod_pacific.php
M htdocs/core/modules/fichinter/modules_fichinter.php
M htdocs/core/modules/livraison/mod_livraison_jade.php
M htdocs/core/modules/payment/mod_payment_cicada.php
M htdocs/core/modules/printing/printgcp.modules.php
M htdocs/core/modules/printing/printipp.modules.php
M htdocs/core/modules/project/mod_project_simple.php
M htdocs/core/modules/project/task/mod_task_simple.php
M htdocs/core/modules/propale/mod_propale_marbre.php
M htdocs/core/modules/societe/mod_codecompta_aquarium.php
M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
M htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
M htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
M htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 0e1772cf66ec910fd7c6ad11342dcdc4eb6a1b71
https://github.com/Dolibarr/dolibarr/commit/0e1772cf66ec910fd7c6ad11342dcdc4eb6a1b71
Author: Rui Strecht <address@hidden>
Date: 2017-09-18 (Mon, 18 Sep 2017)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M dev/examples/code/create_user.php
M dev/examples/code/get_contracts.php
M htdocs/accountancy/admin/accountmodel.php
M htdocs/accountancy/admin/categories_list.php
M htdocs/accountancy/admin/export.php
M htdocs/accountancy/admin/index.php
M htdocs/accountancy/admin/journals_list.php
M htdocs/accountancy/bookkeeping/listbyaccount.php
M htdocs/accountancy/expensereport/list.php
M htdocs/adherents/cartes/carte.php
M htdocs/admin/agenda.php
M htdocs/admin/agenda_other.php
M htdocs/admin/bank.php
M htdocs/admin/compta.php
M htdocs/admin/dict.php
M htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
M htdocs/admin/dolistore/class/dolistore.class.php
M htdocs/admin/loan.php
M htdocs/admin/modules.php
M htdocs/admin/multicurrency.php
M htdocs/admin/payment.php
M htdocs/admin/stock.php
M htdocs/api/index.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/listactions.php
M htdocs/comm/mailing/card.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/propal/card.php
M htdocs/comm/propal/list.php
M htdocs/commande/card.php
M htdocs/commande/list.php
M htdocs/compta/bank/card.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/facture/list.php
M htdocs/contact/card.php
M htdocs/contrat/card.php
M htdocs/contrat/list.php
M htdocs/contrat/services.php
M htdocs/core/actions_fetchobject.inc.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/actions_sendmails.inc.php
M htdocs/core/boxes/box_activity.php
M htdocs/core/class/commoninvoice.class.php
M htdocs/core/class/events.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formactions.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/class/html.formsms.class.php
M htdocs/core/lib/accounting.lib.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/payments.lib.php
M htdocs/core/lib/product.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
M htdocs/core/modules/modAccounting.class.php
M htdocs/core/modules/modProduct.class.php
A htdocs/core/tpl/card_presend.tpl.php
A htdocs/core/tpl/massactions_form.tpl.php
M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
M htdocs/don/card.php
A htdocs/don/tpl/linkedobjectblock.tpl.php
M htdocs/expensereport/card.php
M htdocs/expensereport/list.php
M htdocs/fichinter/card.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/facture/list.php
M htdocs/holiday/card.php
M htdocs/install/check.php
M htdocs/install/mysql/data/llx_c_action_trigger.sql
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/tables/llx_actioncomm.sql
M htdocs/install/mysql/tables/llx_c_action_trigger.sql
M htdocs/install/mysql/tables/llx_c_paiement.sql
M htdocs/install/mysql/tables/llx_c_payment_term.sql
M htdocs/install/mysql/tables/llx_product.sql
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/agenda.lang
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/compta.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/mails.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/multicurrency.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/en_US/products.lang
M htdocs/langs/en_US/stocks.lang
M htdocs/langs/en_US/users.lang
M htdocs/modulebuilder/template/myobject_card.php
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/opensurvey/results.php
M htdocs/opensurvey/wizard/create_survey.php
M htdocs/product/card.php
M htdocs/product/class/product.class.php
M htdocs/product/inventory/tpl/inventory.tpl.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
A htdocs/product/stats/supplier_proposal.php
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/product/stock/product.php
M htdocs/projet/card.php
M htdocs/projet/ganttchart.inc.php
M htdocs/projet/tasks/comment.php
M htdocs/projet/tasks/contact.php
M htdocs/projet/tasks/document.php
M htdocs/projet/tasks/note.php
M htdocs/projet/tasks/task.php
M htdocs/projet/tasks/time.php
M htdocs/resource/element_resource.php
M htdocs/societe/card.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/card.php
M htdocs/supplier_proposal/list.php
M htdocs/user/card.php
M htdocs/user/class/usergroup.class.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: e74f4b8b11346620ed4439ed366e07b0fedc0b60
https://github.com/Dolibarr/dolibarr/commit/e74f4b8b11346620ed4439ed366e07b0fedc0b60
Author: Rui Strecht <address@hidden>
Date: 2017-09-18 (Mon, 18 Sep 2017)
Changed paths:
M htdocs/admin/dolistore/class/dolistore.class.php
R htdocs/admin/dolistore/class/init.php
M htdocs/admin/modules.php
M htdocs/core/lib/project.lib.php
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 7848d99b2c57f0e773b1bc202395abf7ca3b1946
https://github.com/Dolibarr/dolibarr/commit/7848d99b2c57f0e773b1bc202395abf7ca3b1946
Author: Rui Strecht <address@hidden>
Date: 2017-09-18 (Mon, 18 Sep 2017)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/core/js/timesheet.js
M htdocs/core/lib/project.lib.php
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 72b8a2290082ef14ddef4326ef8f615f835f03e7
https://github.com/Dolibarr/dolibarr/commit/72b8a2290082ef14ddef4326ef8f615f835f03e7
Author: Rui Strecht <address@hidden>
Date: 2017-09-21 (Thu, 21 Sep 2017)
Changed paths:
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/bookkeeping/balance.php
M htdocs/admin/stock.php
M htdocs/admin/system/perf.php
M htdocs/api/admin/index.php
M htdocs/comm/action/card.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/mailing/advtargetemailing.php
M htdocs/comm/remx.php
M htdocs/compta/bank/index.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/prelevement/create.php
M htdocs/compta/prelevement/factures.php
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/list.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/class/discount.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/json.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/modCashDesk.class.php
M htdocs/core/tools.php
M htdocs/document.php
M htdocs/ecm/class/ecmfiles.class.php
M htdocs/ecm/docfile.php
M htdocs/ecm/index.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/holiday/class/holiday.class.php
M htdocs/includes/odtphp/Segment.php
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/migration/repair.sql
M htdocs/install/mysql/tables/llx_ecm_files.sql
M htdocs/install/repair.php
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/ecm.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/stocks.lang
M htdocs/langs/en_US/website.lang
M htdocs/langs/en_US/withdrawals.lang
M htdocs/main.inc.php
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/product/price.php
M htdocs/product/stats/commande_fournisseur.php
M htdocs/product/stats/propal.php
M htdocs/product/stats/supplier_proposal.php
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/projet/card.php
M htdocs/projet/document.php
M htdocs/projet/element.php
M htdocs/projet/tasks/contact.php
M htdocs/public/payment/newpayment.php
M htdocs/public/payment/paymentko.php
M htdocs/public/payment/paymentok.php
M htdocs/societe/price.php
A htdocs/theme/common/cheque.png
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: a34a49d1cea37a69753c9281c57310e4e0953910
https://github.com/Dolibarr/dolibarr/commit/a34a49d1cea37a69753c9281c57310e4e0953910
Author: Rui Strecht <address@hidden>
Date: 2017-09-22 (Fri, 22 Sep 2017)
Changed paths:
M htdocs/compta/facture/fiche-rec.php
M htdocs/langs/en_US/bills.lang
M htdocs/modulebuilder/template/myobject_list.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: bffe21d058a4186cf09d86a2173f09dcd343a95b
https://github.com/Dolibarr/dolibarr/commit/bffe21d058a4186cf09d86a2173f09dcd343a95b
Author: Rui Strecht <address@hidden>
Date: 2017-09-22 (Fri, 22 Sep 2017)
Changed paths:
M htdocs/admin/ihm.php
M htdocs/admin/mails_templates.php
M htdocs/comm/mailing/card.php
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/facture/fiche-rec.php
A htdocs/compta/facture/invoicetemplate_list.php
M htdocs/contrat/card.php
M htdocs/core/actions_sendmails.inc.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/tpl/card_presend.tpl.php
M htdocs/core/tpl/massactions_form.tpl.php
M htdocs/langs/en_US/mails.lang
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/societe/card.php
M htdocs/societe/list.php
M scripts/emailings/mailing-send.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 31f06f2c71a6bbd297835253c4c6461c10319156
https://github.com/Dolibarr/dolibarr/commit/31f06f2c71a6bbd297835253c4c6461c10319156
Author: Rui Strecht <address@hidden>
Date: 2017-09-25 (Mon, 25 Sep 2017)
Changed paths:
M ChangeLog
M htdocs/adherents/card.php
M htdocs/adherents/class/adherent.class.php
M htdocs/admin/dolistore/ajax/image.php
M htdocs/admin/ihm.php
M htdocs/admin/mails_templates.php
M htdocs/api/admin/index.php
M htdocs/api/class/api.class.php
M htdocs/comm/action/card.php
M htdocs/comm/propal/card.php
M htdocs/comm/remx.php
M htdocs/commande/card.php
M htdocs/compta/bank/bankentries.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/api_invoices.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/paiement/card.php
M htdocs/contrat/card.php
M htdocs/contrat/list.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/actions_sendmails.inc.php
M htdocs/core/actions_setnotes.inc.php
M htdocs/core/boxes/box_activity.php
M htdocs/core/boxes/modules_boxes.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formactions.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/js/lib_head.js.php
R htdocs/core/js/select2_locale.js.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/modulebuilder.lib.php
M htdocs/core/lib/security2.lib.php
M htdocs/core/menus/standard/auguria.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/search_page.php
M htdocs/core/tpl/card_presend.tpl.php
M htdocs/core/tpl/massactions_form.tpl.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/cron/card.php
M htdocs/expedition/card.php
M htdocs/expensereport/card.php
M htdocs/fichinter/card.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/commande/orderstoinvoice.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/paiement/card.php
M htdocs/install/mysql/data/llx_c_action_trigger.sql
A htdocs/install/mysql/data/llx_c_email_templates.sql
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/mails.lang
M htdocs/langs/en_US/modulebuilder.lang
M htdocs/livraison/card.php
M htdocs/loan/card.php
M htdocs/loan/payment/payment.php
M htdocs/main.inc.php
M htdocs/modulebuilder/index.php
M htdocs/modulebuilder/template/ChangeLog.md
M htdocs/modulebuilder/template/class/myobject.class.php
M htdocs/modulebuilder/template/doc/Specifications.asciidoc
M htdocs/modulebuilder/template/myobject_card.php
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/product/card.php
M htdocs/product/class/html.formproduct.class.php
M htdocs/product/class/product.class.php
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/projet/element.php
M htdocs/public/members/new.php
M htdocs/resource/list.php
M htdocs/supplier_proposal/card.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
M htdocs/user/note.php
M htdocs/websites/index.php
M test/phpunit/AdherentTest.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 7fd690df3b66b74310a295ed273306ceeef200d5
https://github.com/Dolibarr/dolibarr/commit/7fd690df3b66b74310a295ed273306ceeef200d5
Author: Rui Strecht <address@hidden>
Date: 2017-09-25 (Mon, 25 Sep 2017)
Changed paths:
M htdocs/adherents/card.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/class/api_memberstypes.class.php
M htdocs/adherents/index.php
M htdocs/adherents/ldap.php
M htdocs/adherents/list.php
M htdocs/adherents/type.php
A htdocs/adherents/type_ldap.php
M htdocs/admin/ldap.php
M htdocs/admin/ldap_groups.php
A htdocs/admin/ldap_members_types.php
M htdocs/contact/ldap.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/ldap.class.php
M htdocs/core/lib/ldap.lib.php
M htdocs/core/lib/member.lib.php
M htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/en_US/ldap.lang
M htdocs/langs/en_US/members.lang
M htdocs/user/group/ldap.php
M htdocs/user/ldap.php
A scripts/members/sync_members_types_dolibarr2ldap.php
A scripts/members/sync_members_types_ldap2dolibarr.php
M test/phpunit/AdherentTest.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/ruistrecht-alt/dolibarr; branch
'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 6115093d8f240228dc5971cab4318c61b5a22cfa
https://github.com/Dolibarr/dolibarr/commit/6115093d8f240228dc5971cab4318c61b5a22cfa
Author: Rui Strecht <address@hidden>
Date: 2017-09-25 (Mon, 25 Sep 2017)
Changed paths:
M htdocs/compta/bank/bankentries.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/index.php
M htdocs/compta/bank/transfer.php
A htdocs/core/ajax/getaccountcurrency.php
M htdocs/core/class/html.form.class.php
M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
M htdocs/install/mysql/data/llx_c_tva.sql
M htdocs/langs/en_US/multicurrency.lang
M htdocs/langs/en_US/products.lang
M htdocs/product/inventory/card.php
M htdocs/product/inventory/list.php
M htdocs/product/stock/replenish.php
M htdocs/variants/admin/admin.php
M htdocs/variants/class/ProductCombination.class.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 542d00a230826f2362fb98e3b973a3eb9707253a
https://github.com/Dolibarr/dolibarr/commit/542d00a230826f2362fb98e3b973a3eb9707253a
Author: Rui Strecht <address@hidden>
Date: 2017-09-26 (Tue, 26 Sep 2017)
Changed paths:
M htdocs/admin/dict.php
M htdocs/admin/multicurrency.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/boxes/box_services_contracts.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/holiday/card.php
M htdocs/install/mysql/data/llx_c_tva.sql
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
M htdocs/langs/en_US/supplier_proposal.lang
M htdocs/resource/list.php
M htdocs/stripe/config.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: ae47b8d3e68d3f957043ffbe1e7508fef8146b32
https://github.com/Dolibarr/dolibarr/commit/ae47b8d3e68d3f957043ffbe1e7508fef8146b32
Author: Rui Strecht <address@hidden>
Date: 2017-09-26 (Tue, 26 Sep 2017)
Changed paths:
M htdocs/core/lib/functions.lib.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
M htdocs/langs/en_US/main.lang
M htdocs/product/admin/product_tools.php
M htdocs/product/class/productcustomerprice.class.php
M htdocs/product/price.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: d6037f269c3b3dd304617525d5102c74b0445f32
https://github.com/Dolibarr/dolibarr/commit/d6037f269c3b3dd304617525d5102c74b0445f32
Author: Rui Strecht <address@hidden>
Date: 2017-09-26 (Tue, 26 Sep 2017)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/modProduct.class.php
M htdocs/document.php
M htdocs/expedition/card.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/main.lang
M htdocs/modulebuilder/template/class/myobject.class.php
M htdocs/product/inventory/card.php
M htdocs/societe/card.php
M htdocs/user/card.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: f05495b439f0540cb22c49077b8f21cc905ad3d1
https://github.com/Dolibarr/dolibarr/commit/f05495b439f0540cb22c49077b8f21cc905ad3d1
Author: Rui Strecht <address@hidden>
Date: 2017-09-27 (Wed, 27 Sep 2017)
Changed paths:
M ChangeLog
A htdocs/api/class/api_dictionary.class.php
R htdocs/api/class/api_dictionarycountries.class.php
R htdocs/api/class/api_dictionaryevents.class.php
R htdocs/api/class/api_dictionaryextrafields.class.php
R htdocs/api/class/api_dictionarytowns.class.php
M htdocs/comm/action/card.php
M htdocs/compta/facture/list.php
M htdocs/contrat/services.php
M htdocs/core/actions_massactions.inc.php
R htdocs/core/js/lib_batch.js
M htdocs/core/modules/modApi.class.php
M htdocs/core/modules/rapport/pdf_paiement.class.php
M htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
M htdocs/fichinter/card.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/commande/dispatch.php
M htdocs/fourn/facture/list.php
M htdocs/install/mysql/data/llx_c_tva.sql
M htdocs/install/mysql/migration/3.0.0-3.1.0.sql
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
M htdocs/install/mysql/tables/llx_societe.sql
M htdocs/product/composition/card.php
M htdocs/product/fournisseurs.php
M htdocs/product/traduction.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/list.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: b2c7113ed3b1c4ee1a79735a6f6e7a5b94d71a6c
https://github.com/Dolibarr/dolibarr/commit/b2c7113ed3b1c4ee1a79735a6f6e7a5b94d71a6c
Author: Rui Strecht <address@hidden>
Date: 2017-09-27 (Wed, 27 Sep 2017)
Changed paths:
M htdocs/admin/mails_templates.php
M htdocs/compta/facture/card.php
M htdocs/core/lib/functions.lib.php
M htdocs/install/mysql/data/llx_c_email_templates.sql
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/tables/llx_c_email_templates.sql
M htdocs/langs/en_US/banks.lang
M htdocs/langs/en_US/main.lang
M htdocs/theme/eldy/img/stcomm0.png
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: b6103b69ff1a7624a40e456f623b1f052917056e
https://github.com/Dolibarr/dolibarr/commit/b6103b69ff1a7624a40e456f623b1f052917056e
Author: Rui Strecht <address@hidden>
Date: 2017-09-28 (Thu, 28 Sep 2017)
Changed paths:
M htdocs/contact/card.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/order.lib.php
M htdocs/core/tpl/card_presend.tpl.php
M htdocs/ecm/docfile.php
M htdocs/langs/en_US/other.lang
M htdocs/societe/card.php
M htdocs/societe/class/societe.class.php
A htdocs/societe/contact.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/ruistrecht-alt/dolibarr; branch
'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 8b4b2707202b22b4c3fe672ab4292a6f2437f6fb
https://github.com/Dolibarr/dolibarr/commit/8b4b2707202b22b4c3fe672ab4292a6f2437f6fb
Author: Rui Strecht <address@hidden>
Date: 2017-10-03 (Tue, 03 Oct 2017)
Changed paths:
A dev/resources/iso-normes/code_nace.txt
M htdocs/adherents/list.php
M htdocs/admin/defaultvalues.php
M htdocs/admin/delais.php
M htdocs/api/class/api.class.php
M htdocs/api/class/api_dictionary.class.php
M htdocs/api/class/api_documents.class.php
M htdocs/comm/action/card.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/document.php
M htdocs/comm/action/info.php
M htdocs/comm/propal/card.php
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/bank/bankentries.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/index.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/invoicetemplate_list.php
M htdocs/compta/facture/list.php
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
M htdocs/compta/salaries/card.php
M htdocs/contact/list.php
M htdocs/contrat/list.php
M htdocs/contrat/services.php
M htdocs/core/actions_extrafields.inc.php
M htdocs/core/actions_linkedfiles.inc.php
M htdocs/core/class/commondocgenerator.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/core/js/lib_head.js.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/geturl.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/core/modules/rapport/pdf_paiement.class.php
M htdocs/core/photos_resize.php
M htdocs/core/tpl/admin_extrafields_add.tpl.php
M htdocs/core/tpl/admin_extrafields_edit.tpl.php
M htdocs/core/tpl/admin_extrafields_view.tpl.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
A htdocs/core/tpl/extrafields_add.tpl.php
A htdocs/core/tpl/extrafields_edit.tpl.php
M htdocs/core/tpl/notes.tpl.php
M htdocs/expedition/list.php
M htdocs/expensereport/list.php
M htdocs/fichinter/list.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/list.php
M htdocs/holiday/card.php
M htdocs/holiday/class/holiday.class.php
M htdocs/holiday/define_holiday.php
M htdocs/holiday/document.php
M htdocs/holiday/list.php
M htdocs/index.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/tables/llx_extrafields.sql
A htdocs/install/mysql/tables/llx_holiday_users.key.sql
M htdocs/install/mysql/tables/llx_holiday_users.sql
M htdocs/install/mysql/tables/llx_website_page.sql
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/website.lang
M htdocs/modulebuilder/template/class/myobject.class.php
M htdocs/modulebuilder/template/lib/myobject.lib.php
M htdocs/modulebuilder/template/myobject_card.php
M htdocs/modulebuilder/template/myobject_document.php
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/product/inventory/list.php
M htdocs/product/list.php
M htdocs/product/stock/productlot_list.php
M htdocs/projet/class/task.class.php
M htdocs/projet/list.php
M htdocs/projet/tasks/list.php
M htdocs/projet/tasks/time.php
M htdocs/resource/element_resource.php
M htdocs/societe/card.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/list.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
M htdocs/user/class/user.class.php
M htdocs/user/index.php
M htdocs/websites/class/websitepage.class.php
M htdocs/websites/index.php
M test/phpunit/FactureTest.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: be5481f51a11f77ec18205032db8395caf58ede5
https://github.com/Dolibarr/dolibarr/commit/be5481f51a11f77ec18205032db8395caf58ede5
Author: Rui Strecht <address@hidden>
Date: 2017-10-03 (Tue, 03 Oct 2017)
Changed paths:
M .travis.yml
M ChangeLog
M dev/initdata/import-thirdparties.php
M htdocs/adherents/agenda.php
M htdocs/adherents/card.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/document.php
M htdocs/adherents/ldap.php
M htdocs/adherents/note.php
M htdocs/adherents/subscription.php
M htdocs/adherents/type.php
M htdocs/adherents/type_ldap.php
M htdocs/admin/agenda.php
M htdocs/admin/dict.php
M htdocs/admin/security_file.php
M htdocs/cashdesk/validation_verif.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/annuel.php
R htdocs/compta/bank/bankentries.php
A htdocs/compta/bank/bankentries_list.php
M htdocs/compta/bank/budget.php
M htdocs/compta/bank/card.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/document.php
M htdocs/compta/bank/graph.php
R htdocs/compta/bank/index.php
M htdocs/compta/bank/info.php
M htdocs/compta/bank/ligne.php
A htdocs/compta/bank/list.php
M htdocs/compta/bank/releve.php
M htdocs/compta/bank/treso.php
M htdocs/compta/bank/various_payment/index.php
M htdocs/compta/charges/index.php
M htdocs/compta/facture/card.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/paymentterm.class.php
M htdocs/compta/facture/contact.php
M htdocs/compta/facture/document.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/facture/info.php
M htdocs/compta/facture/note.php
M htdocs/compta/facture/prelevement.php
M htdocs/compta/paiement.php
M htdocs/compta/paiement/avalider.php
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
M htdocs/compta/paiement/cheque/list.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/compta/paiement/list.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.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/class/paymentsocialcontribution.class.php
M htdocs/compta/sociales/payments.php
M htdocs/compta/tva/reglement.php
M htdocs/contact/agenda.php
M htdocs/contact/card.php
M htdocs/contact/class/contact.class.php
M htdocs/contact/document.php
M htdocs/contact/info.php
M htdocs/contact/ldap.php
M htdocs/contact/note.php
M htdocs/contact/perso.php
M htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/contact.php
M htdocs/contrat/document.php
M htdocs/contrat/info.php
M htdocs/contrat/list.php
M htdocs/contrat/note.php
M htdocs/core/class/antivir.class.php
M htdocs/core/class/commoninvoice.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/translate.class.php
M htdocs/core/lib/bank.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/auguria.lib.php
M htdocs/core/menus/standard/auguria_menu.php
M htdocs/core/menus/standard/eldy.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/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/modFacture.class.php
M htdocs/core/modules/modSalaries.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/rapport/pdf_paiement.class.php
M htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/don/card.php
M htdocs/don/class/don.class.php
M htdocs/don/class/paymentdonation.class.php
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/contact.php
M htdocs/expedition/list.php
M htdocs/expedition/note.php
M htdocs/expedition/shipment.php
M htdocs/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/info.php
M htdocs/expensereport/note.php
M htdocs/fichinter/card.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fichinter/contact.php
M htdocs/fichinter/document.php
M htdocs/fichinter/info.php
M htdocs/fichinter/note.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/class/paiementfourn.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/facture/contact.php
M htdocs/fourn/facture/document.php
M htdocs/fourn/facture/info.php
M htdocs/fourn/facture/note.php
M htdocs/fourn/facture/paiement.php
M htdocs/holiday/card.php
M htdocs/holiday/class/holiday.class.php
M htdocs/holiday/define_holiday.php
M htdocs/holiday/document.php
M htdocs/holiday/list.php
M htdocs/imports/import.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/tables/llx_c_paiement.key.sql
M htdocs/install/mysql/tables/llx_c_paiement.sql
A htdocs/install/mysql/tables/llx_c_payment_term.key.sql
M htdocs/install/mysql/tables/llx_c_payment_term.sql
M htdocs/install/mysql/tables/llx_holiday.sql
M htdocs/install/upgrade2.php
M htdocs/livraison/card.php
M htdocs/livraison/class/livraison.class.php
M htdocs/loan/card.php
M htdocs/loan/class/loanschedule.class.php
M htdocs/loan/class/paymentloan.class.php
M htdocs/margin/tabs/productMargins.php
M htdocs/margin/tabs/thirdpartyMargins.php
M htdocs/modulebuilder/template/class/myobject.class.php
M htdocs/modulebuilder/template/myobject_card.php
M htdocs/product/card.php
M htdocs/product/class/product.class.php
M htdocs/product/composition/card.php
M htdocs/product/document.php
M htdocs/product/fournisseurs.php
M htdocs/product/info.php
M htdocs/product/note.php
M htdocs/product/price.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/stats/supplier_proposal.php
M htdocs/product/stock/product.php
M htdocs/product/traduction.php
M htdocs/supplier_proposal/card.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M htdocs/supplier_proposal/document.php
M htdocs/supplier_proposal/info.php
M htdocs/supplier_proposal/note.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 097438d7a3a8230f570f193797263113588814b8
https://github.com/Dolibarr/dolibarr/commit/097438d7a3a8230f570f193797263113588814b8
Author: Rui Strecht <address@hidden>
Date: 2017-10-04 (Wed, 04 Oct 2017)
Changed paths:
M .travis.yml
M htdocs/adherents/class/api_members.class.php
M htdocs/categories/class/api_categories.class.php
M htdocs/categories/class/categorie.class.php
M htdocs/categories/viewcat.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/facture.class.php
A htdocs/core/actions_comments.inc.php
A htdocs/core/class/comment.class.php
M htdocs/core/class/commoninvoice.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/lib/project.lib.php
A htdocs/core/tpl/bloc_comment.tpl.php
M htdocs/holiday/list.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/modulebuilder.lang
M htdocs/langs/en_US/projects.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/langs/fr_FR/projects.lang
M htdocs/modulebuilder/index.php
M htdocs/modulebuilder/template/README.md
M htdocs/product/class/api_products.class.php
M htdocs/projet/admin/project.php
M htdocs/projet/class/project.class.php
M htdocs/projet/class/task.class.php
A htdocs/projet/comment.php
M htdocs/projet/tasks/comment.php
M htdocs/societe/class/api_contacts.class.php
M htdocs/societe/class/api_thirdparties.class.php
M test/phpunit/FactureTest.php
M test/phpunit/NumberingModulesTest.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 7b60d7557918ff0a9f0de5fc263b2ebb8310e3cf
https://github.com/Dolibarr/dolibarr/commit/7b60d7557918ff0a9f0de5fc263b2ebb8310e3cf
Author: Rui Strecht <address@hidden>
Date: 2017-10-04 (Wed, 04 Oct 2017)
Changed paths:
M htdocs/accountancy/class/accountancyexport.class.php
M htdocs/adherents/agenda.php
M htdocs/adherents/card.php
M htdocs/api/class/api.class.php
M htdocs/comm/action/listactions.php
M htdocs/comm/action/rapport/index.php
M htdocs/comm/propal/class/api_proposals.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/list.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/contact/agenda.php
M htdocs/core/actions_builddoc.inc.php
M htdocs/core/actions_comments.inc.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.formactions.class.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/tpl/bloc_comment.tpl.php
M htdocs/fichinter/card.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/commande/list.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/agenda.lang
M htdocs/langs/en_US/main.lang
M htdocs/product/stock/replenish.php
M htdocs/projet/card.php
M htdocs/projet/class/project.class.php
M htdocs/projet/info.php
M htdocs/projet/tasks.php
M htdocs/societe/agenda.php
M htdocs/societe/card.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 1ea8bd2ed9e281986c624c935857e6613ae36218
https://github.com/Dolibarr/dolibarr/commit/1ea8bd2ed9e281986c624c935857e6613ae36218
Author: Rui Strecht <address@hidden>
Date: 2017-10-06 (Fri, 06 Oct 2017)
Changed paths:
M dev/setup/codesniffer/ruleset.xml
M htdocs/accountancy/bookkeeping/card.php
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
M htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
M htdocs/accountancy/customer/index.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/adherents/class/adherent.class.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/admin/dict.php
M htdocs/api/class/api_documents.class.php
M htdocs/categories/class/categorie.class.php
M htdocs/core/class/comment.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/login/functions_ldap.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/dons/html_cerfafr.modules.php
M htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
M htdocs/document.php
M htdocs/ecm/class/ecmfiles.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/holiday/class/holiday.class.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/modulebuilder.lang
M htdocs/modulebuilder/index.php
M htdocs/user/class/user.class.php
M htdocs/websites/index.php
M scripts/members/sync_members_types_ldap2dolibarr.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 5a53e61940321711b5cd908da50b8c7ca2daeb59
https://github.com/Dolibarr/dolibarr/commit/5a53e61940321711b5cd908da50b8c7ca2daeb59
Author: Rui Strecht <address@hidden>
Date: 2017-10-06 (Fri, 06 Oct 2017)
Changed paths:
M htdocs/accountancy/admin/accountmodel.php
M htdocs/accountancy/admin/journals_list.php
M htdocs/compta/sociales/card.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 9a984c982156f79a1e52cc76738815711b068305
https://github.com/Dolibarr/dolibarr/commit/9a984c982156f79a1e52cc76738815711b068305
Author: Rui Strecht <address@hidden>
Date: 2017-10-06 (Fri, 06 Oct 2017)
Changed paths:
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/ldap.php
M htdocs/admin/company.php
M htdocs/admin/ldap_members.php
M htdocs/admin/ldap_users.php
M htdocs/api/class/api_documents.class.php
M htdocs/comm/propal/class/api_proposals.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/compta/bank/card.php
M htdocs/compta/facture/stats/index.php
M htdocs/core/class/comment.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/ldap.class.php
M htdocs/core/class/notify.class.php
M htdocs/core/lib/contact.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/member.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/core/lib/usergroups.lib.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/triggers/interface_50_modLdap_Ldapsynchro.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/paiementfourn.class.php
M htdocs/fourn/commande/document.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/paiement/card.php
M htdocs/holiday/list.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/migration/repair.sql
M htdocs/install/mysql/tables/llx_user.sql
M htdocs/langs/en_US/modulebuilder.lang
M htdocs/langs/en_US/users.lang
M htdocs/modulebuilder/index.php
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/projet/card.php
M htdocs/projet/class/task.class.php
M htdocs/user/card.php
M htdocs/user/class/user.class.php
M htdocs/user/group/card.php
M htdocs/user/index.php
M htdocs/user/ldap.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: f03f3fbc2f85bf4e26c8ef249c3a7b2293b771f4
https://github.com/Dolibarr/dolibarr/commit/f03f3fbc2f85bf4e26c8ef249c3a7b2293b771f4
Author: Rui Strecht <address@hidden>
Date: 2017-10-06 (Fri, 06 Oct 2017)
Changed paths:
M htdocs/admin/company.php
M htdocs/admin/ihm.php
M htdocs/comm/propal/card.php
M htdocs/core/class/comment.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/notify.class.php
M htdocs/core/lib/usergroups.lib.php
M htdocs/core/triggers/interface_50_modNotification_Notification.class.php
M htdocs/langs/en_US/other.lang
M htdocs/langs/en_US/website.lang
M htdocs/langs/fr_FR/other.lang
M htdocs/projet/list.php
M htdocs/theme/eldy/style.css.php
M htdocs/websites/index.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 4a06ca9885abf0bca01cef07164ae7bf9d03e4c5
https://github.com/Dolibarr/dolibarr/commit/4a06ca9885abf0bca01cef07164ae7bf9d03e4c5
Author: Rui Strecht <address@hidden>
Date: 2017-10-09 (Mon, 09 Oct 2017)
Changed paths:
M ChangeLog
M dev/translation/txpush.sh
M htdocs/accountancy/admin/accountmodel.php
M htdocs/accountancy/admin/journals_list.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/admin/ihm.php
M htdocs/admin/ldap_members.php
M htdocs/admin/ldap_users.php
M htdocs/admin/mails_templates.php
M htdocs/api/class/api_documents.class.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/commande/class/api_deprecated_commande.class.php
M htdocs/commande/class/api_orders.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/card.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/class/api_invoices.class.php
M htdocs/compta/paiement_charge.php
M htdocs/compta/payment_sc/card.php
M htdocs/compta/sociales/card.php
M htdocs/compta/sociales/class/paymentsocialcontribution.class.php
M htdocs/contrat/card.php
M htdocs/contrat/list.php
M htdocs/core/actions_sendmails.inc.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/class/ldap.class.php
M htdocs/core/class/notify.class.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/lib/usergroups.lib.php
M htdocs/core/lib/website.lib.php
M htdocs/core/login/functions_ldap.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/dons/html_cerfafr.modules.php
M htdocs/core/tpl/card_presend.tpl.php
M htdocs/core/triggers/interface_50_modNotification_Notification.class.php
M htdocs/ecm/class/ecmfiles.class.php
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expensereport/class/api_expensereports.class.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/paiementfourn.class.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/paiement/card.php
M htdocs/holiday/class/holiday.class.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/tables/llx_c_email_templates.sql
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/companies.lang
M htdocs/langs/en_US/contracts.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/en_US/website.lang
M htdocs/product/class/product.class.php
M htdocs/product/inventory/card.php
M htdocs/product/list.php
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/projet/card.php
M htdocs/projet/class/api_tasks.class.php
M htdocs/projet/class/task.class.php
M htdocs/projet/list.php
M htdocs/public/demo/index.php
M htdocs/societe/card.php
M htdocs/theme/eldy/style.css.php
M htdocs/user/card.php
M htdocs/user/class/user.class.php
M htdocs/user/ldap.php
M htdocs/websites/class/website.class.php
M htdocs/websites/class/websitepage.class.php
M htdocs/websites/index.php
M scripts/invoices/rebuild_merge_pdf.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: e1fa96cc6ac112989b44562e1bfabe3b6056e9dc
https://github.com/Dolibarr/dolibarr/commit/e1fa96cc6ac112989b44562e1bfabe3b6056e9dc
Author: Rui Strecht <address@hidden>
Date: 2017-10-09 (Mon, 09 Oct 2017)
Changed paths:
M htdocs/comm/mailing/card.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/invoicetemplate_list.php
M htdocs/core/ajax/selectsearchbox.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/mysql/migration/repair.sql
M htdocs/langs/en_US/admin.lang
M htdocs/modulebuilder/template/class/actions_mymodule.class.php
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/projet/admin/project.php
M scripts/emailings/mailing-send.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Commit: 666e62b440116f5de1df05bae6cf11ea88ce72be
https://github.com/Dolibarr/dolibarr/commit/666e62b440116f5de1df05bae6cf11ea88ce72be
Author: Rui Strecht <address@hidden>
Date: 2017-10-09 (Mon, 09 Oct 2017)
Changed paths:
M htdocs/commande/card.php
M htdocs/commande/list.php
M htdocs/commande/stats/index.php
Log Message:
-----------
Fixed issue with inexistent constant in commande STATUS_ACCEPTED
Commit: 5b6ca687601df52a43862e178c0fe85f42292707
https://github.com/Dolibarr/dolibarr/commit/5b6ca687601df52a43862e178c0fe85f42292707
Author: Laurent Destailleur <address@hidden>
Date: 2017-10-11 (Wed, 11 Oct 2017)
Changed paths:
M htdocs/commande/card.php
M htdocs/commande/list.php
M htdocs/commande/stats/index.php
Log Message:
-----------
Merge pull request #7600 from ruistrecht-alt/Fix_STATUS_ACCEPTED_in_commande
Fix STATUS_ACCEPTED in commande
Compare:
https://github.com/Dolibarr/dolibarr/compare/e644f7df58fd...5b6ca687601d
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 7107fb: Merge branch 'NEW_Add_Region_to_third_party_societ...,
Laurent Destailleur <=