gRoussac
fd46c87786
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-22 11:34:02 +02:00
gRoussac
34a2c0191c
[-] CORE :Fix #PSCFV-8631 when order directly in payment state does not update stocks
2013-04-22 11:33:13 +02:00
Rémi Gaillard
7c4a188ae8
[-] BO: Fix #PSCFV-8872 HelperList::displayWarning() don't exists
2013-04-22 10:50:41 +02:00
Vincent Augagneur
7c43ae05fc
Merge pull request #123 from rynge/admin_category_breadcrumbs
...
[-] BO : Fixed a problem with the breadcrumbs in the admin category edit...
2013-04-22 01:18:15 -07:00
vAugagneur
b1a839263d
[*] Modules : use jQuery in blocknewsletter to remove @todo comment - thanks @romainberger
2013-04-22 09:48:30 +02:00
vAugagneur
5f6d0614df
[*] FO : Wait for the image to be loaded before displaying the big image on product page - thanks to @romainberger
2013-04-22 09:40:48 +02:00
Rémi Gaillard
16906d8590
[-] Core: fix redirection loop for bugged versions of mysql using column name aliases on order by
2013-04-19 15:48:18 +02:00
Rémi Gaillard
cc3f9212ac
// fix display of accessories for products without combinations
2013-04-19 15:15:25 +02:00
Rémi Gaillard
236675544b
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
2013-04-19 15:14:51 +02:00
vAugagneur
22135487ab
//new addons url in install process
2013-04-19 11:44:29 +02:00
vAugagneur
da4c87d9ba
[-] CORE : fixed bug #PSCFV-8787 - URL Rewriting remove accent
2013-04-19 11:07:59 +02:00
gRoussac
f93c7ec8c7
[-] BO : Fix bug #PSCFV-8843, no closing span in category-filter helper
2013-04-19 10:34:20 +02:00
Damien Metzger
54b75b9818
// Fixed potential warning
2013-04-18 17:12:59 -03:00
Damien Metzger
65c1198480
// Changed link to documentation in the installer
2013-04-18 16:57:05 -03:00
Damien Metzger
29c0761645
// Removed useless message
2013-04-18 16:53:27 -03:00
Damien Metzger
b1000d63b9
// Fixed truncate / escape order
2013-04-18 16:39:33 -03:00
gRoussac
62836d65ab
[-] Fo : Remove additionnal space in phone field value
2013-04-18 19:43:04 +02:00
gRoussac
e2905ca845
[-] FO : fix bug #PSCFV-8684, phone not required in guest checkout when not set in BO
2013-04-18 19:12:07 +02:00
François Gaillard
b6d9c89b99
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-18 18:23:18 +02:00
gRoussac
1a8ab7f68c
[-] BO : Can not set PS_ORDER_OUT_OF_STOCK in one shop
2013-04-18 17:28:16 +02:00
Rémi Gaillard
38bdd421f7
// performance improve for ObjectModel::displayFieldName #PSCFV-8713
2013-04-18 17:12:05 +02:00
vAugagneur
803447b88d
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-18 17:02:51 +02:00
vAugagneur
828ffb74ad
[-] FO - fixed bug #PSCFV-8826 sort now work fine on bestsale controller
2013-04-18 17:02:45 +02:00
gRoussac
e22fe455b3
[-] CORE : Fix bug #PSCFV-8636 again, cart rule with a reduction and free shipping
2013-04-18 16:44:55 +02:00
vAugagneur
e9b8af0e97
[-] BO - fixed bug #PSCFV-8614
2013-04-18 15:14:37 +02:00
Rémi Gaillard
53cc380a6a
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-18 14:59:02 +02:00
Rémi Gaillard
986d57148f
//AdminModulesController::extractArchive() now return something
2013-04-18 14:58:43 +02:00
gRoussac
ccfa343b0d
[-] BO : Bad gender image when no gender
2013-04-18 14:54:12 +02:00
Rémi Gaillard
ab700a6285
[-] FO: send current product to some hook like displayProductTabContent on product page #PSCFV-8825
2013-04-18 14:24:50 +02:00
Rémi Gaillard
158ab771b6
[-] BO: Fix #PSCFV-8827 fixed price of specific price rules should be a float
2013-04-18 14:21:44 +02:00
Rémi Gaillard
5edfd03068
// don't try to clear smarty cache if smarty is not defined
2013-04-18 14:06:49 +02:00
François Gaillard
768eb473e4
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-18 12:09:47 +02:00
Rémi Gaillard
f0c5407aa6
// Revert a93cfbec07
2013-04-18 11:36:55 +02:00
gRoussac
ee3e2ac6dc
[-] FO : Fix bug #PSCFV-8728 context country not updated after changing delivery address in OPC
2013-04-18 11:26:50 +02:00
sLorenzini
b633b44ac7
[-] FO: fixed some css bug for ie7
2013-04-18 11:22:40 +02:00
Rémi Gaillard
5ba3fda95f
[-] FO: Add the protocol content to the cache id of modules #PSCFV-8810
2013-04-17 18:14:58 +02:00
Rémi Gaillard
f83b91ae51
// Fix smarty cache after modules translation update
2013-04-17 14:44:20 +02:00
Rémi Gaillard
49ff8ae4a1
// pscleaner clean address inversion between customers and manufacturers/suppliers
2013-04-17 11:39:11 +02:00
Vincent Augagneur
34f2ff36a3
Merge pull request #179 from nturato/patch-1
...
[-] WS: images are only shown as jpg or gif
2013-04-17 01:56:57 -07:00
vAugagneur
de0ef82f74
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-17 10:02:37 +02:00
vAugagneur
de887cc078
Merge Pull request #98 - Thanks to @phproberto
2013-04-17 10:02:32 +02:00
gRoussac
701d9e50af
[-] CORE : Fix bug last part #PSCFV-8636, cart rule with a reduction and free shipping
2013-04-16 18:56:00 +02:00
Gregory Roussac
5bae95dacc
Merge pull request #391 from ldecoker/patch-5
...
[-] [BO] error in form.tpl for attributes controller, thanks to ldecoker
2013-04-16 08:50:45 -07:00
ldecoker
4783cb17c5
";" in wrong place
...
Should be after display but inside quotes
2013-04-16 18:34:20 +03:00
ccauw
f7ef4e0350
[*] BO : Add block "override_form_extra" in helper
...
[*] BO : Add block "override_form_extra" in list_header.tpl
{if !$simple_header}
<form method="post" action="{$action}" class="form">
{block name="override_form_extra"}{/block}
In AdminXxxxController, If we display list which are filtered by "variable" like
index.php?controller=AdminXxxx&variable=val&token=...
When using pagination or columns filters, the controller is called without our variable.
There are two methods to retrieve our variable: cookie or form Post.
To use the second opportunity, we need to put hidden input "variable" in the form.
So we need à block in the form to override.
2013-04-16 16:21:23 +03:00
Vincent Augagneur
1a795cfe4a
Merge pull request #366 from kluevandrew/patch-2
...
[FIX] Bug in Controller class
2013-04-16 06:13:48 -07:00
ccauw
5b13f6aa7e
[*] BO : Add block "override_form_extra"
...
Add block "override_form_extra" in list_header.tpl
{if !$simple_header}
<form method="post" action="{$action}" class="form">
{block name="override_form_extra"}{/block}
In AdminXxxxController, If we display list which are filtered by "variable" like
index.php?controller=AdminXxxx&variable=val&token=...
When using pagination or columns filters, the controller is called without our variable.
There are two methods to retrieve our variable: cookie or form Post.
To use the second opportunity, we need to put hidden input "variable" in the form.
So we need à block in the form to override.
2013-04-16 16:09:26 +03:00
gRoussac
47c118c3ca
[-] FO : empty cache getContextualValue_ when updating cart quantity
2013-04-16 15:00:24 +02:00
Rémi Gaillard
22694898df
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-16 14:14:36 +02:00
Rémi Gaillard
96ee6386c1
[-] BO: Fix admin carts currency prices on view and listing
2013-04-16 14:14:04 +02:00
gRoussac