Commit Graph

8039 Commits

Author SHA1 Message Date
Rémi Gaillard eed3f3453b [-] BO: Fix #PSCFV-6616 id_shop should be loaded from cart when no order is created on Admin Carts 2013-01-15 19:31:21 +01:00
Rémi Gaillard adf928d60c // opti 2013-01-15 18:56:42 +01:00
Rémi Gaillard b86b1a089e [-] FO: Fix Pack::getItemTable with some PHP versions 2013-01-15 18:53:01 +01:00
Damien Metzger aeb60a0eb9 // Fixed typo 2013-01-15 18:36:49 +01:00
Damien Metzger 76dc6970d2 // Fixed potential warning 2013-01-15 18:09:56 +01:00
vAugagneur dd0a29eeee Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-15 17:15:37 +01:00
vAugagneur 6724491cfe [-] BO : fixed bug #PSCFV-6623 - multistore edit greek encoding 2013-01-15 17:15:30 +01:00
Damien Metzger 50ab651c4f [-] FO : recycled package should be disabled by default (because the option can be deactivated) #PSCFV-6639 2013-01-15 15:37:02 +01:00
Damien Metzger 4526b48acc // Removed deprecated file 2013-01-15 15:08:07 +01:00
vAugagneur 15d5b1ae07 //revert boulette 2013-01-15 15:04:20 +01:00
vAugagneur 34364e0801 //small fix 2013-01-15 14:52:57 +01:00
Damien Metzger 76abac8ae0 // Translations 2013-01-15 14:46:55 +01:00
Damien Metzger f3374a5afb // Translation 2013-01-15 14:15:33 +01:00
Damien Metzger 49f8b7c7af [-] FO : fixed shipping number in e-mail #PSCFV-6584 2013-01-15 13:56:39 +01:00
Damien Metzger 710feb595a // Fixed typo 2013-01-15 13:54:06 +01:00
Rémi Gaillard 4bad5fa3b1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-15 10:20:50 +01:00
Rémi Gaillard 95ab473198 // clean the output buffer before print PDF in BO 2013-01-15 10:20:37 +01:00
vAugagneur 2b54d38f70 //fixed bug #PSCFV-6645 missing translation 2013-01-15 10:01:29 +01:00
vAugagneur 9a933d8818 //recovered View my shop button 2013-01-14 17:59:18 +01:00
vAugagneur 71e863c6f5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-14 17:44:54 +01:00
vAugagneur ffbc326454 //clean duplicate css in BO 2013-01-14 17:44:34 +01:00
Damien Metzger 886f6d864b [+] BO : Added customer language on the customer page 2013-01-14 16:45:21 +01:00
Rémi Gaillard 6d748d46d2 [-] FO: Fix #PSCFV-6456 price of default attribute with specific price on product comparison 2013-01-14 15:16:50 +01:00
vAugagneur 7e8192280b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-14 14:24:14 +01:00
vAugagneur 7e4897034d //BO more compliant with 1024x768 2013-01-14 14:24:05 +01:00
Rémi Gaillard 5cecff7251 // fix php warning 2013-01-14 14:12:14 +01:00
Rémi Gaillard 968d6b4cfd Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-14 12:08:26 +01:00
Rémi Gaillard ef904c9083 [-] BO: Fix #PSCFV-5930 #PSCFV-5939 the filters are handled as the same between tabs which can cause sql errors 2013-01-14 12:08:12 +01:00
sLorenzini 3f4bf5f559 [-] FO: improvement shopping cart voucher 2013-01-14 11:25:50 +01:00
Rémi Gaillard 556955a7f0 // small fix for smarty pre-compile 2013-01-14 11:05:42 +01:00
vAugagneur 4dad9522e5 [-] CORE : fixed bug #PSCFV-6555 - Custom theme not working properly with image size 2013-01-14 10:38:41 +01:00
Rémi Gaillard 3f4f5f5df0 [*] Installer: pre-compile the smarty templates to improve the loading time of first connection 2013-01-11 18:13:28 +01:00
sLorenzini 542d3aa1da [-] FO: fixed bug CSS 2013-01-10 17:23:32 +01:00
sLorenzini c2a1e1f150 [-] FO: fixed Css issue in BO - #PSCFV-6408 2013-01-10 17:18:17 +01:00
Rémi Gaillard 90b3c7c467 [-] FO: Fix add to cart for product packs with no quantity and out of stock allowed #PSCFV-4788 2013-01-10 11:30:41 +01:00
vAugagneur 6e3c743948 [-] FO : fixed bug #PSCFV-5569 - Trying to get property of non-object in SitemapController 2013-01-10 09:31:46 +01:00
Vincent Augagneur 2fad90640d [-] FO : fixed bug #PSCFV-6529 2013-01-09 23:18:09 +01:00
vAugagneur d72a5d4d94 [-] BO : fixed bug #PSCFV-6536 indefined index in toolbar.tpl 2013-01-09 23:03:20 +01:00
Rémi Gaillard c0d35d6d28 [-] BO: Disallow advanced stock management if the product become a pa 2013-01-09 19:09:49 +01:00
Rémi Gaillard ada8d3e28a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-09 19:09:09 +01:00
Rémi Gaillard 1956accc32 // small typo fix 2013-01-09 18:27:42 +01:00
gRoussac ffa3be6e89 [-] FO : fix #PSCFV-6165 cart update when inactive country in old address 2013-01-09 18:23:40 +01:00
gRoussac 84b6222de1 [-] FO : Fix backslashes for smartyTranslate and js=1 2013-01-09 18:20:25 +01:00
gRoussac 6abb99552e [-] FO : Bad html entities for alert of order-address.js 2013-01-09 17:09:15 +01:00
gRoussac b672b3281e [-] FO : Do not suggest states that are not active 2013-01-09 17:05:33 +01:00
vAugagneur f768081aa0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-09 17:00:48 +01:00
vAugagneur 6629542a22 [-] CORE : fixed bug #PSCFV-5433 - Order confirmation email doesn't report customization 2013-01-09 17:00:41 +01:00
Rémi Gaillard 554dd4aba4 // Fix PHP warning 2013-01-09 16:55:28 +01:00
gRoussac 425a108aab [-] FO : Fix #PSCFV-5905 Fatal error: "no default carrier" 2013-01-09 15:55:48 +01:00
vAugagneur 1eefd74994 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-09 15:47:03 +01:00