dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,989 Commits 9 Branches 19 Tags
0af76e01fb303fa6eeb7ee7a78755d2bc8dfd708
Commit Graph

6950 Commits

Author SHA1 Message Date
vAugagneur df860f1f47 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-05 14:16:58 +01:00
vAugagneur 64764c4c1e //added getWidthSize and getHeightSize method in tpl thanks to @PrestaEdit 2013-02-05 14:16:47 +01:00
vAugagneur b73ca29b58 //added getWidthSize and getHeightSize method in tpl thanks to @PrestaEdit 2013-02-05 14:16:47 +01:00
Rémi Gaillard a84e91f973 // Fix merge bug 2013-02-05 11:02:05 +01:00
Rémi Gaillard b9fec8eb0c // Fix merge bug 2013-02-05 11:02:05 +01:00
vAugagneur 0ceab34c5e //failed to delete buffer. No buffer to delete in PDF 2013-02-05 10:12:00 +01:00
vAugagneur 0d9eb664d4 //failed to delete buffer. No buffer to delete in PDF 2013-02-05 10:12:00 +01:00
Vincent Augagneur f8c97d8814 Merge pull request #134 from PrestaEdit/patch-2 
[-] FO: need id_product_attribute to know quantity
 2013-02-05 00:52:50 -08:00
Vincent Augagneur 288c3e1323 Merge pull request #134 from PrestaEdit/patch-2 
[-] FO: need id_product_attribute to know quantity
 2013-02-05 00:52:50 -08:00
vAugagneur 4ef61eb8f8 [-] BO : error message on install module 2013-02-05 09:41:34 +01:00
vAugagneur 606b3eedd5 [-] BO : error message on install module 2013-02-05 09:41:34 +01:00
vAugagneur b23aa76d6b Merge branch 'dispatch_modules' into development 2013-02-04 18:20:24 +01:00
vAugagneur d0d3180509 Merge branch 'dispatch_modules' into development 2013-02-04 18:20:24 +01:00
vAugagneur 0de5c242ca [+] BO : new display of payment modules in payment tab 2013-02-04 18:18:50 +01:00
vAugagneur 947397c69b [+] BO : new display of payment modules in payment tab 2013-02-04 18:18:50 +01:00
Damien Metzger a9106be306 Merge pull request #243 from burhanbvk/patch-3 
[-] FO : Fixed a typo for ui.droppable dependencies
 2013-02-04 09:14:20 -08:00
Damien Metzger 168ccb2687 Merge pull request #243 from burhanbvk/patch-3 
[-] FO : Fixed a typo for ui.droppable dependencies
 2013-02-04 09:14:20 -08:00
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