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 |
|
Gregory Roussac
|
ae117c2457
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-04 16:32:45 +01:00 |
|
Gregory Roussac
|
adb95f7693
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-04 16:32:45 +01:00 |
|
gRoussac
|
51517e14a3
|
[-] FO : Fix #PSCFV-4885 for DNI field, states and postcode display
|
2013-01-04 16:31:05 +01:00 |
|
gRoussac
|
34f98b0987
|
[-] FO : Fix #PSCFV-4885 for DNI field, states and postcode display
|
2013-01-04 16:31:05 +01:00 |
|
Rémi Gaillard
|
9c5f416f5e
|
[-] FO: Fix #PSCFV-6493 root and home category id should be different of 1 and 2
|
2013-01-04 16:04:15 +01:00 |
|
Rémi Gaillard
|
3b466c54e3
|
[-] FO: Fix #PSCFV-6493 root and home category id should be different of 1 and 2
|
2013-01-04 16:04:15 +01:00 |
|
Rémi Gaillard
|
d7694b5900
|
[*] BO: Improve form of catalog price rules #PSCFV-6099
|
2013-01-04 15:50:13 +01:00 |
|
Rémi Gaillard
|
e7d5985d41
|
[*] BO: Improve form of catalog price rules #PSCFV-6099
|
2013-01-04 15:50:13 +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 |
|
Raphaël Malié
|
4696c57390
|
Fix Collection->sqlGroupBy()
|
2013-01-04 14:28:49 +01:00 |
|
Raphaël Malié
|
bdceac5bb2
|
Fix Collection->sqlGroupBy()
|
2013-01-04 14:28:49 +01:00 |
|
marcinsz101
|
9bd5e530b6
|
[*] FO : Possibility of hook blocknewsletter in footer
|
2013-01-04 12:35:14 +01:00 |
|
marcinsz101
|
93ce66df70
|
[*] FO : Possibility of hook blocknewsletter in footer
|
2013-01-04 12:35:14 +01:00 |
|
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 |
|