[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 2147bd: Fix: remove lines with specia
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 2147bd: Fix: remove lines with special code when convert t... |
|
Date: |
Thu, 08 Feb 2018 06:20:40 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 2147bd23e64da09d96fc2a44395aa4293a2ab427
https://github.com/Dolibarr/dolibarr/commit/2147bd23e64da09d96fc2a44395aa4293a2ab427
Author: Regis Houssin <address@hidden>
Date: 2018-02-02 (Fri, 02 Feb 2018)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Fix: remove lines with special code when convert to reduc
Commit: a161ca37ffe23e530870f5fb83522910d075fff6
https://github.com/Dolibarr/dolibarr/commit/a161ca37ffe23e530870f5fb83522910d075fff6
Author: Regis Houssin <address@hidden>
Date: 2018-02-04 (Sun, 04 Feb 2018)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Fix: use product_type instead special_code
Commit: d5b7184c8d501e6d4e8b83afeed36027eed9a2c6
https://github.com/Dolibarr/dolibarr/commit/d5b7184c8d501e6d4e8b83afeed36027eed9a2c6
Author: Regis Houssin <address@hidden>
Date: 2018-02-04 (Sun, 04 Feb 2018)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Fix: wrong test
Commit: c4277c1e54b766d98f89d6dc6a95cf5c7a3f19d9
https://github.com/Dolibarr/dolibarr/commit/c4277c1e54b766d98f89d6dc6a95cf5c7a3f19d9
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-04 (Sun, 04 Feb 2018)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Merge pull request #8128 from hregis/5.0_bug
Fix: remove lines with special code when convert to reduc
Commit: ae9c7ad6b6b9668dddf46e9692053049735dd3b5
https://github.com/Dolibarr/dolibarr/commit/ae9c7ad6b6b9668dddf46e9692053049735dd3b5
Author: atm-quentin <address@hidden>
Date: 2018-02-05 (Mon, 05 Feb 2018)
Changed paths:
M htdocs/societe/card.php
Log Message:
-----------
FIX unset categorie
Commit: 839de650121b330daed69476aec3baae58b2a68f
https://github.com/Dolibarr/dolibarr/commit/839de650121b330daed69476aec3baae58b2a68f
Author: Regis Houssin <address@hidden>
Date: 2018-02-05 (Mon, 05 Feb 2018)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Fix: avoid error -1
Commit: 2d4624a1be64b3b97461282f1d5d286ab48d60ed
https://github.com/Dolibarr/dolibarr/commit/2d4624a1be64b3b97461282f1d5d286ab48d60ed
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-05 (Mon, 05 Feb 2018)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge pull request #8134 from hregis/6.0_multicompany
Fix: avoid error -1
Commit: bb93b98260dc2de3a82f37df1b424866877849c7
https://github.com/Dolibarr/dolibarr/commit/bb93b98260dc2de3a82f37df1b424866877849c7
Author: atm-quentin <address@hidden>
Date: 2018-02-05 (Mon, 05 Feb 2018)
Changed paths:
M htdocs/core/modules/modFacture.class.php
Log Message:
-----------
NEW field commerciaux and categ export CustomersInvoicesAndPayments
Commit: 2081aefc84cf1156527c09b7e827b500423a4f00
https://github.com/Dolibarr/dolibarr/commit/2081aefc84cf1156527c09b7e827b500423a4f00
Author: atm-quentin <address@hidden>
Date: 2018-02-05 (Mon, 05 Feb 2018)
Changed paths:
M htdocs/societe/card.php
Log Message:
-----------
FIX creer into lire
Commit: 783dc18cd07edf047ec41b3a73be4371918dab6a
https://github.com/Dolibarr/dolibarr/commit/783dc18cd07edf047ec41b3a73be4371918dab6a
Author: atm-quentin <address@hidden>
Date: 2018-02-05 (Mon, 05 Feb 2018)
Log Message:
-----------
Merge
Commit: d989483d2bc3d2c57814ad4cf9b3927102818354
https://github.com/Dolibarr/dolibarr/commit/d989483d2bc3d2c57814ad4cf9b3927102818354
Author: atm-quentin <address@hidden>
Date: 2018-02-05 (Mon, 05 Feb 2018)
Changed paths:
M htdocs/core/modules/modFacture.class.php
M htdocs/societe/card.php
Log Message:
-----------
Merge branch '60test' into 6.0
Commit: ad384a999299629fa90a5a4b4525e9b1a5118404
https://github.com/Dolibarr/dolibarr/commit/ad384a999299629fa90a5a4b4525e9b1a5118404
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-05 (Mon, 05 Feb 2018)
Changed paths:
M htdocs/compta/tva/reglement.php
Log Message:
-----------
Fix default sort order
Commit: c2590b9c7eb47d444910556b3f6966edeaa4e5c4
https://github.com/Dolibarr/dolibarr/commit/c2590b9c7eb47d444910556b3f6966edeaa4e5c4
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-05 (Mon, 05 Feb 2018)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/compta/tva/class/tva.class.php
Log Message:
-----------
Fix: complete labels of operation if bank journal
Conflicts:
htdocs/compta/tva/class/tva.class.php
Commit: 180f9918c7c426a2184417de204f7ac50e882462
https://github.com/Dolibarr/dolibarr/commit/180f9918c7c426a2184417de204f7ac50e882462
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-05 (Mon, 05 Feb 2018)
Changed paths:
M htdocs/langs/fr_FR/accountancy.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/bills.lang
M htdocs/langs/fr_FR/companies.lang
M htdocs/langs/fr_FR/compta.lang
M htdocs/langs/fr_FR/ecm.lang
M htdocs/langs/fr_FR/mails.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/langs/fr_FR/modulebuilder.lang
M htdocs/langs/fr_FR/other.lang
M htdocs/langs/fr_FR/salaries.lang
M htdocs/langs/fr_FR/users.lang
Log Message:
-----------
Transifex sync
Commit: 6d5267660047f809ae5077b12b573d5ee62e64db
https://github.com/Dolibarr/dolibarr/commit/6d5267660047f809ae5077b12b573d5ee62e64db
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-05 (Mon, 05 Feb 2018)
Changed paths:
M htdocs/filefunc.inc.php
Log Message:
-----------
Prepare 7.0
Commit: 2fbe4637acd1719b348be823a6fc65e97b4a702b
https://github.com/Dolibarr/dolibarr/commit/2fbe4637acd1719b348be823a6fc65e97b4a702b
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-05 (Mon, 05 Feb 2018)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
Log Message:
-----------
Fix bad filter link
Commit: b063c19084eef006356f2e9c276aef03eee118d3
https://github.com/Dolibarr/dolibarr/commit/b063c19084eef006356f2e9c276aef03eee118d3
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-06 (Tue, 06 Feb 2018)
Changed paths:
M htdocs/comm/propal/list.php
Log Message:
-----------
Fix: object project not defined
Commit: 074f4a3b466873e5d699528f9e46e19b8d4dd08d
https://github.com/Dolibarr/dolibarr/commit/074f4a3b466873e5d699528f9e46e19b8d4dd08d
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-06 (Tue, 06 Feb 2018)
Changed paths:
M htdocs/comm/propal/list.php
M htdocs/compta/facture/list.php
M htdocs/fourn/facture/list.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Fix class not found when selecting project ref in lists
Commit: f251113f69ed5eb73594de78401132b4288a0492
https://github.com/Dolibarr/dolibarr/commit/f251113f69ed5eb73594de78401132b4288a0492
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-06 (Tue, 06 Feb 2018)
Changed paths:
M htdocs/accountancy/class/accountingjournal.class.php
M htdocs/accountancy/class/lettering.class.php
M htdocs/install/mysql/data/llx_accounting_abc.sql
Log Message:
-----------
Fix accounting module with multicompany
Commit: b364b2a4de06564d376f82fba948077dce1fcf54
https://github.com/Dolibarr/dolibarr/commit/b364b2a4de06564d376f82fba948077dce1fcf54
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-06 (Tue, 06 Feb 2018)
Changed paths:
M htdocs/comm/action/list.php
Log Message:
-----------
Fix selection of filter in agenda views
Commit: bf7ae08c4841b5557d37cdcac3d4a693d25d267f
https://github.com/Dolibarr/dolibarr/commit/bf7ae08c4841b5557d37cdcac3d4a693d25d267f
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-06 (Tue, 06 Feb 2018)
Changed paths:
M htdocs/langs/ar_SA/admin.lang
M htdocs/langs/ar_SA/bills.lang
M htdocs/langs/ar_SA/companies.lang
M htdocs/langs/ar_SA/compta.lang
M htdocs/langs/ar_SA/ecm.lang
M htdocs/langs/ar_SA/mails.lang
M htdocs/langs/ar_SA/main.lang
M htdocs/langs/ar_SA/other.lang
M htdocs/langs/ar_SA/salaries.lang
M htdocs/langs/ar_SA/users.lang
M htdocs/langs/bg_BG/admin.lang
M htdocs/langs/bg_BG/bills.lang
M htdocs/langs/bg_BG/companies.lang
M htdocs/langs/bg_BG/compta.lang
M htdocs/langs/bg_BG/ecm.lang
M htdocs/langs/bg_BG/mails.lang
M htdocs/langs/bg_BG/main.lang
M htdocs/langs/bg_BG/other.lang
M htdocs/langs/bg_BG/salaries.lang
M htdocs/langs/bg_BG/users.lang
M htdocs/langs/bn_BD/admin.lang
M htdocs/langs/bn_BD/bills.lang
M htdocs/langs/bn_BD/companies.lang
M htdocs/langs/bn_BD/compta.lang
M htdocs/langs/bn_BD/ecm.lang
M htdocs/langs/bn_BD/mails.lang
M htdocs/langs/bn_BD/main.lang
M htdocs/langs/bn_BD/other.lang
M htdocs/langs/bn_BD/salaries.lang
M htdocs/langs/bn_BD/users.lang
M htdocs/langs/bs_BA/admin.lang
M htdocs/langs/bs_BA/bills.lang
M htdocs/langs/bs_BA/companies.lang
M htdocs/langs/bs_BA/compta.lang
M htdocs/langs/bs_BA/ecm.lang
M htdocs/langs/bs_BA/mails.lang
M htdocs/langs/bs_BA/main.lang
M htdocs/langs/bs_BA/other.lang
M htdocs/langs/bs_BA/salaries.lang
M htdocs/langs/bs_BA/users.lang
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/companies.lang
M htdocs/langs/ca_ES/compta.lang
M htdocs/langs/ca_ES/ecm.lang
M htdocs/langs/ca_ES/mails.lang
M htdocs/langs/ca_ES/main.lang
M htdocs/langs/ca_ES/modulebuilder.lang
M htdocs/langs/ca_ES/multicurrency.lang
M htdocs/langs/ca_ES/other.lang
M htdocs/langs/ca_ES/printing.lang
M htdocs/langs/ca_ES/salaries.lang
M htdocs/langs/ca_ES/users.lang
M htdocs/langs/ca_ES/withdrawals.lang
M htdocs/langs/cs_CZ/admin.lang
M htdocs/langs/cs_CZ/bills.lang
M htdocs/langs/cs_CZ/companies.lang
M htdocs/langs/cs_CZ/compta.lang
M htdocs/langs/cs_CZ/ecm.lang
M htdocs/langs/cs_CZ/mails.lang
M htdocs/langs/cs_CZ/main.lang
M htdocs/langs/cs_CZ/other.lang
M htdocs/langs/cs_CZ/salaries.lang
M htdocs/langs/cs_CZ/users.lang
M htdocs/langs/da_DK/admin.lang
M htdocs/langs/da_DK/bills.lang
M htdocs/langs/da_DK/companies.lang
M htdocs/langs/da_DK/compta.lang
M htdocs/langs/da_DK/ecm.lang
M htdocs/langs/da_DK/mails.lang
M htdocs/langs/da_DK/main.lang
M htdocs/langs/da_DK/other.lang
M htdocs/langs/da_DK/salaries.lang
M htdocs/langs/da_DK/users.lang
M htdocs/langs/de_DE/accountancy.lang
M htdocs/langs/de_DE/admin.lang
M htdocs/langs/de_DE/bills.lang
M htdocs/langs/de_DE/companies.lang
M htdocs/langs/de_DE/compta.lang
M htdocs/langs/de_DE/donations.lang
M htdocs/langs/de_DE/ecm.lang
M htdocs/langs/de_DE/languages.lang
M htdocs/langs/de_DE/mails.lang
M htdocs/langs/de_DE/main.lang
M htdocs/langs/de_DE/other.lang
M htdocs/langs/de_DE/projects.lang
M htdocs/langs/de_DE/salaries.lang
M htdocs/langs/de_DE/stocks.lang
M htdocs/langs/de_DE/trips.lang
M htdocs/langs/de_DE/users.lang
M htdocs/langs/de_DE/withdrawals.lang
M htdocs/langs/de_DE/workflow.lang
M htdocs/langs/el_GR/admin.lang
M htdocs/langs/el_GR/bills.lang
M htdocs/langs/el_GR/companies.lang
M htdocs/langs/el_GR/compta.lang
M htdocs/langs/el_GR/ecm.lang
M htdocs/langs/el_GR/mails.lang
M htdocs/langs/el_GR/main.lang
M htdocs/langs/el_GR/other.lang
M htdocs/langs/el_GR/salaries.lang
M htdocs/langs/el_GR/users.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/bills.lang
M htdocs/langs/es_ES/companies.lang
M htdocs/langs/es_ES/compta.lang
M htdocs/langs/es_ES/ecm.lang
M htdocs/langs/es_ES/mails.lang
M htdocs/langs/es_ES/main.lang
M htdocs/langs/es_ES/other.lang
M htdocs/langs/es_ES/salaries.lang
M htdocs/langs/es_ES/users.lang
M htdocs/langs/et_EE/admin.lang
M htdocs/langs/et_EE/bills.lang
M htdocs/langs/et_EE/companies.lang
M htdocs/langs/et_EE/compta.lang
M htdocs/langs/et_EE/ecm.lang
M htdocs/langs/et_EE/mails.lang
M htdocs/langs/et_EE/main.lang
M htdocs/langs/et_EE/other.lang
M htdocs/langs/et_EE/salaries.lang
M htdocs/langs/et_EE/users.lang
M htdocs/langs/eu_ES/admin.lang
M htdocs/langs/eu_ES/bills.lang
M htdocs/langs/eu_ES/companies.lang
M htdocs/langs/eu_ES/compta.lang
M htdocs/langs/eu_ES/ecm.lang
M htdocs/langs/eu_ES/mails.lang
M htdocs/langs/eu_ES/main.lang
M htdocs/langs/eu_ES/other.lang
M htdocs/langs/eu_ES/salaries.lang
M htdocs/langs/eu_ES/users.lang
M htdocs/langs/fa_IR/admin.lang
M htdocs/langs/fa_IR/bills.lang
M htdocs/langs/fa_IR/companies.lang
M htdocs/langs/fa_IR/compta.lang
M htdocs/langs/fa_IR/ecm.lang
M htdocs/langs/fa_IR/mails.lang
M htdocs/langs/fa_IR/main.lang
M htdocs/langs/fa_IR/other.lang
M htdocs/langs/fa_IR/salaries.lang
M htdocs/langs/fa_IR/users.lang
M htdocs/langs/fi_FI/admin.lang
M htdocs/langs/fi_FI/bills.lang
M htdocs/langs/fi_FI/companies.lang
M htdocs/langs/fi_FI/compta.lang
M htdocs/langs/fi_FI/ecm.lang
M htdocs/langs/fi_FI/mails.lang
M htdocs/langs/fi_FI/main.lang
M htdocs/langs/fi_FI/other.lang
M htdocs/langs/fi_FI/salaries.lang
M htdocs/langs/fi_FI/users.lang
M htdocs/langs/he_IL/admin.lang
M htdocs/langs/he_IL/bills.lang
M htdocs/langs/he_IL/companies.lang
M htdocs/langs/he_IL/compta.lang
M htdocs/langs/he_IL/ecm.lang
M htdocs/langs/he_IL/mails.lang
M htdocs/langs/he_IL/main.lang
M htdocs/langs/he_IL/other.lang
M htdocs/langs/he_IL/salaries.lang
M htdocs/langs/he_IL/users.lang
M htdocs/langs/hr_HR/admin.lang
M htdocs/langs/hr_HR/bills.lang
M htdocs/langs/hr_HR/companies.lang
M htdocs/langs/hr_HR/compta.lang
M htdocs/langs/hr_HR/ecm.lang
M htdocs/langs/hr_HR/mails.lang
M htdocs/langs/hr_HR/main.lang
M htdocs/langs/hr_HR/other.lang
M htdocs/langs/hr_HR/salaries.lang
M htdocs/langs/hr_HR/users.lang
M htdocs/langs/hu_HU/admin.lang
M htdocs/langs/hu_HU/bills.lang
M htdocs/langs/hu_HU/companies.lang
M htdocs/langs/hu_HU/compta.lang
M htdocs/langs/hu_HU/ecm.lang
M htdocs/langs/hu_HU/mails.lang
M htdocs/langs/hu_HU/main.lang
M htdocs/langs/hu_HU/other.lang
M htdocs/langs/hu_HU/salaries.lang
M htdocs/langs/hu_HU/users.lang
M htdocs/langs/id_ID/admin.lang
M htdocs/langs/id_ID/bills.lang
M htdocs/langs/id_ID/companies.lang
M htdocs/langs/id_ID/compta.lang
M htdocs/langs/id_ID/ecm.lang
M htdocs/langs/id_ID/mails.lang
M htdocs/langs/id_ID/main.lang
M htdocs/langs/id_ID/other.lang
M htdocs/langs/id_ID/salaries.lang
M htdocs/langs/id_ID/users.lang
M htdocs/langs/is_IS/admin.lang
M htdocs/langs/is_IS/bills.lang
M htdocs/langs/is_IS/companies.lang
M htdocs/langs/is_IS/compta.lang
M htdocs/langs/is_IS/ecm.lang
M htdocs/langs/is_IS/mails.lang
M htdocs/langs/is_IS/main.lang
M htdocs/langs/is_IS/other.lang
M htdocs/langs/is_IS/salaries.lang
M htdocs/langs/is_IS/users.lang
M htdocs/langs/it_IT/admin.lang
M htdocs/langs/it_IT/bills.lang
M htdocs/langs/it_IT/companies.lang
M htdocs/langs/it_IT/compta.lang
M htdocs/langs/it_IT/ecm.lang
M htdocs/langs/it_IT/mails.lang
M htdocs/langs/it_IT/main.lang
M htdocs/langs/it_IT/other.lang
M htdocs/langs/it_IT/salaries.lang
M htdocs/langs/it_IT/users.lang
M htdocs/langs/ja_JP/admin.lang
M htdocs/langs/ja_JP/bills.lang
M htdocs/langs/ja_JP/companies.lang
M htdocs/langs/ja_JP/compta.lang
M htdocs/langs/ja_JP/ecm.lang
M htdocs/langs/ja_JP/mails.lang
M htdocs/langs/ja_JP/main.lang
M htdocs/langs/ja_JP/other.lang
M htdocs/langs/ja_JP/salaries.lang
M htdocs/langs/ja_JP/users.lang
M htdocs/langs/ka_GE/admin.lang
M htdocs/langs/ka_GE/bills.lang
M htdocs/langs/ka_GE/companies.lang
M htdocs/langs/ka_GE/compta.lang
M htdocs/langs/ka_GE/ecm.lang
M htdocs/langs/ka_GE/mails.lang
M htdocs/langs/ka_GE/main.lang
M htdocs/langs/ka_GE/other.lang
M htdocs/langs/ka_GE/salaries.lang
M htdocs/langs/ka_GE/users.lang
M htdocs/langs/km_KH/main.lang
M htdocs/langs/kn_IN/admin.lang
M htdocs/langs/kn_IN/bills.lang
M htdocs/langs/kn_IN/companies.lang
M htdocs/langs/kn_IN/compta.lang
M htdocs/langs/kn_IN/ecm.lang
M htdocs/langs/kn_IN/mails.lang
M htdocs/langs/kn_IN/main.lang
M htdocs/langs/kn_IN/other.lang
M htdocs/langs/kn_IN/salaries.lang
M htdocs/langs/kn_IN/users.lang
M htdocs/langs/ko_KR/admin.lang
M htdocs/langs/ko_KR/bills.lang
M htdocs/langs/ko_KR/companies.lang
M htdocs/langs/ko_KR/compta.lang
M htdocs/langs/ko_KR/ecm.lang
M htdocs/langs/ko_KR/mails.lang
M htdocs/langs/ko_KR/main.lang
M htdocs/langs/ko_KR/other.lang
M htdocs/langs/ko_KR/salaries.lang
M htdocs/langs/ko_KR/users.lang
M htdocs/langs/lo_LA/admin.lang
M htdocs/langs/lo_LA/bills.lang
M htdocs/langs/lo_LA/companies.lang
M htdocs/langs/lo_LA/compta.lang
M htdocs/langs/lo_LA/ecm.lang
M htdocs/langs/lo_LA/mails.lang
M htdocs/langs/lo_LA/main.lang
M htdocs/langs/lo_LA/other.lang
M htdocs/langs/lo_LA/salaries.lang
M htdocs/langs/lo_LA/users.lang
M htdocs/langs/lt_LT/admin.lang
M htdocs/langs/lt_LT/bills.lang
M htdocs/langs/lt_LT/companies.lang
M htdocs/langs/lt_LT/compta.lang
M htdocs/langs/lt_LT/ecm.lang
M htdocs/langs/lt_LT/mails.lang
M htdocs/langs/lt_LT/main.lang
M htdocs/langs/lt_LT/other.lang
M htdocs/langs/lt_LT/salaries.lang
M htdocs/langs/lt_LT/users.lang
M htdocs/langs/lv_LV/admin.lang
M htdocs/langs/lv_LV/bills.lang
M htdocs/langs/lv_LV/companies.lang
M htdocs/langs/lv_LV/compta.lang
M htdocs/langs/lv_LV/ecm.lang
M htdocs/langs/lv_LV/mails.lang
M htdocs/langs/lv_LV/main.lang
M htdocs/langs/lv_LV/other.lang
M htdocs/langs/lv_LV/salaries.lang
M htdocs/langs/lv_LV/users.lang
M htdocs/langs/mk_MK/admin.lang
M htdocs/langs/mk_MK/bills.lang
M htdocs/langs/mk_MK/companies.lang
M htdocs/langs/mk_MK/compta.lang
M htdocs/langs/mk_MK/ecm.lang
M htdocs/langs/mk_MK/mails.lang
M htdocs/langs/mk_MK/main.lang
M htdocs/langs/mk_MK/other.lang
M htdocs/langs/mk_MK/salaries.lang
M htdocs/langs/mk_MK/users.lang
M htdocs/langs/mn_MN/admin.lang
M htdocs/langs/mn_MN/bills.lang
M htdocs/langs/mn_MN/companies.lang
M htdocs/langs/mn_MN/compta.lang
M htdocs/langs/mn_MN/ecm.lang
M htdocs/langs/mn_MN/mails.lang
M htdocs/langs/mn_MN/main.lang
M htdocs/langs/mn_MN/other.lang
M htdocs/langs/mn_MN/salaries.lang
M htdocs/langs/mn_MN/users.lang
M htdocs/langs/nb_NO/admin.lang
M htdocs/langs/nb_NO/bills.lang
M htdocs/langs/nb_NO/companies.lang
M htdocs/langs/nb_NO/compta.lang
M htdocs/langs/nb_NO/ecm.lang
M htdocs/langs/nb_NO/mails.lang
M htdocs/langs/nb_NO/main.lang
M htdocs/langs/nb_NO/other.lang
M htdocs/langs/nb_NO/salaries.lang
M htdocs/langs/nb_NO/users.lang
M htdocs/langs/nl_BE/admin.lang
M htdocs/langs/nl_BE/boxes.lang
M htdocs/langs/nl_BE/companies.lang
R htdocs/langs/nl_BE/link.lang
M htdocs/langs/nl_NL/accountancy.lang
M htdocs/langs/nl_NL/admin.lang
M htdocs/langs/nl_NL/banks.lang
M htdocs/langs/nl_NL/bills.lang
M htdocs/langs/nl_NL/boxes.lang
M htdocs/langs/nl_NL/cashdesk.lang
M htdocs/langs/nl_NL/commercial.lang
M htdocs/langs/nl_NL/companies.lang
M htdocs/langs/nl_NL/compta.lang
M htdocs/langs/nl_NL/donations.lang
M htdocs/langs/nl_NL/ecm.lang
M htdocs/langs/nl_NL/errors.lang
M htdocs/langs/nl_NL/exports.lang
M htdocs/langs/nl_NL/incoterm.lang
M htdocs/langs/nl_NL/install.lang
M htdocs/langs/nl_NL/languages.lang
M htdocs/langs/nl_NL/ldap.lang
M htdocs/langs/nl_NL/link.lang
M htdocs/langs/nl_NL/loan.lang
M htdocs/langs/nl_NL/mailmanspip.lang
M htdocs/langs/nl_NL/mails.lang
M htdocs/langs/nl_NL/main.lang
M htdocs/langs/nl_NL/orders.lang
M htdocs/langs/nl_NL/other.lang
M htdocs/langs/nl_NL/productbatch.lang
M htdocs/langs/nl_NL/products.lang
M htdocs/langs/nl_NL/projects.lang
M htdocs/langs/nl_NL/propal.lang
M htdocs/langs/nl_NL/resource.lang
M htdocs/langs/nl_NL/salaries.lang
M htdocs/langs/nl_NL/sendings.lang
M htdocs/langs/nl_NL/sms.lang
M htdocs/langs/nl_NL/stocks.lang
M htdocs/langs/nl_NL/supplier_proposal.lang
M htdocs/langs/nl_NL/users.lang
M htdocs/langs/nl_NL/withdrawals.lang
M htdocs/langs/pl_PL/admin.lang
M htdocs/langs/pl_PL/bills.lang
M htdocs/langs/pl_PL/companies.lang
M htdocs/langs/pl_PL/compta.lang
M htdocs/langs/pl_PL/ecm.lang
M htdocs/langs/pl_PL/mails.lang
M htdocs/langs/pl_PL/main.lang
M htdocs/langs/pl_PL/other.lang
M htdocs/langs/pl_PL/salaries.lang
M htdocs/langs/pl_PL/users.lang
M htdocs/langs/pt_BR/bills.lang
M htdocs/langs/pt_BR/compta.lang
M htdocs/langs/pt_BR/main.lang
M htdocs/langs/pt_BR/products.lang
M htdocs/langs/pt_BR/suppliers.lang
M htdocs/langs/pt_PT/admin.lang
M htdocs/langs/pt_PT/bills.lang
M htdocs/langs/pt_PT/companies.lang
M htdocs/langs/pt_PT/compta.lang
M htdocs/langs/pt_PT/cron.lang
M htdocs/langs/pt_PT/dict.lang
M htdocs/langs/pt_PT/ecm.lang
M htdocs/langs/pt_PT/errors.lang
M htdocs/langs/pt_PT/install.lang
M htdocs/langs/pt_PT/interventions.lang
M htdocs/langs/pt_PT/languages.lang
M htdocs/langs/pt_PT/mails.lang
M htdocs/langs/pt_PT/main.lang
M htdocs/langs/pt_PT/members.lang
M htdocs/langs/pt_PT/other.lang
M htdocs/langs/pt_PT/products.lang
M htdocs/langs/pt_PT/projects.lang
M htdocs/langs/pt_PT/salaries.lang
M htdocs/langs/pt_PT/sendings.lang
M htdocs/langs/pt_PT/stocks.lang
M htdocs/langs/pt_PT/supplier_proposal.lang
M htdocs/langs/pt_PT/suppliers.lang
M htdocs/langs/pt_PT/trips.lang
M htdocs/langs/pt_PT/users.lang
M htdocs/langs/ro_RO/admin.lang
M htdocs/langs/ro_RO/bills.lang
M htdocs/langs/ro_RO/companies.lang
M htdocs/langs/ro_RO/compta.lang
M htdocs/langs/ro_RO/ecm.lang
M htdocs/langs/ro_RO/mails.lang
M htdocs/langs/ro_RO/main.lang
M htdocs/langs/ro_RO/other.lang
M htdocs/langs/ro_RO/salaries.lang
M htdocs/langs/ro_RO/users.lang
M htdocs/langs/ru_RU/admin.lang
M htdocs/langs/ru_RU/bills.lang
M htdocs/langs/ru_RU/companies.lang
M htdocs/langs/ru_RU/compta.lang
M htdocs/langs/ru_RU/ecm.lang
M htdocs/langs/ru_RU/mails.lang
M htdocs/langs/ru_RU/main.lang
M htdocs/langs/ru_RU/other.lang
M htdocs/langs/ru_RU/salaries.lang
M htdocs/langs/ru_RU/users.lang
M htdocs/langs/sk_SK/admin.lang
M htdocs/langs/sk_SK/bills.lang
M htdocs/langs/sk_SK/companies.lang
M htdocs/langs/sk_SK/compta.lang
M htdocs/langs/sk_SK/ecm.lang
M htdocs/langs/sk_SK/mails.lang
M htdocs/langs/sk_SK/main.lang
M htdocs/langs/sk_SK/other.lang
M htdocs/langs/sk_SK/salaries.lang
M htdocs/langs/sk_SK/users.lang
M htdocs/langs/sl_SI/admin.lang
M htdocs/langs/sl_SI/bills.lang
M htdocs/langs/sl_SI/companies.lang
M htdocs/langs/sl_SI/compta.lang
M htdocs/langs/sl_SI/ecm.lang
M htdocs/langs/sl_SI/mails.lang
M htdocs/langs/sl_SI/main.lang
M htdocs/langs/sl_SI/other.lang
M htdocs/langs/sl_SI/salaries.lang
M htdocs/langs/sl_SI/users.lang
M htdocs/langs/sq_AL/admin.lang
M htdocs/langs/sq_AL/bills.lang
M htdocs/langs/sq_AL/companies.lang
M htdocs/langs/sq_AL/compta.lang
M htdocs/langs/sq_AL/ecm.lang
M htdocs/langs/sq_AL/mails.lang
M htdocs/langs/sq_AL/main.lang
M htdocs/langs/sq_AL/other.lang
M htdocs/langs/sq_AL/salaries.lang
M htdocs/langs/sq_AL/users.lang
M htdocs/langs/sr_RS/admin.lang
M htdocs/langs/sr_RS/bills.lang
M htdocs/langs/sr_RS/companies.lang
M htdocs/langs/sr_RS/compta.lang
M htdocs/langs/sr_RS/ecm.lang
M htdocs/langs/sr_RS/mails.lang
M htdocs/langs/sr_RS/main.lang
M htdocs/langs/sr_RS/other.lang
M htdocs/langs/sr_RS/salaries.lang
M htdocs/langs/sr_RS/users.lang
M htdocs/langs/sv_SE/admin.lang
M htdocs/langs/sv_SE/bills.lang
M htdocs/langs/sv_SE/companies.lang
M htdocs/langs/sv_SE/compta.lang
M htdocs/langs/sv_SE/ecm.lang
M htdocs/langs/sv_SE/mails.lang
M htdocs/langs/sv_SE/main.lang
M htdocs/langs/sv_SE/other.lang
M htdocs/langs/sv_SE/salaries.lang
M htdocs/langs/sv_SE/users.lang
M htdocs/langs/sw_SW/admin.lang
M htdocs/langs/sw_SW/bills.lang
M htdocs/langs/sw_SW/companies.lang
M htdocs/langs/sw_SW/compta.lang
M htdocs/langs/sw_SW/ecm.lang
M htdocs/langs/sw_SW/mails.lang
M htdocs/langs/sw_SW/main.lang
M htdocs/langs/sw_SW/other.lang
M htdocs/langs/sw_SW/salaries.lang
M htdocs/langs/sw_SW/users.lang
M htdocs/langs/th_TH/admin.lang
M htdocs/langs/th_TH/bills.lang
M htdocs/langs/th_TH/companies.lang
M htdocs/langs/th_TH/compta.lang
M htdocs/langs/th_TH/ecm.lang
M htdocs/langs/th_TH/mails.lang
M htdocs/langs/th_TH/main.lang
M htdocs/langs/th_TH/other.lang
M htdocs/langs/th_TH/salaries.lang
M htdocs/langs/th_TH/users.lang
M htdocs/langs/tr_TR/admin.lang
M htdocs/langs/tr_TR/bills.lang
M htdocs/langs/tr_TR/companies.lang
M htdocs/langs/tr_TR/compta.lang
M htdocs/langs/tr_TR/ecm.lang
M htdocs/langs/tr_TR/mails.lang
M htdocs/langs/tr_TR/main.lang
M htdocs/langs/tr_TR/other.lang
M htdocs/langs/tr_TR/salaries.lang
M htdocs/langs/tr_TR/users.lang
M htdocs/langs/uk_UA/admin.lang
M htdocs/langs/uk_UA/bills.lang
M htdocs/langs/uk_UA/companies.lang
M htdocs/langs/uk_UA/compta.lang
M htdocs/langs/uk_UA/ecm.lang
M htdocs/langs/uk_UA/mails.lang
M htdocs/langs/uk_UA/main.lang
M htdocs/langs/uk_UA/other.lang
M htdocs/langs/uk_UA/salaries.lang
M htdocs/langs/uk_UA/users.lang
M htdocs/langs/uz_UZ/admin.lang
M htdocs/langs/uz_UZ/bills.lang
M htdocs/langs/uz_UZ/companies.lang
M htdocs/langs/uz_UZ/compta.lang
M htdocs/langs/uz_UZ/ecm.lang
M htdocs/langs/uz_UZ/mails.lang
M htdocs/langs/uz_UZ/main.lang
M htdocs/langs/uz_UZ/other.lang
M htdocs/langs/uz_UZ/salaries.lang
M htdocs/langs/uz_UZ/users.lang
M htdocs/langs/vi_VN/admin.lang
M htdocs/langs/vi_VN/bills.lang
M htdocs/langs/vi_VN/companies.lang
M htdocs/langs/vi_VN/compta.lang
M htdocs/langs/vi_VN/ecm.lang
M htdocs/langs/vi_VN/mails.lang
M htdocs/langs/vi_VN/main.lang
M htdocs/langs/vi_VN/other.lang
M htdocs/langs/vi_VN/salaries.lang
M htdocs/langs/vi_VN/users.lang
M htdocs/langs/zh_CN/admin.lang
M htdocs/langs/zh_CN/bills.lang
M htdocs/langs/zh_CN/companies.lang
M htdocs/langs/zh_CN/compta.lang
M htdocs/langs/zh_CN/ecm.lang
M htdocs/langs/zh_CN/mails.lang
M htdocs/langs/zh_CN/main.lang
M htdocs/langs/zh_CN/other.lang
M htdocs/langs/zh_CN/salaries.lang
M htdocs/langs/zh_CN/users.lang
M htdocs/langs/zh_TW/admin.lang
M htdocs/langs/zh_TW/bills.lang
M htdocs/langs/zh_TW/companies.lang
M htdocs/langs/zh_TW/compta.lang
M htdocs/langs/zh_TW/ecm.lang
M htdocs/langs/zh_TW/mails.lang
M htdocs/langs/zh_TW/main.lang
M htdocs/langs/zh_TW/other.lang
M htdocs/langs/zh_TW/salaries.lang
M htdocs/langs/zh_TW/users.lang
Log Message:
-----------
sync transifex
Commit: 930d58ab961c4d1e0095fb460e8ff72b4db28f7b
https://github.com/Dolibarr/dolibarr/commit/930d58ab961c4d1e0095fb460e8ff72b4db28f7b
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-06 (Tue, 06 Feb 2018)
Changed paths:
M htdocs/core/modules/modProduct.class.php
M htdocs/core/modules/modService.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/langs/en_US/companies.lang
M htdocs/langs/en_US/main.lang
M htdocs/resource/list.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Fix import supplier product price vat
Commit: 565372eaab444e954246d8fed59da9c6858c237f
https://github.com/Dolibarr/dolibarr/commit/565372eaab444e954246d8fed59da9c6858c237f
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-06 (Tue, 06 Feb 2018)
Changed paths:
M htdocs/core/class/extrafields.class.php
M htdocs/core/tpl/extrafields_list_search_input.tpl.php
Log Message:
-----------
Fix param showsize. Fix extrafields field too long
Commit: ea92f6beaed611340dd330fe5ff1bc2ebe4495ce
https://github.com/Dolibarr/dolibarr/commit/ea92f6beaed611340dd330fe5ff1bc2ebe4495ce
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-06 (Tue, 06 Feb 2018)
Changed paths:
M htdocs/compta/prelevement/bons.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/prelevement/create.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.php
M htdocs/core/boxes/box_activity.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/core/lib/project.lib.php
M htdocs/core/modules/modProjet.class.php
M htdocs/opensurvey/list.php
M htdocs/projet/activity/index.php
M htdocs/projet/graph_opportunities.inc.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
Log Message:
-----------
Fix for multicompany
Commit: 69196dc52c76c5d0dac642abeece7bd7f06bde75
https://github.com/Dolibarr/dolibarr/commit/69196dc52c76c5d0dac642abeece7bd7f06bde75
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-06 (Tue, 06 Feb 2018)
Changed paths:
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/projet/admin/project.php
Log Message:
-----------
Fix menu not visible with auguria module
Commit: 490a1bd08d583badf1eb3ddb39fb6c8f38c3fe14
https://github.com/Dolibarr/dolibarr/commit/490a1bd08d583badf1eb3ddb39fb6c8f38c3fe14
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-06 (Tue, 06 Feb 2018)
Changed paths:
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
Log Message:
-----------
Fix label
Commit: 9962d36dbc452138769676eddbb437bf61b56552
https://github.com/Dolibarr/dolibarr/commit/9962d36dbc452138769676eddbb437bf61b56552
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-06 (Tue, 06 Feb 2018)
Changed paths:
M htdocs/langs/en_US/projects.lang
Log Message:
-----------
Fix translation
Commit: 9b5655596249c3e0367f63d44e4d9f8e59da95ca
https://github.com/Dolibarr/dolibarr/commit/9b5655596249c3e0367f63d44e4d9f8e59da95ca
Author: Juanjo Menent <address@hidden>
Date: 2018-02-06 (Tue, 06 Feb 2018)
Changed paths:
M htdocs/compta/prelevement/list.php
Log Message:
-----------
FIX: Withdrawals lines not filter by company name and not respect dropdown
limit lines by page
Commit: 5e7d172a58cccd501d08a17294256c8a96b5ff58
https://github.com/Dolibarr/dolibarr/commit/5e7d172a58cccd501d08a17294256c8a96b5ff58
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-06 (Tue, 06 Feb 2018)
Changed paths:
M htdocs/user/class/usergroup.class.php
M htdocs/user/group/index.php
M htdocs/user/home.php
Log Message:
-----------
Fix look and feel v7 on ref popup
Commit: 8b7f40e15bb64ad97d78c75142acc339ccdd0540
https://github.com/Dolibarr/dolibarr/commit/8b7f40e15bb64ad97d78c75142acc339ccdd0540
Author: Regis Houssin <address@hidden>
Date: 2018-02-06 (Tue, 06 Feb 2018)
Changed paths:
M htdocs/user/class/usergroup.class.php
M htdocs/user/group/index.php
M htdocs/user/home.php
Log Message:
-----------
Fix: wrong id name
Commit: b95cd2f38396a12467dcbcd81d47207640c06690
https://github.com/Dolibarr/dolibarr/commit/b95cd2f38396a12467dcbcd81d47207640c06690
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-06 (Tue, 06 Feb 2018)
Changed paths:
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/langs/en_US/products.lang
Log Message:
-----------
Fix translation
Commit: 852c4fc0336585b8f04b4d4bad9fd3558ca5ad5d
https://github.com/Dolibarr/dolibarr/commit/852c4fc0336585b8f04b4d4bad9fd3558ca5ad5d
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-07 (Wed, 07 Feb 2018)
Changed paths:
M htdocs/user/card.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/index.php
Log Message:
-----------
Fix context of filter not lost
Commit: 6254e20c676319e0b29dc2bd5262644270af32dd
https://github.com/Dolibarr/dolibarr/commit/6254e20c676319e0b29dc2bd5262644270af32dd
Author: atm-ph <address@hidden>
Date: 2018-02-07 (Wed, 07 Feb 2018)
Changed paths:
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:
-----------
Fix position if module use pdf hook "linkedobjects"
Commit: d8872a412b1f6709492cbd37c3af05d0e52c0eed
https://github.com/Dolibarr/dolibarr/commit/d8872a412b1f6709492cbd37c3af05d0e52c0eed
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-07 (Wed, 07 Feb 2018)
Changed paths:
M htdocs/core/modules/expensereport/mod_expensereport_jade.php
M htdocs/expensereport/card.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/langs/en_US/trips.lang
Log Message:
-----------
Fix numbering for expense report
Commit: 413331c7dd546dfaaeea89691ab273ffd25874c4
https://github.com/Dolibarr/dolibarr/commit/413331c7dd546dfaaeea89691ab273ffd25874c4
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-07 (Wed, 07 Feb 2018)
Changed paths:
M htdocs/user/class/usergroup.class.php
Log Message:
-----------
Fix travis
Commit: 8dd7d69294b286c8eb1528b1bca9c1521f2b8581
https://github.com/Dolibarr/dolibarr/commit/8dd7d69294b286c8eb1528b1bca9c1521f2b8581
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-07 (Wed, 07 Feb 2018)
Changed paths:
M htdocs/expensereport/card.php
Log Message:
-----------
Fix commit
Commit: 510fc22172d8e9fd20296accc8db771bb5f1255e
https://github.com/Dolibarr/dolibarr/commit/510fc22172d8e9fd20296accc8db771bb5f1255e
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-07 (Wed, 07 Feb 2018)
Changed paths:
M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
M htdocs/expensereport/card.php
Log Message:
-----------
Fix expense report
Commit: cb5d0b1677b112d6c606d9797528a3ab78992e22
https://github.com/Dolibarr/dolibarr/commit/cb5d0b1677b112d6c606d9797528a3ab78992e22
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-07 (Wed, 07 Feb 2018)
Changed paths:
M htdocs/core/modules/expensereport/mod_expensereport_jade.php
Log Message:
-----------
Fix compatibility option EXPENSEREPORT_USE_OLD_NUMBERING_RULE
Commit: 37afc58c485b69d6462c544080dfd7ded926e0d3
https://github.com/Dolibarr/dolibarr/commit/37afc58c485b69d6462c544080dfd7ded926e0d3
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-07 (Wed, 07 Feb 2018)
Changed paths:
M ChangeLog
M htdocs/core/modules/expensereport/mod_expensereport_jade.php
Log Message:
-----------
The module ExpenseReport use numbering rules that you can setup (like
other modules do). If you need to keep the hard coded numbering rule of
expenses report used in 6.0, just add constant
EXPENSEREPORT_USE_OLD_NUMBERING_RULE to 1.
Commit: 507328d83acf923ad406c35933fa31496a8fb3be
https://github.com/Dolibarr/dolibarr/commit/507328d83acf923ad406c35933fa31496a8fb3be
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-07 (Wed, 07 Feb 2018)
Changed paths:
M htdocs/core/modules/expensereport/mod_expensereport_jade.php
Log Message:
-----------
Fix syntax error
Commit: 729cf20df72b039a1b2dd63d69f94069ffc1197a
https://github.com/Dolibarr/dolibarr/commit/729cf20df72b039a1b2dd63d69f94069ffc1197a
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-07 (Wed, 07 Feb 2018)
Changed paths:
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Fix css
Commit: 70a65b89eb39f7ef334279f2b97fc7493871d59e
https://github.com/Dolibarr/dolibarr/commit/70a65b89eb39f7ef334279f2b97fc7493871d59e
Author: Regis Houssin <address@hidden>
Date: 2018-02-08 (Thu, 08 Feb 2018)
Changed paths:
M ChangeLog
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
M htdocs/core/modules/expensereport/mod_expensereport_jade.php
M htdocs/expensereport/card.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/langs/en_US/products.lang
M htdocs/langs/en_US/trips.lang
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
M htdocs/user/card.php
M htdocs/user/class/usergroup.class.php
M htdocs/user/group/card.php
M htdocs/user/group/ldap.php
M htdocs/user/group/perms.php
M htdocs/user/index.php
Log Message:
-----------
Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_bug
Commit: 879308e0ef5e986e9f7d60c0c12a7f8780c90d53
https://github.com/Dolibarr/dolibarr/commit/879308e0ef5e986e9f7d60c0c12a7f8780c90d53
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-08 (Thu, 08 Feb 2018)
Changed paths:
M htdocs/core/tpl/login.tpl.php
Log Message:
-----------
Fix responsive
Commit: a26bb2d884220a0093f82f1f7155771bdc89a252
https://github.com/Dolibarr/dolibarr/commit/a26bb2d884220a0093f82f1f7155771bdc89a252
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-08 (Thu, 08 Feb 2018)
Changed paths:
M htdocs/fichinter/class/fichinter.class.php
Log Message:
-----------
FIX #8151
Commit: 81563740055c1013167fac574adcfa8bdb9d009c
https://github.com/Dolibarr/dolibarr/commit/81563740055c1013167fac574adcfa8bdb9d009c
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-08 (Thu, 08 Feb 2018)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Commit: 414093f94fe352b4fe2998d4ed87f10d3b1be670
https://github.com/Dolibarr/dolibarr/commit/414093f94fe352b4fe2998d4ed87f10d3b1be670
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-08 (Thu, 08 Feb 2018)
Changed paths:
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 pull request #8155 from atm-ph/fix_6.0_pdf_writelinkedobjects_position
Fix position if module use pdf hook "linkedobjects"
Commit: 2e3bb4a585508de1b5a385923d92007c7262caf4
https://github.com/Dolibarr/dolibarr/commit/2e3bb4a585508de1b5a385923d92007c7262caf4
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-08 (Thu, 08 Feb 2018)
Changed paths:
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 '6.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Commit: c988d3f1cc3f4b4b9eb712439540e1e739597484
https://github.com/Dolibarr/dolibarr/commit/c988d3f1cc3f4b4b9eb712439540e1e739597484
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-08 (Thu, 08 Feb 2018)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/compta/facture.php
Commit: ab21769aa28ef599e3fbe225b84fe0d3e1b4fd06
https://github.com/Dolibarr/dolibarr/commit/ab21769aa28ef599e3fbe225b84fe0d3e1b4fd06
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-08 (Thu, 08 Feb 2018)
Changed paths:
M htdocs/compta/facture/card.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
M htdocs/core/tpl/card_presend.tpl.php
M htdocs/fichinter/class/fichinter.class.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/compta/facture/card.php
Commit: 3f17c92aa3550b1131205e15b8c519c444821d17
https://github.com/Dolibarr/dolibarr/commit/3f17c92aa3550b1131205e15b8c519c444821d17
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-08 (Thu, 08 Feb 2018)
Changed paths:
M htdocs/societe/card.php
Log Message:
-----------
Update card.php
Commit: 371b168db1756012915b5079a4d350ea9735681d
https://github.com/Dolibarr/dolibarr/commit/371b168db1756012915b5079a4d350ea9735681d
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-08 (Thu, 08 Feb 2018)
Changed paths:
M htdocs/societe/card.php
Log Message:
-----------
Merge pull request #8133 from atm-quentin/6.0
FIX unset categorie
Commit: 071436caba442610ce183c8ea5fa18f861e03e5c
https://github.com/Dolibarr/dolibarr/commit/071436caba442610ce183c8ea5fa18f861e03e5c
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-08 (Thu, 08 Feb 2018)
Changed paths:
M htdocs/user/class/usergroup.class.php
M htdocs/user/group/index.php
M htdocs/user/home.php
Log Message:
-----------
Merge pull request #8144 from hregis/7.0_bug
Fix: wrong id name
Commit: 03b10041db412ef53c57a80af61cfd95e68601d8
https://github.com/Dolibarr/dolibarr/commit/03b10041db412ef53c57a80af61cfd95e68601d8
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-08 (Thu, 08 Feb 2018)
Changed paths:
M htdocs/product/fournisseurs.php
Log Message:
-----------
Fix missing contextpage
Commit: c8ba1735635a84ff55d581c3050d2e973312450c
https://github.com/Dolibarr/dolibarr/commit/c8ba1735635a84ff55d581c3050d2e973312450c
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-08 (Thu, 08 Feb 2018)
Changed paths:
M htdocs/user/class/usergroup.class.php
M htdocs/user/group/index.php
M htdocs/user/home.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Commit: 39cd63e2d4abdcb8d1e035e8c7b870c0cbd33e03
https://github.com/Dolibarr/dolibarr/commit/39cd63e2d4abdcb8d1e035e8c7b870c0cbd33e03
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-08 (Thu, 08 Feb 2018)
Changed paths:
M htdocs/compta/prelevement/list.php
Log Message:
-----------
Merge pull request #8143 from simnandez/6.0
FIX: Withdrawals lines not filter by company name and not respect dropdown
limit lines by page
Commit: b56da9c11ee4291d667151cd2cea4e4d9df12b1a
https://github.com/Dolibarr/dolibarr/commit/b56da9c11ee4291d667151cd2cea4e4d9df12b1a
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-08 (Thu, 08 Feb 2018)
Changed paths:
M htdocs/index.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Better balance css columns in dashboard
Commit: ddcb1e2bb64463ac21d87e58b3b2448019bf3671
https://github.com/Dolibarr/dolibarr/commit/ddcb1e2bb64463ac21d87e58b3b2448019bf3671
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-08 (Thu, 08 Feb 2018)
Changed paths:
M htdocs/langs/fr_FR/categories.lang
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Commit: 2b2e68c78dcc35f4b7cc8ccd5ce2fce279a3af7a
https://github.com/Dolibarr/dolibarr/commit/2b2e68c78dcc35f4b7cc8ccd5ce2fce279a3af7a
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-08 (Thu, 08 Feb 2018)
Changed paths:
M htdocs/compta/prelevement/list.php
M htdocs/societe/card.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/societe/card.php
Commit: eccdc9a075298031e2fe4ea54092c565b610a652
https://github.com/Dolibarr/dolibarr/commit/eccdc9a075298031e2fe4ea54092c565b610a652
Author: Laurent Destailleur <address@hidden>
Date: 2018-02-08 (Thu, 08 Feb 2018)
Changed paths:
M ChangeLog
M htdocs/accountancy/class/accountingjournal.class.php
M htdocs/accountancy/class/lettering.class.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/list.php
M htdocs/comm/propal/list.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/list.php
M htdocs/compta/prelevement/bons.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/prelevement/create.php
M htdocs/compta/prelevement/list.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.php
M htdocs/core/boxes/box_activity.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/core/lib/project.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
M htdocs/core/modules/expensereport/mod_expensereport_jade.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/modProduct.class.php
M htdocs/core/modules/modProjet.class.php
M htdocs/core/modules/modService.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/tpl/card_presend.tpl.php
M htdocs/core/tpl/extrafields_list_search_input.tpl.php
M htdocs/core/tpl/login.tpl.php
M htdocs/expensereport/card.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fourn/facture/list.php
M htdocs/install/mysql/data/llx_accounting_abc.sql
M htdocs/langs/ar_SA/admin.lang
M htdocs/langs/ar_SA/bills.lang
M htdocs/langs/ar_SA/companies.lang
M htdocs/langs/ar_SA/compta.lang
M htdocs/langs/ar_SA/ecm.lang
M htdocs/langs/ar_SA/mails.lang
M htdocs/langs/ar_SA/main.lang
M htdocs/langs/ar_SA/other.lang
M htdocs/langs/ar_SA/salaries.lang
M htdocs/langs/ar_SA/users.lang
M htdocs/langs/bg_BG/admin.lang
M htdocs/langs/bg_BG/bills.lang
M htdocs/langs/bg_BG/companies.lang
M htdocs/langs/bg_BG/compta.lang
M htdocs/langs/bg_BG/ecm.lang
M htdocs/langs/bg_BG/mails.lang
M htdocs/langs/bg_BG/main.lang
M htdocs/langs/bg_BG/other.lang
M htdocs/langs/bg_BG/salaries.lang
M htdocs/langs/bg_BG/users.lang
M htdocs/langs/bn_BD/admin.lang
M htdocs/langs/bn_BD/bills.lang
M htdocs/langs/bn_BD/companies.lang
M htdocs/langs/bn_BD/compta.lang
M htdocs/langs/bn_BD/ecm.lang
M htdocs/langs/bn_BD/mails.lang
M htdocs/langs/bn_BD/main.lang
M htdocs/langs/bn_BD/other.lang
M htdocs/langs/bn_BD/salaries.lang
M htdocs/langs/bn_BD/users.lang
M htdocs/langs/bs_BA/admin.lang
M htdocs/langs/bs_BA/bills.lang
M htdocs/langs/bs_BA/companies.lang
M htdocs/langs/bs_BA/compta.lang
M htdocs/langs/bs_BA/ecm.lang
M htdocs/langs/bs_BA/mails.lang
M htdocs/langs/bs_BA/main.lang
M htdocs/langs/bs_BA/other.lang
M htdocs/langs/bs_BA/salaries.lang
M htdocs/langs/bs_BA/users.lang
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/companies.lang
M htdocs/langs/ca_ES/compta.lang
M htdocs/langs/ca_ES/ecm.lang
M htdocs/langs/ca_ES/mails.lang
M htdocs/langs/ca_ES/main.lang
M htdocs/langs/ca_ES/modulebuilder.lang
M htdocs/langs/ca_ES/multicurrency.lang
M htdocs/langs/ca_ES/other.lang
M htdocs/langs/ca_ES/printing.lang
M htdocs/langs/ca_ES/salaries.lang
M htdocs/langs/ca_ES/users.lang
M htdocs/langs/ca_ES/withdrawals.lang
M htdocs/langs/cs_CZ/admin.lang
M htdocs/langs/cs_CZ/bills.lang
M htdocs/langs/cs_CZ/companies.lang
M htdocs/langs/cs_CZ/compta.lang
M htdocs/langs/cs_CZ/ecm.lang
M htdocs/langs/cs_CZ/mails.lang
M htdocs/langs/cs_CZ/main.lang
M htdocs/langs/cs_CZ/other.lang
M htdocs/langs/cs_CZ/salaries.lang
M htdocs/langs/cs_CZ/users.lang
M htdocs/langs/da_DK/admin.lang
M htdocs/langs/da_DK/bills.lang
M htdocs/langs/da_DK/companies.lang
M htdocs/langs/da_DK/compta.lang
M htdocs/langs/da_DK/ecm.lang
M htdocs/langs/da_DK/mails.lang
M htdocs/langs/da_DK/main.lang
M htdocs/langs/da_DK/other.lang
M htdocs/langs/da_DK/salaries.lang
M htdocs/langs/da_DK/users.lang
M htdocs/langs/de_DE/accountancy.lang
M htdocs/langs/de_DE/admin.lang
M htdocs/langs/de_DE/bills.lang
M htdocs/langs/de_DE/companies.lang
M htdocs/langs/de_DE/compta.lang
M htdocs/langs/de_DE/donations.lang
M htdocs/langs/de_DE/ecm.lang
M htdocs/langs/de_DE/languages.lang
M htdocs/langs/de_DE/mails.lang
M htdocs/langs/de_DE/main.lang
M htdocs/langs/de_DE/other.lang
M htdocs/langs/de_DE/projects.lang
M htdocs/langs/de_DE/salaries.lang
M htdocs/langs/de_DE/stocks.lang
M htdocs/langs/de_DE/trips.lang
M htdocs/langs/de_DE/users.lang
M htdocs/langs/de_DE/withdrawals.lang
M htdocs/langs/de_DE/workflow.lang
M htdocs/langs/el_GR/admin.lang
M htdocs/langs/el_GR/bills.lang
M htdocs/langs/el_GR/companies.lang
M htdocs/langs/el_GR/compta.lang
M htdocs/langs/el_GR/ecm.lang
M htdocs/langs/el_GR/mails.lang
M htdocs/langs/el_GR/main.lang
M htdocs/langs/el_GR/other.lang
M htdocs/langs/el_GR/salaries.lang
M htdocs/langs/el_GR/users.lang
M htdocs/langs/en_US/companies.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/products.lang
M htdocs/langs/en_US/projects.lang
M htdocs/langs/en_US/trips.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/bills.lang
M htdocs/langs/es_ES/companies.lang
M htdocs/langs/es_ES/compta.lang
M htdocs/langs/es_ES/ecm.lang
M htdocs/langs/es_ES/mails.lang
M htdocs/langs/es_ES/main.lang
M htdocs/langs/es_ES/other.lang
M htdocs/langs/es_ES/salaries.lang
M htdocs/langs/es_ES/users.lang
M htdocs/langs/et_EE/admin.lang
M htdocs/langs/et_EE/bills.lang
M htdocs/langs/et_EE/companies.lang
M htdocs/langs/et_EE/compta.lang
M htdocs/langs/et_EE/ecm.lang
M htdocs/langs/et_EE/mails.lang
M htdocs/langs/et_EE/main.lang
M htdocs/langs/et_EE/other.lang
M htdocs/langs/et_EE/salaries.lang
M htdocs/langs/et_EE/users.lang
M htdocs/langs/eu_ES/admin.lang
M htdocs/langs/eu_ES/bills.lang
M htdocs/langs/eu_ES/companies.lang
M htdocs/langs/eu_ES/compta.lang
M htdocs/langs/eu_ES/ecm.lang
M htdocs/langs/eu_ES/mails.lang
M htdocs/langs/eu_ES/main.lang
M htdocs/langs/eu_ES/other.lang
M htdocs/langs/eu_ES/salaries.lang
M htdocs/langs/eu_ES/users.lang
M htdocs/langs/fa_IR/admin.lang
M htdocs/langs/fa_IR/bills.lang
M htdocs/langs/fa_IR/companies.lang
M htdocs/langs/fa_IR/compta.lang
M htdocs/langs/fa_IR/ecm.lang
M htdocs/langs/fa_IR/mails.lang
M htdocs/langs/fa_IR/main.lang
M htdocs/langs/fa_IR/other.lang
M htdocs/langs/fa_IR/salaries.lang
M htdocs/langs/fa_IR/users.lang
M htdocs/langs/fi_FI/admin.lang
M htdocs/langs/fi_FI/bills.lang
M htdocs/langs/fi_FI/companies.lang
M htdocs/langs/fi_FI/compta.lang
M htdocs/langs/fi_FI/ecm.lang
M htdocs/langs/fi_FI/mails.lang
M htdocs/langs/fi_FI/main.lang
M htdocs/langs/fi_FI/other.lang
M htdocs/langs/fi_FI/salaries.lang
M htdocs/langs/fi_FI/users.lang
M htdocs/langs/fr_FR/accountancy.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/bills.lang
M htdocs/langs/fr_FR/companies.lang
M htdocs/langs/fr_FR/compta.lang
M htdocs/langs/fr_FR/ecm.lang
M htdocs/langs/fr_FR/mails.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/langs/fr_FR/modulebuilder.lang
M htdocs/langs/fr_FR/other.lang
M htdocs/langs/fr_FR/salaries.lang
M htdocs/langs/fr_FR/users.lang
M htdocs/langs/he_IL/admin.lang
M htdocs/langs/he_IL/bills.lang
M htdocs/langs/he_IL/companies.lang
M htdocs/langs/he_IL/compta.lang
M htdocs/langs/he_IL/ecm.lang
M htdocs/langs/he_IL/mails.lang
M htdocs/langs/he_IL/main.lang
M htdocs/langs/he_IL/other.lang
M htdocs/langs/he_IL/salaries.lang
M htdocs/langs/he_IL/users.lang
M htdocs/langs/hr_HR/admin.lang
M htdocs/langs/hr_HR/bills.lang
M htdocs/langs/hr_HR/companies.lang
M htdocs/langs/hr_HR/compta.lang
M htdocs/langs/hr_HR/ecm.lang
M htdocs/langs/hr_HR/mails.lang
M htdocs/langs/hr_HR/main.lang
M htdocs/langs/hr_HR/other.lang
M htdocs/langs/hr_HR/salaries.lang
M htdocs/langs/hr_HR/users.lang
M htdocs/langs/hu_HU/admin.lang
M htdocs/langs/hu_HU/bills.lang
M htdocs/langs/hu_HU/companies.lang
M htdocs/langs/hu_HU/compta.lang
M htdocs/langs/hu_HU/ecm.lang
M htdocs/langs/hu_HU/mails.lang
M htdocs/langs/hu_HU/main.lang
M htdocs/langs/hu_HU/other.lang
M htdocs/langs/hu_HU/salaries.lang
M htdocs/langs/hu_HU/users.lang
M htdocs/langs/id_ID/admin.lang
M htdocs/langs/id_ID/bills.lang
M htdocs/langs/id_ID/companies.lang
M htdocs/langs/id_ID/compta.lang
M htdocs/langs/id_ID/ecm.lang
M htdocs/langs/id_ID/mails.lang
M htdocs/langs/id_ID/main.lang
M htdocs/langs/id_ID/other.lang
M htdocs/langs/id_ID/salaries.lang
M htdocs/langs/id_ID/users.lang
M htdocs/langs/is_IS/admin.lang
M htdocs/langs/is_IS/bills.lang
M htdocs/langs/is_IS/companies.lang
M htdocs/langs/is_IS/compta.lang
M htdocs/langs/is_IS/ecm.lang
M htdocs/langs/is_IS/mails.lang
M htdocs/langs/is_IS/main.lang
M htdocs/langs/is_IS/other.lang
M htdocs/langs/is_IS/salaries.lang
M htdocs/langs/is_IS/users.lang
M htdocs/langs/it_IT/admin.lang
M htdocs/langs/it_IT/bills.lang
M htdocs/langs/it_IT/companies.lang
M htdocs/langs/it_IT/compta.lang
M htdocs/langs/it_IT/ecm.lang
M htdocs/langs/it_IT/mails.lang
M htdocs/langs/it_IT/main.lang
M htdocs/langs/it_IT/other.lang
M htdocs/langs/it_IT/salaries.lang
M htdocs/langs/it_IT/users.lang
M htdocs/langs/ja_JP/admin.lang
M htdocs/langs/ja_JP/bills.lang
M htdocs/langs/ja_JP/companies.lang
M htdocs/langs/ja_JP/compta.lang
M htdocs/langs/ja_JP/ecm.lang
M htdocs/langs/ja_JP/mails.lang
M htdocs/langs/ja_JP/main.lang
M htdocs/langs/ja_JP/other.lang
M htdocs/langs/ja_JP/salaries.lang
M htdocs/langs/ja_JP/users.lang
M htdocs/langs/ka_GE/admin.lang
M htdocs/langs/ka_GE/bills.lang
M htdocs/langs/ka_GE/companies.lang
M htdocs/langs/ka_GE/compta.lang
M htdocs/langs/ka_GE/ecm.lang
M htdocs/langs/ka_GE/mails.lang
M htdocs/langs/ka_GE/main.lang
M htdocs/langs/ka_GE/other.lang
M htdocs/langs/ka_GE/salaries.lang
M htdocs/langs/ka_GE/users.lang
M htdocs/langs/km_KH/main.lang
M htdocs/langs/kn_IN/admin.lang
M htdocs/langs/kn_IN/bills.lang
M htdocs/langs/kn_IN/companies.lang
M htdocs/langs/kn_IN/compta.lang
M htdocs/langs/kn_IN/ecm.lang
M htdocs/langs/kn_IN/mails.lang
M htdocs/langs/kn_IN/main.lang
M htdocs/langs/kn_IN/other.lang
M htdocs/langs/kn_IN/salaries.lang
M htdocs/langs/kn_IN/users.lang
M htdocs/langs/ko_KR/admin.lang
M htdocs/langs/ko_KR/bills.lang
M htdocs/langs/ko_KR/companies.lang
M htdocs/langs/ko_KR/compta.lang
M htdocs/langs/ko_KR/ecm.lang
M htdocs/langs/ko_KR/mails.lang
M htdocs/langs/ko_KR/main.lang
M htdocs/langs/ko_KR/other.lang
M htdocs/langs/ko_KR/salaries.lang
M htdocs/langs/ko_KR/users.lang
M htdocs/langs/lo_LA/admin.lang
M htdocs/langs/lo_LA/bills.lang
M htdocs/langs/lo_LA/companies.lang
M htdocs/langs/lo_LA/compta.lang
M htdocs/langs/lo_LA/ecm.lang
M htdocs/langs/lo_LA/mails.lang
M htdocs/langs/lo_LA/main.lang
M htdocs/langs/lo_LA/other.lang
M htdocs/langs/lo_LA/salaries.lang
M htdocs/langs/lo_LA/users.lang
M htdocs/langs/lt_LT/admin.lang
M htdocs/langs/lt_LT/bills.lang
M htdocs/langs/lt_LT/companies.lang
M htdocs/langs/lt_LT/compta.lang
M htdocs/langs/lt_LT/ecm.lang
M htdocs/langs/lt_LT/mails.lang
M htdocs/langs/lt_LT/main.lang
M htdocs/langs/lt_LT/other.lang
M htdocs/langs/lt_LT/salaries.lang
M htdocs/langs/lt_LT/users.lang
M htdocs/langs/lv_LV/admin.lang
M htdocs/langs/lv_LV/bills.lang
M htdocs/langs/lv_LV/companies.lang
M htdocs/langs/lv_LV/compta.lang
M htdocs/langs/lv_LV/ecm.lang
M htdocs/langs/lv_LV/mails.lang
M htdocs/langs/lv_LV/main.lang
M htdocs/langs/lv_LV/other.lang
M htdocs/langs/lv_LV/salaries.lang
M htdocs/langs/lv_LV/users.lang
M htdocs/langs/mk_MK/admin.lang
M htdocs/langs/mk_MK/bills.lang
M htdocs/langs/mk_MK/companies.lang
M htdocs/langs/mk_MK/compta.lang
M htdocs/langs/mk_MK/ecm.lang
M htdocs/langs/mk_MK/mails.lang
M htdocs/langs/mk_MK/main.lang
M htdocs/langs/mk_MK/other.lang
M htdocs/langs/mk_MK/salaries.lang
M htdocs/langs/mk_MK/users.lang
M htdocs/langs/mn_MN/admin.lang
M htdocs/langs/mn_MN/bills.lang
M htdocs/langs/mn_MN/companies.lang
M htdocs/langs/mn_MN/compta.lang
M htdocs/langs/mn_MN/ecm.lang
M htdocs/langs/mn_MN/mails.lang
M htdocs/langs/mn_MN/main.lang
M htdocs/langs/mn_MN/other.lang
M htdocs/langs/mn_MN/salaries.lang
M htdocs/langs/mn_MN/users.lang
M htdocs/langs/nb_NO/admin.lang
M htdocs/langs/nb_NO/bills.lang
M htdocs/langs/nb_NO/companies.lang
M htdocs/langs/nb_NO/compta.lang
M htdocs/langs/nb_NO/ecm.lang
M htdocs/langs/nb_NO/mails.lang
M htdocs/langs/nb_NO/main.lang
M htdocs/langs/nb_NO/other.lang
M htdocs/langs/nb_NO/salaries.lang
M htdocs/langs/nb_NO/users.lang
M htdocs/langs/nl_BE/admin.lang
M htdocs/langs/nl_BE/boxes.lang
M htdocs/langs/nl_BE/companies.lang
R htdocs/langs/nl_BE/link.lang
M htdocs/langs/nl_NL/accountancy.lang
M htdocs/langs/nl_NL/admin.lang
M htdocs/langs/nl_NL/banks.lang
M htdocs/langs/nl_NL/bills.lang
M htdocs/langs/nl_NL/boxes.lang
M htdocs/langs/nl_NL/cashdesk.lang
M htdocs/langs/nl_NL/commercial.lang
M htdocs/langs/nl_NL/companies.lang
M htdocs/langs/nl_NL/compta.lang
M htdocs/langs/nl_NL/donations.lang
M htdocs/langs/nl_NL/ecm.lang
M htdocs/langs/nl_NL/errors.lang
M htdocs/langs/nl_NL/exports.lang
M htdocs/langs/nl_NL/incoterm.lang
M htdocs/langs/nl_NL/install.lang
M htdocs/langs/nl_NL/languages.lang
M htdocs/langs/nl_NL/ldap.lang
M htdocs/langs/nl_NL/link.lang
M htdocs/langs/nl_NL/loan.lang
M htdocs/langs/nl_NL/mailmanspip.lang
M htdocs/langs/nl_NL/mails.lang
M htdocs/langs/nl_NL/main.lang
M htdocs/langs/nl_NL/orders.lang
M htdocs/langs/nl_NL/other.lang
M htdocs/langs/nl_NL/productbatch.lang
M htdocs/langs/nl_NL/products.lang
M htdocs/langs/nl_NL/projects.lang
M htdocs/langs/nl_NL/propal.lang
M htdocs/langs/nl_NL/resource.lang
M htdocs/langs/nl_NL/salaries.lang
M htdocs/langs/nl_NL/sendings.lang
M htdocs/langs/nl_NL/sms.lang
M htdocs/langs/nl_NL/stocks.lang
M htdocs/langs/nl_NL/supplier_proposal.lang
M htdocs/langs/nl_NL/users.lang
M htdocs/langs/nl_NL/withdrawals.lang
M htdocs/langs/pl_PL/admin.lang
M htdocs/langs/pl_PL/bills.lang
M htdocs/langs/pl_PL/companies.lang
M htdocs/langs/pl_PL/compta.lang
M htdocs/langs/pl_PL/ecm.lang
M htdocs/langs/pl_PL/mails.lang
M htdocs/langs/pl_PL/main.lang
M htdocs/langs/pl_PL/other.lang
M htdocs/langs/pl_PL/salaries.lang
M htdocs/langs/pl_PL/users.lang
M htdocs/langs/pt_BR/bills.lang
M htdocs/langs/pt_BR/compta.lang
M htdocs/langs/pt_BR/main.lang
M htdocs/langs/pt_BR/products.lang
M htdocs/langs/pt_BR/suppliers.lang
M htdocs/langs/pt_PT/admin.lang
M htdocs/langs/pt_PT/bills.lang
M htdocs/langs/pt_PT/companies.lang
M htdocs/langs/pt_PT/compta.lang
M htdocs/langs/pt_PT/cron.lang
M htdocs/langs/pt_PT/dict.lang
M htdocs/langs/pt_PT/ecm.lang
M htdocs/langs/pt_PT/errors.lang
M htdocs/langs/pt_PT/install.lang
M htdocs/langs/pt_PT/interventions.lang
M htdocs/langs/pt_PT/languages.lang
M htdocs/langs/pt_PT/mails.lang
M htdocs/langs/pt_PT/main.lang
M htdocs/langs/pt_PT/members.lang
M htdocs/langs/pt_PT/other.lang
M htdocs/langs/pt_PT/products.lang
M htdocs/langs/pt_PT/projects.lang
M htdocs/langs/pt_PT/salaries.lang
M htdocs/langs/pt_PT/sendings.lang
M htdocs/langs/pt_PT/stocks.lang
M htdocs/langs/pt_PT/supplier_proposal.lang
M htdocs/langs/pt_PT/suppliers.lang
M htdocs/langs/pt_PT/trips.lang
M htdocs/langs/pt_PT/users.lang
M htdocs/langs/ro_RO/admin.lang
M htdocs/langs/ro_RO/bills.lang
M htdocs/langs/ro_RO/companies.lang
M htdocs/langs/ro_RO/compta.lang
M htdocs/langs/ro_RO/ecm.lang
M htdocs/langs/ro_RO/mails.lang
M htdocs/langs/ro_RO/main.lang
M htdocs/langs/ro_RO/other.lang
M htdocs/langs/ro_RO/salaries.lang
M htdocs/langs/ro_RO/users.lang
M htdocs/langs/ru_RU/admin.lang
M htdocs/langs/ru_RU/bills.lang
M htdocs/langs/ru_RU/companies.lang
M htdocs/langs/ru_RU/compta.lang
M htdocs/langs/ru_RU/ecm.lang
M htdocs/langs/ru_RU/mails.lang
M htdocs/langs/ru_RU/main.lang
M htdocs/langs/ru_RU/other.lang
M htdocs/langs/ru_RU/salaries.lang
M htdocs/langs/ru_RU/users.lang
M htdocs/langs/sk_SK/admin.lang
M htdocs/langs/sk_SK/bills.lang
M htdocs/langs/sk_SK/companies.lang
M htdocs/langs/sk_SK/compta.lang
M htdocs/langs/sk_SK/ecm.lang
M htdocs/langs/sk_SK/mails.lang
M htdocs/langs/sk_SK/main.lang
M htdocs/langs/sk_SK/other.lang
M htdocs/langs/sk_SK/salaries.lang
M htdocs/langs/sk_SK/users.lang
M htdocs/langs/sl_SI/admin.lang
M htdocs/langs/sl_SI/bills.lang
M htdocs/langs/sl_SI/companies.lang
M htdocs/langs/sl_SI/compta.lang
M htdocs/langs/sl_SI/ecm.lang
M htdocs/langs/sl_SI/mails.lang
M htdocs/langs/sl_SI/main.lang
M htdocs/langs/sl_SI/other.lang
M htdocs/langs/sl_SI/salaries.lang
M htdocs/langs/sl_SI/users.lang
M htdocs/langs/sq_AL/admin.lang
M htdocs/langs/sq_AL/bills.lang
M htdocs/langs/sq_AL/companies.lang
M htdocs/langs/sq_AL/compta.lang
M htdocs/langs/sq_AL/ecm.lang
M htdocs/langs/sq_AL/mails.lang
M htdocs/langs/sq_AL/main.lang
M htdocs/langs/sq_AL/other.lang
M htdocs/langs/sq_AL/salaries.lang
M htdocs/langs/sq_AL/users.lang
M htdocs/langs/sr_RS/admin.lang
M htdocs/langs/sr_RS/bills.lang
M htdocs/langs/sr_RS/companies.lang
M htdocs/langs/sr_RS/compta.lang
M htdocs/langs/sr_RS/ecm.lang
M htdocs/langs/sr_RS/mails.lang
M htdocs/langs/sr_RS/main.lang
M htdocs/langs/sr_RS/other.lang
M htdocs/langs/sr_RS/salaries.lang
M htdocs/langs/sr_RS/users.lang
M htdocs/langs/sv_SE/admin.lang
M htdocs/langs/sv_SE/bills.lang
M htdocs/langs/sv_SE/companies.lang
M htdocs/langs/sv_SE/compta.lang
M htdocs/langs/sv_SE/ecm.lang
M htdocs/langs/sv_SE/mails.lang
M htdocs/langs/sv_SE/main.lang
M htdocs/langs/sv_SE/other.lang
M htdocs/langs/sv_SE/salaries.lang
M htdocs/langs/sv_SE/users.lang
M htdocs/langs/sw_SW/admin.lang
M htdocs/langs/sw_SW/bills.lang
M htdocs/langs/sw_SW/companies.lang
M htdocs/langs/sw_SW/compta.lang
M htdocs/langs/sw_SW/ecm.lang
M htdocs/langs/sw_SW/mails.lang
M htdocs/langs/sw_SW/main.lang
M htdocs/langs/sw_SW/other.lang
M htdocs/langs/sw_SW/salaries.lang
M htdocs/langs/sw_SW/users.lang
M htdocs/langs/th_TH/admin.lang
M htdocs/langs/th_TH/bills.lang
M htdocs/langs/th_TH/companies.lang
M htdocs/langs/th_TH/compta.lang
M htdocs/langs/th_TH/ecm.lang
M htdocs/langs/th_TH/mails.lang
M htdocs/langs/th_TH/main.lang
M htdocs/langs/th_TH/other.lang
M htdocs/langs/th_TH/salaries.lang
M htdocs/langs/th_TH/users.lang
M htdocs/langs/tr_TR/admin.lang
M htdocs/langs/tr_TR/bills.lang
M htdocs/langs/tr_TR/companies.lang
M htdocs/langs/tr_TR/compta.lang
M htdocs/langs/tr_TR/ecm.lang
M htdocs/langs/tr_TR/mails.lang
M htdocs/langs/tr_TR/main.lang
M htdocs/langs/tr_TR/other.lang
M htdocs/langs/tr_TR/salaries.lang
M htdocs/langs/tr_TR/users.lang
M htdocs/langs/uk_UA/admin.lang
M htdocs/langs/uk_UA/bills.lang
M htdocs/langs/uk_UA/companies.lang
M htdocs/langs/uk_UA/compta.lang
M htdocs/langs/uk_UA/ecm.lang
M htdocs/langs/uk_UA/mails.lang
M htdocs/langs/uk_UA/main.lang
M htdocs/langs/uk_UA/other.lang
M htdocs/langs/uk_UA/salaries.lang
M htdocs/langs/uk_UA/users.lang
M htdocs/langs/uz_UZ/admin.lang
M htdocs/langs/uz_UZ/bills.lang
M htdocs/langs/uz_UZ/companies.lang
M htdocs/langs/uz_UZ/compta.lang
M htdocs/langs/uz_UZ/ecm.lang
M htdocs/langs/uz_UZ/mails.lang
M htdocs/langs/uz_UZ/main.lang
M htdocs/langs/uz_UZ/other.lang
M htdocs/langs/uz_UZ/salaries.lang
M htdocs/langs/uz_UZ/users.lang
M htdocs/langs/vi_VN/admin.lang
M htdocs/langs/vi_VN/bills.lang
M htdocs/langs/vi_VN/companies.lang
M htdocs/langs/vi_VN/compta.lang
M htdocs/langs/vi_VN/ecm.lang
M htdocs/langs/vi_VN/mails.lang
M htdocs/langs/vi_VN/main.lang
M htdocs/langs/vi_VN/other.lang
M htdocs/langs/vi_VN/salaries.lang
M htdocs/langs/vi_VN/users.lang
M htdocs/langs/zh_CN/admin.lang
M htdocs/langs/zh_CN/bills.lang
M htdocs/langs/zh_CN/companies.lang
M htdocs/langs/zh_CN/compta.lang
M htdocs/langs/zh_CN/ecm.lang
M htdocs/langs/zh_CN/mails.lang
M htdocs/langs/zh_CN/main.lang
M htdocs/langs/zh_CN/other.lang
M htdocs/langs/zh_CN/salaries.lang
M htdocs/langs/zh_CN/users.lang
M htdocs/langs/zh_TW/admin.lang
M htdocs/langs/zh_TW/bills.lang
M htdocs/langs/zh_TW/companies.lang
M htdocs/langs/zh_TW/compta.lang
M htdocs/langs/zh_TW/ecm.lang
M htdocs/langs/zh_TW/mails.lang
M htdocs/langs/zh_TW/main.lang
M htdocs/langs/zh_TW/other.lang
M htdocs/langs/zh_TW/salaries.lang
M htdocs/langs/zh_TW/users.lang
M htdocs/opensurvey/list.php
M htdocs/product/fournisseurs.php
M htdocs/projet/activity/index.php
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/projet/admin/project.php
M htdocs/projet/graph_opportunities.inc.php
M htdocs/resource/list.php
M htdocs/societe/card.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
M htdocs/user/card.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/home.php
M htdocs/user/index.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
htdocs/langs/pt_PT/companies.lang
Compare:
https://github.com/Dolibarr/dolibarr/compare/9a4de796e12d...eccdc9a07529