Commit Graph

5608 Commits

Author SHA1 Message Date
vAugagneur 9154984c78 [-] 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
Gregory Roussac 66ddc0c809 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-07 18:02:25 +01:00
Gregory Roussac 0a08c7ee1d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-07 18:02:25 +01:00
gRoussac 4b104f2358 [-] FO : Fix Exception when invoice address is empty in OPC 2013-01-07 18:02:01 +01:00
gRoussac 88c62ad036 [-] FO : Fix Exception when invoice address is empty in OPC 2013-01-07 18:02:01 +01:00
vAugagneur f37758605c [-] BO : fixed bug #PSCFV-4925 - duplicate subject in SAV 2013-01-07 17:55:17 +01:00
vAugagneur 89f5fcf52e [-] BO : fixed bug #PSCFV-4925 - duplicate subject in SAV 2013-01-07 17:55:17 +01:00
gRoussac 6a7795a92f [-] FO : Fix #PSCFV-5544 same alias is no more rejected in OPC 2013-01-07 16:54:42 +01:00
gRoussac e6d23f175c [-] FO : Fix #PSCFV-5544 same alias is no more rejected in OPC 2013-01-07 16:54:42 +01:00
vAugagneur 9615de5dca //merge pull request 2013-01-07 10:15:47 +01:00
vAugagneur 7a942164b7 //merge pull request 2013-01-07 10:15:47 +01:00
djfm 385c593129 //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
djfm 714a5e08cc //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
Rémi Gaillard 507309ddf5 [-] BO: Fix #PSCFV-6386 recyclable should be init to 0 on BO orders 2013-01-04 15:06:07 +01:00
Rémi Gaillard cb818d1ece [-] BO: Fix #PSCFV-6386 recyclable should be init to 0 on BO orders 2013-01-04 15:06:07 +01:00
Rémi Gaillard 3fbd7dc55c [-] BO: Fix #PSCFV-6120 display of shipping price on BO order summary detail with freeshipping 2013-01-04 14:51:01 +01:00
Rémi Gaillard 091459bde6 [-] BO: Fix #PSCFV-6120 display of shipping price on BO order summary detail with freeshipping 2013-01-04 14:51:01 +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
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
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 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
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
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
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 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
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
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
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
Mats Rynge f2dbf94973 [-] BO : Fixed a problem with the breadcrumbs in the admin category editing controller. The previous code used asort() which put the category breadcrumbs in the wrong order. 2012-12-30 00:24:03 -08:00
Mats Rynge 230cd38839 [-] BO : Fixed a problem with the breadcrumbs in the admin category editing controller. The previous code used asort() which put the category breadcrumbs in the wrong order. 2012-12-30 00:24:03 -08:00
vAugagneur ef46d41800 //Merge controllers/admin/AdminTranslationsController.php 2012-12-28 10:23:37 +01:00