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

1654 Commits

Author SHA1 Message Date
fBrignoli
54fd09b72e [-] BO : Bug fixed #PSCFV-2474 - Missing shop association when creating a manufacturer with a logo 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15498 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 13:23:49 +00:00
rGaillard
2553bc015e [-] BO: Fix PSCFV-2442 product price on backoffice order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15493 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 13:05:16 +00:00
vChabot
c6320cebc7 [-] BO : BugFix : #PSCFV-2481 : Scene creation needs to show categories from context 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15492 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 12:57:32 +00:00
vChabot
6f50b2bd9c [-] BO : BugFix : #PSCFV-2476 : Shop creation : adding an error message if you do not select at least the root category 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15491 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 12:29:37 +00:00
fBrignoli
11df2e41e7 [-] BO : Bug Fixed #PSCFV-2470 - Group by id_category 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15483 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 09:45:47 +00:00
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
dMetzger
165d90925d [-] BO : refresh currency rates button fixed 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15450 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 14:40:10 +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
vChabot
6e4b178fa4 [-] BO : BugFix : #PSCFV-2441 : Shop creation : unable to save parameters 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15448 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 13:52:52 +00:00
lLefevre
c344ae2385 [-] BO : fix #PSCFV-2381 : now count translations fields are good and translations... 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15443 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 13:26:27 +00:00
rMalie
787b320031 // Fix check of duplicat urls for shops 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15435 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 12:49:04 +00:00
vChabot
c9ddab2cf5 // update condition 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15434 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 12:38:08 +00:00
aFolletete
098e0fbc35 [-] BO : fixed bug #PSCFV-2436 - fix bug on product adding on order page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15425 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 10:52:04 +00:00
rMalie
5781694b9f // Fix multishop checkbox on theme selection 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15423 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 10:43:01 +00:00
aFolletete
6230b51db1 [-] BO : fixed bug #PSCFV-2434 - FIx bug on Product line edition in order page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15422 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 10:41:51 +00:00
vChabot
0a6da05301 [-] BO : BugFix : #PSCFV-2423 / #PSCFV-2424 : .htaccess generation is improved (description updated if you cannot generate your htaccess) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15413 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 09:41:44 +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
aFolletete
a3e1a4bdd3 [-] BO : fixed bug #PSCFV-2342 - fix issue on Admin Tab position 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15398 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-18 15:53:54 +00:00
rMalie
b635abaf30 // Fix admin carriers multishop bug #PSCFV-2380 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15397 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-18 15:44:46 +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
rMalie
76b9e4ec08 // Remove updateAssoShop() from admin categories controller 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15393 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-18 15:25:07 +00:00
dMetzger
b9026f8241 [-] BO : module tab crashed when trying to update a module that wasn't loaded (because of the XML cache file) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15392 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-18 15:20:05 +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
rMalie
a37dbc1e44 // Fix lot of multishop bugs (updateAssoShop reworked, remove multishop property for country / zone / currency / carrier, getList()) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15386 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-18 14:54:37 +00:00
mDeflotte
5a01b62e6b // Missing ";" 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15384 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-18 14:51:18 +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
rGaillard
66c9b52d43 // Fix product stocks on multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15379 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-18 14:32:29 +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
fSerny
63041b0b31 [-] BO : Fix scroll when errors occurred on modules 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15358 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-17 00:07:03 +00:00
vSchoener
6ebbfd3925 [-] BO : Fixed bug #PSCFV-1590. Save restrictions won't delete the ones for inactive module. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15354 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-16 16:15:55 +00:00
vSchoener
232d487b67 [+] CORE : Add statistic request for theme too (refacto of the last commit for module) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15351 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-16 15:22:09 +00:00
vChabot
92e91afc01 [-] BO : BugFix : #PSCFV-2343 : Group discount does not show associated categories properly 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15344 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-16 14:11:20 +00:00
vSchoener
2bf53431b3 [+] BO : Request when a module is installed is sent to the webservice. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15342 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-16 14:06:51 +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
vChabot
bb1fa8fd52 [-] BO : BugFix : #PSCFV-2373 : Problem on country creation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15336 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-16 13:17:07 +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
lLefevre
34c96972cf [-] BO : fix #PSCFV-2318 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15323 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-15 18:21:00 +00:00
lLefevre
a006f23a5b [-] BO : fix #PSCFV-2316 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15322 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-15 18:03:17 +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
mDeflotte
ea7e73ef35 [-] BO : #PSCFV-139 - Improving Retial refund 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15316 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-15 14:58:02 +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
lLefevre
4251021163 [-] BO : #PSCFV-2336 : Now importation of lang pack is moving in selected themes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15314 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-15 14:45:52 +00:00
lLefevre
a0b9410861 [-] FO : #PSCFV-67 : Translation english updated and english keys update in all languages 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15310 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-15 10:04:43 +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
vAugagneur
c9d6e1bcec [-] BO : fixed bug #PSCFV-521 - range fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15306 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-15 09:39:47 +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