mMarinetti
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
mBertholino
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
bLeveque
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
jObregon
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
bLeveque
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
jObregon
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
mMarinetti
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
bLeveque
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
lLefevre
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
jObregon
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
bLeveque
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
rGaillard
ba00d85c27
[-] FO: The product page now doesn't display reduction amount when it is to 0
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15453 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 15:14:25 +00:00
rGaillard
5eda4dea56
[-] BO: Fix specific price final price
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15452 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 15:01:13 +00:00
rGaillard
1bd51177f8
[-] Core: Fix PSCFV-2109 specific prices when updating product
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15451 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 14:55:28 +00:00
dMetzger
165d90925d
[-] BO : refresh currency rates button fixed
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15450 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 14:40:10 +00:00
rMalie
639b1f2368
// Remove AdminProductsController->cleanMultishopFields
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15449 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 14:02:59 +00:00
vChabot
6e4b178fa4
[-] BO : BugFix : #PSCFV-2441 : Shop creation : unable to save parameters
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15448 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 13:52:52 +00:00
vChabot
46e6e47971
[-] FO : Cart summary : quantity is fixed to 1
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15447 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 13:47:07 +00:00
rMalie
f2e68e1253
// Multishop entities are not created anymore in ObjectModel->update(), they are only updated
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15446 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 13:39:39 +00:00
dMetzger
2a240a3d68
// Free shipping display in the cart summary
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15445 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 13:39:32 +00:00
aFolletete
a5dfa315dd
// fix issue on link in email
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15444 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 13:31:10 +00:00
lLefevre
c344ae2385
[-] BO : fix #PSCFV-2381 : now count translations fields are good and translations...
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15443 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 13:26:27 +00:00
dMetzger
7fdea61289
[*] FO : cart summary is adapted to cart rules with a special "friendly" display
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15442 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 13:26:21 +00:00
tDidierjean
59717088d1
// fix update for module productcomments
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15441 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 13:14:43 +00:00
aFolletete
511f65fa25
// fix little align issue in invoice
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15440 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 13:12:45 +00:00
fBrignoli
5a0762e830
[-] BO : Bug fixed #PSCFV-2443 - Incorrect default tab for my new employee
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15439 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 13:12:38 +00:00
tDidierjean
bf054f5680
// fix B2B missing upgrade sql
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15438 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 12:56:55 +00:00
aFolletete
a5284d09de
// fix translation issue
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15437 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 12:55:57 +00:00
aFolletete
8a7bd76a47
// fix little issue on Favorites Product module
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15436 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 12:53:33 +00:00
rMalie
787b320031
// Fix check of duplicat urls for shops
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15435 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 12:49:04 +00:00
vChabot
c9ddab2cf5
// update condition
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15434 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 12:38:08 +00:00
aFolletete
75df05c099
// fix translations
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15433 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 12:37:03 +00:00
aFolletete
09db21c596
// fix french translations
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15432 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 12:30:51 +00:00
vChabot
b71fee03d1
[-] BO : BugFix : #PSCFV-2440 : Impossible to delete a shop with share option
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15431 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 12:23:58 +00:00
tDidierjean
26c1e8ded3
// fix product list by category when ordering by update date
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15430 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 12:14:45 +00:00
dMetzger
f907523250
// Cart rule autoadd fixed
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15429 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 12:03:13 +00:00
fBrignoli
6e673b6075
// strike price + group reduction
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15428 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 11:56:10 +00:00
rMalie
cd1073e68e
// Fix double configurations in installer
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15427 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 11:14:02 +00:00
tDidierjean
ae81857144
// add sql update for editorial multishop
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15426 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 11:10:24 +00:00
aFolletete
098e0fbc35
[-] BO : fixed bug #PSCFV-2436 - fix bug on product adding on order page
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15425 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 10:52:04 +00:00
rMalie
f5b7e23ffe
// Fix tmp image deletion for carriers #PSCFV-2435
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15424 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 10:47:09 +00:00
rMalie
5781694b9f
// Fix multishop checkbox on theme selection
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15423 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 10:43:01 +00:00
aFolletete
6230b51db1
[-] BO : fixed bug #PSCFV-2434 - FIx bug on Product line edition in order page
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15422 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 10:41:51 +00:00
tDidierjean
98c770118f
// move sql to latest upgrade file
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15421 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 10:41:22 +00:00
tDidierjean
0a7c709d1a
// Upgrade sql fixes
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15420 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 10:40:20 +00:00
dMetzger
b5bc94f78c
// Cart must not be null when given to a module
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15419 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 10:32:38 +00:00
dMetzger
1f555e5111
// Keep the behavior of the 1.4 for displayMaintenancePage() (retro-compatibility)
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15418 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 10:25:43 +00:00
vChabot
92a56d34df
[-] BO : BugFix : Creating a category in multishop updates her position as well
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15417 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 10:16:24 +00:00
rMalie
c2eefbc37d
// Overrides
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15416 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 10:15:46 +00:00
fBrignoli
1d54545840
// "Unknown" gender ... seriously?
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15415 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 10:03:45 +00:00
mMarinetti