Commit Graph
8094 Commits
Author SHA1 Message Date
PrestaEdit 3b2b718f84 [-] MO: fix a problem with the wishlist_link
With @ArtDesign, we see that if you put the module "Block MyAccount" before the "Wishlist", the wishlist_link var is not declare yet, so the link is empty. If you put the var in the header, it can be accessed by the other tpl.

Or, we can put this in a {$link->getModuleLink(...)} in TPL
2013-01-22 23:50:52 +01:00
gRoussac caf95de092 [-] FO : Try to fix "phone required" bug once again when only signing in 2013-01-22 18:33:14 +01:00
Gregory Roussac 7a8fade4b1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-22 16:33:56 +01:00
gRoussac c0e7444889 [-] FO : Fix bug #PSCFI-6751 for 1.5.X carriers and payments update in OPC 2013-01-22 16:32:55 +01:00
Rémi Gaillard 9e45ad974a [-] BO: Allow override for emails translations on the default theme without MODE_DEV 2013-01-22 15:07:25 +01:00
Vincent Augagneur 377cc5d794 Merge pull request #183 from PrestaEdit/patch-8
[-] Small Fix: change documentation URL
2013-01-22 05:49:56 -08:00
Vincent Augagneur 9c821b3932 Merge pull request #184 from PrestaEdit/patch-9
// Welcome 2013
2013-01-22 05:49:18 -08:00
Vincent Augagneur b4864f83f6 Merge pull request #190 from PrestaEdit/patch-13
[-] BO: Standard Norm
2013-01-22 03:02:05 -08: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 f40ae37a24 [-] Core: check the existence of the overriden emails templates before try to sending them 2013-01-22 11:27:51 +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 268b581953 Merge pull request #209 from Patanock/patch-3
[-] FO : Fix for automatic modules upgrades
2013-01-22 00:19:49 -08:00
Patanock 1514263b35 Update classes/module/Module.php 2013-01-21 20:28:59 +01:00
Rémi Gaillard 378320854c // typo fix 2013-01-21 18:42:56 +01:00
Patanock d96d6a46d1 Update classes/module/Module.php
[-] FO : Fix for automatic modules upgrades
2013-01-21 17:53:29 +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 1915ea63a7 [-] BO: Fix #PSCFV-6383 allow numerics chars on SQL Manager 2013-01-21 16:32:31 +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 17be5368c7 [*] BO : Fix #PSCFI-6225 for 1.5.X 2013-01-21 15:41:13 +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 00702ba1e2 [-] FO : small fix on shopping cart adresses 2013-01-21 15:30:31 +01:00
sLorenzini f56cbc9fa8 [-] FO: fixed Installer - Message d'erreur mal affiché - #PSCFV-6585 2013-01-21 14:46:54 +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 b30c355e3c [-] FO: improve display voucher code 2013-01-21 11:11:58 +01: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 e4800accf3 When no warehouse configurated set 0 instead of seting '' 2013-01-19 22:56:47 +02: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
Rémi Gaillard c0e46bbf07 // DbQuery could now use multiple tables for FROM 2013-01-18 16:01:31 +01:00
Rémi Gaillard b38c9d0484 // lower memory usage for SpecificPrice::getProductIdByDate 2013-01-18 14:18:59 +01:00
PrestaEdit fb27c9d5cc [-] BO: Standard Norm 2013-01-18 00:08:38 +01:00
Rémi Gaillard 3fe27697a8 // Something was missing in commit ee62ed8d27 2013-01-17 17:27:59 +01:00
vAugagneur 0b177232a3 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-17 13:58:55 +01:00
vAugagneur f76427fd22 [-] FO : fixed bug #PSCFV-5635 - Mobile Theme tax displayed 2013-01-17 13:58:48 +01:00
Francois Gaillard c550a6494e // Module upload error message 2013-01-17 10:26:45 +01:00
vAugagneur 4059f95086 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-17 09:28:13 +01:00
vAugagneur af3f89812d //update localization for canada 2013-01-17 09:28:06 +01:00
Francois Gaillard 1060bb3141 Merge branch 'development' of http://github.com/PrestaShop/PrestaShop into development 2013-01-16 18:47:39 +01:00
Francois Gaillard 9390dd63af // AdminHomeController, syntax changed 2013-01-16 18:47:29 +01:00
vAugagneur 6d46644cc4 [-] BO : fixed bug #PSCFV-5601 - AddressFormat wrongly forbid the 'other' field from the Address to be part of the address format 2013-01-16 18:24:11 +01:00
Damien Metzger f6fa20c3d5 [-] FO : fixed reduction display on product page #PSCFV-6308 2013-01-16 15:51:58 +01:00
Damien Metzger 7393e6bf7f [-] BO : fixed quick access for upgrade from 1.4 #PSCFV-6370 2013-01-16 15:51:58 +01:00
vAugagneur 80422f5640 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-16 15:51:08 +01:00
vAugagneur 1959075a27 [-] BO - fixed bug #PSCFV-5549 - 2013-01-16 15:50:52 +01:00
Rémi Gaillard 969e5d5bb5 [-] Core: Hook actionUpdateQuantity was not called for product without attributes which depends on the physical stock 2013-01-16 14:08:33 +01:00
vAugagneur 508cd6e028 [-] BO : fixed bug #PSCFV-6381 - Customer Service mixing groups of shops (Multistore) 2013-01-16 12:20:02 +01:00
vAugagneur a2eda82603 //reduced informations block and added click to see more link 2013-01-16 11:07:29 +01:00
vAugagneur 2ea46c15a6 [-] FO : fixed bug #PSCFV-6533 - CMS categories: This page does not exist. 2013-01-16 10:47:00 +01:00
vAugagneur 1c6a4c842c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-16 10:36:29 +01:00
vAugagneur 3e0081a5d1 [-] BO : fixed bug #PSCFV-6623 - fixed Parse error 2013-01-16 10:36:24 +01:00