Commit Graph
5405 Commits
Author SHA1 Message Date
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 f5b7e23ffe // Fix tmp image deletion for carriers #PSCFV-2435
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15424 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 10:47:09 +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
tDidierjean 98c770118f // move sql to latest upgrade file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15421 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 10:41:22 +00:00
tDidierjean 0a7c709d1a // Upgrade sql fixes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15420 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 10:40:20 +00:00
dMetzger b5bc94f78c // Cart must not be null when given to a module
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15419 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 10:32:38 +00:00
dMetzger 1f555e5111 // Keep the behavior of the 1.4 for displayMaintenancePage() (retro-compatibility)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15418 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 10:25:43 +00:00
vChabot 92a56d34df [-] BO : BugFix : Creating a category in multishop updates her position as well
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15417 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 10:16:24 +00:00
rMalie c2eefbc37d // Overrides
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15416 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 10:15:46 +00:00
fBrignoli 1d54545840 // "Unknown" gender ... seriously?
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15415 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 10:03:45 +00:00
dMetzger 9875a91792 // SQL query optimization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15414 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 09:59:54 +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
aFolletete 2dc77533d7 [-] BO : fixed bug #PSCFV-2428 - fix bug on combination creation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15412 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 09:34:53 +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
dMetzger df97a11ac8 [-] BO : admin tab without multishop classes couldn't be displayed #PSCFV-2427
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15410 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 09:25:25 +00:00
rMalie 3ca67d4ebd // Fix dispatcher when no empty rewrite meta is found with friendly url
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15409 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 09:25:07 +00:00
rMalie 04f4e669d9 // Fix range price creation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15405 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 08:45:11 +00:00
fBrignoli b8ad9b0d0d [-] Installer : Order detail taxes table is now filled
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15404 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 08:35:54 +00:00
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