Commit Graph

2516 Commits

Author SHA1 Message Date
Damien Metzger
aefc22bb10 [-] BO : fixed quote issue with magic quote in customization in adminorders #PSCFV-9311 2013-06-17 11:40:35 +02:00
Damien Metzger
c53d2d04ce [-] BO : fixed parsing of discount value in AdminOrders #PSCFV-9481 2013-06-17 11:16:16 +02:00
Vincent Augagneur
148cb6c123 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-14 15:01:27 +02:00
Vincent Augagneur
6778b17b23 [-] BO - fixed bug #PSCFV-9347 - Saving the E-Mail preferences loses the smtp server password 2013-06-14 15:01:22 +02:00
Damien Metzger
12e13e275f [-] BO : fixed ajax in permissions tab #PSCFV-7442 2013-06-14 11:20:38 +02:00
Damien Metzger
331dcc4d6e [-] BO : Fixed permission update #PSCFV-7441 2013-06-14 10:48:24 +02:00
Damien Metzger
5493010e67 [-] BO : postcode required in manufacturer address 2013-06-14 10:25:37 +02:00
Damien Metzger
ff876034b4 // Fixed display of the image option "legacy system" 2013-06-14 09:57:00 +02:00
Damien Metzger
cd6f415dc1 [-] BO : fixed link in AdminTracking #PSCFV-7409 2013-06-13 18:38:00 +02:00
Rémi Gaillard
fafb7fdef7 [-] BO: Fix #PSCFV-8904 bad id_warehouse is stored on ps_address table 2013-06-13 15:05:55 +02:00
Rémi Gaillard
f5dfb12e4d [-] BO: association of product attributes on associating a product to another shop #PSCFV-8735 2013-06-13 14:30:21 +02:00
Rémi Gaillard
b3a823f876 [-] BO: Fix #PSCFV-7763 Re-inject quantities after deleting a product from a order 2013-06-12 17:08:00 +02:00
Rémi Gaillard
91ececef1a // missing return statement 2013-06-11 12:19:04 +02:00
Rémi Gaillard
7ed9ceb593 [-] BO: Addresses are now totally deleted from the database if not used on a order 2013-06-11 12:18:05 +02:00
Vincent Augagneur
5ec9aa56ac //small fix 2013-06-10 12:15:11 +02:00
Vincent Augagneur
12872fea65 [-] BO - fixed bug #PSCFV-9071 - PS_SHOP_DOMAIN and PS_SHOP_DOMAIN_SSL have not updated after updated Shop domain and SSL domain from Preferences > SEO & URLs 2013-06-10 10:47:57 +02:00
Rémi Gaillard
5d9d3938e5 // small change on optimization tips for smarty 2013-06-04 15:20:09 +02:00
Vincent Augagneur
682d10143e [-] BO fixed bug #PSCFV-9130 - Ordering Categories by Name does not work correctly 2013-06-04 14:50:20 +02:00
gRoussac
ff2c3725d3 [-] Bo : Fix #PSCFV-9306 report of #PSCFI-7115 Add a new specific price = faulty validation 2013-05-31 18:10:41 +02:00
gRoussac
ea5405a917 [-] CORE : Report of ec8deb2891 2013-05-27 19:06:59 +02:00
gRoussac
a04e6b1a67 [-] BO : Fix bug #PSCFI-7231 strtolower iso_lang for package download link 2013-05-27 18:13:13 +02:00
vAugagneur
4f8b73ef9d //small fix 2013-05-22 14:38:39 +02:00
vAugagneur
3328c7a653 [-] BO : remove deprecated parameter when call Tools::displayDate() 2013-05-20 16:55:52 +02:00
Cédric Mouleyre
f921fd2352 Add Wysiwyg Category Controller 2013-05-17 12:00:43 +03:00
Damien Metzger
3e4ef99214 [-] BO : fixed issue with reduction in the category for groups #PSCFV-9101 2013-05-15 15:23:13 +02:00
gRoussac
9b615244b1 [-] BO : Fix "The controller adminnotound is missing or invalid." error when no controller get variable 2013-05-15 11:31:55 +02:00
Damien Metzger
52bffe6917 // Fixed warning 2013-05-07 17:27:16 +02:00
Damien Metzger
9ce563e332 Merge pull request #419 from e-gaulue/Module_translation_patch
[-] BO : don't show translations for module overrides in admin modules translation page
2013-05-06 07:09:58 -07:00
Damien Metzger
f4df47986b Merge pull request #420 from e-gaulue/Module_translation_patch_2
[-] BO : don't show unecessary tpl module translations - complience with documentation
2013-05-06 07:08:41 -07:00
Damien Metzger
80b5855006 [-] BO : fixed potential warning with texture list #PSCFV-9050 2013-05-06 09:27:03 +02:00
Rémi Gaillard
63993a425b [-] BO: You can now disable the email sent after account creation 2013-05-03 17:01:12 +02:00
Edouard Gaulué
0442bee919 [-] BO : don't show unecessary tpl module translations - complience with documentation 2013-05-02 18:46:13 +02:00
Rémi Gaillard
41786587ba [-] BO: Fix #PSCFV-8179 shop domain used in emails sometimes was for the wrong shop 2013-05-02 18:42:01 +02:00
Edouard Gaulué
444a99f564 [-] BO : don't show translation for class/controler overrides when on modules translation page 2013-05-02 18:21:54 +02:00
Damien Metzger
fb604492b7 [-] BO : fixed infinite loop in the categories #PSCFV-8965 2013-05-02 16:06:26 +02:00
Dragan Skrbic
7f8a33763a // Fixed image import 2013-04-29 18:07:42 +02:00
Damien Metzger
3600a31862 [-] BO : fixed image import with allow_url_fopen deactivated #PSCFV-8181 2013-04-29 17:45:45 +02:00
Rémi Gaillard
bfc8a0ad02 [-] BO: Fix #PSCFV-8957 order creation when id_cart=0 is present in database but should normally not happen 2013-04-29 13:47:46 +02:00
Damien Metzger
94090e2a39 // Fixed directory creation in translation #PSCFV-8212 2013-04-29 12:08:45 +02:00
Damien Metzger
43a897436a [-] BO : fixed automatic creation of email overrides in the template #PSCFV-8785 2013-04-29 11:16:26 +02:00
Damien Metzger
459768d1ac [-] BO : fixed error message in language form #PSCFV-8890 2013-04-29 10:47:59 +02:00
Vincent Augagneur
218a76c443 Merge pull request #310 from Patanock/patch-5
[*] BO: Customer and carrier need to be send to the hook
2013-04-29 01:31:16 -07:00
Damien Metzger
1921668596 [-] BO : Fixed display when you translate modules without theme selected 2013-04-25 17:47:07 +02:00
Francois Gaillard
8d735b333f // Release branch merged 2013-04-25 17:00:56 +02:00
Cédric Mouleyre
d5817a56cc 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:29:01 +02:00
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
Damien Metzger
7a76b8b6a0 // Removed deprecated block for new installs 2013-04-25 09:03:32 +02:00
Damien Metzger
4df54ce743 // Fixed warning in translations 2013-04-24 16:27:45 +02:00