vAugagneur
12f47a1b9b
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-06 11:32:24 +01:00
vAugagneur
e809f6bfdb
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-06 11:32:24 +01:00
vAugagneur
d71970d5ff
[-] BO : fixed bug #PSCFV-4699 - Module uninstall confirmation message is missing
2012-12-06 11:32:19 +01:00
vAugagneur
6f37326675
[-] BO : fixed bug #PSCFV-4699 - Module uninstall confirmation message is missing
2012-12-06 11:32:19 +01:00
Rémi Gaillard
2166937cf5
Merge pull request #72 from Milow/development
...
// Fix mail error, make a little more robust
2012-12-06 01:48:46 -08:00
Rémi Gaillard
d9ba307893
Merge pull request #72 from Milow/development
...
// Fix mail error, make a little more robust
2012-12-06 01:48:46 -08:00
sLorenzini
2191eec919
[-] FO: improvement on h4/h5 edits (id become class)
2012-12-06 10:06:56 +01:00
sLorenzini
2a4b7cae75
[-] FO: improvement on h4/h5 edits (id become class)
2012-12-06 10:06:56 +01:00
Milow
82c7f03119
Fix typo
2012-12-05 21:27:37 -06:00
Milow
cf7aebd029
Fix typo
2012-12-05 21:27:37 -06:00
Milow
55e55689a6
Fix mail error
...
This changes two things in the mail class.
1. If the html template was missing, it would tell you the txt template
was missing. It now tells you that the html template is missing.
2. If the type is set to only text or html, don't fail if the other
template is missing. Example, if set to only use text templates, don't
fail if the html template does not exist. If the type is set to both,
or if the specific type of template is missing, it will still complain.
2012-12-05 21:26:07 -06:00
Milow
c87fb469fd
Fix mail error
...
This changes two things in the mail class.
1. If the html template was missing, it would tell you the txt template
was missing. It now tells you that the html template is missing.
2. If the type is set to only text or html, don't fail if the other
template is missing. Example, if set to only use text templates, don't
fail if the html template does not exist. If the type is set to both,
or if the specific type of template is missing, it will still complain.
2012-12-05 21:26:07 -06:00
Sarah Lorenzini
8ddafa2568
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-05 11:03:16 +01:00
Sarah Lorenzini
7897d40e22
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-05 11:03:16 +01:00
sLorenzini
4844914b0a
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-05 10:59:47 +01:00
sLorenzini
5c63deb469
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-05 10:59:47 +01:00
sLorenzini
babded4d29
//[-] FO: fixed bug #product_list li span.new: IE 6,7,8 bug: New product badge still not correct position - #PSCFV-5921
2012-12-05 10:42:26 +01:00
sLorenzini
59e793fa99
//[-] FO: fixed bug #product_list li span.new: IE 6,7,8 bug: New product badge still not correct position - #PSCFV-5921
2012-12-05 10:42:26 +01:00
vAugagneur
6e9ea91ae7
//small variable name fix part 2
2012-12-04 18:47:00 +01:00
vAugagneur
2c3ad2e7f9
//small variable name fix part 2
2012-12-04 18:47:00 +01:00
vAugagneur
6740906dcb
//small variable name fix
2012-12-04 18:35:10 +01:00
vAugagneur
89e9f90cf1
//small variable name fix
2012-12-04 18:35:10 +01:00
vAugagneur
2c095c11a1
[-] FO : fixed bug #PSCFV-5826 #PSCFV-4697 Live edit only works for home page && Live edit can't load module
2012-12-04 18:29:10 +01:00
vAugagneur
712f0c3d6d
[-] FO : fixed bug #PSCFV-5826 #PSCFV-4697 Live edit only works for home page && Live edit can't load module
2012-12-04 18:29:10 +01:00
Sarah Lorenzini
31efb947ab
// change h4, h5
2012-12-04 17:15:49 +01:00
Sarah Lorenzini
2b10fcd712
// change h4, h5
2012-12-04 17:15:49 +01:00
Rémi Gaillard
4e9c534f1b
[-] Core: Locales should be setted anywhere #PSCFV-5953
2012-12-04 15:40:17 +01:00
Rémi Gaillard
da5c5fb4a0
[-] Core: Locales should be setted anywhere #PSCFV-5953
2012-12-04 15:40:17 +01:00
Rémi Gaillard
a1e91bcfa9
[-] Core: Fix #PSCFV-5948 id_warehouse was sometime set to null on validateorder with stock management disabled
2012-12-04 15:32:06 +01:00
Rémi Gaillard
2d93064fb9
[-] Core: Fix #PSCFV-5948 id_warehouse was sometime set to null on validateorder with stock management disabled
2012-12-04 15:32:06 +01:00
sLorenzini
52803b40b9
// fixed FO bugs
2012-12-04 15:27:43 +01:00
sLorenzini
9322f3338e
// fixed FO bugs
2012-12-04 15:27:43 +01:00
Rémi Gaillard
b414bd06a4
[-] Core: Fix #PSCFV-5966 the tax rate applied to shipping cost for the visitors was the product tax rate
2012-12-04 15:09:41 +01:00
Rémi Gaillard
0071850981
[-] Core: Fix #PSCFV-5966 the tax rate applied to shipping cost for the visitors was the product tax rate
2012-12-04 15:09:41 +01:00
Rémi Gaillard
a4b6594f9c
// Fix PHP notice #PSCFV-5967
2012-12-04 14:33:12 +01:00
Rémi Gaillard
6cad7c2bf4
// Fix PHP notice #PSCFV-5967
2012-12-04 14:33:12 +01:00
Rémi Gaillard
e70069bdfa
[-] WS: #PSCFV-5982 logo email/invoices/mail don't return standard logo if not exists
2012-12-04 11:56:17 +01:00
Rémi Gaillard
e568e0992d
[-] WS: #PSCFV-5982 logo email/invoices/mail don't return standard logo if not exists
2012-12-04 11:56:17 +01:00
Rémi Gaillard
aac0500c72
[-] WS: Fix #PSCFV-5981 logo path
2012-12-04 11:52:04 +01:00
Rémi Gaillard
b80bc2a6ba
[-] WS: Fix #PSCFV-5981 logo path
2012-12-04 11:52:04 +01:00
Rémi Gaillard
69fbd79eee
[-] BO: Fix #PSCFV-4889 don't delete product if physical stock > 0
2012-12-04 11:38:47 +01:00
Rémi Gaillard
7d05a6d8e9
[-] BO: Fix #PSCFV-4889 don't delete product if physical stock > 0
2012-12-04 11:38:47 +01:00
Rémi Gaillard
6e87020ddf
[-] BO: Add display of modules errors on reset #PSCFV-2077
2012-12-04 11:13:06 +01:00
Rémi Gaillard
e5ec07f95a
[-] BO: Add display of modules errors on reset #PSCFV-2077
2012-12-04 11:13:06 +01:00
vAugagneur
8baa2b34b8
//small html fix
2012-12-04 11:07:56 +01:00
vAugagneur
3510cc03ab
//small html fix
2012-12-04 11:07:56 +01:00
Vincent Augagneur
85daf29f87
Merge pull request #63 from Ha99y/blockcms-fix
...
[*] FO - Update modules/blockcms/blockcms.tpl
2012-12-04 01:37:32 -08:00
Vincent Augagneur
640c0202dd
Merge pull request #63 from Ha99y/blockcms-fix
...
[*] FO - Update modules/blockcms/blockcms.tpl
2012-12-04 01:37:32 -08:00
Rémi Gaillard
1091d82546
// Fix PHP warning
2012-12-03 19:11:37 +01:00
Rémi Gaillard
7d9057a476
// Fix PHP warning
2012-12-03 19:11:37 +01:00
vAugagneur