Commit Graph

311 Commits

Author SHA1 Message Date
tDidierjean
2a97927eba // #PSTEST-1229 - make sure you cannot select virtual product if you have combinations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14857 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 16:45:00 +00:00
tDidierjean
8f4a8b1b5c // #PSTEST-1229 - remove virtual combinations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14844 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 13:23:02 +00:00
rMalie
d6f7da35ab // Fix list of adminProducts (was called twice, causing a bug on multishop product lang)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14837 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 09:15:19 +00:00
lLefevre
6683903b1a [-] BO : Fix #PSFV-868 : Unity price can be set
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14815 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 13:41:36 +00:00
vChabot
d788baee35 // add condition isProductFieldUpdated to product and category association
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14790 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-20 15:26:41 +00:00
rMalie
33d8a79b0b // Combination multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14786 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-20 10:01:05 +00:00
vChabot
e8dfa8311d // BO : product form improved (categories association)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14777 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-19 16:18:58 +00:00
tDidierjean
8bb5cd701f // Fix errors on product combinations edition page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14776 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-19 15:41:52 +00:00
rMalie
4dc087b286 // Fix product SEO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14775 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-19 15:06:15 +00:00
tDidierjean
41d8630e97 [*] BO : #PSFV-865 - it is now possible to use drag and drop positions in custom controllers using HelperList
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14740 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-18 15:48:38 +00:00
tDidierjean
61305d4a36 [-] BO : fix #PSTEST-1172 - do not sort all products list by position
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14719 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-18 09:43:50 +00:00
vChabot
530937a495 // categories association for product with multishop and context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14713 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-18 08:48:42 +00:00
tDidierjean
03afca360c [-] BO : fix #PSTEST-1170 - broken suppliers edition in product page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14696 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 16:00:31 +00:00
bMancone
7d533b3189 // Fixed exceptions when saving products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14693 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 15:56:04 +00:00
rMalie
e7b7ab9371 // Fix ObjectModel::updateMultishopTable() for Combination
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14690 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 15:29:07 +00:00
rMalie
0ed295a94a // Fix id_tax_rules_group assignation on product edtion
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14684 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 14:05:29 +00:00
rMalie
0c2dd0cd2f // MERGE product_multistore branch : product fields are now editable per shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14682 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 13:32:12 +00:00
tDidierjean
ca71733f00 [*] BO : #PSTEST-1157 - Ajax deletion of virtual file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14668 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 08:07:35 +00:00
lLefevre
4e61be6b9e [-] BO : fix #PSFV-866 : Add the missing hook for update a product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14654 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-16 12:57:38 +00:00
bMancone
ea4e871897 // Fixed AdminProductsController : could not save product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14643 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-16 08:30:09 +00:00
tDidierjean
2db490b3c2 [-] BO : fix bug #PSFV-839 - Reset products features while editing products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14640 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-13 16:03:05 +00:00
tDidierjean
244a2f9102 [*] BO : #PI-123 - toolbar and page title refactoring
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14594 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-12 08:34:38 +00:00
lLefevre
26e1fb7158 [*] BO : fix #PSTEST-1140
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14572 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-11 13:40:47 +00:00
lLefevre
13f16490a7 [*] BO : #PSFV-696 : add attachment when we duplicate a product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14560 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-10 16:23:37 +00:00
tDidierjean
f5b4f351fa // PI-116 - attribute default refactoring
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14525 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-06 11:59:29 +00:00
lLefevre
ef424cadc4 [-] BO : fixed #PSFV-722
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14518 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-06 09:14:22 +00:00
tDidierjean
ec94cb35b9 // refactor parameters
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14454 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-04 13:08:25 +00:00
tDidierjean
e1a98ac876 [-] BO : fix #PSTEST-1128 - when saving a pack, a validation error causes pack data loss
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14451 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-04 12:38:42 +00:00
tDidierjean
8b46657cae // More BO product page cleanup
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14436 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-03 16:54:00 +00:00
tDidierjean
5b3159a408 [*] BO : #PI-107 refactoring product page JS - adding ProductTabsManager
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14421 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-03 09:34:56 +00:00
tDidierjean
b9319b9796 // #PI-107 BO product page JS refactoring
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14405 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-02 12:46:47 +00:00
tDidierjean
e288be915e // Rename fieldsDisplay to fields_list part2 (timeout)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14377 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-29 16:29:31 +00:00
vChabot
fc44d1a51f // little fix when bulk deleting products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14346 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-28 15:56:51 +00:00
tDidierjean
0d22f3ad08 [*] BO : #PI-84 - virtual product page has been remade
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14323 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-28 10:03:24 +00:00
tDidierjean
d752b192f5 // Refactoring: remove $token arg from process functions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14269 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-26 15:25:36 +00:00
lLefevre
a7a05b7637 // Fix replace \\" by " in english keys and change french keys for errors files
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14180 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-15 08:31:12 +00:00
lLefevre
0e9e23aaae // Fix update english key of translations in all files
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14143 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-14 12:25:51 +00:00
tDidierjean
884bf14228 // Move customization fields processing to general product processing
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14138 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-14 10:15:51 +00:00
tDidierjean
1341dcf329 [*] BO : #PSFV-481 - Refactor HelperList position management
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14099 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-13 16:22:23 +00:00
mDeflotte
ec1671e226 [-] BO : #PSFV-646 - Fix problem with button save & preview
// Replace some "else if" by "elseif"

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14030 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-12 10:32:07 +00:00
tDidierjean
47f0aa1593 [-] BO : fix bug #PSTEST-1003 - Saving product attached documents redirect to informations tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13993 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-09 09:57:17 +00:00
rMalie
48e9590cf4 // Normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13991 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-09 09:19:30 +00:00
mDeflotte
8faf31d00d [-] FO : #PSTEST-981 - Minimal quantity not setted correctly on combibination
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13931 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-07 15:13:30 +00:00
bMancone
ec6e70b5ff // Added quantity field when listing the products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13883 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-06 13:05:50 +00:00
vChabot
000e05602b [-] BO : Bugfix : #PSFV-619 : removing the ability to add a new root category if you are not in multishop
// category tree improved

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13856 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-05 16:52:58 +00:00
mDeflotte
fac7db1502 [-] BO : #PSFV-600 - Fix bug with Controller::addJqueryUI
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13805 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-01 17:05:49 +00:00
bMancone
1761520097 // Improved stock management for packs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13789 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-01 14:28:56 +00:00
bMancone
ed6fb12963 // Updated mailalerts module
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13780 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-01 13:32:16 +00:00
bMancone
78237c7f48 // Fixed #PSFV-464
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13743 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-29 14:45:34 +00:00
tDidierjean
7a6a998aab // rename $toolbar_fix to $toolbar_scroll part2
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13712 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-28 17:39:40 +00:00