Commit Graph

5608 Commits

Author SHA1 Message Date
PrestaEdit 4fd9908953 [*] BO : use the employee lang 2013-01-17 22:00:44 +01:00
Rémi Gaillard 30c516619d // Something was missing in commit ee62ed8d27 2013-01-17 17:27:59 +01:00
Rémi Gaillard 3fe27697a8 // Something was missing in commit ee62ed8d27 2013-01-17 17:27:59 +01:00
François Gaillard b9dde1d50e Merge branch 'development' of http://github.com/PrestaShop/PrestaShop into development 2013-01-16 18:47:39 +01:00
Francois Gaillard 1060bb3141 Merge branch 'development' of http://github.com/PrestaShop/PrestaShop into development 2013-01-16 18:47:39 +01:00
François Gaillard 338ba1ce85 // AdminHomeController, syntax changed 2013-01-16 18:47:29 +01:00
Francois Gaillard 9390dd63af // AdminHomeController, syntax changed 2013-01-16 18:47:29 +01:00
vAugagneur 94a45b0572 [-] BO : fixed bug #PSCFV-5601 - AddressFormat wrongly forbid the 'other' field from the Address to be part of the address format 2013-01-16 18:24:11 +01:00
vAugagneur 6d46644cc4 [-] BO : fixed bug #PSCFV-5601 - AddressFormat wrongly forbid the 'other' field from the Address to be part of the address format 2013-01-16 18:24:11 +01:00
vAugagneur 51a067c34c [-] FO : fixed bug #PSCFV-6533 - CMS categories: This page does not exist. 2013-01-16 10:47:00 +01:00
vAugagneur 2ea46c15a6 [-] FO : fixed bug #PSCFV-6533 - CMS categories: This page does not exist. 2013-01-16 10:47:00 +01:00
vAugagneur f7124f6cee Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-16 10:36:29 +01:00
vAugagneur 1c6a4c842c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-16 10:36:29 +01:00
vAugagneur 46aa9eeca7 [-] BO : fixed bug #PSCFV-6623 - fixed Parse error 2013-01-16 10:36:24 +01:00
vAugagneur 3e0081a5d1 [-] BO : fixed bug #PSCFV-6623 - fixed Parse error 2013-01-16 10:36:24 +01:00
Damien Metzger c30f7b48e0 [-] FO : fixed voucher highlighting in the cart #PSCFV-6422 2013-01-15 20:08:38 +01:00
Damien Metzger 57727a4cfa [-] FO : fixed voucher highlighting in the cart #PSCFV-6422 2013-01-15 20:08:38 +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 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
vAugagneur 61b3135f6b [-] BO : fixed bug #PSCFV-6623 - multistore edit greek encoding 2013-01-15 17:15:30 +01:00
vAugagneur 6724491cfe [-] BO : fixed bug #PSCFV-6623 - multistore edit greek encoding 2013-01-15 17:15:30 +01:00
Damien Metzger 9f99ec01b5 [-] FO : fixed shipping number in e-mail #PSCFV-6584 2013-01-15 13:56:39 +01:00
Damien Metzger 49f8b7c7af [-] 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
Damien Metzger 710feb595a // Fixed typo 2013-01-15 13:54:06 +01:00
Damien Metzger 4efaad145f [+] BO : Added customer language on the customer page 2013-01-14 16:45:21 +01:00
Damien Metzger 886f6d864b [+] BO : Added customer language on the customer page 2013-01-14 16:45:21 +01:00
vAugagneur 61371b5b4c //BO more compliant with 1024x768 2013-01-14 14:24:05 +01:00
vAugagneur 7e4897034d //BO more compliant with 1024x768 2013-01-14 14:24:05 +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
vAugagneur 6e3c743948 [-] FO : fixed bug #PSCFV-5569 - Trying to get property of non-object in SitemapController 2013-01-10 09:31:46 +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 c0d35d6d28 [-] BO: Disallow advanced stock management if the product become a pa 2013-01-09 19:09:49 +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 ffa3be6e89 [-] FO : fix #PSCFV-6165 cart update when inactive country in old address 2013-01-09 18:23:40 +01:00
gRoussac 9771af9e28 [-] FO : Bad html entities for alert of order-address.js 2013-01-09 17:09:15 +01:00
gRoussac 6abb99552e [-] FO : Bad html entities for alert of order-address.js 2013-01-09 17:09:15 +01:00
Rémi Gaillard 3d6b3d2cb0 // Fix PHP warning 2013-01-09 16:55:28 +01:00
Rémi Gaillard 554dd4aba4 // Fix PHP warning 2013-01-09 16:55:28 +01:00
vAugagneur 66974a05e0 [-] BO : fixed bug #PSCFV-4961 - Strange behavior when reordering categories 2013-01-09 13:44:19 +01:00
vAugagneur 108dfb292c [-] BO : fixed bug #PSCFV-4961 - Strange behavior when reordering categories 2013-01-09 13:44:19 +01:00
vAugagneur b64098f3f2 //small fix part 2 2013-01-09 12:06:00 +01:00
vAugagneur 39e4dc96d4 //small fix part 2 2013-01-09 12:06:00 +01:00
vAugagneur 26055c26e7 //small fix 2013-01-09 11:58:48 +01:00
vAugagneur 107295e570 //small fix 2013-01-09 11:58:48 +01:00
vAugagneur 58100276a6 [-] BO : fixed bug #PSCFV-4668 - added check if module folder is writable before upgrade it 2013-01-09 11:37:02 +01:00
vAugagneur e9726f2463 [-] BO : fixed bug #PSCFV-4668 - added check if module folder is writable before upgrade it 2013-01-09 11:37:02 +01:00
Rémi Gaillard 2dac490089 // small fix 2013-01-09 10:28:28 +01:00
Rémi Gaillard d52c1c4516 // small fix 2013-01-09 10:28:28 +01:00
vAugagneur 857b8c2009 [-] CORE : fixed bug #PSCFV-4523 - Static _PS_DEFAULT_CUSTOMER_GROUP_ is still use in code even if deprecated 1.5.0.1 2013-01-09 10:26:16 +01:00