[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] c8c77d: Fix: Agenda and Banks module
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] c8c77d: Fix: Agenda and Banks module were not working with... |
|
Date: |
Wed, 02 Apr 2014 02:42:16 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: c8c77dbdcff7ae684b56d3a15c9ff5c07dda6d60
https://github.com/Dolibarr/dolibarr/commit/c8c77dbdcff7ae684b56d3a15c9ff5c07dda6d60
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-03-22 (Sat, 22 Mar 2014)
Changed paths:
M ChangeLog
M htdocs/comm/action/index.php
M htdocs/core/lib/security.lib.php
Log Message:
-----------
Fix: Agenda and Banks module were not working with multicompany module
Commit: e2f51d0df2a824732a980042eff4a31b678278fd
https://github.com/Dolibarr/dolibarr/commit/e2f51d0df2a824732a980042eff4a31b678278fd
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-03-22 (Sat, 22 Mar 2014)
Changed paths:
M htdocs/core/lib/security.lib.php
Log Message:
-----------
Removed duplicate line
Commit: 09e02f807fe8227b87f072f8d68fc128eb6ff1f9
https://github.com/Dolibarr/dolibarr/commit/09e02f807fe8227b87f072f8d68fc128eb6ff1f9
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-03-22 (Sat, 22 Mar 2014)
Changed paths:
M htdocs/core/lib/security.lib.php
Log Message:
-----------
Even better improvement
Commit: ae728645d6bdb83792a049f4b90cdbdf8a81efc6
https://github.com/Dolibarr/dolibarr/commit/ae728645d6bdb83792a049f4b90cdbdf8a81efc6
Author: Laurent Destailleur <address@hidden>
Date: 2014-03-27 (Thu, 27 Mar 2014)
Changed paths:
M ChangeLog
M htdocs/comm/action/index.php
M htdocs/core/lib/security.lib.php
Log Message:
-----------
Merge pull request #1504 from marcosgdf/multicompany-fixes
Fix: Agenda and Banks module were not working with multicompany module
Commit: e6bd3921f1cb410447515c33212d7c382a632e5e
https://github.com/Dolibarr/dolibarr/commit/e6bd3921f1cb410447515c33212d7c382a632e5e
Author: Marcos García de La Fuente <address@hidden>
Date: 2014-03-30 (Sun, 30 Mar 2014)
Changed paths:
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/index.php
Log Message:
-----------
Fixed a problem with bank accounts sharing across entities
Commit: 1fad6938671bb176a0b187903c48b4368cba4848
https://github.com/Dolibarr/dolibarr/commit/1fad6938671bb176a0b187903c48b4368cba4848
Author: Laurent Destailleur <address@hidden>
Date: 2014-03-31 (Mon, 31 Mar 2014)
Changed paths:
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Fix: Removed useless strtolower
Commit: f1466e64afda19f1275c8bb5278aaebf412529ac
https://github.com/Dolibarr/dolibarr/commit/f1466e64afda19f1275c8bb5278aaebf412529ac
Author: Laurent Destailleur <address@hidden>
Date: 2014-04-01 (Tue, 01 Apr 2014)
Changed paths:
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_opensuse.spec
Log Message:
-----------
Fix: Build for obs
Commit: c969bc3e93582f734396b5a0c201bb2dfa5dbfed
https://github.com/Dolibarr/dolibarr/commit/c969bc3e93582f734396b5a0c201bb2dfa5dbfed
Author: Laurent Destailleur <address@hidden>
Date: 2014-04-01 (Tue, 01 Apr 2014)
Changed paths:
M htdocs/admin/tools/dolibarr_export.php
M htdocs/admin/tools/export.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Commit: df5a009aa2e27d33cc8913059e2a4a176f1f7f9c
https://github.com/Dolibarr/dolibarr/commit/df5a009aa2e27d33cc8913059e2a4a176f1f7f9c
Author: Cedric <address@hidden>
Date: 2014-04-01 (Tue, 01 Apr 2014)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
FIX : [ bug #1317 ] Removing a category does not remove all child categories
Commit: 6dab09e07ac1ef04845ef878aafa8740d11809ac
https://github.com/Dolibarr/dolibarr/commit/6dab09e07ac1ef04845ef878aafa8740d11809ac
Author: Laurent Destailleur <address@hidden>
Date: 2014-04-02 (Wed, 02 Apr 2014)
Changed paths:
M htdocs/core/lib/company.lib.php
Log Message:
-----------
Fix: Bad dialog position
Commit: 48c77d2cebd014d4002968aab489c092cdaa7187
https://github.com/Dolibarr/dolibarr/commit/48c77d2cebd014d4002968aab489c092cdaa7187
Author: Laurent Destailleur <address@hidden>
Date: 2014-04-02 (Wed, 02 Apr 2014)
Changed paths:
M htdocs/opensurvey/public/choix_autre.php
Log Message:
-----------
Fix: [ bug #1312 ] Call to undefined function _()
Commit: 6806a87ebbbbca08b57f23f854304b76a42ee0e3
https://github.com/Dolibarr/dolibarr/commit/6806a87ebbbbca08b57f23f854304b76a42ee0e3
Author: Laurent Destailleur <address@hidden>
Date: 2014-04-02 (Wed, 02 Apr 2014)
Changed paths:
M htdocs/install/pgsql/functions/functions.sql
Log Message:
-----------
Missing tms update
Commit: ab6a67054af486c7404967058da8afa2a478f482
https://github.com/Dolibarr/dolibarr/commit/ab6a67054af486c7404967058da8afa2a478f482
Author: Laurent Destailleur <address@hidden>
Date: 2014-04-02 (Wed, 02 Apr 2014)
Changed paths:
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/index.php
Log Message:
-----------
Merge pull request #1516 from marcosgdf/multicompany-fixes
Fixed a problem with bank accounts sharing across entities
Commit: c421613da975d56a9066af5bb62bdc56ceaddd5f
https://github.com/Dolibarr/dolibarr/commit/c421613da975d56a9066af5bb62bdc56ceaddd5f
Author: Laurent Destailleur <address@hidden>
Date: 2014-04-02 (Wed, 02 Apr 2014)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
Merge pull request #1520 from KreizIT/fix_1317
FIX : [ bug #1317 ] Removing a category does not remove all child categories
Commit: 663a3bd45c11e0cbc1f4bed0d2094f0d559c1019
https://github.com/Dolibarr/dolibarr/commit/663a3bd45c11e0cbc1f4bed0d2094f0d559c1019
Author: Laurent Destailleur <address@hidden>
Date: 2014-04-02 (Wed, 02 Apr 2014)
Changed paths:
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_opensuse.spec
M htdocs/categories/class/categorie.class.php
M htdocs/core/lib/company.lib.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Commit: a4797a0e4a5f5b7c68359b7748944dd58f22663d
https://github.com/Dolibarr/dolibarr/commit/a4797a0e4a5f5b7c68359b7748944dd58f22663d
Author: Cedric <address@hidden>
Date: 2014-04-02 (Wed, 02 Apr 2014)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
FIX : [ bug #1317 ] Removing a category does not remove all child categories
Commit: 8cb06cac089a929beb24bedf1cf9ee5df3a1950d
https://github.com/Dolibarr/dolibarr/commit/8cb06cac089a929beb24bedf1cf9ee5df3a1950d
Author: Laurent Destailleur <address@hidden>
Date: 2014-04-02 (Wed, 02 Apr 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
FIX : [ bug #1317 ] Removing a category does not remove all child
categories
Commit: 46e46507ecf8313ca526a5cfc5320517cd0d2592
https://github.com/Dolibarr/dolibarr/commit/46e46507ecf8313ca526a5cfc5320517cd0d2592
Author: Laurent Destailleur <address@hidden>
Date: 2014-04-02 (Wed, 02 Apr 2014)
Changed paths:
M ChangeLog
M htdocs/comm/action/index.php
M htdocs/core/lib/security.lib.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
htdocs/comm/action/index.php
htdocs/compta/bank/class/account.class.php
htdocs/compta/bank/index.php
Commit: 3f99d9c86658d63b5bd2ec474ea6364d81c30ee2
https://github.com/Dolibarr/dolibarr/commit/3f99d9c86658d63b5bd2ec474ea6364d81c30ee2
Author: Laurent Destailleur <address@hidden>
Date: 2014-04-02 (Wed, 02 Apr 2014)
Changed paths:
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
M htdocs/admin/fckeditor.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/core/class/doleditor.class.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/langs/ar_SA/admin.lang
M htdocs/langs/ar_SA/agenda.lang
M htdocs/langs/ar_SA/bills.lang
M htdocs/langs/ar_SA/languages.lang
M htdocs/langs/ar_SA/margins.lang
M htdocs/langs/ar_SA/salaries.lang
M htdocs/langs/ar_SA/withdrawals.lang
M htdocs/langs/bg_BG/admin.lang
M htdocs/langs/bg_BG/agenda.lang
M htdocs/langs/bg_BG/bills.lang
M htdocs/langs/bg_BG/languages.lang
M htdocs/langs/bg_BG/margins.lang
M htdocs/langs/bg_BG/salaries.lang
M htdocs/langs/bg_BG/withdrawals.lang
M htdocs/langs/bs_BA/admin.lang
M htdocs/langs/bs_BA/agenda.lang
M htdocs/langs/bs_BA/bills.lang
M htdocs/langs/bs_BA/languages.lang
M htdocs/langs/bs_BA/margins.lang
M htdocs/langs/bs_BA/salaries.lang
M htdocs/langs/bs_BA/withdrawals.lang
M htdocs/langs/ca_ES/admin.lang
M htdocs/langs/ca_ES/agenda.lang
M htdocs/langs/ca_ES/bills.lang
M htdocs/langs/ca_ES/languages.lang
M htdocs/langs/ca_ES/margins.lang
M htdocs/langs/ca_ES/salaries.lang
M htdocs/langs/ca_ES/withdrawals.lang
M htdocs/langs/cs_CZ/admin.lang
M htdocs/langs/cs_CZ/agenda.lang
M htdocs/langs/cs_CZ/bills.lang
M htdocs/langs/cs_CZ/languages.lang
M htdocs/langs/cs_CZ/margins.lang
M htdocs/langs/cs_CZ/salaries.lang
M htdocs/langs/cs_CZ/withdrawals.lang
M htdocs/langs/da_DK/admin.lang
M htdocs/langs/da_DK/agenda.lang
M htdocs/langs/da_DK/bills.lang
M htdocs/langs/da_DK/languages.lang
M htdocs/langs/da_DK/margins.lang
M htdocs/langs/da_DK/salaries.lang
M htdocs/langs/da_DK/withdrawals.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/categories.lang
M htdocs/langs/de_DE/companies.lang
M htdocs/langs/de_DE/compta.lang
M htdocs/langs/de_DE/cron.lang
M htdocs/langs/de_DE/deliveries.lang
M htdocs/langs/de_DE/exports.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/margins.lang
M htdocs/langs/de_DE/opensurvey.lang
M htdocs/langs/de_DE/other.lang
M htdocs/langs/de_DE/products.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/withdrawals.lang
M htdocs/langs/el_GR/admin.lang
M htdocs/langs/el_GR/agenda.lang
M htdocs/langs/el_GR/bills.lang
M htdocs/langs/el_GR/companies.lang
M htdocs/langs/el_GR/languages.lang
M htdocs/langs/el_GR/main.lang
M htdocs/langs/el_GR/margins.lang
M htdocs/langs/el_GR/opensurvey.lang
M htdocs/langs/el_GR/propal.lang
M htdocs/langs/el_GR/salaries.lang
M htdocs/langs/el_GR/withdrawals.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/agenda.lang
M htdocs/langs/es_ES/bills.lang
M htdocs/langs/es_ES/languages.lang
M htdocs/langs/es_ES/margins.lang
M htdocs/langs/es_ES/salaries.lang
M htdocs/langs/es_ES/withdrawals.lang
M htdocs/langs/et_EE/admin.lang
M htdocs/langs/et_EE/agenda.lang
M htdocs/langs/et_EE/bills.lang
M htdocs/langs/et_EE/languages.lang
M htdocs/langs/et_EE/margins.lang
M htdocs/langs/et_EE/salaries.lang
M htdocs/langs/et_EE/withdrawals.lang
M htdocs/langs/eu_ES/admin.lang
M htdocs/langs/eu_ES/agenda.lang
M htdocs/langs/eu_ES/bills.lang
M htdocs/langs/eu_ES/languages.lang
M htdocs/langs/eu_ES/margins.lang
M htdocs/langs/eu_ES/salaries.lang
M htdocs/langs/eu_ES/withdrawals.lang
M htdocs/langs/fa_IR/admin.lang
M htdocs/langs/fa_IR/agenda.lang
M htdocs/langs/fa_IR/bills.lang
M htdocs/langs/fa_IR/languages.lang
M htdocs/langs/fa_IR/margins.lang
M htdocs/langs/fa_IR/salaries.lang
M htdocs/langs/fa_IR/withdrawals.lang
M htdocs/langs/fi_FI/admin.lang
M htdocs/langs/fi_FI/agenda.lang
M htdocs/langs/fi_FI/bills.lang
M htdocs/langs/fi_FI/languages.lang
M htdocs/langs/fi_FI/margins.lang
M htdocs/langs/fi_FI/salaries.lang
M htdocs/langs/fi_FI/withdrawals.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/agenda.lang
M htdocs/langs/fr_FR/bills.lang
M htdocs/langs/fr_FR/companies.lang
M htdocs/langs/fr_FR/languages.lang
M htdocs/langs/fr_FR/margins.lang
M htdocs/langs/fr_FR/products.lang
M htdocs/langs/fr_FR/salaries.lang
M htdocs/langs/fr_FR/withdrawals.lang
M htdocs/langs/he_IL/admin.lang
M htdocs/langs/he_IL/agenda.lang
M htdocs/langs/he_IL/bills.lang
M htdocs/langs/he_IL/languages.lang
M htdocs/langs/he_IL/margins.lang
M htdocs/langs/he_IL/salaries.lang
M htdocs/langs/he_IL/withdrawals.lang
M htdocs/langs/hr_HR/admin.lang
M htdocs/langs/hr_HR/agenda.lang
M htdocs/langs/hr_HR/bills.lang
M htdocs/langs/hr_HR/languages.lang
M htdocs/langs/hr_HR/margins.lang
M htdocs/langs/hr_HR/salaries.lang
M htdocs/langs/hr_HR/withdrawals.lang
M htdocs/langs/hu_HU/admin.lang
M htdocs/langs/hu_HU/agenda.lang
M htdocs/langs/hu_HU/bills.lang
M htdocs/langs/hu_HU/languages.lang
M htdocs/langs/hu_HU/margins.lang
M htdocs/langs/hu_HU/salaries.lang
M htdocs/langs/hu_HU/withdrawals.lang
M htdocs/langs/id_ID/admin.lang
M htdocs/langs/id_ID/agenda.lang
M htdocs/langs/id_ID/bills.lang
M htdocs/langs/id_ID/languages.lang
M htdocs/langs/id_ID/margins.lang
M htdocs/langs/id_ID/salaries.lang
M htdocs/langs/id_ID/withdrawals.lang
M htdocs/langs/is_IS/admin.lang
M htdocs/langs/is_IS/agenda.lang
M htdocs/langs/is_IS/bills.lang
M htdocs/langs/is_IS/languages.lang
M htdocs/langs/is_IS/margins.lang
M htdocs/langs/is_IS/salaries.lang
M htdocs/langs/is_IS/withdrawals.lang
M htdocs/langs/it_IT/admin.lang
M htdocs/langs/it_IT/agenda.lang
M htdocs/langs/it_IT/bills.lang
M htdocs/langs/it_IT/languages.lang
M htdocs/langs/it_IT/margins.lang
M htdocs/langs/it_IT/salaries.lang
M htdocs/langs/it_IT/withdrawals.lang
M htdocs/langs/ja_JP/admin.lang
M htdocs/langs/ja_JP/agenda.lang
M htdocs/langs/ja_JP/bills.lang
M htdocs/langs/ja_JP/languages.lang
M htdocs/langs/ja_JP/margins.lang
M htdocs/langs/ja_JP/salaries.lang
M htdocs/langs/ja_JP/withdrawals.lang
M htdocs/langs/ko_KR/admin.lang
M htdocs/langs/ko_KR/agenda.lang
M htdocs/langs/ko_KR/bills.lang
M htdocs/langs/ko_KR/languages.lang
M htdocs/langs/ko_KR/margins.lang
M htdocs/langs/ko_KR/salaries.lang
M htdocs/langs/ko_KR/withdrawals.lang
M htdocs/langs/lt_LT/admin.lang
M htdocs/langs/lt_LT/agenda.lang
M htdocs/langs/lt_LT/bills.lang
M htdocs/langs/lt_LT/languages.lang
M htdocs/langs/lt_LT/margins.lang
M htdocs/langs/lt_LT/salaries.lang
M htdocs/langs/lt_LT/withdrawals.lang
M htdocs/langs/lv_LV/admin.lang
M htdocs/langs/lv_LV/agenda.lang
M htdocs/langs/lv_LV/bills.lang
M htdocs/langs/lv_LV/languages.lang
M htdocs/langs/lv_LV/margins.lang
M htdocs/langs/lv_LV/salaries.lang
M htdocs/langs/lv_LV/withdrawals.lang
M htdocs/langs/mk_MK/admin.lang
M htdocs/langs/mk_MK/agenda.lang
M htdocs/langs/mk_MK/bills.lang
M htdocs/langs/mk_MK/languages.lang
M htdocs/langs/mk_MK/margins.lang
M htdocs/langs/mk_MK/salaries.lang
M htdocs/langs/mk_MK/withdrawals.lang
M htdocs/langs/nb_NO/admin.lang
M htdocs/langs/nb_NO/agenda.lang
M htdocs/langs/nb_NO/bills.lang
M htdocs/langs/nb_NO/languages.lang
M htdocs/langs/nb_NO/margins.lang
M htdocs/langs/nb_NO/salaries.lang
M htdocs/langs/nb_NO/withdrawals.lang
M htdocs/langs/nl_NL/admin.lang
M htdocs/langs/nl_NL/agenda.lang
M htdocs/langs/nl_NL/bills.lang
M htdocs/langs/nl_NL/languages.lang
M htdocs/langs/nl_NL/margins.lang
M htdocs/langs/nl_NL/salaries.lang
M htdocs/langs/nl_NL/withdrawals.lang
M htdocs/langs/pl_PL/admin.lang
M htdocs/langs/pl_PL/agenda.lang
M htdocs/langs/pl_PL/bills.lang
M htdocs/langs/pl_PL/languages.lang
M htdocs/langs/pl_PL/margins.lang
M htdocs/langs/pl_PL/salaries.lang
M htdocs/langs/pl_PL/withdrawals.lang
M htdocs/langs/pt_PT/admin.lang
M htdocs/langs/pt_PT/agenda.lang
M htdocs/langs/pt_PT/bills.lang
M htdocs/langs/pt_PT/languages.lang
M htdocs/langs/pt_PT/margins.lang
M htdocs/langs/pt_PT/salaries.lang
M htdocs/langs/pt_PT/withdrawals.lang
M htdocs/langs/ro_RO/admin.lang
M htdocs/langs/ro_RO/agenda.lang
M htdocs/langs/ro_RO/banks.lang
M htdocs/langs/ro_RO/bills.lang
M htdocs/langs/ro_RO/languages.lang
M htdocs/langs/ro_RO/margins.lang
M htdocs/langs/ro_RO/salaries.lang
M htdocs/langs/ro_RO/withdrawals.lang
M htdocs/langs/ru_RU/admin.lang
M htdocs/langs/ru_RU/agenda.lang
M htdocs/langs/ru_RU/bills.lang
M htdocs/langs/ru_RU/languages.lang
M htdocs/langs/ru_RU/margins.lang
M htdocs/langs/ru_RU/salaries.lang
M htdocs/langs/ru_RU/withdrawals.lang
M htdocs/langs/tr_TR/admin.lang
M htdocs/langs/tr_TR/agenda.lang
M htdocs/langs/tr_TR/bills.lang
M htdocs/langs/tr_TR/categories.lang
M htdocs/langs/tr_TR/companies.lang
M htdocs/langs/tr_TR/deliveries.lang
M htdocs/langs/tr_TR/errors.lang
M htdocs/langs/tr_TR/exports.lang
M htdocs/langs/tr_TR/languages.lang
M htdocs/langs/tr_TR/margins.lang
M htdocs/langs/tr_TR/salaries.lang
M htdocs/langs/tr_TR/withdrawals.lang
M htdocs/langs/uk_UA/admin.lang
M htdocs/langs/uk_UA/agenda.lang
M htdocs/langs/uk_UA/bills.lang
M htdocs/langs/uk_UA/languages.lang
M htdocs/langs/uk_UA/margins.lang
M htdocs/langs/uk_UA/salaries.lang
M htdocs/langs/uk_UA/withdrawals.lang
M htdocs/langs/uz_UZ/admin.lang
M htdocs/langs/uz_UZ/agenda.lang
M htdocs/langs/uz_UZ/bills.lang
M htdocs/langs/uz_UZ/languages.lang
M htdocs/langs/uz_UZ/margins.lang
M htdocs/langs/uz_UZ/withdrawals.lang
M htdocs/langs/vi_VN/admin.lang
M htdocs/langs/vi_VN/agenda.lang
M htdocs/langs/vi_VN/bills.lang
M htdocs/langs/vi_VN/languages.lang
M htdocs/langs/vi_VN/margins.lang
M htdocs/langs/vi_VN/salaries.lang
M htdocs/langs/vi_VN/withdrawals.lang
M htdocs/langs/zh_CN/admin.lang
M htdocs/langs/zh_CN/agenda.lang
M htdocs/langs/zh_CN/bills.lang
M htdocs/langs/zh_CN/languages.lang
M htdocs/langs/zh_CN/margins.lang
M htdocs/langs/zh_CN/salaries.lang
M htdocs/langs/zh_CN/withdrawals.lang
M htdocs/langs/zh_TW/admin.lang
M htdocs/langs/zh_TW/agenda.lang
M htdocs/langs/zh_TW/bills.lang
M htdocs/langs/zh_TW/languages.lang
M htdocs/langs/zh_TW/margins.lang
M htdocs/langs/zh_TW/salaries.lang
M htdocs/langs/zh_TW/withdrawals.lang
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Commit: 7ac193bb809c3c81b93815107362fc30402d9d8c
https://github.com/Dolibarr/dolibarr/commit/7ac193bb809c3c81b93815107362fc30402d9d8c
Author: Laurent Destailleur <address@hidden>
Date: 2014-04-02 (Wed, 02 Apr 2014)
Changed paths:
M ChangeLog
M htdocs/categories/class/categorie.class.php
M htdocs/comm/action/index.php
M htdocs/core/lib/security.lib.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/opensurvey/public/choix_autre.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/efcd822c2727...7ac193bb809c