 dMetzger
|
3af54b348e
|
// Oups
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15619 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-22 13:16:41 +00:00 |
|
|
lLefevre
|
4708c70a35
|
[-] BO : fix #PSCFV-2480 : fix translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15615 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-22 12:42:58 +00:00 |
|
|
lLefevre
|
943e6bfedf
|
[-] BO : fix #PSCFV-2513
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15613 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-22 12:20:19 +00:00 |
|
|
rMalie
|
7d9ca8d486
|
// Code review for the change paymentModule
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15612 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-22 12:12:50 +00:00 |
|
|
dMetzger
|
859f360783
|
// Autoassignation of the cart rule when log out
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15610 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-22 10:20:36 +00:00 |
|
|
tDidierjean
|
59e29fad75
|
// cleanup
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15608 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-22 10:10:08 +00:00 |
|
|
fSerny
|
534b4facb2
|
[-] BO : Fixing module restrictions in multishop context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15606 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-22 10:08:21 +00:00 |
|
|
tDidierjean
|
8398c73e12
|
// fix redirection
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15604 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-22 09:46:26 +00:00 |
|
|
tDidierjean
|
c3bdc25d32
|
// fix url redirection with multishop secondary urls
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15601 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-22 09:33:24 +00:00 |
|
|
dMetzger
|
654b7069c5
|
// Translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15600 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-22 09:20:26 +00:00 |
|
|
aKorczak
|
4f0ae05ba0
|
[-] WS : id_group_shop is not mandatory
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15595 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-22 08:01:54 +00:00 |
|
|
rMalie
|
5bc76bbd14
|
// Fix share customer on shops
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15589 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 22:03:34 +00:00 |
|
|
rMalie
|
f969e341c0
|
// Fix context in multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15585 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 19:33:02 +00:00 |
|
|
rMalie
|
cb4527a95b
|
// Fix multishop in objectModel (langs were not correctly generated when an employee has not all auths on shops)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15582 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 19:12:35 +00:00 |
|
|
rMalie
|
233caca6e6
|
// Fix default context in shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15576 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 18:57:51 +00:00 |
|
|
dMetzger
|
f1b7e0b834
|
// Fixed warning when calculating the order total of an empty cart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15575 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 18:56:19 +00:00 |
|
|
dMetzger
|
231a924e31
|
// Cart display for free shipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15574 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 18:53:30 +00:00 |
|
|
aNiassy
|
e5e53d54bb
|
[-] BO : Fixed a bug which did not permitted to found a customer in the creation of order in the back office
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15572 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 18:34:36 +00:00 |
|
|
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 |
|