dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,079 Commits 9 Branches 19 Tags
ea6b4eaef84a0d1f1fdb9de48086efa7faefb67f
Commit Graph
9079 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
PrestaEdit 4fd9908953 [*] BO : use the employee lang 2013-01-17 22:00:44 +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
Damien Metzger 57727a4cfa [-] FO : fixed voucher highlighting in the cart #PSCFV-6422 2013-01-15 20:08:38 +01:00
Damien Metzger 571f6a4d71 [-] FO : fixed +/- Tx on the customer voucher page #PSCFV-6642 2013-01-15 20:08:37 +01:00
Damien Metzger 46b4570e14 [-] MO : fixed phone number in mailalert #PSCFV-6667 2013-01-15 20:08:37 +01:00
Rémi Gaillard eed3f3453b [-] BO: Fix #PSCFV-6616 id_shop should be loaded from cart when no order is created on Admin Carts 2013-01-15 19:31:21 +01:00
Rémi Gaillard adf928d60c // opti 2013-01-15 18:56:42 +01:00
Rémi Gaillard b86b1a089e [-] FO: Fix Pack::getItemTable with some PHP versions 2013-01-15 18:53:01 +01:00
Damien Metzger aeb60a0eb9 // Fixed typo 2013-01-15 18:36:49 +01:00
Damien Metzger 76dc6970d2 // Fixed potential warning 2013-01-15 18:09:56 +01:00
PrestaEdit bcbbc7e63e // Welcome 2013 2013-01-15 17:52:04 +01:00
PrestaEdit a17802f621 [-] Small Fix: change documentation URL 2013-01-15 17:48:28 +01:00
vAugagneur dd0a29eeee Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-15 17:15:37 +01:00
vAugagneur 6724491cfe [-] BO : fixed bug #PSCFV-6623 - multistore edit greek encoding 2013-01-15 17:15:30 +01:00
Damien Metzger 50ab651c4f [-] FO : recycled package should be disabled by default (because the option can be deactivated) #PSCFV-6639 2013-01-15 15:37:02 +01:00
Damien Metzger 4526b48acc // Removed deprecated file 2013-01-15 15:08:07 +01:00
vAugagneur 15d5b1ae07 //revert boulette 2013-01-15 15:04:20 +01:00
vAugagneur 34364e0801 //small fix 2013-01-15 14:52:57 +01:00
Damien Metzger 76abac8ae0 // Translations 2013-01-15 14:46:55 +01:00
Damien Metzger f3374a5afb // Translation 2013-01-15 14:15:33 +01:00
Damien Metzger 49f8b7c7af [-] FO : fixed shipping number in e-mail #PSCFV-6584 2013-01-15 13:56:39 +01:00
Damien Metzger 710feb595a // Fixed typo 2013-01-15 13:54:06 +01:00
Rémi Gaillard 4bad5fa3b1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-15 10:20:50 +01:00
Rémi Gaillard 95ab473198 // clean the output buffer before print PDF in BO 2013-01-15 10:20:37 +01:00
nturato 1348291415 [WS] images are only shown as jpg or gif 
If you enable BO to also use the PNG file you can not use these images in WS because there are no controls on the image type
 2013-01-15 10:17:02 +01:00