Commit Graph

18638 Commits

Author SHA1 Message Date
Gregory Roussac 4a26358517 [*] Installer : Lower memory for update_order_messages.php 2013-01-03 10:44:11 +01:00
Gregory Roussac eb8f89f265 [*] Installer : Lower memory for update_order_messages.php 2013-01-03 10:44:11 +01:00
vAugagneur 865c98e096 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-02 17:48:07 +01:00
vAugagneur f4fac3d123 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-02 17:48:07 +01:00
vAugagneur a5ab1d5bc2 //small fix when disabled language with bulk action 2013-01-02 17:47:49 +01:00
vAugagneur f9c12ad564 //small fix when disabled language with bulk action 2013-01-02 17:47:49 +01:00
PrestaEdit 62703ee39b [+] Class: Product::getIdByEan13
Sometimes, it's can be good to get the Product ID by EAN13.
2013-01-02 17:21:04 +01:00
PrestaEdit 2a2190e4c9 [+] Class: Product::getIdByEan13
Sometimes, it's can be good to get the Product ID by EAN13.
2013-01-02 17:21:04 +01:00
Vincent Augagneur e0eafaaac1 Merge pull request #136 from PrestaEdit/patch-3
//remove WAHOU
2013-01-02 08:18:24 -08:00
Vincent Augagneur d464c9cda5 Merge pull request #136 from PrestaEdit/patch-3
//remove WAHOU
2013-01-02 08:18:24 -08:00
vAugagneur 13ad25f331 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-02 17:09:44 +01:00
vAugagneur 9cdd7c8a0d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-02 17:09:44 +01:00
vAugagneur f7754045fb [-] BO : fixed bug #PSCFV-6130 - Wrong currency in product specific prices administration 2013-01-02 17:09:39 +01:00
vAugagneur dd49bfb464 [-] BO : fixed bug #PSCFV-6130 - Wrong currency in product specific prices administration 2013-01-02 17:09:39 +01:00
PrestaEdit c811f6a835 [-] FO: remove WAHOU 2013-01-02 17:06:24 +01:00
PrestaEdit 06716c841b [-] FO: remove WAHOU 2013-01-02 17:06:24 +01:00
Rémi Gaillard 384c610d81 [-] BO: Fix #PSCFV-6394 price/weight/unit_price reduction impact on combinations form 2013-01-02 16:48:30 +01:00
Rémi Gaillard f33a0d2f9f [-] BO: Fix #PSCFV-6394 price/weight/unit_price reduction impact on combinations form 2013-01-02 16:48:30 +01:00
Rémi Gaillard 301dc491b4 [-] BO: Fix #PSCFV-6415 php notice 2013-01-02 16:21:54 +01:00
Rémi Gaillard 1900700f1b [-] BO: Fix #PSCFV-6415 php notice 2013-01-02 16:21:54 +01:00
vAugagneur b9e688a4bf [-] FO : fixed bug #PSCFV-6411 Friendly URL on prices-drop for page 2 doesn't work 2013-01-02 14:40:35 +01:00
vAugagneur f0f50db926 [-] FO : fixed bug #PSCFV-6411 Friendly URL on prices-drop for page 2 doesn't work 2013-01-02 14:40:35 +01:00
Damien Metzger 691dc919c4 // Changelog, readme and install_version.php 2013-01-02 12:01:12 +01:00
Damien Metzger bdc421b645 // Changelog, readme and install_version.php 2013-01-02 12:01:12 +01:00
Damien Metzger 039b3fa9cf // Fix upgrade 2013-01-02 12:00:57 +01:00
Damien Metzger d8feb5dba8 // Fix upgrade 2013-01-02 12:00:57 +01:00
vAugagneur a232288ee1 //retro compat smarty variable name 'onr_phone_at_least' 2013-01-02 11:53:43 +01:00
vAugagneur fc7ea8ef14 //retro compat smarty variable name 'onr_phone_at_least' 2013-01-02 11:53:43 +01:00
PrestaEdit b3479877bc [-] FO: need id_product_attribute to know quantity 2013-01-02 11:04:57 +01:00
PrestaEdit 1c24fe85c1 [-] FO: need id_product_attribute to know quantity 2013-01-02 11:04:57 +01:00
vAugagneur 2e90e12293 //Merge branch release 2013-01-02 09:56:20 +01:00
vAugagneur a4eb2cc7a9 //Merge branch release 2013-01-02 09:56:20 +01:00
Rémi Gaillard b3639c958b // oups.... 2012-12-31 12:20:26 +01:00
Rémi Gaillard 2420fff747 // oups.... 2012-12-31 12:20:26 +01:00
Rémi Gaillard 1edd663b11 // small fix 2012-12-31 12:17:42 +01:00
Rémi Gaillard 1e03d017ad // small fix 2012-12-31 12:17:42 +01:00
Rémi Gaillard 37f9d31c0a [-] FO: Fix retrocompatibility for modules and old themes 2012-12-31 12:06:28 +01:00
Rémi Gaillard 2688e97145 [-] FO: Fix retrocompatibility for modules and old themes 2012-12-31 12:06:28 +01:00
Rémi Gaillard f49630e02b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-31 12:03:54 +01:00
Rémi Gaillard a76d05b650 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-31 12:03:54 +01:00
Damien Metzger a9f123f3f2 // Just to be sure... 2012-12-31 12:00:29 +01:00
Damien Metzger 31859f6e6f // Just to be sure... 2012-12-31 12:00:29 +01:00
Rémi Gaillard ed238ad619 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-31 11:54:12 +01:00
Rémi Gaillard b28d561e4b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-31 11:54:12 +01:00
Jonathan Danse 96c6f36b69 [-] BO: don't have the delivery PDF - User can define which statuses show the delivery PDF 2012-12-31 10:45:46 +01:00
Jonathan Danse 04ad0a5e4a [-] BO: don't have the delivery PDF - User can define which statuses show the delivery PDF 2012-12-31 10:45:46 +01:00
Damien Metzger c6ca7b6215 [-] BO : fixed accentuated URLs in products 2012-12-31 10:22:53 +01:00
Damien Metzger 6c00cf69e0 [-] BO : fixed accentuated URLs in products 2012-12-31 10:22:53 +01:00
Rémi Gaillard 4d76877ec6 [-] FO: Fix PHP warning on category controller 2012-12-31 10:04:53 +01:00
Rémi Gaillard 8b44ef218b [-] FO: Fix PHP warning on category controller 2012-12-31 10:04:53 +01:00