Commit Graph

5530 Commits

Author SHA1 Message Date
aNiassy ced31aa0ac [-] BO : Modified a translation in French
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15567 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 18:07:30 +00:00
aFolletete 545abdbc24 [-] BO : fixed bug #PSCFV-2503 - fix issue on stock update when product line edition in order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15566 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 18:04:07 +00:00
fSerny e70fbf89dc // Missing french translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15564 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 18:02:21 +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
rGaillard 18160ffa65 // Little fix on order page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15561 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:38:55 +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
lLefevre 9c00c0eb1e [-] BO : fix #PSCFV-2366 : check if an sentence use an specific syntax
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15559 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:31:48 +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
fSerny d3c4a7a617 // Small fix on Admin
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15557 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:25:26 +00:00
mMarinetti 42e1a25ec0 // remove not useful comments
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15556 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:19:52 +00:00
mMarinetti a36c0d5776 [-] Installer : fix missing columns, #PSCFV-2464
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15555 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:18:03 +00:00
mMarinetti c735c84ea9 // additional fix for cms feature and blockcms module
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15554 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:17:08 +00:00
aFolletete 6a56d02c1f [-] FO : fixed bug #PSCFV-2382 - Your shopping cart is empty not appear and the right column go to the left side
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15553 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:16:36 +00:00
vAugagneur b67a4fdd77 //fixed #PSCFV-2432 part 3 for IE :p
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15552 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:15:51 +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
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