dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,997 Commits 9 Branches 19 Tags
6d90aaec1cc4063ca49b2f42e5cdcd6430231d03
Commit Graph

1520 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
vChabot
79e53679b5 // product import improved (image problem because of file_exists PHP function) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14852 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-24 14:39:29 +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
lLefevre
142bb01271 [-] BO : Fix #PSTEST-1220 : now position update for attribute value is good && fix JavaScript error in admin-dnd.js 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14843 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-24 12:59:17 +00:00
lLefevre
2fa47bf4b5 [-] BO : Fix #PSTEST-1217 : fatal error when all carrier are free 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14841 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-24 09:51:03 +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
f6cf5fdf88 [-] BO : Fix #PSTEST-1185 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14828 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-23 16:17:20 +00:00
tDidierjean
efe2c50d4d [-] BO : fix #PSTEST-697 - remove cancel button in category list 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14823 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-23 15:06:32 +00:00
rMalie
b9fe1bb36b // Add a multishop restriction on address in BO #PSTEST-1035 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14820 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-23 14:27:08 +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
rMalie
e50fa1ae2a // Fix // Fix left join on product_attribute_shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14813 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-23 13:29:24 +00:00
lLefevre
6b387a1e43 [-] BO : PSTEST-1216 : Fix translations lost 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14811 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-23 13:07:32 +00:00
rMalie
0be8cc5693 // Fix left join on product_attribute_shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14809 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-23 13:01:02 +00:00
lLefevre
610d582d0f // Fix deutsch subject mail and encoding characters in mails 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14805 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-23 09:42:13 +00:00
lLefevre
560c2bee11 // Refacto AdminTranslationsController : normalize 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14802 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-23 09:18:52 +00:00
bMancone
53821dd3ad // When viewing an order, a warning is now displayed if one/some product(s) are out of stock - #PSTEST-821 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14801 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-23 08:26:10 +00:00
bMancone
9ea9bd183c // When viewing an order, the stock_available is now properly displayed. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14800 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-23 08:15:23 +00:00
lLefevre
b5d6b66f24 // Refacto AdminTranslationsController : now you can translated your files by themes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14799 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-23 08:11:54 +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
c0a6bfaf9c [-] BO : fix #PSTEST-1176 - Modules positions drag and drop - ajax process is broken, page JS too 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14764 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-19 12:20:47 +00:00
mDeflotte
19961a5438 [-] Project : #PSFV-820 - Cartrules are now reapplied each time we add/remove a product on/from the cart 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14760 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-19 09:39:14 +00:00
mDeflotte
37401cd8fa // Removing debug function call 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14759 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-19 09:16:11 +00:00
tDidierjean
dac784f83e [-] BO : fix #PSTEST-1175 - duplicate text in toolbar in AdminAttributesGroups 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14755 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-19 08:40:13 +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
rMalie
342ab72ed1 // Change order of fields in ShopGroup creation #PSTEST-690 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14738 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-18 15:19:36 +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
dMetzger
713d17d14a // Fixed technical bug with an int that exceeded the size of an int... 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14718 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-18 09:42:57 +00:00
bMancone
c44c2c9f4e // Fixed prefixes for the product_shop table 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14715 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-18 09:24:43 +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
rGaillard
d07623cbc2 [*] BO: Set defaults payment order state on BackOffice order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14694 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 15:56:38 +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
fBrignoli
03b504e06e [-] BO : Bug Fixed #PSFV-339 - Multishop logo 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14683 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 13:34:59 +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
mDeflotte
d4d1c35cb9 [-] BO : #PSCFI-5378 - Create voucher from the BO after a product return 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14681 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 13:19:13 +00:00
bMancone
ffebd91170 // Normalize AdminWarehousesController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14679 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 12:24:43 +00:00
bMancone
d3b0c7fec1 // Fixed warehouses/carriers associations - #PI-134 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14678 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 12:21:22 +00:00
lLefevre
7e3e03b869 [-] BO : fix #PSFV-870 : translations modules 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14677 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 09:51:55 +00:00
bMancone
caf154c77d // Fixed #PSTEST-1146 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14676 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 09:49:55 +00:00
mDeflotte
d0809600a0 [-] BO : #PSFV-434 - Bad product total calculation (confusion with wt) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14672 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 09:08:54 +00:00
dMetzger
04797eb90b [-] BO : fixed double in the product list of the cart rules when multi-shop is activated #PSTEST-1154 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14669 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 08:09:16 +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
rGaillard
1e1970e13c // Fix default carrier selection on backoffice order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14660 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-16 14:03:07 +00:00
bMancone
285becae29 // Fixed stock_available when ordering products 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14656 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-16 13:39:15 +00:00