Commit Graph

5386 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
lLefevre
c5e22e50eb // Fix themeInstallor error
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15401 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 16:03:05 +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
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
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
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
lLefevre
79703661d7 [-] BO : fix #PSCFV-2359 : change name default theme in module themeinstallator
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15388 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 15:00:46 +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
lLefevre
13c6eec6fd [-] BO : fix #PSCFV-2364 : Now we can selected of modules which must be disabled
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15385 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 14:52:20 +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
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
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
mDeflotte
94922d1c53 // Fix little bug with theme installator
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15378 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 14:27:38 +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
aFolletete
c57061f759 [-] FO : fixed bug #PSCFV-2393 - On Linux system there is a little problem around the "link <a>"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15376 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 14:14:36 +00:00
lLefevre
b6ba7e6ae6 [-] BO : fix #PSCFV-2364 : Now we can exported a theme of all shops
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15375 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 14:07:45 +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
mDeflotte
8983c48a83 [-] MO : #PSCFV-2354 - Remove chars number limit of version number
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15373 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 13:54:10 +00:00
lLefevre
6b9b80a097 // Fix themeInstallor error
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15372 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 13:44:26 +00:00
lLefevre
6d51787798 [-] BO : fix #PSCFV-2364 : Now we can imported a theme in each shop && normalize && translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15371 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 13:41:51 +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
mDeflotte
fd43da9f1c [-] MO : #PSCFV-2356 - Theme installor - Check one theme at least is selected before exportation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15369 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 13:01:26 +00:00
aFolletete
b22d4f7661 [-] MO : Add ModuleController in ProductComments
// refacto ProductComments

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15368 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 10:09:02 +00:00
mDeflotte
5eb050b89c [-] MO : #PSCFV-2357 - Fix bug with error displaying
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15367 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 09:37:39 +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
mDeflotte
c30fff9b49 [-] MO : #PSCFV-2349 - Fix bugs with theme export
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15365 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 09:08:29 +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
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
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
814ba7059d // invoice translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15355 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-16 16:28:36 +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
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
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
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