Commit Graph

5513 Commits

Author SHA1 Message Date
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
vAugagneur 4b4f1be743 //fixed #PSCFV-2432 part 2 for IE
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15547 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:07:51 +00:00
vAugagneur 0f91f91030 //fixed #PSCFV-2432
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15546 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:01:22 +00:00
aNiassy 1ac646309c [-] BO : added a translation in French
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15545 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 16:56:47 +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
mMarinetti 82e92a946c // -executeS()/+execute()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15542 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 16:50:51 +00:00
tDidierjean c26ea01d05 // product page js fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15541 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 16:25:22 +00:00
vAugagneur aa42936b46 //new cool advertising & store picture
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15540 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 16:20: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
fSerny 1fc014d107 // Small fix on admin home
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15538 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 16:03:36 +00:00
fBrignoli 24c9ea257f [-] Installer : Decimal replaces Float
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15537 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 15:56:42 +00:00
rMalie 2e00c2ff00 // Add a warning in adminProducts if we try to create a product in a shop where the product is not linked
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15536 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 15:54:31 +00:00
rGaillard edf9cf9f88 // Fix price displaying on product page when using an amount reduction
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15535 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 15:52:58 +00:00
fBrignoli db233ab4bd [-] BO : Bug fixed related to #PSCFV-2490 - Default group should be copied
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15534 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 15:51:50 +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
rGaillard d1e74ce3be // Display warning if no address is available in backoffice order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15529 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 15:27:11 +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
fSerny 5b959706cf // Update on some config.xml file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15526 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 15:18:56 +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
vSchoener 34770fe391 // Fix accounting upgrade
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15522 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 15:04:47 +00:00
tDidierjean 4f37d01320 // fix module group upgrade
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15521 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 15:01:04 +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
vAugagneur 3eca197d02 //migrate shop tabs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15509 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 14:17:03 +00:00
tDidierjean 5257111ba2 // fix upgrade delivery table
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15508 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 14:05:20 +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
aFolletete bb021a8e8f // fix css issue
// fix norm

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15504 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 13:57:52 +00:00
aFolletete a40362286d // change image on reinssurance bloc
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15502 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 13:34:53 +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
fBrignoli 54fd09b72e [-] BO : Bug fixed #PSCFV-2474 - Missing shop association when creating a manufacturer with a logo
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15498 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 13:23:49 +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
mDeflotte f52c736c15 // Product Gift are missing on the cart summary (step 5)
// Fix bug : undefined var on payment step

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15495 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 13:16:06 +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
rGaillard 2553bc015e [-] BO: Fix PSCFV-2442 product price on backoffice order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15493 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 13:05:16 +00:00
vChabot c6320cebc7 [-] BO : BugFix : #PSCFV-2481 : Scene creation needs to show categories from context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15492 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 12:57:32 +00:00
vChabot 6f50b2bd9c [-] BO : BugFix : #PSCFV-2476 : Shop creation : adding an error message if you do not select at least the root category
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15491 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 12:29:37 +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
lLefevre e30388fb18 [-] BO : fix #PSCFV-2466 : Fix translations tabs to spanish in installor : fix encoding errors
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15489 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 10:00:57 +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
tDidierjean 598c96ff97 // fix customer groups upgrade
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15487 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 09:58:51 +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
lLefevre db0a6f4cfc [-] BO : fix #PSCFV-2466 : Fix translations tabs to spanish in installor
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15485 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 09:48:43 +00:00