Commit Graph

6583 Commits

Author SHA1 Message Date
Rémi Gaillard d4667abc63 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-04 16:05:17 +01:00
Rémi Gaillard 0caea77c36 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-04 16:05:17 +01:00
Rémi Gaillard 1dbf4855cc [-] BO: Fix id_shop for configuration variables in global context for orders 2013-02-04 16:05:01 +01:00
Rémi Gaillard 44d26d5804 [-] BO: Fix id_shop for configuration variables in global context for orders 2013-02-04 16:05:01 +01:00
Damien Metzger a53163feee [-] Core : Fixed a lot of issue with free shipping vouchers #PSCFV-7325 2013-02-04 16:00:46 +01:00
Damien Metzger 2bf3df1c7d [-] Core : Fixed a lot of issue with free shipping vouchers #PSCFV-7325 2013-02-04 16:00:46 +01:00
Damien Metzger 3c6f17b855 // Voucher cleaning 2013-02-04 16:00:45 +01:00
Damien Metzger 49ecd42395 // Voucher cleaning 2013-02-04 16:00:45 +01:00
Damien Metzger 4f180b9b27 [-] FO : fixed voucher display in the customer view #PSCFV-7332 2013-02-04 16:00:45 +01:00
Damien Metzger e9a7474bbe [-] FO : fixed voucher display in the customer view #PSCFV-7332 2013-02-04 16:00:45 +01:00
Rémi Gaillard 7bd44ca1b1 [-] BO: get the invoice prefix from the right shop 2013-02-04 15:11:29 +01:00
Rémi Gaillard d72ce0d892 [-] BO: get the invoice prefix from the right shop 2013-02-04 15:11:29 +01:00
Rémi Gaillard ceed2c996a // PHP_SELF is only index.php 2013-02-04 14:22:59 +01:00
Rémi Gaillard 8fd63e0f6e // PHP_SELF is only index.php 2013-02-04 14:22:59 +01:00
Damien Metzger 3156093542 [-] FO : Fixed voucher value when it exceeds the product total #PSCFV-7421 2013-02-04 11:53:07 +01:00
Damien Metzger 9c3f58b6a2 [-] FO : Fixed voucher value when it exceeds the product total #PSCFV-7421 2013-02-04 11:53:07 +01:00
Damien Metzger 3cf9a1aa21 [-] FO : fixed customer discounts #PSCFV-7479 2013-02-04 11:53:06 +01:00
Damien Metzger 197778c91a [-] FO : fixed customer discounts #PSCFV-7479 2013-02-04 11:53:06 +01:00
Burhan 233b579ff6 [-] Fixed a typo for ui.droppable dependencies 2013-02-03 23:49:19 +02:00
Burhan c9a2f61dae [-] Fixed a typo for ui.droppable dependencies 2013-02-03 23:49:19 +02:00
Damien Metzger 3617a9089c Merge pull request #151 from Shagshag/patch-2
[-] Core : Wrong parameters for Memcache::addServer
2013-02-01 10:04:33 -08:00
Damien Metzger b6bb0637d6 Merge pull request #151 from Shagshag/patch-2
[-] Core : Wrong parameters for Memcache::addServer
2013-02-01 10:04:33 -08:00
Damien Metzger 8d9f878b34 Merge pull request #164 from Shagshag/patch-7
[-] BO : OrderHistory::changeIdOrderState
2013-02-01 10:00:10 -08:00
Damien Metzger 067e055858 Merge pull request #164 from Shagshag/patch-7
[-] BO : OrderHistory::changeIdOrderState
2013-02-01 10:00:10 -08:00
Rémi Gaillard f0694639eb Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-01 18:36:48 +01:00
Rémi Gaillard 8507cab98d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-01 18:36:48 +01:00
Rémi Gaillard 5490f6063d [-] Installer: check create table privileges 2013-02-01 18:36:35 +01:00
Rémi Gaillard 418a3ba10d [-] Installer: check create table privileges 2013-02-01 18:36:35 +01:00
Damien Metzger 9589131674 [-] Core : cart rule cache cleared on update 2013-02-01 18:30:32 +01:00
Damien Metzger fd74aa2798 [-] Core : cart rule cache cleared on update 2013-02-01 18:30:32 +01:00
gRoussac 68673f92d1 [-] FO : Fix bug #PSCFI-6864 #PSCFV-6516 Issue with deleted address blocking order process 2013-01-31 19:06:19 +01:00
gRoussac c0a62be1c5 [-] FO : Fix bug #PSCFI-6864 #PSCFV-6516 Issue with deleted address blocking order process 2013-01-31 19:06:19 +01:00
Rémi Gaillard 9455a7185f [-] FO: Fix #PSCFV-7530 bad quantity returned displayed on order detail for multiple return 2013-01-31 15:10:52 +01:00
Rémi Gaillard f9f24aef84 [-] FO: Fix #PSCFV-7530 bad quantity returned displayed on order detail for multiple return 2013-01-31 15:10:52 +01:00
gRoussac 88dc561463 // forgot debug sorry 2013-01-31 11:50:19 +01:00
gRoussac cf2bc874ba // forgot debug sorry 2013-01-31 11:50:19 +01:00
gRoussac 00047b8ae4 [-] BO : Adresses not deduplicate in orders page 2013-01-31 11:33:37 +01:00
gRoussac 92ca63402a [-] BO : Adresses not deduplicate in orders page 2013-01-31 11:33:37 +01:00
gRoussac 95fa1556e7 // norms 2013-01-30 18:52:52 +01:00
gRoussac 836a30b029 // norms 2013-01-30 18:52:52 +01:00
gRoussac 764212a27e [-] CORE : FIx #PSCFV-3163 getextendedstats returning new keys 2013-01-30 18:47:30 +01:00
gRoussac 4658b24e4b [-] CORE : FIx #PSCFV-3163 getextendedstats returning new keys 2013-01-30 18:47:30 +01:00
gRoussac 439f338fd3 [-] FO : Fix fatal error when memcache is not installed and using Memcached 2013-01-30 17:08:51 +01:00
gRoussac 1d06030a66 [-] FO : Fix fatal error when memcache is not installed and using Memcached 2013-01-30 17:08:51 +01:00
gRoussac 6b691cb7a8 [-] BO : Fix bug #PSCFI-6902 fatal error when memcache not installed and Memcached previously activated 2013-01-30 16:28:11 +01:00
gRoussac d74f9c837b [-] BO : Fix bug #PSCFI-6902 fatal error when memcache not installed and Memcached previously activated 2013-01-30 16:28:11 +01:00
Damien Metzger 77f854b836 // Fixed hook names 2013-01-30 16:03:37 +01:00
Damien Metzger bf9b1de873 // Fixed hook names 2013-01-30 16:03:37 +01:00
Gregory Roussac 700fd6a1a3 // fix warning 2013-01-30 14:56:54 +01:00
Gregory Roussac edd4bb0323 // fix warning 2013-01-30 14:56:54 +01:00