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

1579 Commits

Author SHA1 Message Date
tDidierjean
4fcc657a56 [-] BO : fix bug #PSCFV-2522 - Unable to switch a product from virtual to normal 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15621 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-22 13:23:35 +00:00
rMalie
3c41954293 // Improve multishop page ergonomy 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15620 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-22 13:16:48 +00:00
lLefevre
d8569a1ab1 // Fix small bug 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15579 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 19:04:58 +00:00
aFolletete
545abdbc24 [-] BO : fixed bug #PSCFV-2503 - fix issue on stock update when product line edition in order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15566 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 18:04:07 +00:00
rGaillard
18160ffa65 // Little fix on order page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15561 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 17:38:55 +00:00
lLefevre
9c00c0eb1e [-] BO : fix #PSCFV-2366 : check if an sentence use an specific syntax 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15559 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 17:31:48 +00:00
fSerny
d3c4a7a617 // Small fix on Admin 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15557 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 17:25:26 +00:00
vAugagneur
b67a4fdd77 //fixed #PSCFV-2432 part 3 for IE :p 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15552 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 17:15:51 +00:00
rGaillard
8b589b02c0 [*] BO: Add free shipping to BackOffice Order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15551 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 17:11:00 +00:00
vAugagneur
4b4f1be743 //fixed #PSCFV-2432 part 2 for IE 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15547 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 17:07:51 +00:00
vAugagneur
0f91f91030 //fixed #PSCFV-2432 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15546 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 17:01:22 +00:00
rGaillard
d1e74ce3be // Display warning if no address is available in backoffice order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15529 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 15:27:11 +00:00
rGaillard
ac08ba378b // Product is now correctly inserted in product_shop for existant products 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15484 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 09:46:53 +00:00
rGaillard
c22c0d97f7 // Add information on BackOffice Order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15475 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 08:48:55 +00:00
lLefevre
56690036fb [-] BO : fix #PSCFV-2365 : add message for using the sprintf() in yours translations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15473 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 08:10:20 +00:00
bLeveque
6bd5e1dce6 [-] BO : Fixed an issue with htmlentities() 
[-] BO : Fixed the Sample file for Categories Import - #PSCFV-1960

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15463 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 22:15:58 +00:00
jObregon
4476b69cac [-] BO : Fixed bug #PSCFV-2288. _PS_ADMIN_DIR_ was not defined 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15462 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 22:03:35 +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
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
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
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
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