Commit Graph

8041 Commits

Author SHA1 Message Date
Damien Metzger 9f9565ebb2 [-] FO : fixed +/- Tx on the customer voucher page #PSCFV-6642 2013-01-15 20:08:37 +01:00
Damien Metzger 83930c1b2e [-] MO : fixed phone number in mailalert #PSCFV-6667 2013-01-15 20:08:37 +01:00
Rémi Gaillard e5e62ba00b [-] 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 a4997405dc // opti 2013-01-15 18:56:42 +01:00
Rémi Gaillard 02bbfb25d6 [-] FO: Fix Pack::getItemTable with some PHP versions 2013-01-15 18:53:01 +01:00
Damien Metzger d450a259c4 // Fixed typo 2013-01-15 18:36:49 +01:00
Damien Metzger 36aad94b6a // Fixed potential warning 2013-01-15 18:09:56 +01:00
vAugagneur 71bd641b55 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-15 17:15:37 +01:00
vAugagneur 61b3135f6b [-] BO : fixed bug #PSCFV-6623 - multistore edit greek encoding 2013-01-15 17:15:30 +01:00
Damien Metzger 610bd9d8c5 [-] 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 7aec6663b9 // Removed deprecated file 2013-01-15 15:08:07 +01:00
vAugagneur 2c0bebef47 //revert boulette 2013-01-15 15:04:20 +01:00
vAugagneur e3e9651f39 //small fix 2013-01-15 14:52:57 +01:00
Damien Metzger 7e3accbb8a // Translations 2013-01-15 14:46:55 +01:00
Damien Metzger c97b8927a8 // Translation 2013-01-15 14:15:33 +01:00
Damien Metzger 9f99ec01b5 [-] FO : fixed shipping number in e-mail #PSCFV-6584 2013-01-15 13:56:39 +01:00
Damien Metzger e48c0cfc67 // Fixed typo 2013-01-15 13:54:06 +01:00
Rémi Gaillard 915244d1b7 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-15 10:20:50 +01:00
Rémi Gaillard 433a446a35 // clean the output buffer before print PDF in BO 2013-01-15 10:20:37 +01:00
vAugagneur 4af9ddd83f //fixed bug #PSCFV-6645 missing translation 2013-01-15 10:01:29 +01:00
vAugagneur 8e43f1e38f //recovered View my shop button 2013-01-14 17:59:18 +01:00
vAugagneur 5f490483d1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-14 17:44:54 +01:00
vAugagneur cbb87e4bbc //clean duplicate css in BO 2013-01-14 17:44:34 +01:00
Damien Metzger 4efaad145f [+] BO : Added customer language on the customer page 2013-01-14 16:45:21 +01:00
Rémi Gaillard bfffc48b82 [-] FO: Fix #PSCFV-6456 price of default attribute with specific price on product comparison 2013-01-14 15:16:50 +01:00
vAugagneur 451383e4c0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-14 14:24:14 +01:00
vAugagneur 61371b5b4c //BO more compliant with 1024x768 2013-01-14 14:24:05 +01:00
Rémi Gaillard c2261cc7fc // fix php warning 2013-01-14 14:12:14 +01:00
Rémi Gaillard f496b844db Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-14 12:08:26 +01:00
Rémi Gaillard 76a12eb369 [-] 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 6659bdceca [-] FO: improvement shopping cart voucher 2013-01-14 11:25:50 +01:00
Rémi Gaillard f516409fc0 // small fix for smarty pre-compile 2013-01-14 11:05:42 +01:00
vAugagneur 60260c4757 [-] CORE : fixed bug #PSCFV-6555 - Custom theme not working properly with image size 2013-01-14 10:38:41 +01:00
Rémi Gaillard 2c855558cd [*] Installer: pre-compile the smarty templates to improve the loading time of first connection 2013-01-11 18:13:28 +01:00
sLorenzini 52a6a67f74 [-] FO: fixed bug CSS 2013-01-10 17:23:32 +01:00
sLorenzini 6ca6a83412 [-] FO: fixed Css issue in BO - #PSCFV-6408 2013-01-10 17:18:17 +01:00
Rémi Gaillard 2b9f64b790 [-] 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 74774be65e [-] FO : fixed bug #PSCFV-5569 - Trying to get property of non-object in SitemapController 2013-01-10 09:31:46 +01:00
Vincent Augagneur 195c2c48f8 [-] FO : fixed bug #PSCFV-6529 2013-01-09 23:18:09 +01:00
vAugagneur 796b02bb68 [-] BO : fixed bug #PSCFV-6536 indefined index in toolbar.tpl 2013-01-09 23:03:20 +01:00
Rémi Gaillard c740199e4f [-] BO: Disallow advanced stock management if the product become a pa 2013-01-09 19:09:49 +01:00
Rémi Gaillard a933346af9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-09 19:09:09 +01:00
Rémi Gaillard 97626fc251 // small typo fix 2013-01-09 18:27:42 +01:00
gRoussac 015037c65f [-] FO : fix #PSCFV-6165 cart update when inactive country in old address 2013-01-09 18:23:40 +01:00
gRoussac 06b339fab0 [-] FO : Fix backslashes for smartyTranslate and js=1 2013-01-09 18:20:25 +01:00
gRoussac 9771af9e28 [-] FO : Bad html entities for alert of order-address.js 2013-01-09 17:09:15 +01:00
gRoussac 882b20bd81 [-] FO : Do not suggest states that are not active 2013-01-09 17:05:33 +01:00
vAugagneur d76123db2f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-09 17:00:48 +01:00
vAugagneur 6632b1674d [-] CORE : fixed bug #PSCFV-5433 - Order confirmation email doesn't report customization 2013-01-09 17:00:41 +01:00
Rémi Gaillard 3d6b3d2cb0 // Fix PHP warning 2013-01-09 16:55:28 +01:00