Rémi Gaillard
36b0eae84f
Merge pull request #403 from MrManchot/patch-4
...
Double 'id_image' definition in product getList
2013-04-25 02:23:16 -07:00
vAugagneur
ac9a5c5a41
[-] CORE : fixed bug #PSCFV-8723 - PSCFV-8656 live edit 404
2013-04-25 10:59:18 +02:00
Cédric Mouleyre
89723f9daf
Double 'id_image' definition in product getList
...
Double 'id_image' definition in product getList, the correct on is : MAX('.$alias_image.'.id_image) id_image, I remove the second.
The problem was, sometimes, image product was not display in multi-shop in the BO.
2013-04-25 11:31:10 +03:00
Francois Gaillard
50d52baa7b
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-24 16:38:31 +02:00
Vincent Augagneur
fd23578e1a
Merge pull request #305 from Prestaworks/patch-9
...
[-]BO: Fixes issue with logo name.
2013-04-24 01:29:58 -07:00
vAugagneur
3607c2264f
[-] BO - fixed bug #PSCFV-8802 - #PNM-960 - #PNM-944 url rewrite bug when generate front url from back
2013-04-23 17:41:29 +02:00
vAugagneur
c7bbf74913
//small fix on Link::getProductLink()
2013-04-23 17:33:15 +02:00
vAugagneur
b84b44a44c
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-23 14:22:45 +02:00
vAugagneur
ece02e6bf3
Merge Pull Request #167 - Thanks @Zeyckler
2013-04-23 14:22:40 +02:00
Vincent Augagneur
5e9ba185ef
Merge pull request #390 from ccauw/patch-7
...
[*] BO : Add block "override_form_extra" in helper
2013-04-23 05:20:43 -07:00
vAugagneur
2d2b9f76e0
Merge Pull Request #53 - Thanks @Caleydon
2013-04-23 11:40:08 +02:00
Francois Gaillard
e61bd7c185
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-23 11:39:14 +02:00
vAugagneur
da96eb6651
Merge Pull request #67 - Thanks @Ha99y
2013-04-23 10:02:29 +02:00
vAugagneur
18ed37127d
Merge Pull Request #21 - thanks @Caleydon
2013-04-23 09:34:24 +02:00
vAugagneur
3d6d97af5f
[*] BO : added new button on manufacturers view
2013-04-22 14:56:59 +02:00
gRoussac
d8b39d060d
[*] FO : one_phone_at_least should be set
2013-04-22 12:18:26 +02:00
gRoussac
c5ed733cfc
[-] CORE : Fix bug #PSCFV-8705 stocks update for when no current state
2013-04-22 12:09:35 +02:00
vAugagneur
aead567def
Merged Pull request #355 - thanks to @bibendi
2013-04-22 12:06:19 +02:00
Damien Metzger
e7b22ad8d4
// Fixed a few UI bugs in the stats
2013-04-22 11:57:36 +02:00
gRoussac
6b8c3d8612
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-22 11:34:02 +02:00
gRoussac
1acd07e063
[-] 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
20f8709940
[-] BO: Fix #PSCFV-8872 HelperList::displayWarning() don't exists
2013-04-22 10:50:41 +02:00
Vincent Augagneur
c643abcfa2
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
ec051deb31
[*] Modules : use jQuery in blocknewsletter to remove @todo comment - thanks @romainberger
2013-04-22 09:48:30 +02:00
vAugagneur
50528a5fe3
[*] 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
vAugagneur
2cde30c118
//new addons url in install process
2013-04-19 11:44:29 +02:00
vAugagneur
ce44e9a95c
[-] CORE : fixed bug #PSCFV-8787 - URL Rewriting remove accent
2013-04-19 11:07:59 +02:00
gRoussac
6e1f99f4b2
[-] BO : Fix bug #PSCFV-8843, no closing span in category-filter helper
2013-04-19 10:34:20 +02:00
Damien Metzger
17536ff682
// Fixed potential warning
2013-04-18 17:12:59 -03:00
Damien Metzger
c4ae13af75
// Changed link to documentation in the installer
2013-04-18 16:57:05 -03:00
Damien Metzger
bfbc46cf51
// Removed useless message
2013-04-18 16:53:27 -03:00
Damien Metzger
550ee435e8
// Fixed truncate / escape order
2013-04-18 16:39:33 -03:00
gRoussac
b840b6bd2b
[-] Fo : Remove additionnal space in phone field value
2013-04-18 19:43:04 +02:00
gRoussac
65a73c7d4b
[-] FO : fix bug #PSCFV-8684, phone not required in guest checkout when not set in BO
2013-04-18 19:12:07 +02:00
Francois Gaillard
8251e98323
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-18 18:23:18 +02:00
gRoussac
dcb46e7867
[-] BO : Can not set PS_ORDER_OUT_OF_STOCK in one shop
2013-04-18 17:28:16 +02:00
Rémi Gaillard
103513bf28
// performance improve for ObjectModel::displayFieldName #PSCFV-8713
2013-04-18 17:12:05 +02:00
vAugagneur
ea0203f43f
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-18 17:02:51 +02:00
vAugagneur
75d395c84a
[-] FO - fixed bug #PSCFV-8826 sort now work fine on bestsale controller
2013-04-18 17:02:45 +02:00
gRoussac
2a3789d48b
[-] CORE : Fix bug #PSCFV-8636 again, cart rule with a reduction and free shipping
2013-04-18 16:44:55 +02:00
vAugagneur
b52c71c7ad
[-] BO - fixed bug #PSCFV-8614
2013-04-18 15:14:37 +02:00
Rémi Gaillard
45fdb3f79d
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-18 14:59:02 +02:00
Rémi Gaillard
a7be6b14e8
//AdminModulesController::extractArchive() now return something
2013-04-18 14:58:43 +02:00
gRoussac
0a8eddf7d6
[-] BO : Bad gender image when no gender
2013-04-18 14:54:12 +02:00
Rémi Gaillard
f24022311e
[-] 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
f7a1fdb9e0
[-] 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
e7b344adab
// don't try to clear smarty cache if smarty is not defined
2013-04-18 14:06:49 +02:00
Francois Gaillard
c9a53bf491
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-18 12:09:47 +02:00
Rémi Gaillard
be250c9ecc
// Revert a93cfbec07
2013-04-18 11:36:55 +02:00
gRoussac
5a815e7b19
[-] FO : Fix bug #PSCFV-8728 context country not updated after changing delivery address in OPC
2013-04-18 11:26:50 +02:00
Rémi Gaillard