dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,570 Commits 9 Branches 19 Tags
94de4d3d2f35403b5de1c10a4a02503f11ca1c2b
Commit Graph

494 Commits

Author SHA1 Message Date
Jérôme Nadaud
3287ff5300 [+] BO : Product attachment "For" 2013-07-26 15:32:04 +02:00
Jérôme Nadaud
5c52ba31e9 [+] BO : Products quantities "For" and small template fix 2013-07-26 15:03:29 +02:00
Jérôme Nadaud
cc1fddd52d [+] BO : Product "For" and new carriers select list 2013-07-25 16:24:43 +02:00
Jérôme Nadaud
3f83dd9222 [+] BO : Product "For" 2013-07-25 14:33:14 +02:00
Jérôme Nadaud
d6b38635f9 [+] BO : Product "For" 2013-07-25 14:02:36 +02:00
Kevin Granger
77f80b1774 // Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	.gitignore
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/page.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/orders/_documents.tpl
	admin-dev/themes/default/template/controllers/orders/_shipping.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/restrictions.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/modules_list/list.tpl
	classes/Tools.php
	controllers/admin/AdminCartRulesController.php
	controllers/admin/AdminProductsController.php
	css/admin.css
 2013-07-24 17:01:23 +02:00
gRoussac
4aab4f88cd [-] BO : Fix SQL query when $join_category == false, pull request d5f75c63b6 thanks @Captain-FLAM 2013-07-23 18:25:32 +02:00
gRoussac
dbe26e0a1d [-] BO : Could not find cover when image table corrupted 2013-07-23 11:47:16 +02:00
Kevin Granger
9d16eb1d1b // BO fix + work on helpers + compass/codekit config 2013-07-22 16:43:16 +02:00
Jérôme Nadaud
5646e682bc [-] BO : FIxBug Correct image language in product 2013-07-19 15:21:06 +02:00
Rémi Gaillard
ac02e5191a // ups 2013-07-18 18:34:10 +02:00
Rémi Gaillard
958d92c9fa [*] BO: Add an option to allow iframes on descriptions 2013-07-18 18:31:31 +02:00
Jérôme Nadaud
458838e598 [-] BO : FixBug #PSCFV-9613 Fix product tax to be shop dependent 2013-07-17 17:33:53 +02:00
Jérôme Nadaud
6884d7c5de [-] BO : FixBug #PSCFV-8287 Breadcrumbs label was wrong 2013-07-17 16:19:15 +02:00
Damien Metzger
3d283000a0 // Fixed misplaced comma 2013-07-16 10:27:52 +02:00
Damien Metzger
d9c2ec37d4 // Code cleaning 2013-07-15 18:13:07 +02:00
Damien Metzger
a3039024e7 // Code cleaning 2013-07-15 18:07:53 +02:00
Rémi Gaillard
4b492046c0 // add another logs information 2013-07-12 10:55:37 +02:00
Rémi Gaillard
17ee071bdf Merge pull request #540 from axometeam/patch-7 
[*] BO : Correct the getList() request for quantity and id_product
 2013-07-11 06:40:17 -07:00
Rémi Gaillard
004e833b24 [+] BO: Addition, deletion and edition are now logged 2013-07-11 14:50:23 +02:00
Kevin Granger
f042d704d2 // field translatable + tpl products + fixs 2013-07-10 19:39:35 +02:00
Kevin Granger
ec466b8c70 // Porting more product tpl 2013-07-09 19:10:56 +02:00
Damien Metzger
bad15211a8 [-] BO : added checks on product attributes properties #PSCFV-9703 2013-07-09 11:30:59 +02:00
Axome
fe660c097c [*] BO : Correct the getList() request for quantity and id_product 
Quantity and Id_product should be fixe as Int, else the Mysql request do something like : quantity LIKE "%0%"

When an admin key-in quantity as 0, he want product with quantity as 0, not as 0 / 10 /20 / 30... ect (The same for id_product)
 2013-07-03 11:18:04 +02:00
Kevin Granger
0ad4b44866 // Refactor helper list + fixs 2013-07-02 18:55:43 +02:00
Rémi Gaillard
6b71ec8b09 [-] BO: product supplier price should not be converted on product page #PSCFV-9420 2013-07-02 15:45:12 +02:00
gRoussac
64f615a061 [-] BO : Fix warnings when product not available in Shop 2013-06-25 18:16:06 +02:00
Rémi Gaillard
68540f1887 [-] BO: Stock should not appears on product listing when stock management is disabled #PSCFV-8207 2013-06-19 11:35:24 +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
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
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
Rémi Gaillard
3aba9f026b [-] BO: Fix #PSCFV-8422 it is now possible to manage minimal quantity even if stock management is disabled 2013-03-25 16:48:57 +01:00
Rémi Gaillard
fea8f50ab9 // reset category filter on adminproducts on multishop when category is not associated to the shop 2013-03-21 12:03:39 +01:00
Rémi Gaillard
5f181c8e4c [-] Core: Fix the listings in multishop context when you have at least a combination on one shop and not on the others and the same for the images 2013-03-20 20:12:28 +01:00
Rémi Gaillard
a58e9948e7 [-] BO: AdminProductControllers::bulkDelete should return error message if stock left with adv stock management like standard delete #PSCFV-8250 2013-03-20 16:38:20 +01:00
Rémi Gaillard
f17f9c9bee // Fix product multishop association when the product is created before the shop 2013-03-15 15:23:18 +01:00
Rémi Gaillard
8b4bd8e471 [-] BO: Fix auto-selection of default category when you have choosen one on the listing 2013-03-14 15:04:54 +01:00
fram
77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
Rémi Gaillard
32e9c7ff4f // check fields before change products statuse 2013-03-12 12:28:40 +01:00
Rémi Gaillard
433563b7f1 [-] FO: Fix ecotax displayed on the quantity discounts tab with a change of base_price on the product page 2013-03-06 18:02:13 +01:00
Rémi Gaillard
1983cb5ab1 [-] BO: Auto-select the tax rules group most used on product creation 2013-03-06 15:06:11 +01:00
vAugagneur
8af272f6e3 [-] BO : fixed bug when save image shop association 2013-03-01 17:17:17 +01:00
vAugagneur
fc3c86da39 //small sql fix 2013-03-01 16:00:00 +01:00
Rémi Gaillard
95f43d3ac6 [-] BO: Fix #PSCFV-7995 countries/groups/currencies refreshment when selecting a shop in specific price form 2013-02-25 18:45:28 +01:00
Damien Metzger
5059d825f8 // Unit changed for product pictures, I set it up to a usable minimum #PSCFV-6597 2013-02-21 11:52:42 +01:00
Rémi Gaillard
a3de006c5a [-] BO: Fix #PSCFV-7838 deleted taxes should not appears on the listing 2013-02-20 17:34:32 +01:00
Rémi Gaillard
7deb751ce9 // small fix 2013-02-20 15:28:54 +01:00
Rémi Gaillard
96b86a79f3 [-] BO: Fix #PSCFV-7646 JS error when adding a product existing in an other shop 2013-02-18 15:29:48 +01:00
Rémi Gaillard
804f88ec23 [-] BO: Fix #PSCFV-7730 update the multishop fields in adminproducts on default shop if context is all and if product is not associated to all shops 2013-02-15 17:25:53 +01:00
Rémi Gaillard
d473c04ebe [*] BO: store filter by category in admin products 2013-02-14 14:51:51 +01:00