Rémi Gaillard
0e4bf800c6
[-] Module: Mailalert should not send email to employee if stock management is disabled #PSCFV-5841
2012-11-29 16:28:18 +01:00
Vincent Augagneur
3b63713cdd
Merge pull request #3 from damonsk/development
...
[-] FO : fixed bug #PSCFV-5637 - Order reference (string) if passed in from a 1.4 theme...
2012-11-29 06:15:56 -08:00
Vincent Augagneur
12971aa769
Merge pull request #57 from oleacorner/patch-1
...
[*] PDF : Update /PDFGenerator::render()
2012-11-29 05:46:38 -08:00
Vincent Augagneur
86f720398a
Merge pull request #15 from axome/shipping_cost_admin
...
//6 decimals for shipping cost in admin tab
2012-11-29 05:40:56 -08:00
oleacorner
25ff95741b
Update classes/pdf/PDFGenerator.php
2012-11-29 13:05:05 +01:00
Vincent Augagneur
5f8b5c1527
Merge pull request #41 from jessylenne/patch-1
...
[-] CORE : lang.php inclusion path correction in classes/Mail.php
2012-11-29 03:08:24 -08:00
vAugagneur
30b8f81e36
//small fix in controllers/front/OrderController.php thanks to @Butterback
2012-11-29 09:07:02 +01:00
vAugagneur
853515ebf0
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-11-28 18:52:17 +01:00
vAugagneur
72464dc9b7
[-] BO : fixed bug #PSCFV-5743 - modify status Preparation in progress and remove the delivery flag
2012-11-28 18:52:01 +01:00
Sarah Lorenzini
d7ecc8bb99
[-] FO: Bug CSS on SAFARI with iphone or ipad - #PSCFV-5704
2012-11-28 17:01:56 +01:00
vAugagneur
b35e0fd519
//remove useless comment
2012-11-28 16:27:21 +01:00
Sarah Lorenzini
813d28bda9
[-] FO: fix #product_list li span.new: IE 6,7,8 bug: New product badge not correct position - #PSCFV-5898
2012-11-28 16:07:36 +01:00
Sarah Lorenzini
f3cde47048
[-] FO: added border-right on product-comparison table
2012-11-28 15:13:14 +01:00
vAugagneur
ce427a91d4
//bad link in CONTRIBUTING.md :p
2012-11-28 14:45:52 +01:00
vAugagneur
f07d918867
//bad link in CONTRIBUTING.md
2012-11-28 14:38:19 +01:00
oleacorner
7834f1e274
Update classes/pdf/PDFGenerator.php
...
Proposal to enhance the $display parameter.
The proposal supports the true/false value, but also the 'D', 'I' and 'S' of fpdf.
The behavior of the true value is changed to 'D' instead of 'I'.
So, in fornt or back office, while cliking on a button to retrieve a PDF, the download windows is proposed instead of displaying the PDF inside the navigator.
2012-11-28 13:55:08 +01:00
vAugagneur
8d6433f48f
[-] BO : fixed bug #PSCFV-5610 Credit slip reference is too short
...
[*] BO : added prefix on credit slip reference
2012-11-28 10:56:43 +01:00
vAugagneur
09ce9b2870
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-11-27 18:39:36 +01:00
vAugagneur
3b28e532fe
//added modules/statssales/config.xml
2012-11-27 18:39:32 +01:00
Vincent Augagneur
1d45d66370
Merge pull request #50 from PrestaEdit/PSCFV-5880
...
[-] CORE : fixed bug #PSCFV-5880: add Cart ID into $cache_id
2012-11-27 09:21:44 -08:00
vAugagneur
4a05ddd0a2
[-] FO : fixed bug #PSCFV-5871 - URL rewrite with layered disabled
2012-11-27 17:07:59 +01:00
Sarah Lorenzini
fda993d05d
[-] FO: fix Referral Program Email link fix generates duplicate address in the url - #PSCFV-5853
...
Fixed in all languages
2012-11-27 16:41:52 +01:00
vAugagneur
0993d57862
[-] FO : fixed bug #PSCFV-5865 - Payment modules are not visible in the hookPayment for a foreigner country
2012-11-27 16:33:32 +01:00
Rémi Gaillard
4b87a10bf0
// small fix for merge pull #49
2012-11-27 15:57:01 +01:00
Rémi Gaillard
5e86f1114b
Merge pull request #49 from PrestaEdit/PSCFV-5879
...
[-] FO: Fix PSCFV-5879: If default group of customer don't display tax, do not use them
2012-11-27 06:48:10 -08:00
vAugagneur
6b5452b053
[-] INSTALLER : fixed bug #PSCFV-5721 Duplicate column name 'cover' part 2
2012-11-27 15:31:21 +01:00
vAugagneur
65acf285e3
[-] INSTALLER : fixed bug #PSCFV-5721 Duplicate column name 'cover'
2012-11-27 15:30:37 +01:00
Sarah Lorenzini
fc23dae9de
[-] FO: fix The "Compare buttons" on the Manufacturers List page is coded incorrectly... - #PSCFV-5636
...
I also fixed this bug on the supplier list
2012-11-27 15:27:11 +01:00
Sarah Lorenzini
d4cff1c94b
[-] FO: fix Can't create consumer account if blockcart module is disabled - baseUri not defined - #PSCFV-5667
2012-11-27 15:13:53 +01:00
Sarah Lorenzini
dc8d8a23ca
[-] FO: bug fixed on infos fields authentification
2012-11-27 15:06:11 +01:00
Vincent Augagneur
a25b960fc1
Merge pull request #24 from Caleydon/patch-3
...
[-] FO : SEO and accessibility improvement in modules/blockuserinfo/blockuserinfo.tpl
2012-11-27 06:04:09 -08:00
Vincent Augagneur
e09c412a65
Merge pull request #25 from Caleydon/patch-4
...
[*] FO : Added ordered list formating on CMS pages : themes/default/css/cms.css
2012-11-27 06:03:02 -08:00
Rémi Gaillard
37ddd943ed
[-] FO: Fix cookie problem when accessing not accessing to the shop with the main url
2012-11-27 14:52:15 +01:00
Vincent Augagneur
a7dfa64f3e
Merge pull request #22 from Caleydon/patch-1
...
[-] MO : SEO and accessibility improvement in modules/blockmyaccountfooter/blockmyaccountfooter.tpl
2012-11-27 05:46:22 -08:00
Vincent Augagneur
fdb5ba9649
Merge pull request #19 from Caleydon/patch-5
...
[-] FO : Update themes/default/sitemap.tpl
2012-11-27 05:40:12 -08:00
DamienMetzger
ded3b0cd5e
[-] BO : improved error display on admincarriers #PSCFV-5660
2012-11-27 12:01:27 +01:00
Francois Gaillard
545e37a57f
[-] Classes : Bug fix : Modules, check module instance
2012-11-27 11:58:25 +01:00
Rémi Gaillard
1812937933
[-] BO: Fix product image link for admin orders #PSCFV-5163
2012-11-27 11:55:58 +01:00
Vincent Augagneur
91d53843d9
Merge pull request #51 from PrestaEdit/PSCFV-5872
...
[-] CORE : fixed bug #PSCFV-5872: Modify is_a() with instanceof
2012-11-27 01:32:07 -08:00
Jonathan Danse
41f7a8678f
// add $usetax in block BestSellers
2012-11-27 10:24:46 +01:00
vAugagneur
9e0ad934f8
[-] BO : added Module::getInstanceByName brefore ->loadUpgradeVersionList
2012-11-27 10:10:00 +01:00
Jonathan Danse
53b1475631
// remove test in Product
2012-11-27 10:09:22 +01:00
Jonathan Danse
8e4d5057ae
// $module_name is a string, test not good
2012-11-27 09:30:04 +01:00
PrestaEdit
7827d02eaf
// Modify is_a() with instanceof
2012-11-26 23:12:17 +01:00
PrestaEdit
76e7fc15ee
//add Cart ID into $cache_id
2012-11-26 22:51:37 +01:00
PrestaEdit
74f4942254
// If default group of customer don't display tax, do not use them
2012-11-26 22:42:57 +01:00
Rémi Gaillard
a9ccf0a3e3
// small fix
2012-11-26 19:14:06 +01:00
Rémi Gaillard
cd4c7b28c3
// small fix some $ was missing :]
2012-11-26 19:12:53 +01:00
Rémi Gaillard
3f90d9edbc
// small fix
2012-11-26 17:44:41 +01:00
Gabriel Schwardy
3b265a7922
Update themes/default/sitemap.tpl
2012-11-26 17:14:14 +01:00