Commit Graph

18638 Commits

Author SHA1 Message Date
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
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 aed9c5dac2 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 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
Damien Metzger d0397b5cbe // Fixed label in install 2013-02-01 18:47:25 +01:00
Damien Metzger 46cd704209 // 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 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 836791bb7a Merge pull request #218 from samy-r/development
Disable search indexation
2013-02-01 09:32:57 -08:00
Damien Metzger 717f42f878 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 e0d51c6392 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 fd74aa2798 [-] 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 bbe9909772 // Changed number of languages 2013-02-01 17:48:24 +01:00