Commit Graph

1672 Commits

Author SHA1 Message Date
lLefevre e26ee662ef [-] BO : fix #PSCFV-2480 : fix translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15617 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 12:45:55 +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 15a0234612 [-] BO : fix #PSCFV-2504 : Now class PaymentModule can be translated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15614 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 12:30:42 +00:00
dMetzger 7f6d1a17d0 [-] BO : Product filter initialization fixed in cart rules #PSCFV-2524
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15611 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 11:54:54 +00:00
fSerny f2b5b0cd63 // Fixing warning on PaymentModule Tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15609 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 10:19:01 +00:00
lLefevre defcb25997 [-] BO : fix #PSCFV-2517 : Import combinaison, now the minimal quantity is not the quantity in ps_product_attribute
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15605 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 09:49:54 +00:00
fSerny 629a7420f6 [-] BO : Fixing warnings on PaymentModule Tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15602 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 09:40:18 +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
fSerny b59423bc94 // Small fix on home
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15598 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 09:03:10 +00:00
aFolletete 93ccf3e36e // fixed title in AdminLogin page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15597 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 08:39:24 +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
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
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
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
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
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
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
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
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
fBrignoli 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
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
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
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
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 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 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
vChabot 0a6da05301 [-] BO : BugFix : #PSCFV-2423 / #PSCFV-2424 : .htaccess generation is improved (description updated if you cannot generate your htaccess)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15413 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 09:41:44 +00:00
fBrignoli 67638494fc [-] BO : CONTEXT_ALL shouldn't display a product price
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15411 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 09:32:07 +00:00
aFolletete a3e1a4bdd3 [-] BO : fixed bug #PSCFV-2342 - fix issue on Admin Tab position
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15398 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 15:53:54 +00:00
rMalie b635abaf30 // Fix admin carriers multishop bug #PSCFV-2380
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15397 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 15:44:46 +00:00
mDeflotte 2fd7807ae5 // Fix bug with js inclusion
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15394 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 15:25:33 +00:00
rMalie 76b9e4ec08 // Remove updateAssoShop() from admin categories controller
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15393 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 15:25:07 +00:00
dMetzger b9026f8241 [-] BO : module tab crashed when trying to update a module that wasn't loaded (because of the XML cache file)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15392 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 15:20:05 +00:00
vChabot 98ff09c8ee // removing shop associations from product page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15391 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 15:13:36 +00:00
vChabot 37a23c8562 [-] BO : BugFix : #PSCFV-2374 : After creating a shop without category, category default from product displays wrong name
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15390 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 15:03:49 +00:00
rMalie a37dbc1e44 // Fix lot of multishop bugs (updateAssoShop reworked, remove multishop property for country / zone / currency / carrier, getList())
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15386 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 14:54:37 +00:00
mDeflotte 5a01b62e6b // Missing ";"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15384 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 14:51:18 +00:00
vChabot de9295b98a // fix on product update and creation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15383 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 14:45:41 +00:00
rGaillard 6223b5e939 // Fix product stocks on multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15380 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 14:33:09 +00:00
rGaillard 66c9b52d43 // Fix product stocks on multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15379 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 14:32:29 +00:00
vChabot 4be86528da // products can be filtered by category again
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15370 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 13:18:17 +00:00