dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,608 Commits 9 Branches 19 Tags
a07733fcec16f471ec447789631804a0a33b94de
Commit Graph
18608 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 fdf5a4c3e1 Merge pull request #129 from PrestaEdit/Forum-#213412 
[-] BO: don't have the delivery PDF - User can define which statuses sho...
 2013-02-05 00:59:48 -08:00
Vincent Augagneur 2aa0f3e93c Merge pull request #129 from PrestaEdit/Forum-#213412 
[-] BO: don't have the delivery PDF - User can define which statuses sho...
 2013-02-05 00:59:48 -08: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 7ffa731761 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 
Conflicts:
	controllers/admin/AdminLogsController.php
 2013-02-05 09:44:13 +01:00
vAugagneur e1213badf8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 
Conflicts:
	controllers/admin/AdminLogsController.php
 2013-02-05 09:44:13 +01: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
Vincent Augagneur d39fb8a8e6 Merge pull request #210 from PrestaEdit/patch-15 
[*] BO: we don't need to clik on a line
 2013-02-05 00:36:54 -08:00
Vincent Augagneur 63da844138 Merge pull request #210 from PrestaEdit/patch-15 
[*] BO: we don't need to clik on a line
 2013-02-05 00:36:54 -08:00
Rémi Gaillard fdf7eeb629 [-] Core: Fix #PSCFV-6067 stock was not reserved sometimes because of time 2013-02-04 19:54:14 +01:00
Rémi Gaillard 35e5912def [-] Core: Fix #PSCFV-6067 stock was not reserved sometimes because of time 2013-02-04 19:54:14 +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
Damien Metzger 5d678ca69d // small fix (installer) 2013-02-04 16:20:22 +01:00
Damien Metzger 3e5cb72f0f // small fix (installer) 2013-02-04 16:20:22 +01: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 10207ea6f9 // Voucher cleaning 2013-02-04 16:00:45 +01:00
Damien Metzger a6a0dee0ca // Voucher cleaning 2013-02-04 16:00:45 +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
Damien Metzger c385618fc2 [-] MO : statsforecast fixed #PSCFV-7399 2013-02-04 16:00:45 +01:00
Damien Metzger 50794f89db [-] MO : statsforecast fixed #PSCFV-7399 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 d6bd352844 // Fix PHP Notice 2013-02-04 14:46:55 +01:00
Rémi Gaillard a07d1b06fe // Fix PHP Notice 2013-02-04 14:46:55 +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
Damien Metzger 2ab51816d4 [-] FO : fixed retro compatibility issue with discounts #PSCFV-7553 2013-02-04 11:53:06 +01:00
Damien Metzger 01454bc3b7 [-] FO : fixed retro compatibility issue with discounts #PSCFV-7553 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