Commit Graph

17570 Commits

Author SHA1 Message Date
vAugagneur 20fa64b05b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-04 11:45:25 +01:00
vAugagneur 638bd51980 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-04 11:45:25 +01:00
vAugagneur 6a07626114 //small refacto 2013-01-04 11:45:17 +01:00
vAugagneur b725fd2d4a //small refacto 2013-01-04 11:45:17 +01:00
François Gaillard 064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
Francois Gaillard 8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
Gregory Roussac b08444cccd Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-03 18:43:14 +01:00
Gregory Roussac c339f585d0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-03 18:43:14 +01:00
root ce24ce6d1b [-] FO : Fix #PSCFV-6307 correct invoice address in OPC 2013-01-03 18:35:01 +01:00
root 76e03d9d38 [-] FO : Fix #PSCFV-6307 correct invoice address in OPC 2013-01-03 18:35:01 +01:00
Rémi Gaillard b9b5e7e998 [-] BO: override the compile check to true for smarty in the BackOffice 2013-01-03 17:49:04 +01:00
Rémi Gaillard 8bb41fb5f8 [-] BO: override the compile check to true for smarty in the BackOffice 2013-01-03 17:49:04 +01:00
Rémi Gaillard 6d7986dae0 [-] MO: Fix blockviewd for non identified customers #PSCFV-6042 2013-01-03 17:25:56 +01:00
Rémi Gaillard 2167904c87 [-] MO: Fix blockviewd for non identified customers #PSCFV-6042 2013-01-03 17:25:56 +01:00
Rémi Gaillard 6c1c3402bc [-] Core: Fix #PSCFV-5912 price computation on cart with multiple product without combinations 2013-01-03 16:44:10 +01:00
Rémi Gaillard ed97ed5698 [-] Core: Fix #PSCFV-5912 price computation on cart with multiple product without combinations 2013-01-03 16:44:10 +01:00
Gregory Roussac 9513a9e599 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-03 15:20:08 +01:00
Gregory Roussac 29f8ad0a32 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-03 15:20:08 +01:00
gRoussac 5c80535287 [-] FO : Fix again #PSCFV-6209 #PSCFV-5686 no required phone 2013-01-03 15:19:04 +01:00
gRoussac 88cd7ce1f4 [-] FO : Fix again #PSCFV-6209 #PSCFV-5686 no required phone 2013-01-03 15:19:04 +01:00
vAugagneur cc32366077 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-03 15:18:06 +01:00
vAugagneur 5703e67c96 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-03 15:18:06 +01:00
vAugagneur 8d7196daf3 [-] BO : fixed import images 2013-01-03 15:18:00 +01:00
vAugagneur 707340b665 [-] BO : fixed import images 2013-01-03 15:18:00 +01:00
Rémi Gaillard b10b53028f [-] FO: Fix #PSCFV-6159 order way of best sales 2013-01-03 12:08:29 +01:00
Rémi Gaillard 5bb2856692 [-] FO: Fix #PSCFV-6159 order way of best sales 2013-01-03 12:08:29 +01:00
PrestaEdit c4804b5cd0 [-] FO: name of the supplier page fixed #PSCFV-5571
You do it right in 5219457 , but if you already have a old version, it's no change...
2013-01-03 02:54:32 -08:00
PrestaEdit 7b5285d6da [-] FO: name of the supplier page fixed #PSCFV-5571
You do it right in 5219457 , but if you already have a old version, it's no change...
2013-01-03 02:54:32 -08:00
Rémi Gaillard df405abfe9 [-] BO: Fix #PSCFV-6118 display of product image for git on BackOffice orders 2013-01-03 11:38:39 +01:00
Rémi Gaillard 0229dad1f6 [-] BO: Fix #PSCFV-6118 display of product image for git on BackOffice orders 2013-01-03 11:38:39 +01:00
Gregory Roussac 742c84bee8 // forgot delete 2013-01-03 11:11:16 +01:00
Gregory Roussac b1d0ab0eb5 // forgot delete 2013-01-03 11:11:16 +01:00
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