Commit Graph

18638 Commits

Author SHA1 Message Date
Rémi Gaillard 5e5cbb0d65 // Fix SQL error 2013-02-11 18:45:00 +01:00
Rémi Gaillard 9709339084 // Fix SQL error 2013-02-11 18:45:00 +01:00
Rémi Gaillard 1197d9248b [-] FO: Fix PHP warning on update quantity in cart with customizables products 2013-02-11 18:04:23 +01:00
Rémi Gaillard 8348e28cac [-] FO: Fix PHP warning on update quantity in cart with customizables products 2013-02-11 18:04:23 +01:00
Rémi Gaillard 372ec5e940 Merge pull request #266 from anat/development
[+] WS : Add product bundle retrieval from Web services
2013-02-11 08:53:31 -08:00
Rémi Gaillard 61dbe6a2e2 Merge pull request #266 from anat/development
[+] WS : Add product bundle retrieval from Web services
2013-02-11 08:53:31 -08:00
anat 8400eb53e5 [+] WS : Add product bundle retrieval from Web services 2013-02-11 17:51:18 +01:00
anat 4990028dc2 [+] WS : Add product bundle retrieval from Web services 2013-02-11 17:51:18 +01:00
Rémi Gaillard adecde6ee1 [-] FO: don't load medias if error on product page to avoid JS bugs 2013-02-11 17:33:19 +01:00
Rémi Gaillard 0ec4f02502 [-] FO: don't load medias if error on product page to avoid JS bugs 2013-02-11 17:33:19 +01:00
Rémi Gaillard 03842da02d [-] FO: Fix Cart::getDeliveryOption() cache 2013-02-11 16:59:16 +01:00
Rémi Gaillard cc15bf0243 [-] FO: Fix Cart::getDeliveryOption() cache 2013-02-11 16:59:16 +01:00
Rémi Gaillard 41069dc231 [-] MO: Clear blockcategories_footer.tpl cache 2013-02-11 16:30:04 +01:00
Rémi Gaillard d2ce6050d2 [-] MO: Clear blockcategories_footer.tpl cache 2013-02-11 16:30:04 +01:00
Gregory Roussac 2fe55e3eb0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-11 16:14:22 +01:00
Gregory Roussac 498904d22a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-11 16:14:22 +01:00
gRoussac 0763774707 [-] FO : Fix bug #PSCFI-6686 when url param has no value set 1 to valuePSCFI-6686 2013-02-11 16:13:46 +01:00
gRoussac 2c2f67dfa8 [-] FO : Fix bug #PSCFI-6686 when url param has no value set 1 to valuePSCFI-6686 2013-02-11 16:13:46 +01:00
Rémi Gaillard 7e8d0a27ff [-] BO: Fix #PSCFV-7462 bad sql request for ordering by price in adminproducts 2013-02-11 15:54:53 +01:00
Rémi Gaillard 5154585bb2 [-] BO: Fix #PSCFV-7462 bad sql request for ordering by price in adminproducts 2013-02-11 15:54:53 +01:00
Rémi Gaillard 9dc31dd415 [-] FO: Fix product restriction by shop 2013-02-11 15:21:54 +01:00
Rémi Gaillard 3cf99fe042 [-] FO: Fix product restriction by shop 2013-02-11 15:21:54 +01:00
gRoussac 069814051d [-] FO : Fix bug #PSCFV-7491 special characters in direct search 2013-02-11 15:07:43 +01:00
gRoussac 387c124a6d [-] FO : Fix bug #PSCFV-7491 special characters in direct search 2013-02-11 15:07:43 +01:00
gRoussac dfb917ef6d [*] TR : update translations for FR and DE 2013-02-11 14:32:19 +01:00
gRoussac cd11ab288e [*] TR : update translations for FR and DE 2013-02-11 14:32:19 +01:00
gRoussac e17874cc55 [-] FO : Fix bug #PSCFV-7562 no availability date in tempalte 2013-02-11 14:31:08 +01:00
gRoussac c5d3c6e293 [-] FO : Fix bug #PSCFV-7562 no availability date in tempalte 2013-02-11 14:31:08 +01:00
gRoussac 3bd56273ef [-] CORe : Fix #PSCFV-7314 unregisterHook and unregisterExceptions in module::uninstall 2013-02-11 12:00:54 +01:00
gRoussac ea2a1eb122 [-] CORe : Fix #PSCFV-7314 unregisterHook and unregisterExceptions in module::uninstall 2013-02-11 12:00:54 +01:00
Rémi Gaillard c94bf2a823 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-11 11:46:02 +01:00
Rémi Gaillard c3ad73cd2c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-11 11:46:02 +01:00
Rémi Gaillard 7ed1a548a2 [-] FO: Fix infinite loop on overriding Module::getPaymentModules and executing hook on it #PSCFV-7760 2013-02-11 11:45:42 +01:00
Rémi Gaillard 57d782956d [-] FO: Fix infinite loop on overriding Module::getPaymentModules and executing hook on it #PSCFV-7760 2013-02-11 11:45:42 +01:00
nezenmoins 64915d390c [-] PDF : Fixed unecessary slash in manufacturer image path test
In the file_exists test of the manufacturer image path there is an unecessary slash after the constant _PS_MANU_IMG_DIR_, and then we can't display a specific manufacturer image.
2013-02-11 11:33:06 +01:00
nezenmoins 70be828219 [-] PDF : Fixed unecessary slash in manufacturer image path test
In the file_exists test of the manufacturer image path there is an unecessary slash after the constant _PS_MANU_IMG_DIR_, and then we can't display a specific manufacturer image.
2013-02-11 11:33:06 +01:00
Michel Courtade 01de5920c3 [-] PDF : Fixed unecessary slash in overriden template path 2013-02-11 10:53:46 +01:00
Michel Courtade 3c00b28107 [-] PDF : Fixed unecessary slash in overriden template path 2013-02-11 10:53:46 +01:00
vAugagneur becee63434 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-11 10:30:38 +01:00
vAugagneur b1c39da837 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-11 10:30:38 +01:00
vAugagneur 9e342d5183 [-] BO : fixed bug #PSCFV-7575 - BO shipping price by zones ang weigth error js 2013-02-11 10:30:32 +01:00
vAugagneur 57e883d6b2 [-] BO : fixed bug #PSCFV-7575 - BO shipping price by zones ang weigth error js 2013-02-11 10:30:32 +01:00
Rémi Gaillard ba11328cec [-] BO: Fix #PSCFV-7427 group id used for price computation on order edition 2013-02-08 15:02:15 +01:00
Rémi Gaillard 70b4ca535e [-] BO: Fix #PSCFV-7427 group id used for price computation on order edition 2013-02-08 15:02:15 +01:00
ldecoker 5eb63feecc Update modules/blocksupplier/blocksupplier.php
Missing uninstall function for blocksupplier to clean the configuration table.
2013-02-08 11:37:14 +01:00
ldecoker 3a5dd223a4 Update modules/blocksupplier/blocksupplier.php
Missing uninstall function for blocksupplier to clean the configuration table.
2013-02-08 11:37:14 +01:00
gRoussac c83a0fda3f // small fix on displayError in Admincountries 2013-02-07 18:40:20 +01:00
gRoussac 1127dc35b4 // small fix on displayError in Admincountries 2013-02-07 18:40:20 +01:00
Damien Metzger 4ab7b7eff4 // Translations 2013-02-07 18:20:19 +01:00
Damien Metzger 26a01f0a41 // Translations 2013-02-07 18:20:19 +01:00