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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
11df2e41e7
[-] BO : Bug Fixed #PSCFV-2470 - Group by id_category
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15483 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 09:45:47 +00:00
571bf8ce18
[-] BO : fix #PSCFV-2466 : Fix translations tabs to spanish in installor
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15482 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 09:44:00 +00:00
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
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
f41b5ba922
[+] Classes : include new method isXmlHttpRequest() in Controller class, allows to make ajax request without ajax=1 in GET parameter
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15479 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 09:38:11 +00:00
76a079bd8f
// Remove 'multishop' => true from Employee and AttributeGroup
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15478 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 09:13:23 +00:00
92155373d6
// fix editorial module upgrade
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15477 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 09:09:57 +00:00
aed3c8c6f3
// Fix bug with multishipping and gift products
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15476 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 08:52:45 +00:00
c22c0d97f7
// Add information on BackOffice Order
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15475 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 08:48:55 +00:00
529460cfa9
[-] BO : BugFix : #PSCFV-2465 : When creating a shop without importing categories, I can still see the default category from other shop
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15474 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 08:20:19 +00:00
56690036fb
[-] BO : fix #PSCFV-2365 : add message for using the sprintf() in yours translations
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15473 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 08:10:20 +00:00
87e91fe3e2
// Add translations
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15472 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 07:30:48 +00:00
e8b54ff8fa
//small check
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15471 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 07:23:31 +00:00
1dd733502f
[-] MO : #PSCFV-2415 : Add multilanguage support to blocktopmenu
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15470 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 03:08:05 +00:00
63e8827c1a
// fix table cms naming
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15469 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-20 11:55:45 +00:00
8dc65e16e4
// fix extra ';'
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15468 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-20 11:43:11 +00:00
8b6069457a
// fix show tableSSS
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15467 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-20 11:12:12 +00:00
30a62768eb
// fix id_shop_group can now be null
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15466 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-20 10:23:45 +00:00
2cf309cd35
// fix upgrade problems #PSCFV-2457 #PSCFV-2462 #PSCFV-1225
...
// (also reverted upgrade modifications from rev. 14682 15127 15129 15134 15165)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15465 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-20 10:10:21 +00:00
fee3790ffd
[-] MO : gsitemap : generate sitemap for multi-shop fix #PSCFV-1493
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15464 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 22:56:35 +00:00
6bd5e1dce6
[-] BO : Fixed an issue with htmlentities()
...
[-] BO : Fixed the Sample file for Categories Import - #PSCFV-1960
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15463 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 22:15:58 +00:00
4476b69cac
[-] BO : Fixed bug #PSCFV-2288. _PS_ADMIN_DIR_ was not defined
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15462 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 22:03:35 +00:00
6f00731fba
[-] INSTALLER : Fixed a missing "echo" at Step 3 in the SMTP configuration
...
[-] BO : Fixed a French hardcoded page (Favorites Views)
[-] BO : Fixed a typo ("Informations" => "Information")
[*] BO : Improved the UI of the Combinations generator and added some explanations - #PSCFV-770
[*] MO : Added a # before the order number in the e-mail sent to the merchant when an order is placed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15461 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 20:55:05 +00:00
e1fa585f43
// Translation for "Envio" in mail confirmation, and fixed spacing in order-carrier
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15460 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 19:56:15 +00:00
87b11b5a89
// fix PREFIX_table missing
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15458 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 18:54:24 +00:00
817c6e5ff1
[-] MO : Fixed bug #PSCFV-2414 - Mail alert "Order e-mail" was badly formated - Fixed in the 5 languages
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15457 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 17:13:49 +00:00
e27509bc0a
[-] BO : fix #PSCFV-2353
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15456 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 16:40:18 +00:00
b558fcc94a
[-] MO : Fixed Blockcart jump effect on hover
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15455 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 16:15:31 +00:00
4f7940115f
[-] TR : Minor changes
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15454 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 15:26:28 +00:00
vAugagneur