gRoussac
4479db88a0
[-) PDF : nowrap on several product prices
2013-11-13 11:52:10 +01:00
Francois Gaillard
339c954cb3
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-11-13 11:24:51 +01:00
Jerome Nadaud
c4837e65ec
[-] FO : FixBug #PSCFV-9291 - Ecotax increment display price in product combination
2013-11-13 11:24:25 +01:00
Jerome Nadaud
2117c89352
[-] FO : FixBug #PSCFV-9291 - Ecotax increment display price in product combination
2013-11-13 11:04:13 +01:00
Jerome Nadaud
9f10a851e5
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-11-13 10:58:01 +01:00
Gregory Roussac
66a9ee03fc
Merge pull request #971 from studiokiwik/sk-ps15x-008
...
[-] FO : fix contact-form id_order input when customer is not logged
2013-11-13 01:42:00 -08:00
gRoussac
c69688cc11
[-] BO : Fix bug #PSCFV-10990 bad version comparison for ps_versions_compliancy
2013-11-13 10:14:21 +01:00
Mikael Blotin
26d1ad0668
[-] FO : fix contact-form id_order input when customer is not logged
2013-11-13 10:12:31 +01:00
Jerome Nadaud
6a99b84452
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-11-13 10:02:28 +01:00
gRoussac
6ddf220aee
[-] Fo : Call Gmaps on https if required
2013-11-12 21:16:09 +01:00
gRoussac
9328a3c473
// forgot to commit 036e2362c9
2013-11-12 19:17:54 +01:00
gRoussac
c8dfe1c174
[-] FO : Wordwrap on prices in history
2013-11-12 19:17:12 +01:00
Rémi Gaillard
75df12dd94
[-] Core: Group::getCurrent() return the default customer group of the shop if default customer group is not associated to shop
2013-11-12 18:49:52 +01:00
Gregory Roussac
6d7e2055ce
Merge pull request #968 from ccauw/patch-12
...
[*] BO : add class on TD in standard List
2013-11-12 09:38:03 -08:00
gRoussac
4d327a537f
[*] FO : addTextFieldToProduct without Line feed, follow up https://github.com/PrestaShop/PrestaShop/pull/962#issuecomment-28294571
2013-11-12 18:28:42 +01:00
ccauw
747926039a
[*] BO : add class on TD in standard List
...
Back office :
Add a class on TD in list created by getList()
In fields_list array of AdminController, we can add a new parameter('class')
example :
'name' => array(
'title' => $this->l('Name'),
'width' => 150,
'class' => 'ma_classe',
'filter_key' => 'b!name'
),
This parameter can be used for javascript effect, ...
Thanks.
2013-11-12 18:01:27 +01:00
gRoussac
5e4382eb08
[-] BO : Fix bug #PSCFV-10982 reduction group truncated
2013-11-12 17:55:07 +01:00
gRoussac
036e2362c9
[+] CORE : Fixed cache_id
2013-11-12 17:09:38 +01:00
Fabio Chelly
fc193d5c8b
Merge remote-tracking branch 'origin/development' into development
2013-11-12 16:36:19 +01:00
Rémi Gaillard
75e6a03591
// small fix
2013-11-12 16:38:34 +01:00
Fabio Chelly
dd05692400
[-] FO : Fixed errors when calculating most selled products from footer link
2013-11-12 16:36:07 +01:00
Rémi Gaillard
b5eb7c5c28
// typo
2013-11-12 16:25:13 +01:00
gRoussac
f0f3679cbd
[*] FO : https on TOS in fancybox, follow up https://github.com/PrestaShop/PrestaShop/pull/956
2013-11-12 15:56:04 +01:00
Rémi Gaillard
175da3ecf6
Merge pull request #965 from djfm/IETF
...
[*] LO : Fix PSCFV-10876: use IETF code to set language of shop, not 'is...
2013-11-12 06:05:10 -08:00
fram
743c4f4607
[*] LO : Fix PSCFV-10876: use IETF code to set language of shop, not 'iso' code, allows to distinguish between chinese variants etc.
2013-11-12 14:59:36 +01:00
gRoussac
40abef8aac
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-11-12 12:32:37 +01:00
Rémi Gaillard
8be339463d
// small fix
2013-11-12 12:36:51 +01:00
gRoussac
f0f630fb50
[-] FO : #PSCFV-10978 firstname displayed instead of lastname in invoice address
2013-11-12 12:32:21 +01:00
gRoussac
3f42a381a4
[*] FO : Redirect to address.tpl when !Address::isCountryActiveById
2013-11-12 12:12:19 +01:00
Gregory Roussac
0e1898be09
Merge pull request #963 from djfm/sprintf
...
// do not use sprintf in installer when it is useless
2013-11-12 01:45:39 -08:00
gRoussac
c1969028f2
[-] FO : Customized meesage with carriage return follow up #962
2013-11-12 10:41:19 +01:00
Gregory Roussac
cd83ec93c7
Merge pull request #961 from joseantgv/patch-4
...
[-] MO : Whishlist, innerhtml in html jquery
2013-11-12 00:42:04 -08:00
fram
ab730dc3da
// do not use sprintf when it is useless
2013-11-12 09:21:05 +01:00
joseantgv
7523828a7a
Update ajax-wishlist.js
...
innerHtml can not execute javascript from "data". If someone modify php files returned from jquery function and includes a script, it's not executed.
2013-11-11 16:58:52 +01:00
gRoussac
e2d8a33a81
[*] FO : Cache on getDiscountsCustomer, follow up https://github.com/PrestaShop/PrestaShop/pull/960
2013-11-11 14:02:11 +01:00
gRoussac
a7869a1f06
[*] CORE : Remove duplicate SQL queries
2013-11-11 13:41:23 +01:00
gRoussac
de404706d9
[*] CORE : Profiling hide non doubles
2013-11-11 02:09:50 +01:00
gRoussac
3f9338e13d
[*] CORE : Cache store for isAssociatedToShop::isAssociatedToShop
2013-11-11 01:59:10 +01:00
gRoussac
38da826671
[-] FO : getTaxCalculator bad cache key again // sorry about that
2013-11-11 01:37:20 +01:00
gRoussac
fee461fdf1
[*] FO : Set cache for StockAvailable::getQuantityAvailableByProduct
2013-11-11 01:00:55 +01:00
gRoussac
8dd951c2df
[*] MO : Remove calls to isRegisteredInHook in crossselling and productscategory
2013-11-11 00:36:17 +01:00
gRoussac
7e93b2cffd
[-] FO : getTaxCalculator bad cache key
2013-11-11 00:13:35 +01:00
gRoussac
19da345531
[-] BO : Could not check all modules after ajax call
2013-11-10 21:51:14 +01:00
Fabio Chelly
bd8eebdc33
Merge remote-tracking branch 'origin/development' into development
2013-11-08 18:12:23 +01:00
Fabio Chelly
4312d241f3
[-] MO :Fixed #PNM-1654 (Loyalty module) by using most expensive attribute instead of default one
2013-11-08 18:12:11 +01:00
gRoussac
7eb70486e0
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-11-08 15:54:28 +01:00
gRoussac
ebc3dfee62
[-] BO : Fix css bug #PSCFV-10899, fixed fix-toolbar z-index
2013-11-08 15:54:13 +01:00
Gregory Roussac
ee487fde59
Merge pull request #953 from Shagshag/patch-4
...
[*] BO: kb was not translatable
2013-11-08 06:37:26 -08:00
Shagshag
c7f1fcb49a
kb was not translatable
2013-11-08 15:33:49 +01:00
gRoussac
530b6dc501
// Productscomments remove warnings
2013-11-08 15:00:56 +01:00
