[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] a805cb: Fix: ER payments are on the b
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] a805cb: Fix: ER payments are on the bank credit |
Date: |
Wed, 16 Sep 2015 13:09:33 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: a805cb93745257b796fdc03d0faac2b3568b1e81
https://github.com/Dolibarr/dolibarr/commit/a805cb93745257b796fdc03d0faac2b3568b1e81
Author: aspangaro <address@hidden>
Date: 2015-09-13 (Sun, 13 Sep 2015)
Changed paths:
M htdocs/expensereport/class/paymentexpensereport.class.php
Log Message:
-----------
Fix: ER payments are on the bank credit
Commit: 6d32efc4de560c091fdf7703df7a9ab20544d08a
https://github.com/Dolibarr/dolibarr/commit/6d32efc4de560c091fdf7703df7a9ab20544d08a
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-13 (Sun, 13 Sep 2015)
Changed paths:
M htdocs/expensereport/class/paymentexpensereport.class.php
Log Message:
-----------
Merge pull request #3518 from aspangaro/3.8-18
Fix: ER payments are on the bank credit
Commit: 7c030a114dfc73638d668aeede5d0d77db8014d9
https://github.com/Dolibarr/dolibarr/commit/7c030a114dfc73638d668aeede5d0d77db8014d9
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-13 (Sun, 13 Sep 2015)
Changed paths:
M htdocs/filefunc.inc.php
Log Message:
-----------
Release 3.8.0
Commit: 4eedec02741dc5fe2a6c03c1c964b7e6704533e8
https://github.com/Dolibarr/dolibarr/commit/4eedec02741dc5fe2a6c03c1c964b7e6704533e8
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-13 (Sun, 13 Sep 2015)
Changed paths:
M build/generate_filecheck_xml.php
M htdocs/admin/system/filecheck.php
M htdocs/install/filelist.xml
Log Message:
-----------
Fix tool to generate filecheck
Commit: 1d4c747aa21e73560f7be2124a04410ce660b9e4
https://github.com/Dolibarr/dolibarr/commit/1d4c747aa21e73560f7be2124a04410ce660b9e4
Author: aspangaro <address@hidden>
Date: 2015-09-13 (Sun, 13 Sep 2015)
Changed paths:
M htdocs/langs/en_US/projects.lang
Log Message:
-----------
Fix #3227 #3226 Missing translations in supplier exports
Commit: 27a85c074ef646ad48f602b087a0eda18a678759
https://github.com/Dolibarr/dolibarr/commit/27a85c074ef646ad48f602b087a0eda18a678759
Author: aspangaro <address@hidden>
Date: 2015-09-13 (Sun, 13 Sep 2015)
Changed paths:
M htdocs/expensereport/class/paymentexpensereport.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8-18' into 3.8-17
Commit: 334766d1945cf2f4baac2aff2c916169c7cbdc96
https://github.com/Dolibarr/dolibarr/commit/334766d1945cf2f4baac2aff2c916169c7cbdc96
Author: aspangaro <address@hidden>
Date: 2015-09-13 (Sun, 13 Sep 2015)
Changed paths:
M htdocs/langs/en_US/interventions.lang
Log Message:
-----------
Fix #3225 Missing translations in interventions
Commit: 3b01b8cb4796de441c5d8f1d7c5193d2d5bad0d1
https://github.com/Dolibarr/dolibarr/commit/3b01b8cb4796de441c5d8f1d7c5193d2d5bad0d1
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-13 (Sun, 13 Sep 2015)
Changed paths:
M htdocs/filefunc.inc.php
Log Message:
-----------
Fix security hole
Commit: b4c964760d6ba600a515ec318670466c4015a707
https://github.com/Dolibarr/dolibarr/commit/b4c964760d6ba600a515ec318670466c4015a707
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-13 (Sun, 13 Sep 2015)
Changed paths:
M htdocs/install/filelist.xml
M htdocs/langs/ca_ES/accountancy.lang
M htdocs/langs/ca_ES/admin.lang
M htdocs/langs/ca_ES/bills.lang
M htdocs/langs/ca_ES/boxes.lang
M htdocs/langs/ca_ES/companies.lang
M htdocs/langs/ca_ES/ecm.lang
M htdocs/langs/ca_ES/errors.lang
M htdocs/langs/ca_ES/exports.lang
M htdocs/langs/ca_ES/install.lang
M htdocs/langs/ca_ES/main.lang
M htdocs/langs/ca_ES/members.lang
M htdocs/langs/ca_ES/other.lang
M htdocs/langs/ca_ES/projects.lang
M htdocs/langs/ca_ES/propal.lang
M htdocs/langs/ca_ES/suppliers.lang
M htdocs/langs/ca_ES/trips.lang
M htdocs/langs/ca_ES/users.lang
M htdocs/langs/de_AT/bills.lang
A htdocs/langs/de_AT/holiday.lang
M htdocs/langs/de_AT/main.lang
M htdocs/langs/de_CH/admin.lang
A htdocs/langs/de_CH/banks.lang
A htdocs/langs/de_CH/bills.lang
A htdocs/langs/de_CH/holiday.lang
M htdocs/langs/de_CH/main.lang
A htdocs/langs/de_CH/projects.lang
M htdocs/langs/de_DE/admin.lang
M htdocs/langs/de_DE/agenda.lang
M htdocs/langs/de_DE/bills.lang
M htdocs/langs/de_DE/bookmarks.lang
M htdocs/langs/de_DE/boxes.lang
M htdocs/langs/de_DE/categories.lang
M htdocs/langs/de_DE/commercial.lang
M htdocs/langs/de_DE/companies.lang
M htdocs/langs/de_DE/compta.lang
M htdocs/langs/de_DE/contracts.lang
M htdocs/langs/de_DE/donations.lang
M htdocs/langs/de_DE/ecm.lang
M htdocs/langs/de_DE/errors.lang
M htdocs/langs/de_DE/exports.lang
M htdocs/langs/de_DE/interventions.lang
M htdocs/langs/de_DE/link.lang
M htdocs/langs/de_DE/main.lang
M htdocs/langs/de_DE/margins.lang
M htdocs/langs/de_DE/printing.lang
M htdocs/langs/de_DE/products.lang
M htdocs/langs/de_DE/projects.lang
M htdocs/langs/de_DE/propal.lang
M htdocs/langs/de_DE/stocks.lang
M htdocs/langs/de_DE/users.lang
M htdocs/langs/el_GR/accountancy.lang
M htdocs/langs/el_GR/admin.lang
M htdocs/langs/el_GR/agenda.lang
M htdocs/langs/el_GR/banks.lang
M htdocs/langs/el_GR/bills.lang
M htdocs/langs/el_GR/boxes.lang
M htdocs/langs/el_GR/holiday.lang
M htdocs/langs/el_GR/main.lang
M htdocs/langs/el_GR/products.lang
M htdocs/langs/en_AU/admin.lang
A htdocs/langs/en_AU/banks.lang
A htdocs/langs/en_AU/bills.lang
M htdocs/langs/en_AU/main.lang
A htdocs/langs/en_AU/projects.lang
M htdocs/langs/en_GB/admin.lang
A htdocs/langs/en_GB/banks.lang
A htdocs/langs/en_GB/bills.lang
M htdocs/langs/en_GB/main.lang
A htdocs/langs/en_GB/projects.lang
M htdocs/langs/en_IN/admin.lang
A htdocs/langs/en_IN/banks.lang
A htdocs/langs/en_IN/bills.lang
M htdocs/langs/en_IN/main.lang
A htdocs/langs/en_IN/projects.lang
M htdocs/langs/es_AR/admin.lang
A htdocs/langs/es_AR/banks.lang
A htdocs/langs/es_AR/bills.lang
A htdocs/langs/es_AR/holiday.lang
M htdocs/langs/es_AR/main.lang
A htdocs/langs/es_AR/projects.lang
M htdocs/langs/es_BO/admin.lang
A htdocs/langs/es_BO/banks.lang
A htdocs/langs/es_BO/bills.lang
A htdocs/langs/es_BO/holiday.lang
M htdocs/langs/es_BO/main.lang
A htdocs/langs/es_BO/projects.lang
M htdocs/langs/es_CL/admin.lang
A htdocs/langs/es_CL/banks.lang
M htdocs/langs/es_CL/bills.lang
A htdocs/langs/es_CL/holiday.lang
M htdocs/langs/es_CL/main.lang
M htdocs/langs/es_CL/projects.lang
M htdocs/langs/es_CO/admin.lang
A htdocs/langs/es_CO/banks.lang
A htdocs/langs/es_CO/bills.lang
A htdocs/langs/es_CO/holiday.lang
A htdocs/langs/es_CO/projects.lang
M htdocs/langs/es_DO/admin.lang
A htdocs/langs/es_DO/banks.lang
A htdocs/langs/es_DO/bills.lang
A htdocs/langs/es_DO/holiday.lang
M htdocs/langs/es_DO/main.lang
A htdocs/langs/es_DO/projects.lang
M htdocs/langs/es_ES/errors.lang
M htdocs/langs/es_ES/exports.lang
M htdocs/langs/es_MX/admin.lang
A htdocs/langs/es_MX/banks.lang
A htdocs/langs/es_MX/bills.lang
A htdocs/langs/es_MX/holiday.lang
M htdocs/langs/es_MX/main.lang
A htdocs/langs/es_MX/projects.lang
M htdocs/langs/es_PE/admin.lang
A htdocs/langs/es_PE/banks.lang
M htdocs/langs/es_PE/bills.lang
A htdocs/langs/es_PE/holiday.lang
M htdocs/langs/es_PE/main.lang
A htdocs/langs/es_PE/projects.lang
M htdocs/langs/es_PY/admin.lang
A htdocs/langs/es_PY/banks.lang
A htdocs/langs/es_PY/bills.lang
A htdocs/langs/es_PY/holiday.lang
M htdocs/langs/es_PY/main.lang
A htdocs/langs/es_PY/projects.lang
M htdocs/langs/et_EE/accountancy.lang
M htdocs/langs/et_EE/agenda.lang
M htdocs/langs/et_EE/categories.lang
M htdocs/langs/et_EE/commercial.lang
M htdocs/langs/et_EE/companies.lang
M htdocs/langs/et_EE/contracts.lang
M htdocs/langs/fr_BE/admin.lang
A htdocs/langs/fr_BE/banks.lang
M htdocs/langs/fr_BE/bills.lang
M htdocs/langs/fr_BE/main.lang
A htdocs/langs/fr_BE/projects.lang
A htdocs/langs/fr_CA/projects.lang
M htdocs/langs/fr_CH/admin.lang
A htdocs/langs/fr_CH/banks.lang
A htdocs/langs/fr_CH/bills.lang
M htdocs/langs/fr_CH/main.lang
A htdocs/langs/fr_CH/projects.lang
M htdocs/langs/fr_FR/bills.lang
M htdocs/langs/fr_FR/compta.lang
M htdocs/langs/hu_HU/bookmarks.lang
M htdocs/langs/it_IT/cron.lang
M htdocs/langs/lv_LV/admin.lang
M htdocs/langs/lv_LV/agenda.lang
M htdocs/langs/lv_LV/companies.lang
M htdocs/langs/lv_LV/cron.lang
M htdocs/langs/lv_LV/errors.lang
M htdocs/langs/lv_LV/incoterm.lang
M htdocs/langs/lv_LV/install.lang
M htdocs/langs/lv_LV/languages.lang
M htdocs/langs/lv_LV/main.lang
M htdocs/langs/lv_LV/orders.lang
M htdocs/langs/lv_LV/other.lang
M htdocs/langs/lv_LV/products.lang
M htdocs/langs/lv_LV/projects.lang
M htdocs/langs/lv_LV/trips.lang
R htdocs/langs/nl_BE/admin.lang
M htdocs/langs/nl_NL/accountancy.lang
M htdocs/langs/pt_BR/admin.lang
M htdocs/langs/pt_BR/agenda.lang
M htdocs/langs/pt_BR/banks.lang
M htdocs/langs/pt_BR/bills.lang
M htdocs/langs/pt_BR/companies.lang
M htdocs/langs/pt_BR/contracts.lang
M htdocs/langs/pt_BR/errors.lang
M htdocs/langs/pt_BR/exports.lang
M htdocs/langs/pt_BR/languages.lang
M htdocs/langs/pt_BR/main.lang
M htdocs/langs/pt_BR/products.lang
M htdocs/langs/pt_BR/sendings.lang
M htdocs/langs/sl_SI/banks.lang
M htdocs/langs/sl_SI/propal.lang
M htdocs/langs/sl_SI/withdrawals.lang
M htdocs/langs/sr_RS/companies.lang
M htdocs/langs/sr_RS/main.lang
M htdocs/langs/sr_RS/users.lang
M htdocs/langs/zh_CN/cron.lang
Log Message:
-----------
Sync transifex
Commit: c75f62ddb792036c84ea0b4ff809c6d91e6847f4
https://github.com/Dolibarr/dolibarr/commit/c75f62ddb792036c84ea0b4ff809c6d91e6847f4
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-14 (Mon, 14 Sep 2015)
Changed paths:
M dev/skeletons/modMyModule.class.php
M htdocs/exports/export.php
Log Message:
-----------
FIX icon into export profile may be not correctly output
Commit: ca2b66ffb357a0dd47628aedac870654082f9f71
https://github.com/Dolibarr/dolibarr/commit/ca2b66ffb357a0dd47628aedac870654082f9f71
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-14 (Mon, 14 Sep 2015)
Changed paths:
M htdocs/langs/en_US/projects.lang
Log Message:
-----------
Merge pull request #3519 from aspangaro/3.8-17
Fix #3227 #3226 Missing translations in supplier exports
Commit: 36beb289f3f195cf6e00f54aa332325ab1f2b6d0
https://github.com/Dolibarr/dolibarr/commit/36beb289f3f195cf6e00f54aa332325ab1f2b6d0
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-14 (Mon, 14 Sep 2015)
Changed paths:
M htdocs/langs/en_US/interventions.lang
Log Message:
-----------
Merge pull request #3520 from aspangaro/3.8-18
Fix #3225 Missing translations in interventions
Commit: e0a88fabd9ff6d65a2ac3c7662b74b351ade4241
https://github.com/Dolibarr/dolibarr/commit/e0a88fabd9ff6d65a2ac3c7662b74b351ade4241
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-14 (Mon, 14 Sep 2015)
Changed paths:
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
Log Message:
-----------
FIX #3521
Commit: d985c77eca23db60e4014ecce29d3f8729cd24d1
https://github.com/Dolibarr/dolibarr/commit/d985c77eca23db60e4014ecce29d3f8729cd24d1
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-14 (Mon, 14 Sep 2015)
Changed paths:
M htdocs/langs/en_US/interventions.lang
M htdocs/langs/en_US/projects.lang
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 2d2f59fe3fa32d8f459bd768e5e3a8e739dddd24
https://github.com/Dolibarr/dolibarr/commit/2d2f59fe3fa32d8f459bd768e5e3a8e739dddd24
Author: aspangaro <address@hidden>
Date: 2015-09-14 (Mon, 14 Sep 2015)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Fix : Class 'Categorie' not found in core\class\html.form.class.php
Commit: 95cfce925f053afa1155c9445ab4247bc896fb26
https://github.com/Dolibarr/dolibarr/commit/95cfce925f053afa1155c9445ab4247bc896fb26
Author: BENKE Charlie <address@hidden>
Date: 2015-09-15 (Tue, 15 Sep 2015)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
fix error on tabcollectors and enhance
fix error on tabcollectors feature
add number of tabs present in tab collectors
Commit: 91bac76511d6118e575b0f0820f6bb29727f8e3e
https://github.com/Dolibarr/dolibarr/commit/91bac76511d6118e575b0f0820f6bb29727f8e3e
Author: Juanjo Menent <address@hidden>
Date: 2015-09-15 (Tue, 15 Sep 2015)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Merge pull request #3522 from aspangaro/3.8-18
Fix : Class 'Categorie' not found in core\class\html.form.class.php in
supplier card
Commit: 7b8096d367c8c0d4f596144760412bb504e5124b
https://github.com/Dolibarr/dolibarr/commit/7b8096d367c8c0d4f596144760412bb504e5124b
Author: Juanjo Menent <address@hidden>
Date: 2015-09-15 (Tue, 15 Sep 2015)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge pull request #3523 from defrance/patch-78
fix error on tabcollectors and enhance
Commit: 7f60abdf7bbc1b26e133198aae1ce04c25241ad3
https://github.com/Dolibarr/dolibarr/commit/7f60abdf7bbc1b26e133198aae1ce04c25241ad3
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-16 (Wed, 16 Sep 2015)
Changed paths:
M htdocs/user/class/user.class.php
Log Message:
-----------
FIX #3524
Commit: e36928fd652586d6f3112ab18e34bcc008fc5c15
https://github.com/Dolibarr/dolibarr/commit/e36928fd652586d6f3112ab18e34bcc008fc5c15
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-16 (Wed, 16 Sep 2015)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/fourn/card.php
Log Message:
-----------
FIX #3529
Commit: 38bae655ea2354a1fba74aef77bcf605defa64c4
https://github.com/Dolibarr/dolibarr/commit/38bae655ea2354a1fba74aef77bcf605defa64c4
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-16 (Wed, 16 Sep 2015)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Conflicts:
htdocs/core/class/html.form.class.php
Commit: 7d8013b3718f077bf9e42aec2da07f2f9f820e6a
https://github.com/Dolibarr/dolibarr/commit/7d8013b3718f077bf9e42aec2da07f2f9f820e6a
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-16 (Wed, 16 Sep 2015)
Changed paths:
M htdocs/societe/soc.php
Log Message:
-----------
FIX #3533
Commit: 313d9ddacdf5f59577d2560999e6dcbc74ccc8bb
https://github.com/Dolibarr/dolibarr/commit/313d9ddacdf5f59577d2560999e6dcbc74ccc8bb
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-16 (Wed, 16 Sep 2015)
Changed paths:
M htdocs/admin/dict.php
M htdocs/commande/card.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/tpl/contacts.tpl.php
M htdocs/expedition/contact.php
Log Message:
-----------
FIX #3534
Commit: 9cbd236c8c7faa5901e6d17a32834cb3e6de4430
https://github.com/Dolibarr/dolibarr/commit/9cbd236c8c7faa5901e6d17a32834cb3e6de4430
Author: Laurent Destailleur <address@hidden>
Date: 2015-09-16 (Wed, 16 Sep 2015)
Changed paths:
M build/generate_filecheck_xml.php
M dev/skeletons/modMyModule.class.php
M htdocs/admin/dict.php
M htdocs/admin/system/filecheck.php
M htdocs/commande/card.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/tpl/contacts.tpl.php
M htdocs/expedition/contact.php
M htdocs/expensereport/class/paymentexpensereport.class.php
M htdocs/exports/export.php
M htdocs/filefunc.inc.php
M htdocs/fourn/card.php
M htdocs/install/filelist.xml
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
M htdocs/langs/ca_ES/accountancy.lang
M htdocs/langs/ca_ES/admin.lang
M htdocs/langs/ca_ES/bills.lang
M htdocs/langs/ca_ES/boxes.lang
M htdocs/langs/ca_ES/companies.lang
M htdocs/langs/ca_ES/ecm.lang
M htdocs/langs/ca_ES/errors.lang
M htdocs/langs/ca_ES/exports.lang
M htdocs/langs/ca_ES/install.lang
M htdocs/langs/ca_ES/main.lang
M htdocs/langs/ca_ES/members.lang
M htdocs/langs/ca_ES/other.lang
M htdocs/langs/ca_ES/projects.lang
M htdocs/langs/ca_ES/propal.lang
M htdocs/langs/ca_ES/suppliers.lang
M htdocs/langs/ca_ES/trips.lang
M htdocs/langs/ca_ES/users.lang
M htdocs/langs/de_AT/bills.lang
A htdocs/langs/de_AT/holiday.lang
M htdocs/langs/de_AT/main.lang
M htdocs/langs/de_CH/admin.lang
A htdocs/langs/de_CH/banks.lang
A htdocs/langs/de_CH/bills.lang
A htdocs/langs/de_CH/holiday.lang
M htdocs/langs/de_CH/main.lang
A htdocs/langs/de_CH/projects.lang
M htdocs/langs/de_DE/admin.lang
M htdocs/langs/de_DE/agenda.lang
M htdocs/langs/de_DE/bills.lang
M htdocs/langs/de_DE/bookmarks.lang
M htdocs/langs/de_DE/boxes.lang
M htdocs/langs/de_DE/categories.lang
M htdocs/langs/de_DE/commercial.lang
M htdocs/langs/de_DE/companies.lang
M htdocs/langs/de_DE/compta.lang
M htdocs/langs/de_DE/contracts.lang
M htdocs/langs/de_DE/donations.lang
M htdocs/langs/de_DE/ecm.lang
M htdocs/langs/de_DE/errors.lang
M htdocs/langs/de_DE/exports.lang
M htdocs/langs/de_DE/interventions.lang
M htdocs/langs/de_DE/link.lang
M htdocs/langs/de_DE/main.lang
M htdocs/langs/de_DE/margins.lang
M htdocs/langs/de_DE/printing.lang
M htdocs/langs/de_DE/products.lang
M htdocs/langs/de_DE/projects.lang
M htdocs/langs/de_DE/propal.lang
M htdocs/langs/de_DE/stocks.lang
M htdocs/langs/de_DE/users.lang
M htdocs/langs/el_GR/accountancy.lang
M htdocs/langs/el_GR/admin.lang
M htdocs/langs/el_GR/agenda.lang
M htdocs/langs/el_GR/banks.lang
M htdocs/langs/el_GR/bills.lang
M htdocs/langs/el_GR/boxes.lang
M htdocs/langs/el_GR/holiday.lang
M htdocs/langs/el_GR/main.lang
M htdocs/langs/el_GR/products.lang
M htdocs/langs/en_AU/admin.lang
A htdocs/langs/en_AU/banks.lang
A htdocs/langs/en_AU/bills.lang
M htdocs/langs/en_AU/main.lang
A htdocs/langs/en_AU/projects.lang
M htdocs/langs/en_GB/admin.lang
A htdocs/langs/en_GB/banks.lang
A htdocs/langs/en_GB/bills.lang
M htdocs/langs/en_GB/main.lang
A htdocs/langs/en_GB/projects.lang
M htdocs/langs/en_IN/admin.lang
A htdocs/langs/en_IN/banks.lang
A htdocs/langs/en_IN/bills.lang
M htdocs/langs/en_IN/main.lang
A htdocs/langs/en_IN/projects.lang
M htdocs/langs/en_US/interventions.lang
M htdocs/langs/en_US/projects.lang
M htdocs/langs/es_AR/admin.lang
A htdocs/langs/es_AR/banks.lang
A htdocs/langs/es_AR/bills.lang
A htdocs/langs/es_AR/holiday.lang
M htdocs/langs/es_AR/main.lang
A htdocs/langs/es_AR/projects.lang
M htdocs/langs/es_BO/admin.lang
A htdocs/langs/es_BO/banks.lang
A htdocs/langs/es_BO/bills.lang
A htdocs/langs/es_BO/holiday.lang
M htdocs/langs/es_BO/main.lang
A htdocs/langs/es_BO/projects.lang
M htdocs/langs/es_CL/admin.lang
A htdocs/langs/es_CL/banks.lang
M htdocs/langs/es_CL/bills.lang
A htdocs/langs/es_CL/holiday.lang
M htdocs/langs/es_CL/main.lang
M htdocs/langs/es_CL/projects.lang
M htdocs/langs/es_CO/admin.lang
A htdocs/langs/es_CO/banks.lang
A htdocs/langs/es_CO/bills.lang
A htdocs/langs/es_CO/holiday.lang
A htdocs/langs/es_CO/projects.lang
M htdocs/langs/es_DO/admin.lang
A htdocs/langs/es_DO/banks.lang
A htdocs/langs/es_DO/bills.lang
A htdocs/langs/es_DO/holiday.lang
M htdocs/langs/es_DO/main.lang
A htdocs/langs/es_DO/projects.lang
M htdocs/langs/es_ES/errors.lang
M htdocs/langs/es_ES/exports.lang
M htdocs/langs/es_MX/admin.lang
A htdocs/langs/es_MX/banks.lang
A htdocs/langs/es_MX/bills.lang
A htdocs/langs/es_MX/holiday.lang
M htdocs/langs/es_MX/main.lang
A htdocs/langs/es_MX/projects.lang
M htdocs/langs/es_PE/admin.lang
A htdocs/langs/es_PE/banks.lang
M htdocs/langs/es_PE/bills.lang
A htdocs/langs/es_PE/holiday.lang
M htdocs/langs/es_PE/main.lang
A htdocs/langs/es_PE/projects.lang
M htdocs/langs/es_PY/admin.lang
A htdocs/langs/es_PY/banks.lang
A htdocs/langs/es_PY/bills.lang
A htdocs/langs/es_PY/holiday.lang
M htdocs/langs/es_PY/main.lang
A htdocs/langs/es_PY/projects.lang
M htdocs/langs/et_EE/accountancy.lang
M htdocs/langs/et_EE/agenda.lang
M htdocs/langs/et_EE/categories.lang
M htdocs/langs/et_EE/commercial.lang
M htdocs/langs/et_EE/companies.lang
M htdocs/langs/et_EE/contracts.lang
M htdocs/langs/fr_BE/admin.lang
A htdocs/langs/fr_BE/banks.lang
M htdocs/langs/fr_BE/bills.lang
M htdocs/langs/fr_BE/main.lang
A htdocs/langs/fr_BE/projects.lang
A htdocs/langs/fr_CA/projects.lang
M htdocs/langs/fr_CH/admin.lang
A htdocs/langs/fr_CH/banks.lang
A htdocs/langs/fr_CH/bills.lang
M htdocs/langs/fr_CH/main.lang
A htdocs/langs/fr_CH/projects.lang
M htdocs/langs/fr_FR/bills.lang
M htdocs/langs/fr_FR/compta.lang
M htdocs/langs/hu_HU/bookmarks.lang
M htdocs/langs/it_IT/cron.lang
M htdocs/langs/lv_LV/admin.lang
M htdocs/langs/lv_LV/agenda.lang
M htdocs/langs/lv_LV/companies.lang
M htdocs/langs/lv_LV/cron.lang
M htdocs/langs/lv_LV/errors.lang
M htdocs/langs/lv_LV/incoterm.lang
M htdocs/langs/lv_LV/install.lang
M htdocs/langs/lv_LV/languages.lang
M htdocs/langs/lv_LV/main.lang
M htdocs/langs/lv_LV/orders.lang
M htdocs/langs/lv_LV/other.lang
M htdocs/langs/lv_LV/products.lang
M htdocs/langs/lv_LV/projects.lang
M htdocs/langs/lv_LV/trips.lang
R htdocs/langs/nl_BE/admin.lang
M htdocs/langs/nl_NL/accountancy.lang
M htdocs/langs/pt_BR/admin.lang
M htdocs/langs/pt_BR/agenda.lang
M htdocs/langs/pt_BR/banks.lang
M htdocs/langs/pt_BR/bills.lang
M htdocs/langs/pt_BR/companies.lang
M htdocs/langs/pt_BR/contracts.lang
M htdocs/langs/pt_BR/errors.lang
M htdocs/langs/pt_BR/exports.lang
M htdocs/langs/pt_BR/languages.lang
M htdocs/langs/pt_BR/main.lang
M htdocs/langs/pt_BR/products.lang
M htdocs/langs/pt_BR/sendings.lang
M htdocs/langs/sl_SI/banks.lang
M htdocs/langs/sl_SI/propal.lang
M htdocs/langs/sl_SI/withdrawals.lang
M htdocs/langs/sr_RS/companies.lang
M htdocs/langs/sr_RS/main.lang
M htdocs/langs/sr_RS/users.lang
M htdocs/langs/zh_CN/cron.lang
M htdocs/societe/soc.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/filefunc.inc.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/813667e564ab...9cbd236c8c7f