Commit Graph
18608 Commits
Author SHA1 Message Date
Marco Cervellin 94ebf82fd5 Merge branch 'development' of git://github.com/PrestaShop/PrestaShop into development 2013-01-22 12:06:25 +01:00
Marco Cervellin f4c361636e Merge branch 'development' of git://github.com/PrestaShop/PrestaShop into development 2013-01-22 12:06:25 +01:00
Vincent Augagneur 7cb6f55193 Merge pull request #190 from PrestaEdit/patch-13
[-] BO: Standard Norm
2013-01-22 03:02:05 -08:00
Vincent Augagneur b4864f83f6 Merge pull request #190 from PrestaEdit/patch-13
[-] BO: Standard Norm
2013-01-22 03:02:05 -08:00
Marco Cervellin 373e7a8c39 [-] FO : fixed smarty curly bracket
Signed-off-by: Marco Cervellin <marco@macodev.com>
2013-01-22 11:53:29 +01:00
Marco Cervellin 1fb06bc07d [-] FO : fixed smarty curly bracket
Signed-off-by: Marco Cervellin <marco@macodev.com>
2013-01-22 11:53:29 +01:00
Rémi Gaillard fc547a4ab9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-22 11:28:05 +01:00
Rémi Gaillard f47031eaaf Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-22 11:28:05 +01:00
Rémi Gaillard f1f8ce993f [-] Core: check the existence of the overriden emails templates before try to sending them 2013-01-22 11:27:51 +01:00
Rémi Gaillard f40ae37a24 [-] Core: check the existence of the overriden emails templates before try to sending them 2013-01-22 11:27:51 +01:00
vAugagneur 262431e0e0 [-] CORE : email with virtual products info was not send to the customer 2013-01-22 11:23:05 +01:00
vAugagneur 459ce4fab8 [-] CORE : email with virtual products info was not send to the customer 2013-01-22 11:23:05 +01:00
Vincent Augagneur 691b2039d3 Merge pull request #209 from Patanock/patch-3
[-] FO : Fix for automatic modules upgrades
2013-01-22 00:19:49 -08:00
Vincent Augagneur 268b581953 Merge pull request #209 from Patanock/patch-3
[-] FO : Fix for automatic modules upgrades
2013-01-22 00:19:49 -08:00
PrestaEdit 6903d9ea62 [*] BO: we don't need to clik on a line 2013-01-21 22:23:51 +01:00
PrestaEdit 7f56058619 [*] BO: we don't need to clik on a line 2013-01-21 22:23:51 +01:00
Patanock 7432db7fad Update classes/module/Module.php 2013-01-21 20:28:59 +01:00
Patanock 1514263b35 Update classes/module/Module.php 2013-01-21 20:28:59 +01:00
Rémi Gaillard 2652130ca4 // typo fix 2013-01-21 18:42:56 +01:00
Rémi Gaillard 378320854c // typo fix 2013-01-21 18:42:56 +01:00
Patanock 7d1bed8407 Update classes/module/Module.php
[-] FO : Fix for automatic modules upgrades
2013-01-21 17:53:29 +01:00
Patanock d96d6a46d1 Update classes/module/Module.php
[-] FO : Fix for automatic modules upgrades
2013-01-21 17:53:29 +01:00
vAugagneur 4523f4c849 [+] BO : new display of module list in all BO tabs 2013-01-21 17:46:40 +01:00
vAugagneur 517e90da43 [+] BO : new display of module list in all BO tabs 2013-01-21 17:46:40 +01:00
Rémi Gaillard dffd143e0f [-] Core: Store partial value in OrderCartRules #PSCFV-6566 2013-01-21 17:33:35 +01:00
Rémi Gaillard a70e92dced [-] Core: Store partial value in OrderCartRules #PSCFV-6566 2013-01-21 17:33:35 +01:00
Rémi Gaillard 935b5b5d02 [-] BO: Fix #PSCFV-6383 allow numerics chars on SQL Manager 2013-01-21 16:32:31 +01:00
Rémi Gaillard 1915ea63a7 [-] BO: Fix #PSCFV-6383 allow numerics chars on SQL Manager 2013-01-21 16:32:31 +01:00
Gregory Roussac ebc3d2562f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-21 15:41:42 +01:00
Rémi Gaillard 3dbf875923 [-] BO: description_short product field validation when the limit is changed #PSCFV-7383 2013-01-21 15:42:58 +01:00
Gregory Roussac ad9543fc53 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-21 15:41:42 +01:00
Rémi Gaillard c45345b36a [-] BO: description_short product field validation when the limit is changed #PSCFV-7383 2013-01-21 15:42:58 +01:00
gRoussac 1de477a77b [*] BO : Fix #PSCFI-6225 for 1.5.X 2013-01-21 15:41:13 +01:00
gRoussac 17be5368c7 [*] BO : Fix #PSCFI-6225 for 1.5.X 2013-01-21 15:41:13 +01:00
Gregory Roussac b3868c74d6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-21 15:31:44 +01:00
Gregory Roussac b6c2532c8f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-21 15:31:44 +01:00
gRoussac 5eb4258bac [-] FO : small fix on shopping cart adresses 2013-01-21 15:30:31 +01:00
gRoussac 00702ba1e2 [-] FO : small fix on shopping cart adresses 2013-01-21 15:30:31 +01:00
sLorenzini 0f5638f0fb [-] FO: fixed Installer - Message d'erreur mal affiché - #PSCFV-6585 2013-01-21 14:46:54 +01:00
sLorenzini f56cbc9fa8 [-] FO: fixed Installer - Message d'erreur mal affiché - #PSCFV-6585 2013-01-21 14:46:54 +01:00
sLorenzini d2077289f0 [-] FO: fixed IE8 Adding Address Problem + improve line-height input on IE - #PSCFV-6401 2013-01-21 11:53:51 +01:00
sLorenzini c45107a65f [-] FO: fixed IE8 Adding Address Problem + improve line-height input on IE - #PSCFV-6401 2013-01-21 11:53:51 +01:00
sLorenzini c90c29abaf [-] FO: improve display voucher code 2013-01-21 11:11:58 +01:00
sLorenzini b30c355e3c [-] FO: improve display voucher code 2013-01-21 11:11:58 +01:00
Rémi Gaillard 6e3f28bdb9 Merge pull request #203 from involic/development
[-] Class: When no warehouse configurated set 0 instead of setting ''
2013-01-21 01:04:28 -08:00
Rémi Gaillard 29be2ef924 Merge pull request #203 from involic/development
[-] Class: When no warehouse configurated set 0 instead of setting ''
2013-01-21 01:04:28 -08:00
Alexander Otchenashev 95490676e4 When no warehouse configurated set 0 instead of seting '' 2013-01-19 22:56:47 +02:00
Alexander Otchenashev e4800accf3 When no warehouse configurated set 0 instead of seting '' 2013-01-19 22:56:47 +02:00
Rémi Gaillard 67d4f21dfa [-] BO: Fix #PSCFV-6367 don't display the payment modules on BackOffice orders if they are disabled 2013-01-18 17:01:47 +01:00
Rémi Gaillard 0d058a5d50 [-] BO: Fix #PSCFV-6367 don't display the payment modules on BackOffice orders if they are disabled 2013-01-18 17:01:47 +01:00