Commit Graph

6583 Commits

Author SHA1 Message Date
Rémi Gaillard 82a230aa70 [-] Core: Fix #PSCFV-5997 - Product::priceCalculation not return the price of default combination 2012-12-11 17:45:06 +01:00
Rémi Gaillard b3b5f7a1e9 [-] Core: Fix #PSCFV-5997 - Product::priceCalculation not return the price of default combination 2012-12-11 17:45:06 +01:00
sLorenzini 0727da6aeb [-] FO: CLONE - order_conf still not fixed propertly #2 - #PSCFV-5817 2012-12-11 17:43:30 +01:00
sLorenzini 05a6f856da [-] FO: CLONE - order_conf still not fixed propertly #2 - #PSCFV-5817 2012-12-11 17:43:30 +01:00
Rémi Gaillard c9cb49d5a1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-11 16:59:56 +01:00
Rémi Gaillard bf1b491e94 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-11 16:59:56 +01:00
vAugagneur fab1c02443 [-] CORE : fixed bug #PSCFV-6084 2012-12-11 16:59:35 +01:00
vAugagneur ec05f5e384 [-] CORE : fixed bug #PSCFV-6084 2012-12-11 16:59:35 +01:00
Rémi Gaillard 4c026fe0fc [-] BO: don't display stock available if stock management is disabled #PSCFV-6029 2012-12-11 16:59:26 +01:00
Rémi Gaillard 8d2f5d6e42 [-] BO: don't display stock available if stock management is disabled #PSCFV-6029 2012-12-11 16:59:26 +01:00
Rémi Gaillard 5891143e5b [-] BO: Improve memory usage in admin product in global context with a lot of shops and attributes 2012-12-11 16:05:29 +01:00
Rémi Gaillard ef4b3576fc [-] BO: Improve memory usage in admin product in global context with a lot of shops and attributes 2012-12-11 16:05:29 +01:00
vAugagneur a4e48ccc7d [-] CORE : fixed bug #PSCFV-6098 Double @ in customer email address crashes BO 2012-12-11 15:44:32 +01:00
vAugagneur 5698e05f63 [-] CORE : fixed bug #PSCFV-6098 Double @ in customer email address crashes BO 2012-12-11 15:44:32 +01:00
Damien Metzger 8e8c1bee81 [-] FO : jquery mobile was not compatible with js minifier, I updated both 2012-12-11 14:01:40 +01:00
Damien Metzger e6ad7ec815 [-] FO : jquery mobile was not compatible with js minifier, I updated both 2012-12-11 14:01:40 +01:00
Rémi Gaillard 7cd629b15b [-] BO: Fix root category should anyway be imported in shop creation #PSCFV-5885 2012-12-11 12:01:04 +01:00
Rémi Gaillard e8718ec42f [-] BO: Fix root category should anyway be imported in shop creation #PSCFV-5885 2012-12-11 12:01:04 +01:00
Rémi Gaillard b2f01058a8 [-] BO: Fix various bugs in categories ntree generation 2012-12-11 11:19:21 +01:00
Rémi Gaillard a8096c2800 [-] BO: Fix various bugs in categories ntree generation 2012-12-11 11:19:21 +01:00
Damien Metzger 27eaed42bd [-] MO : fixed backslashes in homeslider #PSCFV-5664 2012-12-11 11:16:56 +01:00
Damien Metzger b7d4321e5a [-] MO : fixed backslashes in homeslider #PSCFV-5664 2012-12-11 11:16:56 +01:00
Rémi Gaillard 27ae42b086 [-] Core: Fix Swift and TCPDF for hosting which disallow getmypid() php function 2012-12-10 15:06:03 +01:00
Rémi Gaillard a68e5c1cfb [-] Core: Fix Swift and TCPDF for hosting which disallow getmypid() php function 2012-12-10 15:06:03 +01:00
Rémi Gaillard 29b4adb032 [-] Core: Fix search indexation when id_product is forced #PSCFV-6039 2012-12-10 13:52:09 +01:00
Rémi Gaillard 8b817a4a8c [-] Core: Fix search indexation when id_product is forced #PSCFV-6039 2012-12-10 13:52:09 +01:00
Rémi Gaillard 60e99d6b66 // Display exception in admin regardless mode dev 2012-12-10 10:47:41 +01:00
Rémi Gaillard 53f1e8fcbb // Display exception in admin regardless mode dev 2012-12-10 10:47:41 +01:00
Rémi Gaillard db9ff416c0 // small fix 2012-12-07 18:01:32 +01:00
Rémi Gaillard 7e6d94053b // small fix 2012-12-07 18:01:32 +01:00
Rémi Gaillard d274f6d84a [-] WS: Fix #PSCFV-5915 temporary images deletion 2012-12-07 17:58:46 +01:00
Rémi Gaillard 3280bfbeed [-] WS: Fix #PSCFV-5915 temporary images deletion 2012-12-07 17:58:46 +01:00
Rémi Gaillard cd7cc208e8 [-] FO: FIX #PSCFV-5703 quotes in modules translations break javascript execution 2012-12-07 17:23:06 +01:00
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