Commit Graph

6950 Commits

Author SHA1 Message Date
Rémi Gaillard 3497af985a [-] FO: FIX #PSCFV-5703 quotes in modules translations break javascript execution 2012-12-07 17:23:06 +01:00
vAugagneur 006bb7b19a [-] FO : fixed bug #PSCFV-5849 now customer addresses can't be edited if country is not enable in this shop excepte if group shop is shared order 2012-12-07 16:23:52 +01:00
vAugagneur 7bc49194b7 [-] FO : fixed bug #PSCFV-5849 now customer addresses can't be edited if country is not enable in this shop excepte if group shop is shared order 2012-12-07 16:23:52 +01:00
Rémi Gaillard 5bcc1417dd // small fix for urls 2012-12-07 11:46:50 +01:00
Rémi Gaillard 1c1fd827da // small fix for urls 2012-12-07 11:46:50 +01:00
vAugagneur 4dbb321836 [-] CORE : fixed sql bug in PaymentModuleCore::getInstalledPaymentModules() - now get only active payment modules 2012-12-06 17:05:19 +01:00
vAugagneur f40369ef6a [-] CORE : fixed sql bug in PaymentModuleCore::getInstalledPaymentModules() - now get only active payment modules 2012-12-06 17:05:19 +01:00
vAugagneur accb337006 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-06 16:53:37 +01:00
vAugagneur adc1197320 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-06 16:53:37 +01:00
vAugagneur 52f4fca6e1 [-] CORE : small fix in Dispatcher::createURL() when friendly URL is disabled 2012-12-06 16:53:29 +01:00
vAugagneur 048f3cce14 [-] CORE : small fix in Dispatcher::createURL() when friendly URL is disabled 2012-12-06 16:53:29 +01:00
Rémi Gaillard 224646ef1f [-] FO: Fix some tax_display_method value for not default customer group 2012-12-06 16:38:31 +01:00
Rémi Gaillard 56819e3573 [-] FO: Fix some tax_display_method value for not default customer group 2012-12-06 16:38:31 +01:00
vAugagneur 640ec6d006 [-] BO : fixed bug #PSCFV-4701 - Module onclickOption is not called 2012-12-06 12:16:37 +01:00
vAugagneur 61c23c7e75 [-] BO : fixed bug #PSCFV-4701 - Module onclickOption is not called 2012-12-06 12:16:37 +01:00
vAugagneur 12f47a1b9b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-06 11:32:24 +01:00
vAugagneur e809f6bfdb Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-06 11:32:24 +01:00
vAugagneur d71970d5ff [-] BO : fixed bug #PSCFV-4699 - Module uninstall confirmation message is missing 2012-12-06 11:32:19 +01:00
vAugagneur 6f37326675 [-] BO : fixed bug #PSCFV-4699 - Module uninstall confirmation message is missing 2012-12-06 11:32:19 +01:00
Milow 82c7f03119 Fix typo 2012-12-05 21:27:37 -06:00
Milow cf7aebd029 Fix typo 2012-12-05 21:27:37 -06:00
Milow 55e55689a6 Fix mail error
This changes two things in the mail class.

1. If the html template was missing, it would tell you the txt template
was missing. It now tells you that the html template is missing.

2. If the type is set to only text or html, don't fail if the other
template is missing. Example, if set to only use text templates, don't
fail if the html template does not exist. If the type is set to both,
or if the specific type of template is missing, it will still complain.
2012-12-05 21:26:07 -06:00
Milow c87fb469fd Fix mail error
This changes two things in the mail class.

1. If the html template was missing, it would tell you the txt template
was missing. It now tells you that the html template is missing.

