Commit Graph
17965 Commits
Author SHA1 Message Date
gRoussac 65a73c7d4b [-] FO : fix bug #PSCFV-8684, phone not required in guest checkout when not set in BO 2013-04-18 19:12:07 +02:00
François Gaillard b6d9c89b99 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 18:23:18 +02:00
Francois Gaillard 8251e98323 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 18:23:18 +02:00
gRoussac 1a8ab7f68c [-] BO : Can not set PS_ORDER_OUT_OF_STOCK in one shop 2013-04-18 17:28:16 +02:00
gRoussac dcb46e7867 [-] BO : Can not set PS_ORDER_OUT_OF_STOCK in one shop 2013-04-18 17:28:16 +02:00
Rémi Gaillard 38bdd421f7 // performance improve for ObjectModel::displayFieldName #PSCFV-8713 2013-04-18 17:12:05 +02:00
Rémi Gaillard 103513bf28 // performance improve for ObjectModel::displayFieldName #PSCFV-8713 2013-04-18 17:12:05 +02:00
vAugagneur 803447b88d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 17:02:51 +02:00
vAugagneur ea0203f43f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 17:02:51 +02:00
vAugagneur 828ffb74ad [-] FO - fixed bug #PSCFV-8826 sort now work fine on bestsale controller 2013-04-18 17:02:45 +02:00
vAugagneur 75d395c84a [-] FO - fixed bug #PSCFV-8826 sort now work fine on bestsale controller 2013-04-18 17:02:45 +02:00
gRoussac e22fe455b3 [-] CORE : Fix bug #PSCFV-8636 again, cart rule with a reduction and free shipping 2013-04-18 16:44:55 +02:00
gRoussac 2a3789d48b [-] CORE : Fix bug #PSCFV-8636 again, cart rule with a reduction and free shipping 2013-04-18 16:44:55 +02:00
vAugagneur e9b8af0e97 [-] BO - fixed bug #PSCFV-8614 2013-04-18 15:14:37 +02:00
vAugagneur b52c71c7ad [-] BO - fixed bug #PSCFV-8614 2013-04-18 15:14:37 +02:00
Rémi Gaillard 53cc380a6a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 14:59:02 +02:00
Rémi Gaillard 45fdb3f79d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 14:59:02 +02:00
Rémi Gaillard 986d57148f //AdminModulesController::extractArchive() now return something 2013-04-18 14:58:43 +02:00
Rémi Gaillard a7be6b14e8 //AdminModulesController::extractArchive() now return something 2013-04-18 14:58:43 +02:00
gRoussac ccfa343b0d [-] BO : Bad gender image when no gender 2013-04-18 14:54:12 +02:00
gRoussac 0a8eddf7d6 [-] BO : Bad gender image when no gender 2013-04-18 14:54:12 +02:00
Rémi Gaillard ab700a6285 [-] FO: send current product to some hook like displayProductTabContent on product page #PSCFV-8825 2013-04-18 14:24:50 +02:00
Rémi Gaillard f24022311e [-] FO: send current product to some hook like displayProductTabContent on product page #PSCFV-8825 2013-04-18 14:24:50 +02:00
Rémi Gaillard 158ab771b6 [-] BO: Fix #PSCFV-8827 fixed price of specific price rules should be a float 2013-04-18 14:21:44 +02:00
Rémi Gaillard f7a1fdb9e0 [-] BO: Fix #PSCFV-8827 fixed price of specific price rules should be a float 2013-04-18 14:21:44 +02:00
Rémi Gaillard 5edfd03068 // don't try to clear smarty cache if smarty is not defined 2013-04-18 14:06:49 +02:00
Rémi Gaillard e7b344adab // don't try to clear smarty cache if smarty is not defined 2013-04-18 14:06:49 +02:00
PrestaEdit df1b8efbc2 [-] MO: feeder / RSS Valid 2013-04-18 14:45:52 +03:00
PrestaEdit bc07b025c1 [-] MO: feeder / RSS Valid 2013-04-18 14:45:52 +03:00
François Gaillard 768eb473e4 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 12:09:47 +02:00
Francois Gaillard c9a53bf491 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 12:09:47 +02:00
Rémi Gaillard f0c5407aa6 // Revert a93cfbec07 2013-04-18 11:36:55 +02:00
Rémi Gaillard be250c9ecc // Revert a93cfbec07 2013-04-18 11:36:55 +02:00
gRoussac ee3e2ac6dc [-] FO : Fix bug #PSCFV-8728 context country not updated after changing delivery address in OPC 2013-04-18 11:26:50 +02:00
gRoussac 5a815e7b19 [-] FO : Fix bug #PSCFV-8728 context country not updated after changing delivery address in OPC 2013-04-18 11:26:50 +02:00
sLorenzini b633b44ac7 [-] FO: fixed some css bug for ie7 2013-04-18 11:22:40 +02:00
sLorenzini 859175dde1 [-] FO: fixed some css bug for ie7 2013-04-18 11:22:40 +02:00
Rémi Gaillard 5ba3fda95f [-] FO: Add the protocol content to the cache id of modules #PSCFV-8810 2013-04-17 18:14:58 +02:00
Rémi Gaillard 39e3b079dd [-] FO: Add the protocol content to the cache id of modules #PSCFV-8810 2013-04-17 18:14:58 +02:00
Rémi Gaillard f83b91ae51 // Fix smarty cache after modules translation update 2013-04-17 14:44:20 +02:00
Rémi Gaillard a172632600 // Fix smarty cache after modules translation update 2013-04-17 14:44:20 +02:00
Rémi Gaillard 49ff8ae4a1 // pscleaner clean address inversion between customers and manufacturers/suppliers 2013-04-17 11:39:11 +02:00
Rémi Gaillard 76f584a70d // pscleaner clean address inversion between customers and manufacturers/suppliers 2013-04-17 11:39:11 +02:00
Vincent Augagneur 34f2ff36a3 Merge pull request #179 from nturato/patch-1
[-] WS: images are only shown as jpg or gif
2013-04-17 01:56:57 -07:00
Vincent Augagneur 95500d708d Merge pull request #179 from nturato/patch-1
[-] WS: images are only shown as jpg or gif
2013-04-17 01:56:57 -07:00
vAugagneur de0ef82f74 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-17 10:02:37 +02:00
vAugagneur 6bf1d0c036 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-17 10:02:37 +02:00
vAugagneur de887cc078 Merge Pull request #98 - Thanks to @phproberto 2013-04-17 10:02:32 +02:00
vAugagneur 9f9562f92b Merge Pull request #98 - Thanks to @phproberto 2013-04-17 10:02:32 +02:00
gRoussac 701d9e50af [-] CORE : Fix bug last part #PSCFV-8636, cart rule with a reduction and free shipping 2013-04-16 18:56:00 +02:00