Commit Graph

2154 Commits

Author SHA1 Message Date
rMalie
9b0086777e // Fix bug in installer (ignore .svn folder when tmp img are deleted)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15403 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 08:30:29 +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
rMalie
de2aedaa89 // Remove useless multishop code in manufacturers #PSCFV-2394
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15396 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 15:35:56 +00:00
rMalie
5ab581afbe // Remove useless multishop code in manufacturers #PSCFV-2394
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15395 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 15:30:52 +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
tDidierjean
0aace1a73a // revert multishop declaration in definitions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15389 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 15:03:30 +00:00
aFolletete
c1beaa6ca8 // revert issue multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15387 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 14:57:47 +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
aFolletete
dc242942d7 [-] BO : fixed bug #PSCFV-2390 - Suppliers multishop issue
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15382 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 14:43:56 +00:00
tDidierjean
43e2d300c3 [-] BO : fix bug #PSCFV-2383 - adding warehouses not working
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15381 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 14:41:20 +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
502e5a216f [-] BO : fix bug #PSCFV-2402 - scenes creation with multishop is broken
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15377 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 14:15:11 +00:00
tDidierjean
054ed013ee [-] BO : fix #PSCFV-2322 - cannot deactivate multishop with only one shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15374 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 14:04:03 +00:00
tDidierjean
7e0f57aa94 [-] BO : fix bug #PSCFV-2397 - broken language import with multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15364 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 08:51:57 +00:00
fBrignoli
36582b7023 [-] Classes : Bug Fixed #PSCFV-1271 - Order confirmation email + tax excl group
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15362 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 08:40:54 +00:00
fSerny
e18bcf9733 [*] PROJECT : Adding hook on FrontController and AdminController SetMedia method
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15361 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-17 17:55:01 +00:00
fSerny
c2e4d227d6 // norm on previous commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15360 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-17 14:26:35 +00:00
fSerny
53d16fd889 [*] PROJECT : Adding hook on dispatcher
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15359 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-17 11:50:28 +00:00
fBrignoli
2b228c0c14 [-] MO : Bug fixed #PSCFV-2311 - blockspecials doesn't display discounted products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15357 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-16 16:52: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
vAugagneur
dfaf16185f //fixed #PSCFV-2379
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15347 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-16 14:31:35 +00:00
vChabot
5395188ba3 // employee can now be multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15346 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-16 14:23:33 +00:00
vAugagneur
ab5affbb09 //php version compatibility fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15345 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-16 14:16:20 +00:00
vChabot
ca945da2e8 [-] BO : BugFix : #PSCFV-2378 : Created carriers do not appear.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15339 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-16 13:40:12 +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
vChabot
ce873cebc5 [-] BO : BugFix : #PSCFV-2373 : Created currency do not appear
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15335 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-16 13:02:16 +00:00
vChabot
acb38f0904 [-] BO : BugFix : #PSCFV-2372 : Created zones do not appear
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15334 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-16 12:46:38 +00:00
vChabot
8e871f10ac [-] BO : BugFix : #PSCFV-2337 : Multishop : Attributes and values : problem creation attribute
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15328 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-16 09:05:23 +00:00
lLefevre
518e62b636 [-] BO : fix #PSCFV-2344
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15319 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-15 16:19:57 +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
fBrignoli
2e1afd8b8b [-] PDF : Bug Fixed #PSCFV-168 - Invoice discount & shipping are now correctly displayed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15313 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-15 14:22:22 +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
tDidierjean
86bf178c51 // objectmodel fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15286 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 15:21:52 +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
7e1a6d9677 // Revert revision 15263
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15277 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 14:16:54 +00:00
fBrignoli
820ebe40ad // fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15276 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 14:15:08 +00:00
fBrignoli
0bcc55a096 [-] BO : Bug fixed #PSCFV-1975 - Combination import + multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15268 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 12:55:07 +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
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
rMalie
dea9b17296 // Improve language links in dispatcher #PSCFV-1765
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15263 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 09:47:07 +00:00
fSerny
6c79f4803b [-] BO : Bug fix on module extract zip - #PSCFI-5335
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15262 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 09:40:26 +00:00
vAugagneur
9785afd5a2 //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15260 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 09:29:15 +00:00
vAugagneur
392c0f51d3 [-] BO : fixed bug #PSCFV-2285 - Unable to activate/deactivate a product from list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15248 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 08:10:19 +00:00
tDidierjean
65dc076142 [-] Classes : fix bug #PSCFV-2309 - Unable to override Shop::asso_tables
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15247 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 08:09:12 +00:00
vChabot
20f0360c27 [-] BO : BugFix : #PSCFV-2308 : Missing WHERE clause in Manufacturer::getManufacturers()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15244 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 07:46:46 +00:00
fBrignoli
b8587fab0f [-] PDF : Incorrect Order Return title
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15236 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 15:23:49 +00:00
gCharmes
e00ea0ee24 [-] FO : #PSCFV-2306 : Fixed duplicate meta title on manufacturer page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15234 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 15:18:33 +00:00