2. If the type is set to only text or html, don't fail if the other
template is missing. Example, if set to only use text templates, don't
fail if the html template does not exist. If the type is set to both,
or if the specific type of template is missing, it will still complain.
2012-12-05 21:26:07 -06:00
vAugagneur 2c095c11a1 [-] FO : fixed bug #PSCFV-5826 #PSCFV-4697 Live edit only works for home page && Live edit can't load module 2012-12-04 18:29:10 +01:00
vAugagneur 712f0c3d6d [-] FO : fixed bug #PSCFV-5826 #PSCFV-4697 Live edit only works for home page && Live edit can't load module 2012-12-04 18:29:10 +01:00
Rémi Gaillard 4e9c534f1b [-] Core: Locales should be setted anywhere #PSCFV-5953 2012-12-04 15:40:17 +01:00
Rémi Gaillard da5c5fb4a0 [-] Core: Locales should be setted anywhere #PSCFV-5953 2012-12-04 15:40:17 +01:00
Rémi Gaillard a1e91bcfa9 [-] Core: Fix #PSCFV-5948 id_warehouse was sometime set to null on validateorder with stock management disabled 2012-12-04 15:32:06 +01:00
Rémi Gaillard 2d93064fb9 [-] Core: Fix #PSCFV-5948 id_warehouse was sometime set to null on validateorder with stock management disabled 2012-12-04 15:32:06 +01:00
Rémi Gaillard b414bd06a4 [-] Core: Fix #PSCFV-5966 the tax rate applied to shipping cost for the visitors was the product tax rate 2012-12-04 15:09:41 +01:00
Rémi Gaillard 0071850981 [-] Core: Fix #PSCFV-5966 the tax rate applied to shipping cost for the visitors was the product tax rate 2012-12-04 15:09:41 +01:00
Rémi Gaillard e70069bdfa [-] WS: #PSCFV-5982 logo email/invoices/mail don't return standard logo if not exists 2012-12-04 11:56:17 +01:00
Rémi Gaillard e568e0992d [-] WS: #PSCFV-5982 logo email/invoices/mail don't return standard logo if not exists 2012-12-04 11:56:17 +01:00
Rémi Gaillard aac0500c72 [-] WS: Fix #PSCFV-5981 logo path 2012-12-04 11:52:04 +01:00
Rémi Gaillard b80bc2a6ba [-] WS: Fix #PSCFV-5981 logo path 2012-12-04 11:52:04 +01:00
Rémi Gaillard f8365220e2 [-] Core: Fix isDate validator 2012-12-03 16:52:22 +01:00
Rémi Gaillard 6ddd3a03bb [-] Core: Fix isDate validator 2012-12-03 16:52:22 +01:00
Rémi Gaillard a3c28f3ace [-] Core: Fix date validator #PSCFV-5797 2012-12-03 16:12:08 +01:00
Rémi Gaillard 0f3bbaf65c [-] Core: Fix date validator #PSCFV-5797 2012-12-03 16:12:08 +01:00
Jonathan Danse a88b23b16f [+] Project: add the possibility to change the default color (#db3484)
Let the user set the default color in the mail with a color picker (configuration set in Back Office, Themes)
2012-12-03 16:11:43 +01:00
Jonathan Danse edd6bf7b7e [+] Project: add the possibility to change the default color (#db3484)
Let the user set the default color in the mail with a color picker (configuration set in Back Office, Themes)
2012-12-03 16:11:43 +01:00
vAugagneur c769a2599c [-] BO : fixed bug when toggle status on product listing, redirect_type was not good 2012-12-03 15:23:25 +01:00
vAugagneur f6b1e86449 [-] BO : fixed bug when toggle status on product listing, redirect_type was not good 2012-12-03 15:23:25 +01:00
vAugagneur c2f31109e4 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-03 14:14:54 +01:00
vAugagneur 13ebd3afef Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-03 14:14:54 +01:00
vAugagneur 2195f9bdcb [+] CORE : now you can choose the redirect option when your product is disable 2012-12-03 14:13:50 +01:00
vAugagneur ed3e0e1a58 [+] CORE : now you can choose the redirect option when your product is disable 2012-12-03 14:13:50 +01:00
Rémi Gaillard 4a94d54f6d [-] BO: Fix #PSCFV-5332 wrong rights on folder after uploading image 2012-12-03 12:26:27 +01:00
Rémi Gaillard 428c1fa99b [-] BO: Fix #PSCFV-5332 wrong rights on folder after uploading image 2012-12-03 12:26:27 +01:00
Rémi Gaillard c73be7904a [-] BO: Fix category association in global context #PSCFV-5551 2012-12-03 11:25:59 +01:00