 tDidierjean
|
a84328a595
|
// fix image file upload for IE
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15563 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 17:49:28 +00:00 |
|
|
rMalie
|
9291b9ad1f
|
// Fix list of customers in multishop #PSCFV-2499
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15562 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 17:44:38 +00:00 |
|
|
dMetzger
|
477bcc6b58
|
// Cart display improved with free shipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15560 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 17:33:51 +00:00 |
|
|
mDeflotte
|
4b1cce7054
|
// Fix bug with gift products and multishipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15558 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 17:31:43 +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 |
|
|
dMetzger
|
19b486d1e4
|
// Norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15550 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 17:09:21 +00:00 |
|
|
dMetzger
|
fc33b24f3d
|
[-] FO : wrong calcul of the free shipping in multi-shipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15548 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 17:08:16 +00:00 |
|
|
rMalie
|
5b1964b812
|
// Groups with only 1 shop are not disabled anymore in multishop toolbar
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15544 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 16:52:07 +00:00 |
|
|
rMalie
|
962a641bd9
|
// Fix multishop on Category->getChildrenWithNbSelectedSubCat() (best name ever)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15543 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 16:51:09 +00:00 |
|
|
dMetzger
|
8428e228e3
|
// typo
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15539 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 16:17:53 +00:00 |
|
|
mDeflotte
|
b621e0f9eb
|
[-] BO : #PSCFV-2473 - Fix bug with attribute value and shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15531 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 15:32:56 +00:00 |
|
|
rMalie
|
a75cf1475d
|
// Fix multishop management in ObjectModel
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15530 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 15:29:28 +00:00 |
|
|
aFolletete
|
6c305ba98c
|
// little optimization in autoloader, we exclude smarty classes of treatement
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15527 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 15:18:59 +00:00 |
|
|
dMetzger
|
1d3126f99d
|
// Code cleaning and small fixes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15524 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 15:17:21 +00:00 |
|
|
rGaillard
|
d422dae42a
|
// Delete isXmlHttpRequest
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15523 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 15:14:29 +00:00 |
|
|
dMetzger
|
d3b853a686
|
// variable misnamed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15519 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 14:50:13 +00:00 |
|
|
fBrignoli
|
f76832e0ff
|
[-] BO : Bug fixed related to #PSCFV-2490 - Created group doesn't appear in my shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15515 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 14:30:37 +00:00 |
|
|
rGaillard
|
19c239b0b7
|
// Fix SQL error in the product listing on multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15514 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 14:30:28 +00:00 |
|
|
dMetzger
|
3fc24ec862
|
// variable misnamed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15513 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 14:29:54 +00:00 |
|
|
dMetzger
|
0ebae2397a
|
// variable misnamed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15512 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 14:28:34 +00:00 |
|
|
dMetzger
|
f5483f787d
|
[-] FO : added the concept of product package (multi-shipping) for the cart rules in getContextualValue()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15510 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 14:19:54 +00:00 |
|
|
vSchoener
|
1dfcca6270
|
[-] FO : Fix SSL redirection
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15507 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 14:02:24 +00:00 |
|
|
rGaillard
|
ff9720fc6d
|
// Fix product bug when no quantity was added for new products attributes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15506 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 14:00:17 +00:00 |
|
|
aNiassy
|
9cae11c7bc
|
[-] FO : #PSCFV-2478 : Fixed a problem with payment method which displays an error when a product created in multi-shop was chosen
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15499 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 13:24:03 +00:00 |
|
|
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 |
|