 mDeflotte
|
da1a21fd2d
|
// Fix bug with undefined $carrier durring payment process
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15496 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 13:22:26 +00:00 |
|
|
dMetzger
|
c23203018d
|
[-] FO : fixed a great part of the cart rules with multi-shipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15494 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 13:15:15 +00:00 |
|
|
lLefevre
|
122465b198
|
[-] BO : fix #PSCFV-2467 : Now, You can update your theme in AdminThemes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15490 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 12:22:54 +00:00 |
|
|
mDeflotte
|
9763cc1d07
|
// Normalize php doc commentary
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15488 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 09:59:26 +00:00 |
|
|
mDeflotte
|
b1451fed85
|
// Remove unusefull assignation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15486 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 09:58:45 +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 |
|
|
aFolletete
|
67c9cff587
|
// add comment
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15481 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 09:42:19 +00:00 |
|
|
mDeflotte
|
1cd6735093
|
// Fix bug with multishipping shipping cost
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15480 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 09:38:29 +00:00 |
|
|
aFolletete
|
f41b5ba922
|
[+] Classes : include new method isXmlHttpRequest() in Controller class, allows to make ajax request without ajax=1 in GET parameter
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15479 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 09:38:11 +00:00 |
|
|
rMalie
|
76a079bd8f
|
// Remove 'multishop' => true from Employee and AttributeGroup
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15478 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 09:13:23 +00:00 |
|
|
vChabot
|
529460cfa9
|
[-] BO : BugFix : #PSCFV-2465 : When creating a shop without importing categories, I can still see the default category from other shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15474 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 08:20:19 +00:00 |
|
|
vAugagneur
|
e8b54ff8fa
|
//small check
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15471 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 07:23:31 +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 |
|
|
dMetzger
|
165d90925d
|
[-] BO : refresh currency rates button fixed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15450 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-19 14:40:10 +00:00 |
|
|
rMalie
|
f2e68e1253
|
// Multishop entities are not created anymore in ObjectModel->update(), they are only updated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15446 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-19 13:39:39 +00:00 |
|
|
aFolletete
|
a5dfa315dd
|
// fix issue on link in email
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15444 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-19 13:31:10 +00:00 |
|
|
dMetzger
|
7fdea61289
|
[*] FO : cart summary is adapted to cart rules with a special "friendly" display
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15442 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-19 13:26:21 +00:00 |
|
|
fBrignoli
|
5a0762e830
|
[-] BO : Bug fixed #PSCFV-2443 - Incorrect default tab for my new employee
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15439 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-19 13:12:38 +00:00 |
|
|
vChabot
|
b71fee03d1
|
[-] BO : BugFix : #PSCFV-2440 : Impossible to delete a shop with share option
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15431 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-19 12:23:58 +00:00 |
|
|
tDidierjean
|
26c1e8ded3
|
// fix product list by category when ordering by update date
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15430 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-19 12:14:45 +00:00 |
|
|
dMetzger
|
f907523250
|
// Cart rule autoadd fixed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15429 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-19 12:03:13 +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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|