[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 72effa: Fix part of bugs [ bug #766 ]
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 72effa: Fix part of bugs [ bug #766 ] |
|
Date: |
Sat, 16 Mar 2013 09:36:37 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 72effa3f25b2e6495ee7893c59ef53bb787a2c1c
https://github.com/Dolibarr/dolibarr/commit/72effa3f25b2e6495ee7893c59ef53bb787a2c1c
Author: fhenry <address@hidden>
Date: 2013-03-15 (Fri, 15 Mar 2013)
Changed paths:
M htdocs/admin/expedition.php
Log Message:
-----------
Fix part of bugs [ bug #766 ]
Commit: 010207532f2d9c6cacb0d32addbed483899b9bf0
https://github.com/Dolibarr/dolibarr/commit/010207532f2d9c6cacb0d32addbed483899b9bf0
Author: Grand Philippe <address@hidden>
Date: 2013-03-15 (Fri, 15 Mar 2013)
Changed paths:
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
fix trad
Commit: 95c9d19d5eb8e41f86e5818ec96b11c63584e584
https://github.com/Dolibarr/dolibarr/commit/95c9d19d5eb8e41f86e5818ec96b11c63584e584
Author: Laurent Destailleur <address@hidden>
Date: 2013-03-15 (Fri, 15 Mar 2013)
Changed paths:
M htdocs/exports/class/export.class.php
Log Message:
-----------
Fix: Restore ability to filter on '0'
Commit: 1ac78d0e83a8ac22478df11685433aa3dcfb907b
https://github.com/Dolibarr/dolibarr/commit/1ac78d0e83a8ac22478df11685433aa3dcfb907b
Author: Laurent Destailleur <address@hidden>
Date: 2013-03-15 (Fri, 15 Mar 2013)
Changed paths:
M htdocs/admin/expedition.php
Log Message:
-----------
Merge pull request #744 from FHenry/3.3
Fix part of bugs [ bug #766 ]
Commit: 63e3b5742cec64ec1e4f60946c7cd429e3e12d88
https://github.com/Dolibarr/dolibarr/commit/63e3b5742cec64ec1e4f60946c7cd429e3e12d88
Author: Laurent Destailleur <address@hidden>
Date: 2013-03-15 (Fri, 15 Mar 2013)
Changed paths:
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Merge pull request #745 from grandoc/3.3
fix trad
Commit: 36e99e100b0641109de62ea7ee478c1d5cd403bf
https://github.com/Dolibarr/dolibarr/commit/36e99e100b0641109de62ea7ee478c1d5cd403bf
Author: Grand Philippe <address@hidden>
Date: 2013-03-15 (Fri, 15 Mar 2013)
Changed paths:
M htdocs/langs/ar_SA/bills.lang
M htdocs/langs/bg_BG/bills.lang
M htdocs/langs/da_DK/bills.lang
M htdocs/langs/el_GR/bills.lang
M htdocs/langs/en_US/bills.lang
M htdocs/langs/et_EE/bills.lang
M htdocs/langs/fi_FI/bills.lang
M htdocs/langs/he_IL/bills.lang
M htdocs/langs/hu_HU/bills.lang
M htdocs/langs/is_IS/bills.lang
M htdocs/langs/ja_JP/bills.lang
M htdocs/langs/nb_NO/bills.lang
M htdocs/langs/nl_NL/bills.lang
M htdocs/langs/pl_PL/bills.lang
M htdocs/langs/ro_RO/bills.lang
M htdocs/langs/sv_SE/bills.lang
M htdocs/langs/zh_CN/bills.lang
M htdocs/langs/zh_TW/bills.lang
Log Message:
-----------
fix trad
Commit: a5181a06e4f7c8767e445d771c0d263c67209ca3
https://github.com/Dolibarr/dolibarr/commit/a5181a06e4f7c8767e445d771c0d263c67209ca3
Author: Laurent Destailleur <address@hidden>
Date: 2013-03-15 (Fri, 15 Mar 2013)
Changed paths:
M htdocs/langs/ar_SA/bills.lang
M htdocs/langs/bg_BG/bills.lang
M htdocs/langs/da_DK/bills.lang
M htdocs/langs/el_GR/bills.lang
M htdocs/langs/en_US/bills.lang
M htdocs/langs/et_EE/bills.lang
M htdocs/langs/fi_FI/bills.lang
M htdocs/langs/he_IL/bills.lang
M htdocs/langs/hu_HU/bills.lang
M htdocs/langs/is_IS/bills.lang
M htdocs/langs/ja_JP/bills.lang
M htdocs/langs/nb_NO/bills.lang
M htdocs/langs/nl_NL/bills.lang
M htdocs/langs/pl_PL/bills.lang
M htdocs/langs/ro_RO/bills.lang
M htdocs/langs/sv_SE/bills.lang
M htdocs/langs/zh_CN/bills.lang
M htdocs/langs/zh_TW/bills.lang
Log Message:
-----------
Merge pull request #747 from grandoc/3.3
fix trad
Commit: ed8586939457a0c572294ff4cf66d29b655f27fe
https://github.com/Dolibarr/dolibarr/commit/ed8586939457a0c572294ff4cf66d29b655f27fe
Author: Laurent Destailleur <address@hidden>
Date: 2013-03-15 (Fri, 15 Mar 2013)
Changed paths:
M htdocs/admin/expedition.php
M htdocs/langs/ar_SA/bills.lang
M htdocs/langs/bg_BG/bills.lang
M htdocs/langs/da_DK/bills.lang
M htdocs/langs/el_GR/bills.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/bills.lang
M htdocs/langs/et_EE/bills.lang
M htdocs/langs/fi_FI/bills.lang
M htdocs/langs/he_IL/bills.lang
M htdocs/langs/hu_HU/bills.lang
M htdocs/langs/is_IS/bills.lang
M htdocs/langs/ja_JP/bills.lang
M htdocs/langs/nb_NO/bills.lang
M htdocs/langs/nl_NL/bills.lang
M htdocs/langs/pl_PL/bills.lang
M htdocs/langs/ro_RO/bills.lang
M htdocs/langs/sv_SE/bills.lang
M htdocs/langs/zh_CN/bills.lang
M htdocs/langs/zh_TW/bills.lang
Log Message:
-----------
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
Commit: c0e5cacafcb9cfa31c77d38e19936a3473f6f3ab
https://github.com/Dolibarr/dolibarr/commit/c0e5cacafcb9cfa31c77d38e19936a3473f6f3ab
Author: simnandez <address@hidden>
Date: 2013-03-15 (Fri, 15 Mar 2013)
Changed paths:
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/index.php
M htdocs/langs/ca_ES/orders.lang
M htdocs/langs/es_ES/orders.lang
Log Message:
-----------
Fix: Bad orders list viewstatut filter if expeditons module is disabled
Commit: 1a62cdfbe85a5af570827932a370c3bae765142a
https://github.com/Dolibarr/dolibarr/commit/1a62cdfbe85a5af570827932a370c3bae765142a
Author: Laurent Destailleur <address@hidden>
Date: 2013-03-15 (Fri, 15 Mar 2013)
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: Use better test to show localtax to avoid problem when switching
from different country.
Commit: d590aa56eb281517b6baf9726201cf0afa5d9f28
https://github.com/Dolibarr/dolibarr/commit/d590aa56eb281517b6baf9726201cf0afa5d9f28
Author: Laurent Destailleur <address@hidden>
Date: 2013-03-16 (Sat, 16 Mar 2013)
Changed paths:
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/index.php
M htdocs/langs/ca_ES/orders.lang
M htdocs/langs/es_ES/orders.lang
Log Message:
-----------
Merge pull request #749 from simnandez/3.3
Fix: Bad orders list viewstatut filter if expeditons module is disabled
Commit: 013b7eca1092aae986d805f1cc846064a2e227aa
https://github.com/Dolibarr/dolibarr/commit/013b7eca1092aae986d805f1cc846064a2e227aa
Author: Laurent Destailleur <address@hidden>
Date: 2013-03-16 (Sat, 16 Mar 2013)
Changed paths:
M htdocs/commande/liste.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/langs/ca_ES/orders.lang
M htdocs/langs/en_US/orders.lang
M htdocs/langs/es_ES/orders.lang
M htdocs/langs/fr_FR/orders.lang
Log Message:
-----------
Fix: A better fix for status/list of orders.
There was a confusion because of bad translation key StatusOrderToBill
that in fact mean "StatusOrderDelivered".
More explanation:
http://wiki.dolibarr.org/index.php/Module_Customers_Orders#Life_cycle_.2F_Business_rules
Commit: 33a7692fbc1874f053914afc849806947a431ed6
https://github.com/Dolibarr/dolibarr/commit/33a7692fbc1874f053914afc849806947a431ed6
Author: Laurent Destailleur <address@hidden>
Date: 2013-03-16 (Sat, 16 Mar 2013)
Changed paths:
M htdocs/admin/expedition.php
M htdocs/commande/liste.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/exports/class/export.class.php
M htdocs/index.php
M htdocs/langs/ar_SA/bills.lang
M htdocs/langs/bg_BG/bills.lang
M htdocs/langs/ca_ES/orders.lang
M htdocs/langs/da_DK/bills.lang
M htdocs/langs/el_GR/bills.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/orders.lang
M htdocs/langs/es_ES/orders.lang
M htdocs/langs/et_EE/bills.lang
M htdocs/langs/fi_FI/bills.lang
M htdocs/langs/fr_FR/orders.lang
M htdocs/langs/he_IL/bills.lang
M htdocs/langs/hu_HU/bills.lang
M htdocs/langs/is_IS/bills.lang
M htdocs/langs/ja_JP/bills.lang
M htdocs/langs/nb_NO/bills.lang
M htdocs/langs/nl_NL/bills.lang
M htdocs/langs/pl_PL/bills.lang
M htdocs/langs/ro_RO/bills.lang
M htdocs/langs/sv_SE/bills.lang
M htdocs/langs/zh_CN/bills.lang
M htdocs/langs/zh_TW/bills.lang
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/exports/class/export.class.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/2da3fb68a090...33a7692fbc18