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

8245 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
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 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
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 4ef61eb8f8 [-] 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
Rémi Gaillard fdf7eeb629 [-] 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 0de5c242ca [+] 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 5d678ca69d // 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 1dbf4855cc [-] 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 10207ea6f9 // 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 4f180b9b27 [-] 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
Rémi Gaillard 7bd44ca1b1 [-] 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 ceed2c996a // 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 3cf9a1aa21 [-] 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
Burhan 233b579ff6 [-] Fixed a typo for ui.droppable dependencies 2013-02-03 23:49:19 +02:00
Damien Metzger ad7cd0b467 Merge pull request #188 from PrestaEdit/patch-11 
[*] BO : use the employee lang
 2013-02-01 10:43:57 -08: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 8d9f878b34 Merge pull request #164 from Shagshag/patch-7 
[-] BO : OrderHistory::changeIdOrderState
 2013-02-01 10:00:10 -08:00
Damien Metzger d0397b5cbe // Fixed label in install 2013-02-01 18:47:25 +01: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 5490f6063d [-] Installer: check create table privileges 2013-02-01 18:36:35 +01:00
Damien Metzger 836791bb7a Merge pull request #218 from samy-r/development 
Disable search indexation
 2013-02-01 09:32:57 -08:00
Damien Metzger dc8fca0912 Merge pull request #234 from bloodywing/development 
[-] BO : Fixes Syntax Error in Line 126 in AdminSearchConfController.php
 2013-02-01 09:32:06 -08:00
Damien Metzger 9589131674 [-] Core : cart rule cache cleared on update 2013-02-01 18:30:32 +01:00
Damien Metzger bed1e7c259 // Changed number of languages 2013-02-01 17:48:24 +01:00
Damien Metzger fa92819038 // Installer / small fix 2013-02-01 17:47:52 +01:00
Damien Metzger 61b15f35be // A few changes in the installation wizard 2013-02-01 17:47:51 +01:00
Damien Metzger 0148bda9e0 [*] Installer : Automatically drop the system compatibility check when everything's alright 
// Fixed 'next' button when the page is refreshed
 2013-02-01 17:47:51 +01:00
Damien Metzger 35c31ff108 // Added a configuration variable when logged on addons from the back end 2013-02-01 17:47:51 +01:00
Rémi Gaillard 6a261cbc66 // small fix 2013-02-01 16:56:30 +01:00
Rémi Gaillard e91fd47c47 [-] BO: Fix live edit links on homepage 2013-02-01 16:15:55 +01:00
Rémi Gaillard de965867c8 [-] Installer: force magic_quote_runtime to 0 2013-02-01 10:50:29 +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
Damien Metzger d586489556 // Do not search in deactivated tabs (you can still search in forbidden tab however) 2013-01-31 17:04:59 +01:00
Damien Metzger 78a5387a7e // Added references to demo products 2013-01-31 17:04:59 +01:00
Rémi Gaillard 63014eda4b [-] BO: Fix #PSCFV-7576 2013-01-31 16:54:30 +01:00
Rémi Gaillard 10b50d95eb [-] FO: Fix #PSCFV-7474 display taxes on order payment when the price without taxes is displayed 2013-01-31 15:33:30 +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 63c61d6816 // Don't display error message for virtual cart without carrier available 2013-01-31 14:45:54 +01:00
gRoussac ad59853347 [-] FO : Fix bug #PSCFV-7504 last category for parent and not always default one 2013-01-31 12:03:16 +01:00