Commit Graph

199 Commits

Author SHA1 Message Date
vChabot
201c193dd4 // little fix about categories with multishop and Helper::renderAdminCategorieTree
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12301 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-10 10:29:53 +00:00
bMancone
4af34a28b3 // updated stock for Pack
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12292 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-09 18:23:01 +00:00
tDidierjean
84035510b5 // Move controller templates to subfolder controllers/
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12287 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-09 17:23:42 +00:00
vChabot
87fd511314 [*] BO : Adding category management with multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12270 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-09 15:13:46 +00:00
rGaillard
18b9b70441 // Fix deprecated warning on product attribute create
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12255 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-09 09:56:53 +00:00
mDeflotte
099c3502be [-] BO : #PSFV-221 - Fixed bad ajax return on no manufacturers on the product tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12188 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-05 13:55:16 +00:00
vKham
397d9c6e80 // delete stylesheet label information add list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12131 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-04 13:56:34 +00:00
rMalie
494205d52e // Fix PrestaShopException typo
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12128 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-04 13:53:19 +00:00
tDidierjean
f5090e034f [-] BO : fix bug #PSFV-298 - Cannot save supplier specific product price if no reference is set
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12118 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-04 13:17:05 +00:00
lLefevre
def3cac8a0 [-] BO : fix change maximum character for short description
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12116 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-04 11:31:54 +00:00
mMarinetti
c01c61f4a8 [*] classes : new constant Product::PTYPE_SIMPLE /PTYPE_PACK/PTYPE_VIRTUAL
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12115 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-04 11:06:08 +00:00
tDidierjean
115518aac5 // Product tabs position and ajax loading order are now independent
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12103 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-04 10:00:07 +00:00
tDidierjean
d3f8c6b28a // Product tabs now trigger an event when finished loading. Fixed pack and virtual product not being updated when the loading is not complete.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12077 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-03 15:38:47 +00:00
rMalie
6748479a85 // Fix #PSFV-223
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12072 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-03 14:52:06 +00:00
tDidierjean
2b09b1ed4e // fix redirection to new product page when creating a new product with errors
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12067 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-03 14:12:21 +00:00
tDidierjean
4017f3f60b // optimization to Product constructor (stock data is not loaded by default)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12061 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-03 13:40:50 +00:00
lLefevre
b6392ef29c [-] BO : #PSTEST-83 : small changes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12035 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-03 09:48:28 +00:00
tDidierjean
0d1c6fc8fd // getProductLink fix and optimization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12028 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-03 09:22:42 +00:00
tDidierjean
38793a54d2 // Changes to ajax product tabs loading
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12009 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 16:05:35 +00:00
rMalie
07207496d7 // Rename correctly all hooks
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12006 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 15:52:40 +00:00
mBertholino
2e09799884 [-] BO : #PSTEST-290 : Update method ajax process to display the correct product's image
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11984 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 13:23:54 +00:00
lLefevre
3ce9a8705c // add loading tab product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11960 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-01 15:20:27 +00:00
bMancone
33e6ac6628 // Fixed bugs when updating a product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11875 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 17:07:01 +00:00
mBertholino
72b7fa3801 [-] BO : #PSTEST-230 : missing translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11853 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 14:53:17 +00:00
lLefevre
8116af4917 [-] BO : #PSFV-173 : indexing when adding a product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11852 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 14:47:57 +00:00
mBertholino
3517cf88db [-] BO : #PSTEST-230 : bug fixed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11850 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 14:45:25 +00:00
mBertholino
675ee2152c [-] BO : #PSTEST-230 : bug fixed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11849 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 14:44:55 +00:00
bMancone
5c4e87777d // Fixed bug when associating Suppliers. Fixed StockCover
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11802 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-27 16:25:10 +00:00
mBertholino
7013d26717 [-] bo : #PSFV-273 : $max_file_size has been re-added
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11780 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-27 09:33:20 +00:00
lLefevre
35ac5cd809 // fix bug upload image
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11777 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-27 08:53:27 +00:00
rMontagne
f622108d30 [BO] Fix IE bug for adding Images
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11760 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-26 13:15:00 +00:00
rGaillard
ca3ab742f0 // ImageType is now applied to a them
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11708 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 22:08:40 +00:00
aFolletete
d2f89e79ba // revert from r11699
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11702 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 21:56:00 +00:00
rGaillard
e8a3c10175 // ImageType is now applied to a them
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11700 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 21:48:40 +00:00
jBreux
186ae63083 // Fix priorities
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11679 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 20:36:47 +00:00
aNiassy
d1b68c3c47 [-] BO: Modified treatment. now the limit of upload can be modified in the "preferences" tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11666 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 18:32:30 +00:00
bMancone
e7f95cbed0 // updated warning for quantities
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11650 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 17:40:31 +00:00
lLefevre
9d8452eef0 [-] BO : #PSTEST-22 : Orthographe à revoir dans combinaisons de la fiche produit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11607 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 14:16:11 +00:00
mMarinetti
1e1141acc8 // fix #PSTEST-125
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11598 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 13:43:23 +00:00
mDeflotte
5f430e1f97 // By default virtual product don't need to have stock to be sold
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11593 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 13:29:18 +00:00
bMancone
ab214d4c37 // translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11584 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 11:35:39 +00:00
bMancone
3be610fdd2 // AdminproductsController: Quantity - added checks before updating depends_on_stock & advanced_stock_management
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11583 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 11:27:50 +00:00
bMancone
6a4eb7e768 // AdminWarehousesController: fixed association with carriers. Warehouse: fixed association with carriers. Carrier: norm & tags. AdminProductsController: added warning when using the advanced stock management without assocations with warehouses/carriers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11582 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 11:09:33 +00:00
lLefevre
923af93fc3 // fix bug virtual product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11578 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 10:30:25 +00:00
lLefevre
fda1332b58 // Change product tab loading
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11569 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 10:09:21 +00:00
vKham
c3dde0b518 // add stylesheet stats, commandes, new icon back to list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11541 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 18:10:07 +00:00
lLefevre
9a37a8af4a // fix fatal error
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11517 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:03:01 +00:00
tDidierjean
86b31d8ba7 // Change product tab loading
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11495 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 14:41:35 +00:00
lLefevre
cf9017f05f [-] FO : #PSTEST-92 : added display of size fields in attachments.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11483 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 13:57:08 +00:00
lLefevre
2367807440 [-] FO : #PSTEST-74 : change the condition of product if is a virtual product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11481 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 13:42:14 +00:00