mDeflotte
|
b00a823df1
|
[-] BO : #PSTEST-977 - Cart rule, hide unavailable options
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14725 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 09:59:52 +00:00 |
|
rMalie
|
78a2af39ab
|
// Remove profiling
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14724 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 09:59:31 +00:00 |
|
rMalie
|
ba4c5dbb18
|
// Some optimization #PI-121
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14723 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 09:57:19 +00:00 |
|
lLefevre
|
2ae5cf56ab
|
// Fix small bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14722 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 09:50:48 +00:00 |
|
dMetzger
|
46dac2633b
|
// Updated the number of shops in the back end
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14721 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 09:49:05 +00:00 |
|
tDidierjean
|
4ef16714f8
|
[-] BO : fix #PSTEST-1172 - do not sort all products list by position // missing file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14720 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 09:46:42 +00:00 |
|
tDidierjean
|
61305d4a36
|
[-] BO : fix #PSTEST-1172 - do not sort all products list by position
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14719 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 09:43:50 +00:00 |
|
dMetzger
|
713d17d14a
|
// Fixed technical bug with an int that exceeded the size of an int...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14718 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 09:42:57 +00:00 |
|
lLefevre
|
5b912196b0
|
// Fix file_exists errors on the retrocompatibility image tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14716 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 09:26:31 +00:00 |
|
bMancone
|
c44c2c9f4e
|
// Fixed prefixes for the product_shop table
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14715 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 09:24:43 +00:00 |
|
vChabot
|
530937a495
|
// categories association for product with multishop and context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14713 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 08:48:42 +00:00 |
|
rMalie
|
eeeb925420
|
// Shop::$asso_table is now public (for modules) #PSFV-551
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14712 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 08:38:30 +00:00 |
|
rMalie
|
d001741df3
|
// Add multishop checkbox for id_category_default in admin products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14711 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 08:26:41 +00:00 |
|
vChabot
|
e7fb87d4d2
|
[-] FO : BugFix : #PSFV-844 : Categories links are now handled with multishop in footer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14709 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 08:10:25 +00:00 |
|
rMalie
|
94a7037013
|
// Add DESC keyword to executeS() filter #PSFV-791
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14706 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 07:52:40 +00:00 |
|
rMalie
|
360407f52b
|
// Fix Product::priceCalculation() for multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14705 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-18 07:47:02 +00:00 |
|
rMalie
|
38680d7625
|
// Fix position for category_product in installer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14702 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 16:46:26 +00:00 |
|
mDeflotte
|
6120874516
|
[-] BO : #PSFV-874 - Carriers asked with guest checkout and virtual cart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14701 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 16:27:39 +00:00 |
|
rMalie
|
04a7580a98
|
// Fix join between product_attribute and product_attribute_shop on getproducts methods
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14700 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 16:10:51 +00:00 |
|
jBreux
|
72eb7b253e
|
// Fix page link (for W3C)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14698 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 16:05:52 +00:00 |
|
mDeflotte
|
3ca1acc6b0
|
// remove 1.4.8.sql
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14697 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 16:00:54 +00:00 |
|
tDidierjean
|
03afca360c
|
[-] BO : fix #PSTEST-1170 - broken suppliers edition in product page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14696 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 16:00:31 +00:00 |
|
rGaillard
|
d07623cbc2
|
[*] BO: Set defaults payment order state on BackOffice order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14694 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 15:56:38 +00:00 |
|
bMancone
|
7d533b3189
|
// Fixed exceptions when saving products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14693 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 15:56:04 +00:00 |
|
gPoulain
|
0e945ef068
|
[-] FO : W3C fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14692 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 15:50:00 +00:00 |
|
rMalie
|
14c20002e4
|
// Fix ObjectModel::updateMultishopTable() for Combination
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14691 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 15:45:47 +00:00 |
|
rMalie
|
e7b7ab9371
|
// Fix ObjectModel::updateMultishopTable() for Combination
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14690 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 15:29:07 +00:00 |
|
tDidierjean
|
456ea2a191
|
[-] BO : fix product page suppliers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14689 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 15:18:09 +00:00 |
|
tDidierjean
|
a71704fb4e
|
[-] BO : fix #PSTEST-1169 broken processing of list filters
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14688 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 15:08:36 +00:00 |
|
mDeflotte
|
8601c6d25e
|
// 1.4.8 => 1.4.8.0
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14687 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 15:07:35 +00:00 |
|
rMalie
|
dacf032092
|
// Fix ObjectModel with multishop flag to false
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14685 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 14:56:53 +00:00 |
|
rMalie
|
0ed295a94a
|
// Fix id_tax_rules_group assignation on product edtion
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14684 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 14:05:29 +00:00 |
|
fBrignoli
|
03b504e06e
|
[-] BO : Bug Fixed #PSFV-339 - Multishop logo
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14683 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 13:34:59 +00:00 |
|
rMalie
|
0c2dd0cd2f
|
// MERGE product_multistore branch : product fields are now editable per shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14682 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 13:32:12 +00:00 |
|
mDeflotte
|
d4d1c35cb9
|
[-] BO : #PSCFI-5378 - Create voucher from the BO after a product return
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14681 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 13:19:13 +00:00 |
|
jBreux
|
d126db086f
|
// Fix page link (for W3C)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14680 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 12:54:02 +00:00 |
|
bMancone
|
ffebd91170
|
// Normalize AdminWarehousesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14679 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 12:24:43 +00:00 |
|
bMancone
|
d3b0c7fec1
|
// Fixed warehouses/carriers associations - #PI-134
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14678 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 12:21:22 +00:00 |
|
lLefevre
|
7e3e03b869
|
[-] BO : fix #PSFV-870 : translations modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14677 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 09:51:55 +00:00 |
|
bMancone
|
caf154c77d
|
// Fixed #PSTEST-1146
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14676 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 09:49:55 +00:00 |
|
bMancone
|
d9e01b3375
|
// WS : Warehouses - #PI-127
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14673 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 09:21:04 +00:00 |
|
mDeflotte
|
d0809600a0
|
[-] BO : #PSFV-434 - Bad product total calculation (confusion with wt)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14672 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 09:08:54 +00:00 |
|
tDidierjean
|
08921ed277
|
[-] BO : fix display bug when virtual file upload fails
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14671 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 08:53:45 +00:00 |
|
rMalie
|
099c6a7080
|
// Fix id_shop in URL for BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14670 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 08:26:31 +00:00 |
|
dMetzger
|
04797eb90b
|
[-] BO : fixed double in the product list of the cart rules when multi-shop is activated #PSTEST-1154
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14669 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 08:09:16 +00:00 |
|
tDidierjean
|
ca71733f00
|
[*] BO : #PSTEST-1157 - Ajax deletion of virtual file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14668 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-17 08:07:35 +00:00 |
|
rGaillard
|
1e1970e13c
|
// Fix default carrier selection on backoffice order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14660 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-16 14:03:07 +00:00 |
|
bMancone
|
285becae29
|
// Fixed stock_available when ordering products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14656 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-16 13:39:15 +00:00 |
|
lLefevre
|
5c6e33b72a
|
[*] BO : #PSFV-832 : change the type of the property "ajax"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14655 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-16 13:24:28 +00:00 |
|
lLefevre
|
4e61be6b9e
|
[-] BO : fix #PSFV-866 : Add the missing hook for update a product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14654 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-16 12:57:38 +00:00 |
|