497968fd7a
order-carrier more compatible with order-opc
...
carriers' block didn't have the opc-main-block when in opc-order
2012-12-06 14:52:14 +01:00
c89082855a
order-carrier more compatible with order-opc
...
carriers' block didn't have the opc-main-block when in opc-order
2012-12-06 14:52:14 +01:00
094e38206c
order carrier more compatible with opc
...
The carriers' block didnt't have the 'opc-main-block' in the order-opc page.
2012-12-06 14:46:40 +01:00
523ec5c27c
order carrier more compatible with opc
...
The carriers' block didnt't have the 'opc-main-block' in the order-opc page.
2012-12-06 14:46:40 +01:00
78bfcfbaf0
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-06 12:16:47 +01:00
276696dd6c
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-06 12:16:47 +01:00
640ec6d006
[-] BO : fixed bug #PSCFV-4701 - Module onclickOption is not called
2012-12-06 12:16:37 +01:00
61c23c7e75
[-] BO : fixed bug #PSCFV-4701 - Module onclickOption is not called
2012-12-06 12:16:37 +01:00
0e0f6ee641
[-] FO: Fix cart summary ajax refreshment
2012-12-06 11:58:29 +01:00
b474ca3d85
[-] FO: Fix cart summary ajax refreshment
2012-12-06 11:58:29 +01:00
76b435b639
//revert all config.xml
2012-12-06 11:41:52 +01:00
4fa7eb6a3d
//revert all config.xml
2012-12-06 11:41:52 +01:00
12f47a1b9b
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-06 11:32:24 +01:00
e809f6bfdb
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-06 11:32:24 +01:00
d71970d5ff
[-] BO : fixed bug #PSCFV-4699 - Module uninstall confirmation message is missing
2012-12-06 11:32:19 +01:00
6f37326675
[-] BO : fixed bug #PSCFV-4699 - Module uninstall confirmation message is missing
2012-12-06 11:32:19 +01:00
2166937cf5
Merge pull request #72 from Milow/development
...
// Fix mail error, make a little more robust
2012-12-06 01:48:46 -08:00
d9ba307893
Merge pull request #72 from Milow/development
...
// Fix mail error, make a little more robust
2012-12-06 01:48:46 -08:00
2191eec919
[-] FO: improvement on h4/h5 edits (id become class)
2012-12-06 10:06:56 +01:00
2a4b7cae75
[-] FO: improvement on h4/h5 edits (id become class)
2012-12-06 10:06:56 +01:00
82c7f03119
Fix typo
2012-12-05 21:27:37 -06:00
cf7aebd029
Fix typo
2012-12-05 21:27:37 -06:00
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
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
8ddafa2568
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-05 11:03:16 +01:00
7897d40e22
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-05 11:03:16 +01:00
4844914b0a
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-05 10:59:47 +01:00
5c63deb469
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-05 10:59:47 +01:00
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
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
6e9ea91ae7
//small variable name fix part 2
2012-12-04 18:47:00 +01:00
2c3ad2e7f9
//small variable name fix part 2
2012-12-04 18:47:00 +01:00
6740906dcb
//small variable name fix
2012-12-04 18:35:10 +01:00
89e9f90cf1
//small variable name fix
2012-12-04 18:35:10 +01:00
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
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
31efb947ab
// change h4, h5
2012-12-04 17:15:49 +01:00
2b10fcd712
// change h4, h5
2012-12-04 17:15:49 +01:00
4e9c534f1b
[-] Core: Locales should be setted anywhere #PSCFV-5953
2012-12-04 15:40:17 +01:00
da5c5fb4a0
[-] Core: Locales should be setted anywhere #PSCFV-5953
2012-12-04 15:40:17 +01:00
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
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
52803b40b9
// fixed FO bugs
2012-12-04 15:27:43 +01:00
9322f3338e
// fixed FO bugs
2012-12-04 15:27:43 +01:00
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
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
a4b6594f9c
// Fix PHP notice #PSCFV-5967
2012-12-04 14:33:12 +01:00
6cad7c2bf4
// Fix PHP notice #PSCFV-5967
2012-12-04 14:33:12 +01:00
e70069bdfa
[-] WS: #PSCFV-5982 logo email/invoices/mail don't return standard logo if not exists
2012-12-04 11:56:17 +01:00
e568e0992d
[-] WS: #PSCFV-5982 logo email/invoices/mail don't return standard logo if not exists
2012-12-04 11:56:17 +01:00
David Gasperoni