 rMalie
|
d821d474e0
|
// Fix multishop on Category->getChildren()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13621 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 13:15:02 +00:00 |
|
|
rMalie
|
4ee2698992
|
// Replace shop->addSqlAssociation() by static call
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13620 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 13:07:51 +00:00 |
|
|
rMalie
|
c2cef61a5a
|
// Replace shop->addSqlRestriction() and shop->addSqlRestrictionOnLang() by static versions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13618 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 12:15:30 +00:00 |
|
|
rMalie
|
1c2f174bdb
|
// Improve multishop_context in AdminController and rename shop->getListOfID() by Shop::getContextListShopID()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13615 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 09:49:19 +00:00 |
|
|
rGaillard
|
7fde51894d
|
// tax rules product and carriers shop association in webservices
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13600 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 11:12:12 +00:00 |
|
|
rMalie
|
6e6c69e617
|
// Fix getContextType()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13596 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 10:11:01 +00:00 |
|
|
rGaillard
|
8596c81daf
|
// Fix sql request
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13595 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 10:07:38 +00:00 |
|
|
mDeflotte
|
7e5c73c277
|
[-] FO : #PSFV-569 - Fix bug with instant search
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13593 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 09:52:37 +00:00 |
|
|
rMalie
|
d3a7ead1e2
|
// Fix shop->id in Carrier
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13589 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 09:34:54 +00:00 |
|
|
rGaillard
|
2408b4ac5f
|
[+] Core : products and carriers tax rules are associated to shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13586 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 09:26:18 +00:00 |
|
|
rMalie
|
69e2cf95d6
|
// Restore shop context in shop list and can filter shop pages per group shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13579 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 08:58:21 +00:00 |
|
|
rMalie
|
7b62fef1ee
|
// Fix shop context call
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13578 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-24 08:51:52 +00:00 |
|
|
dMetzger
|
319309528a
|
[-] FO : automatic refresh of the cart when a cart rule is added
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13577 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 18:24:23 +00:00 |
|
|
tDidierjean
|
c8b409c86a
|
// Fix bug with missing default value for date
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13575 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 17:04:18 +00:00 |
|
|
rMalie
|
2454cd7863
|
// Welcome 2012²
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13573 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 16:33:10 +00:00 |
|
|
rMalie
|
53e7fe3230
|
// Improve multishop API
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13568 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 15:54:10 +00:00 |
|
|
dMetzger
|
be71b2ddb1
|
[-] FO : cart rule fix (product restrictions mixing attributes and other criteria)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13567 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 15:54:05 +00:00 |
|
|
rMalie
|
b24dcffc9c
|
// Improve multishop API
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13566 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 15:39:44 +00:00 |
|
|
aFolletete
|
cb7965c53f
|
// Fixed bug #PSTEST-752
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13564 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 15:22:17 +00:00 |
|
|
lLefevre
|
e0805b1b96
|
[-] BO : #PSTEST-795 : Display date from and date to filters in list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13563 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 15:19:02 +00:00 |
|
|
dMetzger
|
5339d45d07
|
[+] BO : BO width can now be fixed or flexible (you can set it up in your employee account)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13560 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 14:42:23 +00:00 |
|
|
vSchoener
|
2a760a56b4
|
[+] CORE : Module properly upgraded with message even if no file upgrade file exist, add 'upgrade' button
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13551 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 11:02:35 +00:00 |
|
|
tDidierjean
|
4944752edd
|
[-] BO : fix bug #PSFV-534 - Button toolbar disappear after save if errors
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13549 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 10:34:56 +00:00 |
|
|
rMalie
|
c8e9f1f029
|
// Change RIGHT to LEFT join in shop association
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13543 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 08:34:46 +00:00 |
|
|
fGaillard
|
f4e9c87cc6
|
[-] BO : #PSFV-492 : BugFix CMS pages & categories
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13540 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-22 16:57:51 +00:00 |
|
|
bMancone
|
eb83936f23
|
// Improved SupplyOrders : states & history of reception
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13539 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-22 16:49:54 +00:00 |
|
|
bMancone
|
4233289528
|
// Fixed AdminController : existence of default_value was not accurate
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13536 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-22 16:01:18 +00:00 |
|
|
mDeflotte
|
a53e9c5e60
|
// Removing attribute 'preselect_country' and use 'default_value' instead
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13531 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-22 14:27:32 +00:00 |
|
|
rMalie
|
4e6628cbfd
|
// Remove $display_multishop_toolbar and add instead $multishop_context to manage shop context per admin controller
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13530 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-22 14:25:28 +00:00 |
|
|
dMetzger
|
7e73e088e5
|
[-] FO : ajax cart now display cart rules correctly #PSTEST-724
// Small addition to the controller override
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13527 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-22 11:02:49 +00:00 |
|
|
mDeflotte
|
ee8111c803
|
[-] FO : #PSCFI-4733 - Pagination creates pages that should not exist (and duplicate content)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13521 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-22 09:33:03 +00:00 |
|
|
aKorczak
|
48a3d631c3
|
[-] WS : Fix bug from 1.4 Groups for entity customers API
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13517 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-21 17:14:06 +00:00 |
|
|
aKorczak
|
2f34d9fc8f
|
[-] WS : Fix bug from 1.4 Groups for entity customers API
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13516 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-21 17:13:56 +00:00 |
|
|
aKorczak
|
d8bceda908
|
[-] WS : Fixed PSFV-383
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13510 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-21 15:55:38 +00:00 |
|
|
rMalie
|
92bcf0c8a3
|
// Fix theme retrocompatibility (contact-form + displayHeader)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13509 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-21 15:29:05 +00:00 |
|
|
aKorczak
|
5dc30e0954
|
//missing code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13508 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-21 15:25:18 +00:00 |
|
|
aKorczak
|
8967020600
|
//missing code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13506 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-21 15:12:48 +00:00 |
|
|
aKorczak
|
884f9d4948
|
//norm fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13505 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-21 15:06:43 +00:00 |
|
|
aKorczak
|
69e55b06df
|
[-] WS : Add tax for orders inside order_details api entity
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13504 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-21 15:05:57 +00:00 |
|
|
tDidierjean
|
c6bd82bf3e
|
[-] BO : fix bug #PSFV-322 - Action name in custom controllers is not translated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13502 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-21 14:30:23 +00:00 |
|
|
rMalie
|
798c5e8644
|
// Report $content_dir fix on 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13501 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-21 14:08:01 +00:00 |
|
|
mMarinetti
|
66bb55a360
|
[+] classes : New method ->attachProduct($id_product)
// Fix #PSTEST-699
// now new attachment are automatically linked to the current product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13489 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-21 10:03:32 +00:00 |
|
|
mDeflotte
|
30cdc8b277
|
// Don't preselect delivery options
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13488 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-21 10:02:56 +00:00 |
|
|
mDeflotte
|
49450cdf05
|
[-] Project : #PSCFI-4737 - Add no-cache to header when there are 301 to avoid caching
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13487 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-21 09:16:27 +00:00 |
|
|
dMetzger
|
609a45f25b
|
[*] BO : you can now choose the combination of the free product of a cart rule
[*] FO : the free product is now removed from the cart along with the cart rule (where applicable)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13479 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-20 17:04:41 +00:00 |
|
|
mDeflotte
|
712ce8a688
|
[-] FO : #PSCFI-4762 - When cart contains virtuals products and physicals products, use only physicals to calculate shipping cost
// Product virtuals added before upgrading need to have the column ps_product.is_virtual at 1
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13477 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-20 16:40:22 +00:00 |
|
|
bMancone
|
d105569cec
|
// Improvement #PSFV-550
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13470 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-20 15:37:04 +00:00 |
|
|
vChabot
|
2335b53cdd
|
// select associated categories on a shop creation (with the root category shown when you are not in a shop context)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13466 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-20 14:36:57 +00:00 |
|
|
tDidierjean
|
52d9b4c277
|
// fix redirection on edit page if errors are present
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13463 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-20 14:14:39 +00:00 |
|
|
bMancone
|
8fc5329fe9
|
// Fixed #PSFV-521
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13461 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-20 13:58:19 +00:00 |
|