[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 2ba7c0: FIX: propal: correctly preset
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 2ba7c0: FIX: propal: correctly preset project when creatin... |
|
Date: |
Sun, 12 Aug 2018 11:10:23 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 2ba7c075742c299131ba1e86a73dea6577125cc5
https://github.com/Dolibarr/dolibarr/commit/2ba7c075742c299131ba1e86a73dea6577125cc5
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-07-09 (Mon, 09 Jul 2018)
Changed paths:
M htdocs/comm/propal/card.php
Log Message:
-----------
FIX: propal: correctly preset project when creating with origin/originid
Commit: 97b1589fb51ba549a8762fc9d5feb0d929f4b541
https://github.com/Dolibarr/dolibarr/commit/97b1589fb51ba549a8762fc9d5feb0d929f4b541
Author: Laurent Destailleur <address@hidden>
Date: 2018-07-10 (Tue, 10 Jul 2018)
Changed paths:
M htdocs/comm/propal/card.php
Log Message:
-----------
Merge pull request #9082 from ATM-Marc/FIX_5.0_propal_projectFromOrigin
FIX: propal: correctly preset project when creating with origin/originid
Commit: 103c7e6d066ad7a0754e6db85a93e8ac4b7252e6
https://github.com/Dolibarr/dolibarr/commit/103c7e6d066ad7a0754e6db85a93e8ac4b7252e6
Author: gauthier <address@hidden>
Date: 2018-07-11 (Wed, 11 Jul 2018)
Changed paths:
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/facture/list.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/list.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/list.php
Log Message:
-----------
FIX : page must always be 0 when we search (to avoid case : when we're on
page 3 and we're looking for a precise thirdparty, we stay on page 3 and
nothing's displaied)
Commit: 80ff7fa86f34d11c9facedac8bab3b3250b91b53
https://github.com/Dolibarr/dolibarr/commit/80ff7fa86f34d11c9facedac8bab3b3250b91b53
Author: gauthier <address@hidden>
Date: 2018-07-11 (Wed, 11 Jul 2018)
Changed paths:
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/facture/list.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/list.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/list.php
Log Message:
-----------
FIX : case when we valid form with keyboard
Commit: 7dada7ae8e2c020cda81d614c96d694c7d1f99da
https://github.com/Dolibarr/dolibarr/commit/7dada7ae8e2c020cda81d614c96d694c7d1f99da
Author: Frédéric FRANCE <address@hidden>
Date: 2018-07-29 (Sun, 29 Jul 2018)
Changed paths:
M htdocs/product/reassort.php
Log Message:
-----------
fix #8820
Commit: b9a44fc76bbe4fe4f84f8fdfe0b41ab278b82fe3
https://github.com/Dolibarr/dolibarr/commit/b9a44fc76bbe4fe4f84f8fdfe0b41ab278b82fe3
Author: ATM-Nicolas <address@hidden>
Date: 2018-07-31 (Tue, 31 Jul 2018)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
FIX : Wrong position of firstname lastname
Commit: 4ddca02bb9d86d3e6abfdfe2cb4a75359e9e3582
https://github.com/Dolibarr/dolibarr/commit/4ddca02bb9d86d3e6abfdfe2cb4a75359e9e3582
Author: John BOTELLA <address@hidden>
Date: 2018-07-31 (Tue, 31 Jul 2018)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
fix situation line's total
Commit: ceb85cfa45d60cb987a3ef5271cd11fef844d99d
https://github.com/Dolibarr/dolibarr/commit/ceb85cfa45d60cb987a3ef5271cd11fef844d99d
Author: florian HENRY <address@hidden>
Date: 2018-07-31 (Tue, 31 Jul 2018)
Changed paths:
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
Log Message:
-----------
fix : odt project and task extrafields management
Commit: 2cf51fbdf1ec8c46b9f76f205a9786fc5956bffa
https://github.com/Dolibarr/dolibarr/commit/2cf51fbdf1ec8c46b9f76f205a9786fc5956bffa
Author: Juanjo Menent <address@hidden>
Date: 2018-08-02 (Thu, 02 Aug 2018)
Changed paths:
M htdocs/product/reassort.php
Log Message:
-----------
Merge pull request #9173 from frederic34/patch-22
fix #8820
Commit: b5a0e14ffea0b5208f68b79712dc1b1f5ef09976
https://github.com/Dolibarr/dolibarr/commit/b5a0e14ffea0b5208f68b79712dc1b1f5ef09976
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-02 (Thu, 02 Aug 2018)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Merge pull request #9185 from atm-john/fix_situation_total_calcul
Important: fix situation line's total
Commit: e85ec190182220cc8b7a1460e65367ef020f0e16
https://github.com/Dolibarr/dolibarr/commit/e85ec190182220cc8b7a1460e65367ef020f0e16
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-02 (Thu, 02 Aug 2018)
Changed paths:
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/facture/list.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/list.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/list.php
Log Message:
-----------
Merge pull request #9093 from atm-gauthier/FIX_filters
FIX : page must always be 0 when we search
Commit: 70adfb135dc332c30a225b1412fd1e50f71f2992
https://github.com/Dolibarr/dolibarr/commit/70adfb135dc332c30a225b1412fd1e50f71f2992
Author: ATM-Nicolas <address@hidden>
Date: 2018-08-03 (Fri, 03 Aug 2018)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
FIX : Missing behavior
Commit: 615ed115343b4f49345a30589e45759d1ee3721d
https://github.com/Dolibarr/dolibarr/commit/615ed115343b4f49345a30589e45759d1ee3721d
Author: florian HENRY <address@hidden>
Date: 2018-08-03 (Fri, 03 Aug 2018)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
fix bad use of test_sql_and_script_inject return int not value tested
Commit: 0d85eb52c5c92278f8dabd93083c5fb71b5447ee
https://github.com/Dolibarr/dolibarr/commit/0d85eb52c5c92278f8dabd93083c5fb71b5447ee
Author: florian HENRY <address@hidden>
Date: 2018-08-03 (Fri, 03 Aug 2018)
Changed paths:
M htdocs/contact/list.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/class/extrafields.class.php
M htdocs/expedition/card.php
M htdocs/fourn/facture/list.php
M htdocs/societe/consumption.php
Log Message:
-----------
Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0
Commit: 74d05da149655e29933b689881d0881833203b7c
https://github.com/Dolibarr/dolibarr/commit/74d05da149655e29933b689881d0881833203b7c
Author: florian HENRY <address@hidden>
Date: 2018-08-06 (Mon, 06 Aug 2018)
Changed paths:
M htdocs/holiday/card.php
Log Message:
-----------
fix : display if error
Commit: e84018ac1532daabea7e4a25b6f5ef4a43630755
https://github.com/Dolibarr/dolibarr/commit/e84018ac1532daabea7e4a25b6f5ef4a43630755
Author: ptibogxiv <address@hidden>
Date: 2018-08-06 (Mon, 06 Aug 2018)
Changed paths:
M htdocs/public/stripe/ipn.php
Log Message:
-----------
Fix 3D secure
convett to dolibarr standard stripe payment metadata
Commit: 9024ed9e6193230f2a4c50b1dffa267658d17f95
https://github.com/Dolibarr/dolibarr/commit/9024ed9e6193230f2a4c50b1dffa267658d17f95
Author: florian HENRY <address@hidden>
Date: 2018-08-09 (Thu, 09 Aug 2018)
Changed paths:
M htdocs/api/class/api.class.php
M htdocs/commande/list.php
M htdocs/core/class/commonobject.class.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
Log Message:
-----------
Merge branch '7.0' into 7.0_fhe
Commit: 06189f815346822e8a02166ba8ea96a0c39443aa
https://github.com/Dolibarr/dolibarr/commit/06189f815346822e8a02166ba8ea96a0c39443aa
Author: florian HENRY <address@hidden>
Date: 2018-08-09 (Thu, 09 Aug 2018)
Changed paths:
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/list.php
M htdocs/core/lib/pdf.lib.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/list.php
M htdocs/product/reassort.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/list.php
Log Message:
-----------
Merge branch '6.0' into 6.0_fhe
Commit: 9b50bc21970d8dac2b94878880aaf782af0a0683
https://github.com/Dolibarr/dolibarr/commit/9b50bc21970d8dac2b94878880aaf782af0a0683
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-09 (Thu, 09 Aug 2018)
Changed paths:
M htdocs/comm/propal/list.php
Log Message:
-----------
Fix css
Commit: f0a32a2dead96577c9813acf995b41130ac54499
https://github.com/Dolibarr/dolibarr/commit/f0a32a2dead96577c9813acf995b41130ac54499
Author: florian HENRY <address@hidden>
Date: 2018-08-09 (Thu, 09 Aug 2018)
Changed paths:
M htdocs/adherents/subscription.php
Log Message:
-----------
fix : remove comment on commit
Commit: 2dbb6e258beca78e337a49c37e6bbca142b00598
https://github.com/Dolibarr/dolibarr/commit/2dbb6e258beca78e337a49c37e6bbca142b00598
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-09 (Thu, 09 Aug 2018)
Changed paths:
M htdocs/blockedlog/admin/blockedlog_list.php
M htdocs/core/class/html.form.class.php
M htdocs/langs/en_US/blockedlog.lang
Log Message:
-----------
FIX Can filter on month in export of blockedlog
FIX Fingerprint correct in popup
Commit: 1af9700a581e97aaa9f2228f3e7140fee573c38b
https://github.com/Dolibarr/dolibarr/commit/1af9700a581e97aaa9f2228f3e7140fee573c38b
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-09 (Thu, 09 Aug 2018)
Changed paths:
M htdocs/blockedlog/admin/blockedlog_list.php
Log Message:
-----------
Fix responsive
Commit: 39f4eae07e1e25d94e910887decc23cacb9966a5
https://github.com/Dolibarr/dolibarr/commit/39f4eae07e1e25d94e910887decc23cacb9966a5
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-09 (Thu, 09 Aug 2018)
Changed paths:
M htdocs/user/hierarchy.php
M htdocs/user/list.php
Log Message:
-----------
Fix look and feel v8
Commit: d8d54d246c5cc64cf0699efbf6aeef73b7d89dcd
https://github.com/Dolibarr/dolibarr/commit/d8d54d246c5cc64cf0699efbf6aeef73b7d89dcd
Author: ATM-Nicolas <address@hidden>
Date: 2018-08-10 (Fri, 10 Aug 2018)
Changed paths:
M htdocs/compta/prelevement/create.php
Log Message:
-----------
FIX : Pagination on withdraw request list
Commit: 391230babcc097772bad8edfc560a779c4b0408b
https://github.com/Dolibarr/dolibarr/commit/391230babcc097772bad8edfc560a779c4b0408b
Author: gauthier <address@hidden>
Date: 2018-08-10 (Fri, 10 Aug 2018)
Changed paths:
M htdocs/core/modules/modService.class.php
Log Message:
-----------
FIX : global $mysoc missing (to avoid php notice on lines 279, 280 & 281)
Commit: 12e21b48866ec7ad7de996afe2c0b182c3aea45c
https://github.com/Dolibarr/dolibarr/commit/12e21b48866ec7ad7de996afe2c0b182c3aea45c
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-12 (Sun, 12 Aug 2018)
Changed paths:
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/contact/class/contact.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/product/class/product.class.php
M htdocs/societe/class/societe.class.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M htdocs/user/class/user.class.php
Log Message:
-----------
FIX update extrafields
Commit: 3d4d42462c84d2554d98df3ab3eb4fece85822e0
https://github.com/Dolibarr/dolibarr/commit/3d4d42462c84d2554d98df3ab3eb4fece85822e0
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-12 (Sun, 12 Aug 2018)
Changed paths:
M htdocs/admin/multicurrency.php
M htdocs/api/class/api.class.php
M htdocs/asset/card.php
M htdocs/blockedlog/admin/blockedlog_list.php
M htdocs/comm/propal/list.php
M htdocs/commande/list.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/class/html.form.class.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/expedition/card.php
M htdocs/fourn/facture/list.php
M htdocs/langs/en_US/blockedlog.lang
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/societe/consumption.php
M htdocs/theme/eldy/ckeditor/config.js
M htdocs/theme/md/ckeditor/config.js
M htdocs/user/hierarchy.php
M htdocs/user/list.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Commit: 9124d5c6a50ca8b468ba88dbd8ba777ca7ed65fc
https://github.com/Dolibarr/dolibarr/commit/9124d5c6a50ca8b468ba88dbd8ba777ca7ed65fc
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-12 (Sun, 12 Aug 2018)
Changed paths:
M htdocs/core/modules/modService.class.php
Log Message:
-----------
Merge pull request #9231 from atm-gauthier/7.0_fix_notice
FIX : global $mysoc missing (to avoid php notice on lines 279, 280 & 281
Commit: 8d03d58d5420eaea7849888630f8cdc528263141
https://github.com/Dolibarr/dolibarr/commit/8d03d58d5420eaea7849888630f8cdc528263141
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-12 (Sun, 12 Aug 2018)
Changed paths:
M htdocs/public/stripe/ipn.php
Log Message:
-----------
Merge pull request #9209 from ptibogxiv/patch-34
Fix 3D secure
Commit: 6954ab00f9ada8e986af9594e210034652e834f6
https://github.com/Dolibarr/dolibarr/commit/6954ab00f9ada8e986af9594e210034652e834f6
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-12 (Sun, 12 Aug 2018)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Update functions.lib.php
Commit: 56d8935976b17d09b57b0e6f1c252c94d0fdb329
https://github.com/Dolibarr/dolibarr/commit/56d8935976b17d09b57b0e6f1c252c94d0fdb329
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-12 (Sun, 12 Aug 2018)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge pull request #9181 from ATM-Nicolas/fix_dolGetFirstLastname
FIX : Wrong position of firstname lastname
Commit: 7f797668c9015c9f94b16ea36db27b14611a3b71
https://github.com/Dolibarr/dolibarr/commit/7f797668c9015c9f94b16ea36db27b14611a3b71
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-12 (Sun, 12 Aug 2018)
Changed paths:
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
Log Message:
-----------
Merge pull request #9186 from atm-florian/6.0
fix : odt project and task extrafields management
Commit: be7a764de77fbe2bfa71281b9a5bc8a52f10eb72
https://github.com/Dolibarr/dolibarr/commit/be7a764de77fbe2bfa71281b9a5bc8a52f10eb72
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-12 (Sun, 12 Aug 2018)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/holiday/card.php
Log Message:
-----------
Merge pull request #9202 from atm-florian/7.0
fix bad use of test_sql_and_script_inject return int not value tested
Commit: b11d5c2f71eb00014197e8b306bac3688b447c6a
https://github.com/Dolibarr/dolibarr/commit/b11d5c2f71eb00014197e8b306bac3688b447c6a
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-12 (Sun, 12 Aug 2018)
Changed paths:
M htdocs/adherents/subscription.php
Log Message:
-----------
Merge pull request #9228 from atm-florian/8.0
fix : remove comment on commit
Commit: ddbfaf07888590f9271e877adde3a56adaa345e9
https://github.com/Dolibarr/dolibarr/commit/ddbfaf07888590f9271e877adde3a56adaa345e9
Author: Jan <address@hidden>
Date: 2018-08-12 (Sun, 12 Aug 2018)
Changed paths:
M htdocs/webservices/server_productorservice.php
Log Message:
-----------
wrong position of counter reset
extrafields will work now ;) and not the first product gets the last
extrafields values
Commit: b81b6b651f546209127a42ff3f566fd160a4f510
https://github.com/Dolibarr/dolibarr/commit/b81b6b651f546209127a42ff3f566fd160a4f510
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-12 (Sun, 12 Aug 2018)
Changed paths:
M htdocs/comm/propal/card.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Commit: 234b0d312076d1fc5d42209039695821d62deaa8
https://github.com/Dolibarr/dolibarr/commit/234b0d312076d1fc5d42209039695821d62deaa8
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-12 (Sun, 12 Aug 2018)
Changed paths:
M htdocs/compta/prelevement/create.php
Log Message:
-----------
Merge pull request #9230 from ATM-Nicolas/fix_withdraw_pagination
FIX : Pagination on withdraw request list
Commit: 61a5be6e2a59b0c4fad162b46e172ea4eca958f3
https://github.com/Dolibarr/dolibarr/commit/61a5be6e2a59b0c4fad162b46e172ea4eca958f3
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-12 (Sun, 12 Aug 2018)
Changed paths:
M htdocs/comm/action/index.php
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/list.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/tpl/notes.tpl.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/list.php
M htdocs/product/reassort.php
M htdocs/projet/class/project.class.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/list.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Commit: 30b4d8842869c213663168cdd7c9d8cf5a469739
https://github.com/Dolibarr/dolibarr/commit/30b4d8842869c213663168cdd7c9d8cf5a469739
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-12 (Sun, 12 Aug 2018)
Changed paths:
M htdocs/comm/propal/card.php
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/list.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/list.php
M htdocs/product/reassort.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/list.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/compta/facture/list.php
htdocs/product/reassort.php
htdocs/societe/list.php
Commit: 2d571acc03303856ea30e6c737b7023963f6b96c
https://github.com/Dolibarr/dolibarr/commit/2d571acc03303856ea30e6c737b7023963f6b96c
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-12 (Sun, 12 Aug 2018)
Changed paths:
M htdocs/api/class/api.class.php
M htdocs/commande/list.php
M htdocs/compta/prelevement/create.php
M htdocs/contact/list.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/class/html.form.class.php
M htdocs/core/lib/functions.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/modService.class.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/expedition/card.php
M htdocs/fourn/facture/list.php
M htdocs/holiday/card.php
M htdocs/societe/consumption.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/commande/list.php
Commit: 0a1c6e7194ddee2cf96b562e42b5e96d763275e5
https://github.com/Dolibarr/dolibarr/commit/0a1c6e7194ddee2cf96b562e42b5e96d763275e5
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-12 (Sun, 12 Aug 2018)
Changed paths:
M htdocs/comm/propal/card.php
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/list.php
M htdocs/compta/prelevement/create.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/modules/modService.class.php
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/list.php
M htdocs/holiday/card.php
M htdocs/product/reassort.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/list.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/comm/propal/list.php
htdocs/compta/facture/list.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
Commit: dc8c4402eeb7c587afa81762021899aa153ac1aa
https://github.com/Dolibarr/dolibarr/commit/dc8c4402eeb7c587afa81762021899aa153ac1aa
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-12 (Sun, 12 Aug 2018)
Changed paths:
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/subscription.php
M htdocs/admin/multicurrency.php
M htdocs/api/class/api.class.php
M htdocs/asset/card.php
M htdocs/blockedlog/admin/blockedlog_list.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/facture/class/facture.class.php
M htdocs/compta/facture/list.php
M htdocs/compta/prelevement/create.php
M htdocs/contact/class/contact.class.php
M htdocs/contrat/class/contrat.class.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/class/html.form.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/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/modService.class.php
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/list.php
M htdocs/holiday/card.php
M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
M htdocs/install/upgrade2.php
M htdocs/langs/en_US/blockedlog.lang
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/product/class/product.class.php
M htdocs/product/reassort.php
M htdocs/public/stripe/ipn.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/consumption.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M htdocs/supplier_proposal/list.php
M htdocs/theme/eldy/ckeditor/config.js
M htdocs/theme/md/ckeditor/config.js
M htdocs/user/class/api_users.class.php
M htdocs/user/class/user.class.php
M htdocs/user/hierarchy.php
M htdocs/user/list.php
M htdocs/webservices/server_productorservice.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into develop
Commit: 9fc5d39d07c0624dcc68b175376d5868aca8c792
https://github.com/Dolibarr/dolibarr/commit/9fc5d39d07c0624dcc68b175376d5868aca8c792
Author: Laurent Destailleur <address@hidden>
Date: 2018-08-12 (Sun, 12 Aug 2018)
Changed paths:
M .travis.yml
M build/generate_filelist_xml.php
M dev/examples/code/create_invoice.php
M dev/examples/code/create_order.php
M dev/examples/code/create_product.php
M dev/examples/code/create_user.php
M dev/examples/code/get_contracts.php
M dev/initdata/generate-invoice.php
M dev/initdata/generate-order.php
M dev/initdata/generate-product.php
M dev/initdata/generate-proposal.php
M dev/initdata/generate-thirdparty.php
M dev/initdata/import-products.php
M dev/initdata/import-thirdparties.php
M dev/initdata/import-users.php
M dev/initdata/purge-data.php
M dev/initdemo/sftpget_and_loaddump.php
M dev/initdemo/updatedemo.php
M dev/setup/codesniffer/ruleset.xml
M dev/tools/test/testtcpdf.php
M dev/tools/test/testutf.php
M dev/translation/autotranslator.php
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/admin/accountmodel.php
M htdocs/accountancy/admin/card.php
M htdocs/accountancy/admin/categories.php
M htdocs/accountancy/admin/categories_list.php
M htdocs/accountancy/admin/defaultaccounts.php
M htdocs/accountancy/admin/export.php
M htdocs/accountancy/admin/fiscalyear.php
M htdocs/accountancy/admin/fiscalyear_card.php
M htdocs/accountancy/admin/fiscalyear_info.php
M htdocs/accountancy/admin/importaccounts.php
M htdocs/accountancy/admin/index.php
M htdocs/accountancy/admin/journals_list.php
M htdocs/accountancy/admin/productaccount.php
M htdocs/accountancy/bookkeeping/balance.php
M htdocs/accountancy/bookkeeping/balancebymonth.php
M htdocs/accountancy/bookkeeping/card.php
M htdocs/accountancy/bookkeeping/list.php
M htdocs/accountancy/bookkeeping/listbyaccount.php
M htdocs/accountancy/customer/card.php
M htdocs/accountancy/customer/index.php
M htdocs/accountancy/customer/lines.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/expensereport/card.php
M htdocs/accountancy/expensereport/index.php
M htdocs/accountancy/expensereport/lines.php
M htdocs/accountancy/expensereport/list.php
M htdocs/accountancy/index.php
M htdocs/accountancy/supplier/card.php
M htdocs/accountancy/supplier/index.php
M htdocs/accountancy/supplier/lines.php
M htdocs/accountancy/supplier/list.php
M htdocs/adherents/admin/adherent.php
M htdocs/adherents/admin/adherent_emails.php
M htdocs/adherents/admin/adherent_extrafields.php
M htdocs/adherents/admin/adherent_type_extrafields.php
M htdocs/adherents/admin/website.php
M htdocs/adherents/agenda.php
M htdocs/adherents/card.php
M htdocs/adherents/cartes/carte.php
M htdocs/adherents/document.php
M htdocs/adherents/htpasswd.php
M htdocs/adherents/index.php
M htdocs/adherents/ldap.php
M htdocs/adherents/list.php
M htdocs/adherents/note.php
M htdocs/adherents/stats/byproperties.php
M htdocs/adherents/stats/geo.php
M htdocs/adherents/stats/index.php
M htdocs/adherents/subscription.php
M htdocs/adherents/subscription/card.php
M htdocs/adherents/subscription/info.php
M htdocs/adherents/subscription/list.php
M htdocs/adherents/type.php
M htdocs/adherents/type_ldap.php
M htdocs/admin/agenda.php
M htdocs/admin/agenda_extrafields.php
M htdocs/admin/agenda_extsites.php
M htdocs/admin/agenda_other.php
M htdocs/admin/agenda_reminder.php
M htdocs/admin/agenda_xcal.php
M htdocs/admin/bank.php
M htdocs/admin/bank_extrafields.php
M htdocs/admin/barcode.php
M htdocs/admin/boxes.php
M htdocs/admin/chequereceipts.php
M htdocs/admin/clicktodial.php
M htdocs/admin/commande.php
M htdocs/admin/company.php
M htdocs/admin/compta.php
M htdocs/admin/confexped.php
M htdocs/admin/const.php
M htdocs/admin/contract.php
M htdocs/admin/dav.php
M htdocs/admin/defaultvalues.php
M htdocs/admin/delais.php
M htdocs/admin/dict.php
M htdocs/admin/dolistore/ajax/image.php
M htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
M htdocs/admin/ecm.php
M htdocs/admin/events.php
M htdocs/admin/expedition.php
M htdocs/admin/expedition_extrafields.php
M htdocs/admin/expeditiondet_extrafields.php
M htdocs/admin/expensereport.php
M htdocs/admin/expensereport_extrafields.php
M htdocs/admin/expensereport_ik.php
M htdocs/admin/expensereport_rules.php
M htdocs/admin/export.php
M htdocs/admin/external_rss.php
M htdocs/admin/facture.php
M htdocs/admin/fckeditor.php
M htdocs/admin/fichinter.php
M htdocs/admin/geoipmaxmind.php
M htdocs/admin/holiday.php
M htdocs/admin/ihm.php
M htdocs/admin/index.php
M htdocs/admin/ldap.php
M htdocs/admin/ldap_contacts.php
M htdocs/admin/ldap_groups.php
M htdocs/admin/ldap_members.php
M htdocs/admin/ldap_members_types.php
M htdocs/admin/ldap_users.php
M htdocs/admin/limits.php
M htdocs/admin/livraison.php
M htdocs/admin/livraison_extrafields.php
M htdocs/admin/livraisondet_extrafields.php
M htdocs/admin/loan.php
M htdocs/admin/mailing.php
M htdocs/admin/mailman.php
M htdocs/admin/mails.php
M htdocs/admin/mails_emailing.php
M htdocs/admin/mails_senderprofile_list.php
M htdocs/admin/mails_templates.php
M htdocs/admin/menus.php
M htdocs/admin/menus/edit.php
M htdocs/admin/menus/index.php
M htdocs/admin/menus/other.php
M htdocs/admin/modulehelp.php
M htdocs/admin/modules.php
M htdocs/admin/multicurrency.php
M htdocs/admin/notification.php
M htdocs/admin/oauth.php
M htdocs/admin/oauthlogintokens.php
M htdocs/admin/order_extrafields.php
M htdocs/admin/orderdet_extrafields.php
M htdocs/admin/payment.php
M htdocs/admin/pdf.php
M htdocs/admin/perms.php
M htdocs/admin/prelevement.php
M htdocs/admin/propal.php
M htdocs/admin/proxy.php
M htdocs/admin/receiptprinter.php
M htdocs/admin/resource.php
M htdocs/admin/resource_extrafields.php
M htdocs/admin/salaries.php
M htdocs/admin/security.php
M htdocs/admin/security_file.php
M htdocs/admin/security_other.php
M htdocs/admin/sms.php
M htdocs/admin/spip.php
M htdocs/admin/stock.php
M htdocs/admin/supplier_invoice.php
M htdocs/admin/supplier_order.php
M htdocs/admin/supplier_payment.php
M htdocs/admin/supplier_proposal.php
M htdocs/admin/supplierinvoice_extrafields.php
M htdocs/admin/supplierinvoicedet_extrafields.php
M htdocs/admin/supplierorder_extrafields.php
M htdocs/admin/supplierorderdet_extrafields.php
M htdocs/admin/syslog.php
M htdocs/admin/system/about.php
M htdocs/admin/system/browser.php
M htdocs/admin/system/constall.php
M htdocs/admin/system/database-tables.php
M htdocs/admin/system/database.php
M htdocs/admin/system/dbtable.php
M htdocs/admin/system/dolibarr.php
M htdocs/admin/system/filecheck.php
M htdocs/admin/system/index.php
M htdocs/admin/system/modules.php
M htdocs/admin/system/os.php
M htdocs/admin/system/perf.php
M htdocs/admin/system/phpinfo.php
M htdocs/admin/system/xcache.php
M htdocs/admin/taxes.php
M htdocs/admin/ticket.php
M htdocs/admin/ticket_extrafields.php
M htdocs/admin/tools/dolibarr_export.php
M htdocs/admin/tools/dolibarr_import.php
M htdocs/admin/tools/eaccelerator.php
M htdocs/admin/tools/index.php
M htdocs/admin/tools/listevents.php
M htdocs/admin/tools/listsessions.php
M htdocs/admin/tools/purge.php
M htdocs/admin/tools/update.php
M htdocs/admin/translation.php
M htdocs/admin/triggers.php
M htdocs/admin/user.php
M htdocs/admin/usergroup.php
M htdocs/admin/website.php
M htdocs/admin/website_options.php
M htdocs/admin/workflow.php
M htdocs/asset/admin/assets_extrafields.php
M htdocs/asset/admin/assets_type_extrafields.php
M htdocs/asset/admin/setup.php
M htdocs/asset/card.php
M htdocs/asset/document.php
M htdocs/asset/info.php
M htdocs/asset/note.php
M htdocs/asset/type.php
M htdocs/asterisk/wrapper.php
M htdocs/barcode/codeinit.php
M htdocs/barcode/printsheet.php
M htdocs/blockedlog/admin/blockedlog.php
M htdocs/blockedlog/admin/blockedlog_list.php
M htdocs/bookmarks/admin/bookmark.php
M htdocs/bookmarks/card.php
M htdocs/bookmarks/list.php
M htdocs/cashdesk/admin/cashdesk.php
M htdocs/cashdesk/affContenu.php
M htdocs/cashdesk/facturation.php
M htdocs/cashdesk/validation.php
M htdocs/cashdesk/validation_ok.php
M htdocs/cashdesk/validation_ticket.php
M htdocs/categories/admin/categorie.php
M htdocs/categories/admin/categorie_extrafields.php
M htdocs/categories/card.php
M htdocs/categories/edit.php
M htdocs/categories/index.php
M htdocs/categories/photos.php
M htdocs/categories/traduction.php
M htdocs/categories/viewcat.php
M htdocs/collab/index.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/index.php
M htdocs/comm/action/info.php
M htdocs/comm/action/list.php
M htdocs/comm/action/pertype.php
M htdocs/comm/action/peruser.php
M htdocs/comm/action/rapport/index.php
M htdocs/comm/admin/propal_extrafields.php
M htdocs/comm/admin/propaldet_extrafields.php
M htdocs/comm/card.php
M htdocs/comm/contact.php
M htdocs/comm/index.php
M htdocs/comm/mailing/advtargetemailing.php
M htdocs/comm/mailing/card.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/mailing/index.php
M htdocs/comm/mailing/info.php
M htdocs/comm/mailing/list.php
M htdocs/comm/multiprix.php
M htdocs/comm/propal/card.php
M htdocs/comm/propal/contact.php
M htdocs/comm/propal/document.php
M htdocs/comm/propal/index.php
M htdocs/comm/propal/info.php
M htdocs/comm/propal/list.php
M htdocs/comm/propal/note.php
M htdocs/comm/propal/stats/index.php
M htdocs/comm/prospect/index.php
M htdocs/comm/prospect/recap-prospect.php
M htdocs/comm/recap-client.php
M htdocs/comm/remise.php
M htdocs/comm/remx.php
M htdocs/commande/card.php
M htdocs/commande/class/api_orders.class.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/contact.php
M htdocs/commande/customer.php
M htdocs/commande/document.php
M htdocs/commande/index.php
M htdocs/commande/info.php
M htdocs/commande/list.php
M htdocs/commande/note.php
M htdocs/commande/orderstoinvoice.php
M htdocs/commande/stats/index.php
M htdocs/compta/bank/annuel.php
M htdocs/compta/bank/bankentries_list.php
M htdocs/compta/bank/bilan.php
M htdocs/compta/bank/budget.php
M htdocs/compta/bank/card.php
M htdocs/compta/bank/categ.php
M htdocs/compta/bank/document.php
M htdocs/compta/bank/graph.php
M htdocs/compta/bank/info.php
M htdocs/compta/bank/ligne.php
M htdocs/compta/bank/list.php
M htdocs/compta/bank/releve.php
M htdocs/compta/bank/transfer.php
M htdocs/compta/bank/treso.php
M htdocs/compta/bank/various_payment/card.php
M htdocs/compta/bank/various_payment/document.php
M htdocs/compta/bank/various_payment/index.php
M htdocs/compta/bank/various_payment/info.php
M htdocs/compta/charges/index.php
M htdocs/compta/deplacement/card.php
M htdocs/compta/deplacement/document.php
M htdocs/compta/deplacement/index.php
M htdocs/compta/deplacement/info.php
M htdocs/compta/deplacement/list.php
M htdocs/compta/deplacement/stats/index.php
M htdocs/compta/facture/admin/facture_cust_extrafields.php
M htdocs/compta/facture/admin/facture_rec_cust_extrafields.php
M htdocs/compta/facture/admin/facturedet_cust_extrafields.php
M htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.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/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/invoicetemplate_list.php
M htdocs/compta/facture/list.php
M htdocs/compta/facture/note.php
M htdocs/compta/facture/prelevement.php
M htdocs/compta/facture/stats/index.php
M htdocs/compta/journal/purchasesjournal.php
M htdocs/compta/journal/sellsjournal.php
M htdocs/compta/localtax/card.php
M htdocs/compta/localtax/clients.php
M htdocs/compta/localtax/index.php
M htdocs/compta/localtax/list.php
M htdocs/compta/localtax/quadri_detail.php
M htdocs/compta/paiement/card.php
M htdocs/compta/paiement/cheque/card.php
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
M htdocs/compta/paiement/cheque/index.php
M htdocs/compta/paiement/cheque/list.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/compta/paiement/index.php
M htdocs/compta/paiement/info.php
M htdocs/compta/paiement/list.php
M htdocs/compta/paiement/rapport.php
M htdocs/compta/paiement/tovalidate.php
M htdocs/compta/payment_sc/card.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/demandes.php
M htdocs/compta/prelevement/factures.php
M htdocs/compta/prelevement/fiche-rejet.php
M htdocs/compta/prelevement/fiche-stat.php
M htdocs/compta/prelevement/index.php
M htdocs/compta/prelevement/ligne.php
M htdocs/compta/prelevement/list.php
M htdocs/compta/prelevement/rejets.php
M htdocs/compta/prelevement/stats.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.php
M htdocs/compta/resultat/result.php
M htdocs/compta/salaries/card.php
M htdocs/compta/salaries/class/paymentsalary.class.php
M htdocs/compta/salaries/document.php
M htdocs/compta/salaries/index.php
M htdocs/compta/salaries/info.php
M htdocs/compta/salaries/stats/index.php
M htdocs/compta/sociales/card.php
M htdocs/compta/sociales/class/paymentsocialcontribution.class.php
M htdocs/compta/sociales/document.php
M htdocs/compta/sociales/index.php
M htdocs/compta/sociales/info.php
M htdocs/compta/sociales/payments.php
M htdocs/compta/stats/byratecountry.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/document.php
M htdocs/conf/conf.php.example
M htdocs/contact/document.php
M htdocs/contrat/card.php
M htdocs/contrat/class/api_contracts.class.php
M htdocs/contrat/contact.php
M htdocs/contrat/document.php
M htdocs/contrat/index.php
M htdocs/contrat/info.php
M htdocs/contrat/list.php
M htdocs/contrat/note.php
M htdocs/contrat/services_list.php
M htdocs/core/actions_extrafields.inc.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/ajax/price.php
M htdocs/core/boxes/box_project.php
M htdocs/core/boxes/box_task.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.formprojet.class.php
M htdocs/core/class/smtps.class.php
M htdocs/core/db/Database.interface.php
M htdocs/core/js/lib_photosresize.js
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/bank.lib.php
M htdocs/core/lib/date.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/invoice2.lib.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/modExpenseReport.class.php
M htdocs/core/modules/modHRM.class.php
M htdocs/core/modules/modHoliday.class.php
M htdocs/core/modules/modOpenSurvey.class.php
M htdocs/core/modules/modSalaries.class.php
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
M htdocs/core/modules/syslog/mod_syslog_chromephp.php
M htdocs/core/modules/syslog/mod_syslog_firephp.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/extrafields_list_print_fields.tpl.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/core/tpl/resource_add.tpl.php
M htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
M htdocs/cron/admin/cron.php
M htdocs/cron/class/cronjob.class.php
M htdocs/dav/fileserver.php
M htdocs/don/document.php
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/contact.php
M htdocs/expedition/document.php
M htdocs/expedition/index.php
M htdocs/expedition/list.php
M htdocs/expedition/note.php
M htdocs/expedition/shipment.php
M htdocs/expedition/stats/index.php
M htdocs/expedition/stats/month.php
M htdocs/expensereport/card.php
M htdocs/expensereport/class/expensereportstats.class.php
M htdocs/expensereport/class/paymentexpensereport.class.php
M htdocs/expensereport/document.php
M htdocs/expensereport/export_csv.php
M htdocs/expensereport/index.php
M htdocs/expensereport/info.php
M htdocs/expensereport/list.php
M htdocs/expensereport/note.php
M htdocs/expensereport/payment/card.php
M htdocs/expensereport/payment/info.php
M htdocs/expensereport/payment/payment.php
M htdocs/expensereport/stats/index.php
M htdocs/exports/index.php
M htdocs/externalsite/frametop.php
M htdocs/fichinter/card-rec.php
M htdocs/fichinter/document.php
M htdocs/fourn/class/fournisseur.commande.dispatch.class.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/commande/document.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/facture/document.php
M htdocs/ftp/index.php
M htdocs/holiday/card.php
M htdocs/holiday/define_holiday.php
M htdocs/holiday/document.php
M htdocs/holiday/list.php
M htdocs/holiday/month_report.php
M htdocs/holiday/view_log.php
M htdocs/hrm/admin/admin_establishment.php
M htdocs/hrm/admin/admin_hrm.php
M htdocs/hrm/establishment/card.php
M htdocs/hrm/establishment/info.php
M htdocs/hrm/index.php
M htdocs/index.php
M htdocs/install/fileconf.php
M htdocs/install/mysql/data/llx_accounting_account_be.sql
M htdocs/install/mysql/data/llx_accounting_account_bf.sql
M htdocs/install/mysql/data/llx_accounting_account_bj.sql
M htdocs/install/mysql/data/llx_accounting_account_cd.sql
M htdocs/install/mysql/data/llx_accounting_account_cf.sql
M htdocs/install/mysql/data/llx_accounting_account_cg.sql
M htdocs/install/mysql/data/llx_accounting_account_ch.sql
M htdocs/install/mysql/data/llx_accounting_account_ci.sql
M htdocs/install/mysql/data/llx_accounting_account_cl.sql
M htdocs/install/mysql/data/llx_accounting_account_cm.sql
M htdocs/install/mysql/data/llx_accounting_account_de.sql
M htdocs/install/mysql/data/llx_accounting_account_dk.sql
M htdocs/install/mysql/data/llx_accounting_account_es.sql
M htdocs/install/mysql/data/llx_accounting_account_fr.sql
M htdocs/install/mysql/data/llx_accounting_account_ga.sql
M htdocs/install/mysql/data/llx_accounting_account_gb.sql
M htdocs/install/mysql/data/llx_accounting_account_gq.sql
M htdocs/install/mysql/data/llx_accounting_account_km.sql
M htdocs/install/mysql/data/llx_accounting_account_lu.sql
M htdocs/install/mysql/data/llx_accounting_account_ma.sql
M htdocs/install/mysql/data/llx_accounting_account_ml.sql
M htdocs/install/mysql/data/llx_accounting_account_ne.sql
M htdocs/install/mysql/data/llx_accounting_account_ro.sql
M htdocs/install/mysql/data/llx_accounting_account_sn.sql
M htdocs/install/mysql/data/llx_accounting_account_td.sql
M htdocs/install/mysql/data/llx_accounting_account_tg.sql
M htdocs/install/mysql/data/llx_accounting_account_tn.sql
M htdocs/install/mysql/migration/8.0.0-9.0.0.sql
M htdocs/install/mysql/tables/llx_accounting_account.sql
M htdocs/install/mysql/tables/llx_extrafields.sql
M htdocs/install/mysql/tables/llx_payment_salary.sql
M htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/other.lang
M htdocs/langs/en_US/products.lang
M htdocs/langs/en_US/projects.lang
M htdocs/langs/en_US/salaries.lang
M htdocs/loan/document.php
M htdocs/main.inc.php
M htdocs/margin/admin/margin.php
M htdocs/modulebuilder/index.php
M htdocs/modulebuilder/template/admin/about.php
M htdocs/modulebuilder/template/admin/setup.php
M htdocs/modulebuilder/template/css/mymodule.css.php
M htdocs/modulebuilder/template/js/mymodule.js.php
M htdocs/modulebuilder/template/mymoduleindex.php
M htdocs/modulebuilder/template/myobject_agenda.php
M htdocs/modulebuilder/template/myobject_card.php
M htdocs/modulebuilder/template/myobject_document.php
M htdocs/modulebuilder/template/myobject_list.php
M htdocs/modulebuilder/template/myobject_note.php
M htdocs/modulebuilder/template/scripts/myobject.php
M htdocs/opensurvey/card.php
M htdocs/opensurvey/class/opensurveysondage.class.php
M htdocs/opensurvey/exportcsv.php
M htdocs/opensurvey/index.php
M htdocs/opensurvey/list.php
M htdocs/opensurvey/results.php
M htdocs/opensurvey/wizard/choix_autre.php
M htdocs/opensurvey/wizard/choix_date.php
M htdocs/opensurvey/wizard/create_survey.php
M htdocs/product/admin/product.php
M htdocs/product/card.php
M htdocs/product/class/product.class.php
M htdocs/product/class/productbatch.class.php
M htdocs/product/class/propalmergepdfproduct.class.php
M htdocs/product/document.php
M htdocs/product/fournisseurs.php
M htdocs/product/inventory/list.php
M htdocs/product/price.php
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/product/stock/product.php
M htdocs/product/stock/productlot_document.php
M htdocs/product/stock/replenishorders.php
M htdocs/projet/activity/index.php
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/projet/class/project.class.php
M htdocs/projet/element.php
M htdocs/projet/ganttview.php
M htdocs/projet/tasks.php
M htdocs/projet/tasks/comment.php
M htdocs/projet/tasks/contact.php
M htdocs/projet/tasks/list.php
M htdocs/projet/tasks/note.php
M htdocs/projet/tasks/task.php
M htdocs/public/cron/cron_run_jobs.php
M htdocs/public/onlinesign/newonlinesign.php
M htdocs/public/opensurvey/studs.php
M htdocs/public/payment/newpayment.php
M htdocs/public/stripe/ipn.php
M htdocs/public/ticket/create_ticket.php
M htdocs/public/ticket/list.php
M htdocs/public/ticket/view.php
M htdocs/resource/card.php
M htdocs/resource/class/dolresource.class.php
M htdocs/resource/class/html.formresource.class.php
M htdocs/resource/contact.php
M htdocs/resource/document.php
M htdocs/resource/element_resource.php
M htdocs/resource/list.php
M htdocs/resource/note.php
M htdocs/societe/admin/contact_extrafields.php
M htdocs/societe/admin/societe.php
M htdocs/societe/admin/societe_extrafields.php
M htdocs/societe/agenda.php
M htdocs/societe/card.php
M htdocs/societe/checkvat/checkVatPopup.php
M htdocs/societe/consumption.php
M htdocs/societe/contact.php
M htdocs/societe/document.php
M htdocs/societe/index.php
M htdocs/societe/list.php
M htdocs/societe/note.php
M htdocs/societe/notify/card.php
M htdocs/societe/notify/index.php
M htdocs/societe/paymentmodes.php
M htdocs/societe/price.php
M htdocs/societe/project.php
M htdocs/societe/societecontact.php
M htdocs/societe/website.php
M htdocs/stripe/admin/stripe.php
M htdocs/stripe/charge.php
M htdocs/stripe/config.php
M htdocs/stripe/payment.php
M htdocs/stripe/transaction.php
M htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
M htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
M htdocs/supplier_proposal/card.php
M htdocs/supplier_proposal/contact.php
M htdocs/supplier_proposal/document.php
M htdocs/supplier_proposal/index.php
M htdocs/supplier_proposal/info.php
M htdocs/supplier_proposal/note.php
M htdocs/ticket/class/ticket.class.php
M htdocs/ticket/class/ticketlogs.class.php
M htdocs/ticket/document.php
M htdocs/ticket/list.php
M htdocs/user/admin/group_extrafields.php
M htdocs/user/admin/user_extrafields.php
M htdocs/user/agenda_extsites.php
M htdocs/user/bank.php
M htdocs/user/card.php
M htdocs/user/class/api_users.class.php
M htdocs/user/class/usergroup.class.php
M htdocs/user/clicktodial.php
M htdocs/user/document.php
M htdocs/user/group/card.php
M htdocs/user/group/ldap.php
M htdocs/user/group/list.php
M htdocs/user/group/perms.php
M htdocs/user/hierarchy.php
M htdocs/user/home.php
M htdocs/user/info.php
M htdocs/user/ldap.php
M htdocs/user/list.php
M htdocs/user/note.php
M htdocs/user/notify/card.php
M htdocs/user/param_ihm.php
M htdocs/user/perms.php
M htdocs/variants/admin/admin.php
M htdocs/variants/card.php
M htdocs/variants/combinations.php
M htdocs/variants/create.php
M htdocs/variants/create_val.php
M htdocs/variants/generator.php
M htdocs/variants/list.php
M htdocs/webservices/admin/index.php
M htdocs/webservices/server_actioncomm.php
M htdocs/webservices/server_category.php
M htdocs/webservices/server_contact.php
M htdocs/webservices/server_invoice.php
M htdocs/webservices/server_order.php
M htdocs/webservices/server_other.php
M htdocs/webservices/server_payment.php
M htdocs/webservices/server_productorservice.php
M htdocs/webservices/server_project.php
M htdocs/webservices/server_supplier_invoice.php
M htdocs/website/index.php
M htdocs/website/websiteaccount_card.php
M scripts/accountancy/export-thirdpartyaccount.php
M scripts/bank/export-bank-receipts.php
M scripts/company/export-contacts-xls-example.php
M scripts/company/sync_contacts_dolibarr2ldap.php
M scripts/contracts/email_expire_services_to_customers.php
M scripts/contracts/email_expire_services_to_representatives.php
M scripts/cron/cron_run_jobs.php
M scripts/emailings/mailing-send.php
M scripts/invoices/email_unpaid_invoices_to_customers.php
M scripts/invoices/email_unpaid_invoices_to_representatives.php
M scripts/invoices/rebuild_merge_pdf.php
M scripts/members/sync_members_dolibarr2ldap.php
M scripts/members/sync_members_ldap2dolibarr.php
M scripts/members/sync_members_types_dolibarr2ldap.php
M scripts/members/sync_members_types_ldap2dolibarr.php
M scripts/modulebuilder/builddoc.php
M scripts/modulebuilder/initmodule.php
M scripts/product/migrate_picture_path.php
M scripts/product/regenerate_thumbs.php
M scripts/user/sync_groups_dolibarr2ldap.php
M scripts/user/sync_groups_ldap2dolibarr.php
M scripts/user/sync_users_dolibarr2ldap.php
M scripts/user/sync_users_ldap2dolibarr.php
M scripts/withdrawals/build_withdrawal_file.php
M test/phpunit/ModulesTest.php
M test/phpunit/WebservicesInvoicesTest.php
M test/phpunit/WebservicesOrdersTest.php
M test/phpunit/WebservicesOtherTest.php
M test/phpunit/WebservicesProductsTest.php
M test/phpunit/WebservicesThirdpartyTest.php
M test/phpunit/WebservicesUserTest.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/1ca17fb781bf...9fc5d39d07c0
**NOTE:** This service has been marked for deprecation:
https://developer.github.com/changes/2018-04-25-github-services-deprecation/
Functionality will be removed from GitHub.com on January 31st, 2019.