dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,476 Commits 9 Branches 19 Tags
54fd09b72e21bf723d77092dab0bebdd05839708
Commit Graph

344 Commits

Author SHA1 Message Date
bLeveque
6f00731fba [-] INSTALLER : Fixed a missing "echo" at Step 3 in the SMTP configuration 
[-] BO : Fixed a French hardcoded page (Favorites Views)
[-] BO : Fixed a typo ("Informations" => "Information")
[*] BO : Improved the UI of the Combinations generator and added some explanations - #PSCFV-770
[*] MO : Added a # before the order number in the e-mail sent to the merchant when an order is placed

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15461 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 20:55:05 +00:00
rGaillard
5eda4dea56 [-] BO: Fix specific price final price 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15452 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 15:01:13 +00:00
rGaillard
1bd51177f8 [-] Core: Fix PSCFV-2109 specific prices when updating product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15451 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 14:55:28 +00:00
rMalie
639b1f2368 // Remove AdminProductsController->cleanMultishopFields 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15449 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 14:02:59 +00:00
fBrignoli
67638494fc [-] BO : CONTEXT_ALL shouldn't display a product price 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15411 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 09:32:07 +00:00
mDeflotte
2fd7807ae5 // Fix bug with js inclusion 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15394 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-18 15:25:33 +00:00
vChabot
98ff09c8ee // removing shop associations from product page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15391 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-18 15:13:36 +00:00
vChabot
37a23c8562 [-] BO : BugFix : #PSCFV-2374 : After creating a shop without category, category default from product displays wrong name 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15390 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-18 15:03:49 +00:00
vChabot
de9295b98a // fix on product update and creation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15383 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-18 14:45:41 +00:00
rGaillard
6223b5e939 // Fix product stocks on multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15380 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-18 14:33:09 +00:00
vChabot
4be86528da // products can be filtered by category again 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15370 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-18 13:18:17 +00:00
tDidierjean
4c1c549c8a [-] BO : fix #PSCFV-2377 - missing JS files when saving product with errors 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15338 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-16 13:31:44 +00:00
tDidierjean
af8fee03db [-] BO : fix #PSCFV-2369 - post data is lost if there is an error while saving 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15332 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-16 09:38:59 +00:00
vChabot
20842abdf9 [-] BO : BugFix : #PSCFV-2205 : Cannot associate shop with products 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15317 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-15 15:51:42 +00:00
vChabot
3186567f95 // little fix alias sql product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15315 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-15 14:51:06 +00:00
vChabot
42b3e483b7 // little fix sql categories and product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15307 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-15 09:46:04 +00:00
vChabot
f92adc9626 [-] BO : Categories do not appear in allshop context 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15302 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-15 08:47:36 +00:00
vChabot
a2fbba7823 [-] BO : BugFix : #PSCFV-2206 : Cannot change active or inactive for a product with multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15295 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-15 07:51:46 +00:00
lLefevre
d8b5cf93f3 [-] FO : #PSCFV-2150 : Translations of back office are connected width sprintf() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15279 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-14 14:38:07 +00:00
lLefevre
897c6acb82 [-] FO : #PSCFV-2151 : Translations of errors are connected width sprintf() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15265 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-14 11:45:41 +00:00
fSerny
73fcd280f5 [-] PROJECT : Deleting duplicate hook - #PSCFV-163 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15231 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-11 14:34:57 +00:00
tDidierjean
cf002df6f2 [-] FO : fix #PSCFV-548 - when ordering out of stock downloadable product, the download is not available in order history 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15174 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 13:54:05 +00:00
vSchoener
9a80c774e9 // Delete Accounting #2 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15166 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 10:36:05 +00:00
vSchoener
2c8eb3fa4e [-] BO : Delete accounting 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15153 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 09:30:04 +00:00
tDidierjean
5de7280e23 // Deactivate accounting tab in BO product page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15142 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 08:05:12 +00:00
tDidierjean
ca3c567eca [-] BO : fix bug #PSCFV-2239 - js error on product page on IIS + PHP5.4 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15135 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 16:50:05 +00:00
vChabot
c93160238e [-] BO : BugFix : #PSCFV-1297 :Multistore: admin can delete special price of another shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15128 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 15:54:03 +00:00
tDidierjean
9fd31eff19 [-] BO : fix bug #PSCFV-1597 - image upload size display 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15083 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-07 14:04:11 +00:00
tDidierjean
e8bedcf49b // fix #PSCFV-2176 js error 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15078 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-07 08:44:30 +00:00
vChabot
f4debb57a1 [-] BO : BugFix : #PSCFV-1297 : Multistore: admin cannot delete special price of another shop anymore 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15045 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 14:07:34 +00:00
tDidierjean
6a9f1510d5 [-] BO : fixed #PSCFV-2176 - missing confirmation when deleting product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15040 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 12:51:09 +00:00
rMalie
f5f9ee023d // Rename treeview to treeview-categories 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15022 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 08:10:10 +00:00
rMalie
5ed0a86ad6 // Fix product quantities in mono shop #PSCFV-2118 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14958 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-27 14:30:44 +00:00
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