[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] c85bf1: Fix AdvtargetEmailing
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] c85bf1: Fix AdvtargetEmailing |
|
Date: |
Thu, 13 Jul 2017 15:25:09 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: c85bf18f0e20042739366d6d5df58a8a866ab292
https://github.com/Dolibarr/dolibarr/commit/c85bf18f0e20042739366d6d5df58a8a866ab292
Author: florian HENRY <address@hidden>
Date: 2017-07-11 (Tue, 11 Jul 2017)
Changed paths:
M htdocs/comm/mailing/advtargetemailing.php
M htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
M htdocs/install/mysql/tables/llx_mailing_cibles.sql
Log Message:
-----------
Fix AdvtargetEmailing
Commit: f745c8739405c6e4e1bbcb1cb50833cbf6cfab33
https://github.com/Dolibarr/dolibarr/commit/f745c8739405c6e4e1bbcb1cb50833cbf6cfab33
Author: Regis Houssin <address@hidden>
Date: 2017-07-11 (Tue, 11 Jul 2017)
Changed paths:
M htdocs/core/modules/modProduct.class.php
Log Message:
-----------
Fix: error during upgrade process
Commit: 94309525616d60647ba137f449ada6527777bca5
https://github.com/Dolibarr/dolibarr/commit/94309525616d60647ba137f449ada6527777bca5
Author: Regis Houssin <address@hidden>
Date: 2017-07-12 (Wed, 12 Jul 2017)
Changed paths:
M htdocs/comm/card.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Fix: missing entity filter (multicompany)
Commit: 379a5b9e1694e8a5fee2153cd6641d6f82f7ce5a
https://github.com/Dolibarr/dolibarr/commit/379a5b9e1694e8a5fee2153cd6641d6f82f7ce5a
Author: florian HENRY <address@hidden>
Date: 2017-07-12 (Wed, 12 Jul 2017)
Changed paths:
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
Log Message:
-----------
fix : SQL migration in capital letters
Commit: d63e15f0c6ff13de46e389ed6ffca1ac8ec75344
https://github.com/Dolibarr/dolibarr/commit/d63e15f0c6ff13de46e389ed6ffca1ac8ec75344
Author: Regis Houssin <address@hidden>
Date: 2017-07-12 (Wed, 12 Jul 2017)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/user/group/card.php
Log Message:
-----------
Fix: missing group name with dol_banner_tab
Commit: 44a44ab0a2b16b44d9423449817a03649f286f72
https://github.com/Dolibarr/dolibarr/commit/44a44ab0a2b16b44d9423449817a03649f286f72
Author: Regis Houssin <address@hidden>
Date: 2017-07-12 (Wed, 12 Jul 2017)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Fix: travis error
Commit: 67664331e33600cb4298e9574f3696855fc997c6
https://github.com/Dolibarr/dolibarr/commit/67664331e33600cb4298e9574f3696855fc997c6
Author: florian HENRY <address@hidden>
Date: 2017-07-12 (Wed, 12 Jul 2017)
Changed paths:
M htdocs/admin/notification.php
M htdocs/admin/websites.php
M htdocs/bookmarks/bookmarks.lib.php
M htdocs/comm/action/index.php
M htdocs/comm/action/listactions.php
M htdocs/contact/card.php
M htdocs/core/actions_setmoduleoptions.inc.php
M htdocs/core/class/menubase.class.php
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
M htdocs/install/mysql/migration/repair.sql
A htdocs/install/mysql/tables/llx_website_page.key.sql
A htdocs/install/mysql/tables/llx_website_page.sql
R htdocs/install/mysql/tables/llx_website_pages.key.sql
R htdocs/install/mysql/tables/llx_website_pages.sql
M htdocs/install/step1.php
M htdocs/langs/en_US/modulebuilder.lang
M htdocs/langs/en_US/website.lang
M htdocs/main.inc.php
M htdocs/modulebuilder/index.php
M htdocs/modulebuilder/template/class/myobject.class.php
M htdocs/modulebuilder/template/core/modules/modMyModule.class.php
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/projet/activity/perday.php
M htdocs/societe/price.php
M htdocs/theme/eldy/ckeditor/config.js
M htdocs/theme/md/ckeditor/config.js
M htdocs/websites/class/websitepage.class.php
M htdocs/websites/index.php
M test/phpunit/RestAPIDocumentTest.php
Log Message:
-----------
Merge branch '6.0' of local repository into 6.0_fix_advtargetmailing
Commit: 816283d1e56286dc748e8883e0a000d5b18ea3b9
https://github.com/Dolibarr/dolibarr/commit/816283d1e56286dc748e8883e0a000d5b18ea3b9
Author: florian HENRY <address@hidden>
Date: 2017-07-12 (Wed, 12 Jul 2017)
Changed paths:
M htdocs/comm/mailing/class/advtargetemailing.class.php
Log Message:
-----------
fix SQL
Commit: 0d4d4516c8c3c7fb07607bd706971969db2e9ca7
https://github.com/Dolibarr/dolibarr/commit/0d4d4516c8c3c7fb07607bd706971969db2e9ca7
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-12 (Wed, 12 Jul 2017)
Changed paths:
M htdocs/admin/tools/dolibarr_export.php
M htdocs/admin/tools/dolibarr_import.php
M htdocs/langs/en_US/admin.lang
M htdocs/modulebuilder/template/css/mymodule.css.php
M htdocs/modulebuilder/template/js/mymodule.js.php
Log Message:
-----------
Fix template for css and js
Commit: 4b4dcf2e01d483bbfa4b0b00a600a50c0d65da0a
https://github.com/Dolibarr/dolibarr/commit/4b4dcf2e01d483bbfa4b0b00a600a50c0d65da0a
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-12 (Wed, 12 Jul 2017)
Changed paths:
M htdocs/comm/action/index.php
Log Message:
-----------
Fix overload with a protection for rare case with very high nb of event
Commit: 23fbef3daebc0837803e98340a0f9d5e40ef3a24
https://github.com/Dolibarr/dolibarr/commit/23fbef3daebc0837803e98340a0f9d5e40ef3a24
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/admin/tools/purge.php
M htdocs/core/class/utils.class.php
M htdocs/core/lib/files.lib.php
M htdocs/langs/en_US/admin.lang
M test/phpunit/FilesLibTest.php
Log Message:
-----------
Fix the delete dir functions does not return real nb of deleted files.
Commit: 2870798d0728c4d0cdec0b7d7e061830dc371133
https://github.com/Dolibarr/dolibarr/commit/2870798d0728c4d0cdec0b7d7e061830dc371133
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/admin/productaccount.php
M htdocs/accountancy/bookkeeping/balance.php
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/bookkeeping/listbyaccount.php
M htdocs/accountancy/bookkeeping/listbyyear.php
M htdocs/accountancy/customer/lines.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/expensereport/lines.php
M htdocs/accountancy/expensereport/list.php
M htdocs/accountancy/supplier/lines.php
M htdocs/accountancy/supplier/list.php
M htdocs/adherents/list.php
M htdocs/adherents/subscription/list.php
M htdocs/adherents/type.php
M htdocs/admin/defaultvalues.php
M htdocs/admin/mails_templates.php
M htdocs/admin/tools/listevents.php
M htdocs/admin/translation.php
M htdocs/comm/action/listactions.php
M htdocs/comm/mailing/advtargetemailing.php
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/bank/bankentries.php
M htdocs/compta/bank/index.php
M htdocs/compta/bank/various_payment/index.php
M htdocs/compta/deplacement/list.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/facture/list.php
M htdocs/compta/paiement/cheque/list.php
M htdocs/compta/paiement/list.php
M htdocs/compta/prelevement/bons.php
M htdocs/compta/prelevement/list.php
M htdocs/compta/salaries/index.php
M htdocs/compta/sociales/index.php
M htdocs/compta/tva/reglement.php
M htdocs/contact/agenda.php
M htdocs/contrat/list.php
M htdocs/contrat/services.php
M htdocs/cron/list.php
M htdocs/don/list.php
M htdocs/expedition/list.php
M htdocs/expensereport/list.php
M htdocs/fichinter/list.php
M htdocs/fourn/commande/info.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/impayees.php
M htdocs/fourn/facture/list.php
M htdocs/fourn/facture/paiement.php
M htdocs/fourn/product/list.php
M htdocs/holiday/define_holiday.php
M htdocs/holiday/list.php
M htdocs/loan/index.php
M htdocs/margin/checkMargins.php
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/product/inventory/listview.class.php
M htdocs/product/list-with-listview.php
M htdocs/product/list.php
M htdocs/product/price.php
M htdocs/product/reassort.php
M htdocs/product/reassortlot.php
M htdocs/product/stats/commande.php
M htdocs/product/stats/commande_fournisseur.php
M htdocs/product/stats/facture.php
M htdocs/product/stats/facture_fournisseur.php
M htdocs/product/stats/propal.php
M htdocs/product/stock/list.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/productlot_list.php
M htdocs/product/stock/replenish.php
M htdocs/product/stock/replenishorders.php
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/projet/info.php
M htdocs/projet/list.php
M htdocs/projet/tasks.php
M htdocs/projet/tasks/list.php
M htdocs/projet/tasks/time.php
M htdocs/resource/list.php
M htdocs/societe/agenda.php
M htdocs/societe/consumption.php
M htdocs/societe/list.php
M htdocs/societe/price.php
M htdocs/supplier_proposal/list.php
M htdocs/user/group/index.php
M htdocs/user/hierarchy.php
M htdocs/user/index.php
Log Message:
-----------
Fix remove warnings
Commit: 3fae3a9edac3e5155b2137e9eec47a0d637a43c9
https://github.com/Dolibarr/dolibarr/commit/3fae3a9edac3e5155b2137e9eec47a0d637a43c9
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/accountancy/bookkeeping/card.php
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
Fix typo
Commit: 3fd505d98fc6bc579931ef37b5355e825cfe4b89
https://github.com/Dolibarr/dolibarr/commit/3fd505d98fc6bc579931ef37b5355e825cfe4b89
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/accountancy/bookkeeping/card.php
Log Message:
-----------
Fix error management when making
Commit: bb828f5c9cc12cb2d2e6a7be878b8431a8bf3bf9
https://github.com/Dolibarr/dolibarr/commit/bb828f5c9cc12cb2d2e6a7be878b8431a8bf3bf9
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/accountancy/customer/lines.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/expensereport/lines.php
M htdocs/accountancy/expensereport/list.php
M htdocs/accountancy/supplier/lines.php
M htdocs/accountancy/supplier/list.php
Log Message:
-----------
Fix vat src code must be visible into bind step
Commit: 9127892c713c2e85ae5c435245fe20b1f6a613fc
https://github.com/Dolibarr/dolibarr/commit/9127892c713c2e85ae5c435245fe20b1f6a613fc
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/accountancy/customer/lines.php
M htdocs/accountancy/expensereport/lines.php
M htdocs/accountancy/expensereport/list.php
M htdocs/accountancy/supplier/lines.php
M htdocs/commande/list.php
M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
M htdocs/langs/en_US/workflow.lang
M htdocs/modulebuilder/template/myobject_list.php
Log Message:
-----------
Fix several minor bugs
Commit: 0b4a1d9b653923ff29c0797df9b5f4fde63f6cc6
https://github.com/Dolibarr/dolibarr/commit/0b4a1d9b653923ff29c0797df9b5f4fde63f6cc6
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/commande/list.php
M htdocs/modulebuilder/template/myobject_list.php
Log Message:
-----------
Protection to avoid mass action execution when not required
Commit: fb0298ff1c4bb92b7eb64ae325de592c748e9037
https://github.com/Dolibarr/dolibarr/commit/fb0298ff1c4bb92b7eb64ae325de592c748e9037
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/modulebuilder/template/myobject_card.php
M htdocs/modulebuilder/template/myobject_list.php
Log Message:
-----------
Fix template should work if module in root dir
Commit: 028f1f513388634038b8c24097e48317fe8a4354
https://github.com/Dolibarr/dolibarr/commit/028f1f513388634038b8c24097e48317fe8a4354
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/admin/multicurrency.php
M htdocs/comm/propal/card.php
M htdocs/langs/en_US/multicurrency.lang
M htdocs/supplier_proposal/card.php
Log Message:
-----------
Fix default currency in creation form.
Commit: 2141cfb2824c3c15455a99906ea85e3708f9c8ec
https://github.com/Dolibarr/dolibarr/commit/2141cfb2824c3c15455a99906ea85e3708f9c8ec
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
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_modMailmanspip_Mailmanspipsynchro.class.php
M htdocs/core/triggers/interface_50_modNotification_Notification.class.php
R htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
M htdocs/langs/en_US/multicurrency.lang
M
htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
Log Message:
-----------
Fix code of triggers (disabled if module not enabled)
Commit: 743de4e586dd845d3e7c30b1bb32cd83eef3eb9d
https://github.com/Dolibarr/dolibarr/commit/743de4e586dd845d3e7c30b1bb32cd83eef3eb9d
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/admin/workflow.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
M htdocs/langs/en_US/workflow.lang
Log Message:
-----------
FIX Option to classify proposal/order in workflow module must not set
source object to billed if amount differs.
Commit: f5995cadefae9f5d99eba75ecb4765f8c99314b4
https://github.com/Dolibarr/dolibarr/commit/f5995cadefae9f5d99eba75ecb4765f8c99314b4
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
Log Message:
-----------
Fix detection of payment for credit note
Commit: 10337b4914aec0f2becdeb6ab30a2fdb9da64ad5
https://github.com/Dolibarr/dolibarr/commit/10337b4914aec0f2becdeb6ab30a2fdb9da64ad5
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/install/mysql/tables/llx_mailing_cibles.sql
Log Message:
-----------
Update llx_mailing_cibles.sql
Commit: 13cee533843ceb05a38e87d935565d04811f6716
https://github.com/Dolibarr/dolibarr/commit/13cee533843ceb05a38e87d935565d04811f6716
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
Log Message:
-----------
Update 5.0.0-6.0.0.sql
Commit: 58ce8eaf462002fc7e4ac029984b8d65d3c565f1
https://github.com/Dolibarr/dolibarr/commit/58ce8eaf462002fc7e4ac029984b8d65d3c565f1
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/comm/mailing/advtargetemailing.php
M htdocs/comm/mailing/class/advtargetemailing.class.php
M htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
M htdocs/install/mysql/tables/llx_mailing_cibles.sql
Log Message:
-----------
Merge pull request #7138 from atm-florian/6.0_fix_advtargetmailing
Fix AdvtargetEmailing
Commit: 9ca12c9d11724c6e845ede2a64f51339f49df435
https://github.com/Dolibarr/dolibarr/commit/9ca12c9d11724c6e845ede2a64f51339f49df435
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/core/modules/modProduct.class.php
Log Message:
-----------
Merge pull request #7141 from hregis/6.0
Fix: error during upgrade process
Commit: bea3ced7631a39ff72d0def2445e9865bf06d2aa
https://github.com/Dolibarr/dolibarr/commit/bea3ced7631a39ff72d0def2445e9865bf06d2aa
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/comm/mailing/advtargetemailing.php
M htdocs/comm/mailing/class/advtargetemailing.class.php
M htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
M htdocs/core/modules/modProduct.class.php
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
M htdocs/install/mysql/tables/llx_mailing_cibles.sql
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Commit: 74e29a3fdb0e473b74b363ee3c3801134df787ab
https://github.com/Dolibarr/dolibarr/commit/74e29a3fdb0e473b74b363ee3c3801134df787ab
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/projet/tasks/task.php
Log Message:
-----------
FIX empty object
Commit: 4ee70e496e34eabcf2f56109fa5d489fc2d91694
https://github.com/Dolibarr/dolibarr/commit/4ee70e496e34eabcf2f56109fa5d489fc2d91694
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/comm/card.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Merge pull request #7143 from hregis/6.0_bug
Fix: missing entity filter (multicompany)
Commit: 85d9a2f790acfd82cbdf4d951738d574838052e9
https://github.com/Dolibarr/dolibarr/commit/85d9a2f790acfd82cbdf4d951738d574838052e9
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/user/group/card.php
Log Message:
-----------
Merge pull request #7145 from hregis/6.0_bug2
Fix: missing group name with dol_banner_tab
Commit: ae7797ebf2e98a49c4ed1e54fb2ceeb7534f5663
https://github.com/Dolibarr/dolibarr/commit/ae7797ebf2e98a49c4ed1e54fb2ceeb7534f5663
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/user/group/card.php
M htdocs/user/group/ldap.php
M htdocs/user/group/perms.php
Log Message:
-----------
Look and feel v6
Commit: c434f72d3132a55945cb57f61b46bf3f76b9ae4a
https://github.com/Dolibarr/dolibarr/commit/c434f72d3132a55945cb57f61b46bf3f76b9ae4a
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge pull request #7146 from hregis/6.0_bug3
Fix: travis error (categorie)
Commit: 43f6eab2ea72319be7a8059a9ab22ff2653c4934
https://github.com/Dolibarr/dolibarr/commit/43f6eab2ea72319be7a8059a9ab22ff2653c4934
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/categories/admin/categorie_extrafields.php
M htdocs/categories/class/categorie.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
Log Message:
-----------
FIX #7146
Commit: 7eb4562432955bd7cad4da08adba379e9658310c
https://github.com/Dolibarr/dolibarr/commit/7eb4562432955bd7cad4da08adba379e9658310c
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Code comment
Commit: be8e15a77784d7573deaab5b9739d2d40be79d06
https://github.com/Dolibarr/dolibarr/commit/be8e15a77784d7573deaab5b9739d2d40be79d06
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
Log Message:
-----------
Prepare fix
Commit: 2b77c9b5c7a31cd1047bfb3bded3c585b6b31e49
https://github.com/Dolibarr/dolibarr/commit/2b77c9b5c7a31cd1047bfb3bded3c585b6b31e49
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/compta/facture/card.php
M htdocs/compta/facture/fiche-rec.php
Log Message:
-----------
FIX #7050
Commit: 3db7bd762446cc77ad99383708f5d38b31051260
https://github.com/Dolibarr/dolibarr/commit/3db7bd762446cc77ad99383708f5d38b31051260
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/compta/facture/fiche-rec.php
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
M htdocs/install/mysql/tables/llx_facture_rec.sql
M htdocs/install/pgsql/functions/functions.sql
M htdocs/modulebuilder/template/myobject_list.php
Log Message:
-----------
Fix look and feel v6
Commit: 652d715fdc70baee99bd829076438d5efa1c5966
https://github.com/Dolibarr/dolibarr/commit/652d715fdc70baee99bd829076438d5efa1c5966
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
M htdocs/langs/en_US/banks.lang
Log Message:
-----------
Better translation
Commit: 312b153005751411c0bb9083e10e8de07bcd73c5
https://github.com/Dolibarr/dolibarr/commit/312b153005751411c0bb9083e10e8de07bcd73c5
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.formmailing.class.php
M htdocs/core/lib/modulebuilder.lib.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
Log Message:
-----------
Fix phpcs
Commit: f106ff7e76ad441ab91a6ff80d82305c0387b21f
https://github.com/Dolibarr/dolibarr/commit/f106ff7e76ad441ab91a6ff80d82305c0387b21f
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-13 (Thu, 13 Jul 2017)
Changed paths:
M htdocs/contact/class/contact.class.php
M htdocs/user/class/usergroup.class.php
Log Message:
-----------
Fix var init
Commit: f9a99f506fa00f79e060e025457aabeb03838375
https://github.com/Dolibarr/dolibarr/commit/f9a99f506fa00f79e060e025457aabeb03838375
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-14 (Fri, 14 Jul 2017)
Changed paths:
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/admin/productaccount.php
M htdocs/accountancy/bookkeeping/balance.php
M htdocs/accountancy/bookkeeping/card.php
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/bookkeeping/listbyaccount.php
M htdocs/accountancy/bookkeeping/listbyyear.php
M htdocs/accountancy/customer/lines.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/expensereport/lines.php
M htdocs/accountancy/expensereport/list.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/supplier/lines.php
M htdocs/accountancy/supplier/list.php
M htdocs/adherents/list.php
M htdocs/adherents/subscription/list.php
M htdocs/adherents/type.php
M htdocs/admin/defaultvalues.php
M htdocs/admin/mails_templates.php
M htdocs/admin/multicurrency.php
M htdocs/admin/tools/dolibarr_export.php
M htdocs/admin/tools/dolibarr_import.php
M htdocs/admin/tools/listevents.php
M htdocs/admin/tools/purge.php
M htdocs/admin/translation.php
M htdocs/admin/workflow.php
M htdocs/categories/admin/categorie_extrafields.php
M htdocs/categories/class/categorie.class.php
M htdocs/comm/action/index.php
M htdocs/comm/action/listactions.php
M htdocs/comm/card.php
M htdocs/comm/mailing/advtargetemailing.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/comm/propal/class/propal.class.php
M htdocs/comm/propal/list.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/list.php
M htdocs/compta/bank/bankentries.php
M htdocs/compta/bank/index.php
M htdocs/compta/bank/various_payment/index.php
M htdocs/compta/deplacement/list.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/facture/list.php
M htdocs/compta/paiement/cheque/list.php
M htdocs/compta/paiement/list.php
M htdocs/compta/prelevement/bons.php
M htdocs/compta/prelevement/list.php
M htdocs/compta/salaries/index.php
M htdocs/compta/sociales/index.php
M htdocs/compta/tva/reglement.php
M htdocs/contact/agenda.php
M htdocs/contact/class/contact.class.php
M htdocs/contrat/list.php
M htdocs/contrat/services.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.formmailing.class.php
M htdocs/core/class/utils.class.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/modulebuilder.lib.php
M htdocs/core/modules/modProduct.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_modMailmanspip_Mailmanspipsynchro.class.php
M htdocs/core/triggers/interface_50_modNotification_Notification.class.php
R htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
M htdocs/cron/list.php
M htdocs/don/list.php
M htdocs/expedition/list.php
M htdocs/expensereport/list.php
M htdocs/fichinter/list.php
M htdocs/fourn/commande/info.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/impayees.php
M htdocs/fourn/facture/list.php
M htdocs/fourn/facture/paiement.php
M htdocs/fourn/product/list.php
M htdocs/holiday/define_holiday.php
M htdocs/holiday/list.php
M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
M htdocs/install/mysql/tables/llx_facture_rec.sql
M htdocs/install/mysql/tables/llx_mailing_cibles.sql
M htdocs/install/pgsql/functions/functions.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/multicurrency.lang
M htdocs/langs/en_US/workflow.lang
M htdocs/loan/index.php
M htdocs/margin/checkMargins.php
M
htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
M htdocs/modulebuilder/template/css/mymodule.css.php
M htdocs/modulebuilder/template/js/mymodule.js.php
M htdocs/modulebuilder/template/myobject_card.php
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/product/inventory/listview.class.php
M htdocs/product/list-with-listview.php
M htdocs/product/list.php
M htdocs/product/price.php
M htdocs/product/reassort.php
M htdocs/product/reassortlot.php
M htdocs/product/stats/commande.php
M htdocs/product/stats/commande_fournisseur.php
M htdocs/product/stats/facture.php
M htdocs/product/stats/facture_fournisseur.php
M htdocs/product/stats/propal.php
M htdocs/product/stock/list.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/productlot_list.php
M htdocs/product/stock/replenish.php
M htdocs/product/stock/replenishorders.php
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/projet/info.php
M htdocs/projet/list.php
M htdocs/projet/tasks.php
M htdocs/projet/tasks/list.php
M htdocs/projet/tasks/task.php
M htdocs/projet/tasks/time.php
M htdocs/resource/list.php
M htdocs/societe/agenda.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/consumption.php
M htdocs/societe/list.php
M htdocs/societe/price.php
M htdocs/supplier_proposal/card.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M htdocs/supplier_proposal/list.php
M htdocs/user/class/usergroup.class.php
M htdocs/user/group/card.php
M htdocs/user/group/index.php
M htdocs/user/group/ldap.php
M htdocs/user/group/perms.php
M htdocs/user/hierarchy.php
M htdocs/user/index.php
M test/phpunit/FilesLibTest.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into develop
Commit: 201db3b72008cbeac593adec43e8be8a4e0622c4
https://github.com/Dolibarr/dolibarr/commit/201db3b72008cbeac593adec43e8be8a4e0622c4
Author: Laurent Destailleur <address@hidden>
Date: 2017-07-14 (Fri, 14 Jul 2017)
Changed paths:
M htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
M htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
M htdocs/accountancy/class/lettering.class.php
M htdocs/accountancy/customer/card.php
M htdocs/accountancy/customer/index.php
M htdocs/accountancy/expensereport/card.php
M htdocs/accountancy/supplier/card.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/projet/tasks/task.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/dec1ae863bef...201db3b72008