6dd0a04ed0
[-] BO : fixed bug #PSCFV-5774 BO SAV : the response of the admin appears without newline
2012-12-07 17:22:06 +01:00
cc7c40d4e9
[-] BO : fixed bug #PSCFV-5774 BO SAV : the response of the admin appears without newline
2012-12-07 17:22:06 +01:00
006bb7b19a
[-] FO : fixed bug #PSCFV-5849 now customer addresses can't be edited if country is not enable in this shop excepte if group shop is shared order
2012-12-07 16:23:52 +01:00
7bc49194b7
[-] FO : fixed bug #PSCFV-5849 now customer addresses can't be edited if country is not enable in this shop excepte if group shop is shared order
2012-12-07 16:23:52 +01:00
5bcc1417dd
// small fix for urls
2012-12-07 11:46:50 +01:00
1c1fd827da
// small fix for urls
2012-12-07 11:46:50 +01:00
4dbb321836
[-] CORE : fixed sql bug in PaymentModuleCore::getInstalledPaymentModules() - now get only active payment modules
2012-12-06 17:05:19 +01:00
f40369ef6a
[-] CORE : fixed sql bug in PaymentModuleCore::getInstalledPaymentModules() - now get only active payment modules
2012-12-06 17:05:19 +01:00
accb337006
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-06 16:53:37 +01:00
adc1197320
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-12-06 16:53:37 +01:00
52f4fca6e1
[-] CORE : small fix in Dispatcher::createURL() when friendly URL is disabled
2012-12-06 16:53:29 +01:00
048f3cce14
[-] CORE : small fix in Dispatcher::createURL() when friendly URL is disabled
2012-12-06 16:53:29 +01:00
224646ef1f
[-] FO: Fix some tax_display_method value for not default customer group
2012-12-06 16:38:31 +01:00
56819e3573
[-] FO: Fix some tax_display_method value for not default customer group
2012-12-06 16:38:31 +01:00
310dbaaf24
move header tag out of carrier block
2012-12-06 15:06:08 +01:00
52ea6cddf8
move header tag out of carrier block
2012-12-06 15:06:08 +01:00
3b9b19ec48
order-carrier more compatible with order-opc
...
carriers' block didn't have the opc-main-block when in opc-order
2012-12-06 14:56:06 +01:00
897462b3ee
order-carrier more compatible with order-opc
...
carriers' block didn't have the opc-main-block when in opc-order
2012-12-06 14:56:06 +01:00
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
vAugagneur