Commit Graph

1962 Commits

Author SHA1 Message Date
rGaillard c9e28d8bf6 [-] BO: Add feedback on backoffice order when the minimal quantity is not reached
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15693 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 14:00:16 +00:00
rMalie 34d80f945a // Improve multishop code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15691 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 13:37:43 +00:00
lLefevre a9e892e928 [-] BO : fix #PSCFV-2564 : imported customers with a CSV file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15686 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 12:51:55 +00:00
mDeflotte 1912c4b543 [-] BO : #PSCFV-2562 - Select all categories on creating a new shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15673 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 16:44:00 +00:00
lLefevre 62e33d3ca3 // Fix translations error
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15668 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 15:47:39 +00:00
lLefevre 11fdfe87d5 [-] BO : fix #PSCFV-2544 : delete selected manufacturers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15667 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 15:25:05 +00:00
lLefevre b96ca0977c // Remove comment
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15664 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 13:56:45 +00:00
lLefevre daa22a31cd // Fix Message in AdminTranslationsController when use sprintf()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15663 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 13:52:49 +00:00
mDeflotte 874e8924e7 [-] BO : #PSCFV-2556 #PSCFV-2550 - Fix password alert message "é"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15662 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 13:20:50 +00:00
lLefevre 0517f5438d // Fix translations mails errors for each languages
// Now, Subject for reply_msg.html is translated
// Now use sprintf() in subject mails

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15658 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 09:57:48 +00:00
mDeflotte 89509c07f3 // Fix undefined variable when profiling is at on
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15656 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 07:10:52 +00:00
gCharmes fc8b9a435a [-] BO : Add a check on the scandir for the Employees theme
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15654 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-23 23:05:13 +00:00
lLefevre dd13f01215 [-] BO : fix #PSCFV-2540 : CSV importing categories errors + manufacturers + suppliers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15649 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-23 16:37:26 +00:00
lLefevre 47e5d492a4 // small fix in CSV import controller
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15648 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-23 16:13:27 +00:00
lLefevre 3697b4816a // Fix wholesaleprice when you import a combinaison CSV file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15643 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-23 14:27:43 +00:00
vSchoener f7c208851d [-] BO : Update assign value
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15633 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-23 08:19:32 +00:00
lLefevre 168cfda561 [-] BO : fix #PSCFV-2517 : CSV importing combinaisons
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15632 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-23 08:01:52 +00:00
rMalie 4420cac66e // Fix total of attributes values in admin attribute page in multishop context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15630 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 14:51:36 +00:00
fBrignoli 69fd70ec68 [-] BO : Bug Fixed #PSCFV-2119 - Import CSV: Supplier details not visible
[-] BO : Import CSV: Supplier not linked to shops
[-] BO : Import CSV: Supplier is not active when created throught csv import



git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15629 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 14:48:46 +00:00
aFolletete 9399e2c31e // add information message
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15628 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 14:41:46 +00:00
mDeflotte e76b4408f4 // Fix bug with cart, multishipping and gift product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15625 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 14:07:16 +00:00
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
dMetzger b63325917c // FreeOrder is now "active"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15584 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 19:26:43 +00:00
fBrignoli 8d60b64c43 // retrocompatibility theme 1.4 + carrier
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15570 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 18:09:16 +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
mDeflotte 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
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
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 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