f0da3fa2ae
Merge pull request #404 from MrManchot/patch-5
...
Module newsletter : Send mail with the shop in the context
2013-04-25 05:48:24 -07:00
cde13e7707
Merge pull request #403 from MrManchot/patch-4
...
Double 'id_image' definition in product getList
2013-04-25 02:23:16 -07:00
bf40d68098
Send mail with the shop in the context
2013-04-25 11:59:25 +03:00
1280152db9
[-] CORE : fixed bug #PSCFV-8723 - PSCFV-8656 live edit 404
2013-04-25 10:59:18 +02:00
e344863a3c
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
b5047051cd
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-24 16:38:31 +02:00
ec45ea725f
Merge pull request #305 from Prestaworks/patch-9
...
[-]BO: Fixes issue with logo name.
2013-04-24 01:29:58 -07:00
05fd9aeaae
[-] 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
cc18fd1de6
//small fix on Link::getProductLink()
2013-04-23 17:33:15 +02:00
0156ddc30a
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-23 14:22:45 +02:00
e363dc8759
Merge Pull Request #167 - Thanks @Zeyckler
2013-04-23 14:22:40 +02:00
d1c7f9c012
Merge pull request #390 from ccauw/patch-7
...
[*] BO : Add block "override_form_extra" in helper
2013-04-23 05:20:43 -07:00
38eb16eb48
Merge Pull Request #53 - Thanks @Caleydon
2013-04-23 11:40:08 +02:00
f1e34c20b8
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-23 11:39:14 +02:00
e466ede051
Merge Pull request #67 - Thanks @Ha99y
2013-04-23 10:02:29 +02:00
5b7da618b5
Merge Pull Request #21 - thanks @Caleydon
2013-04-23 09:34:24 +02:00
5fb2bb9ee2
[*] BO : added new button on manufacturers view
2013-04-22 14:56:59 +02:00
34688d6933
[*] FO : one_phone_at_least should be set
2013-04-22 12:18:26 +02:00
4bf41c590b
[-] CORE : Fix bug #PSCFV-8705 stocks update for when no current state
2013-04-22 12:09:35 +02:00
31e7c6a08e
Merged Pull request #355 - thanks to @bibendi
2013-04-22 12:06:19 +02:00
141772725b
// Fixed a few UI bugs in the stats
2013-04-22 11:57:36 +02:00
fd46c87786
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-22 11:34:02 +02:00
34a2c0191c
[-] CORE :Fix #PSCFV-8631 when order directly in payment state does not update stocks
2013-04-22 11:33:13 +02:00
7c4a188ae8
[-] BO: Fix #PSCFV-8872 HelperList::displayWarning() don't exists
2013-04-22 10:50:41 +02:00
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
b1a839263d
[*] Modules : use jQuery in blocknewsletter to remove @todo comment - thanks @romainberger
2013-04-22 09:48:30 +02:00
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
22135487ab
//new addons url in install process
2013-04-19 11:44:29 +02:00
da4c87d9ba
[-] CORE : fixed bug #PSCFV-8787 - URL Rewriting remove accent
2013-04-19 11:07:59 +02:00
f93c7ec8c7
[-] BO : Fix bug #PSCFV-8843, no closing span in category-filter helper
2013-04-19 10:34:20 +02:00
54b75b9818
// Fixed potential warning
2013-04-18 17:12:59 -03:00
65c1198480
// Changed link to documentation in the installer
2013-04-18 16:57:05 -03:00
29c0761645
// Removed useless message
2013-04-18 16:53:27 -03:00
b1000d63b9
// Fixed truncate / escape order
2013-04-18 16:39:33 -03:00
62836d65ab
[-] Fo : Remove additionnal space in phone field value
2013-04-18 19:43:04 +02:00
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
b6d9c89b99
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-18 18:23:18 +02:00
1a8ab7f68c
[-] BO : Can not set PS_ORDER_OUT_OF_STOCK in one shop
2013-04-18 17:28:16 +02:00
38bdd421f7
// performance improve for ObjectModel::displayFieldName #PSCFV-8713
2013-04-18 17:12:05 +02:00
803447b88d
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-18 17:02:51 +02:00
828ffb74ad
[-] FO - fixed bug #PSCFV-8826 sort now work fine on bestsale controller
2013-04-18 17:02:45 +02:00
e22fe455b3
[-] CORE : Fix bug #PSCFV-8636 again, cart rule with a reduction and free shipping
2013-04-18 16:44:55 +02:00
e9b8af0e97
[-] BO - fixed bug #PSCFV-8614
2013-04-18 15:14:37 +02:00
53cc380a6a
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-18 14:59:02 +02:00
986d57148f
//AdminModulesController::extractArchive() now return something
2013-04-18 14:58:43 +02:00
ccfa343b0d
[-] BO : Bad gender image when no gender
2013-04-18 14:54:12 +02:00
ab700a6285
[-] FO: send current product to some hook like displayProductTabContent on product page #PSCFV-8825
2013-04-18 14:24:50 +02:00
158ab771b6
[-] BO: Fix #PSCFV-8827 fixed price of specific price rules should be a float
2013-04-18 14:21:44 +02:00
5edfd03068
// don't try to clear smarty cache if smarty is not defined
2013-04-18 14:06:49 +02:00
768eb473e4
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-18 12:09:47 +02:00
Vincent Augagneur