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

1557 Commits

Author SHA1 Message Date
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
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
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
tDidierjean
7670c2d207 [-] BO : fix bug #PSCFV-2387 - z-index fixes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15366 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-18 09:20:53 +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
fBrignoli
ae47d8b9f2 [-] BO : Bug fixed related to #PSCFV-1354 - Specific price with multishop, groups/currencies/countries should vary in function of the selected shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15353 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-16 15:51:22 +00:00
vSchoener
d00e59285c // Commit linked to my last one (ws call for module). 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15343 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-16 14:10:02 +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
lLefevre
9ed6f1265f [-] BO : fix #PSCFV-2345 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15318 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-15 16:14:36 +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
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
tDidierjean
5fd6bf99d7 [-] BO : fix bug #PSCFV-2307 - multishop: product modification applied to the wrong shop caused by race condition with ajax calls 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15300 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-15 08:34:07 +00:00
rGaillard
4d5db6db39 [-] BO: Fix displaying of specific price rule conditions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15280 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-14 14:53:34 +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
rMalie
2f05ac0c45 // Fix bug with checkbox and multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15278 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-14 14:24:48 +00:00
vAugagneur
50a7847b2b [-] FO : fixed bug #PSCFV-1286 - live edit bug when module name contains "_" 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15266 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-14 12:21:10 +00:00
rMalie
f3ad820a08 // Fix attribute values creation in multishop #PSCFV-2313 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15264 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-14 10:22:51 +00:00
vChabot
0b8e21fc01 [-] BO : BugFix : #PSCFV-2260 : Admin in one shop can see categories from another shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15227 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-11 13:56:15 +00:00
tDidierjean
bf27e6a93a // small js fixes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15224 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-11 13:39:08 +00:00
tDidierjean
403d22ac5c [-] BO : fix #PSCFV-2302 - import: bug with truncate confirmation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15211 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-11 09:47:57 +00:00
mBertholino
11dfb5bd67 [-] BO : #PSCFV-2255 - overide helper/options in admin-dev/themes/.../stores 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15197 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 18:48:43 +00:00
gCharmes
3675224eda [-] BO : Add check to avoid redefine _PS_BASE_URL_ on the admin init 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15195 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 17:16:06 +00:00
lLefevre
bf17db5463 [-] BO : #PSCFV-731 : change type int by string for zipcode_from and zipcode_to 
&& check this zip codes
 && display errors
 && normalize

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15187 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 15:50:44 +00:00
vChabot
d968158b55 [-] BO : BugFix : #PSCFV-2209 : Multishop : cannot delete shops with dependencies 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15175 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 14:09:11 +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
aFolletete
47cfd2b9f9 [-] BO : fixed bug #PSCFV-1296 - Can't add a product in order (BO) 
// Fix backward compatibility issue with updateQty method

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15152 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 09:29:46 +00:00
vChabot
f324abe5fd [-] BO : BugFix : #PSCFV-2242 :CSV Import - Issues with products 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15148 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 08:59:21 +00:00
rMalie
dc10a038d1 // Fix click on "all" checkbox on adminproduct for multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15143 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 08:07: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
dMetzger
58bca9ddb4 // Missing translation #PSCFV-2246 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15122 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 15:14:03 +00:00
rMalie
ccfef659c9 // Multishop interface reworked 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15121 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 15:05:39 +00:00
rGaillard
7df7f7aac4 [+] BO: The customizable products are now usable in the BackOffice order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15109 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 14:04:13 +00:00
tDidierjean
0416403b37 [-] BO : fix bug #PSCFV-2251 - http_build_query must fix arg_separator 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15104 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 13:39:19 +00:00
vAugagneur
73a5cc497d //small fix #PSCFV-2139 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15085 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 08:27:40 +00:00
rGaillard
4dd85be713 [-] BO: Fix the pictures link customized datas 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15084 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-07 16:00:54 +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
lLefevre
642a8c1436 // Remove code unused 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15075 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-04 13:30:23 +00:00
mDeflotte
207256d960 [-] BO : #PSCFV-858 - Rest to paid warning must be changed if the order is overpaid 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15074 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-04 12:54:29 +00:00
tDidierjean
2933edeef6 // fix possibility of duplicate id with textareas in helperform 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15070 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-04 09:38:40 +00:00
tDidierjean
c6be7c30d9 [-] BO : fix bug #PSCFV-341 - ajax call could be made twice for the same product tab 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15065 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-04 08:55:16 +00:00
tDidierjean
0a3b557228 // #PSCFV-737 : BO - don't display shipping information for virtual order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15062 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 16:16:34 +00:00
tDidierjean
da26e0301c // update tinyMCE setup on product page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15058 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 15:37:32 +00:00
rGaillard
068f98b5e5 [-] BO: Fix PSCFV-1439 BackOffice order switching language 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15057 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 15:32:41 +00:00
tDidierjean
746f47fef3 [-] BO : fixed #PSCFV-1239 - tinyMCE issue on IE8 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15056 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 15:27:14 +00:00
aFolletete
41184a7620 [-] BO : fixed bug #PSCFV-2180 - Not auto height with long name shop 
// Clean HTML, JS, CSS code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15043 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 13:48:58 +00:00
dMetzger
cfe25a54e1 // Improvement in the resolution of #PSCFV-2159 (I did not fix the bug, but I fixed a wrong display that hide the real bug) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15042 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 13:14:36 +00:00