Commit Graph

1709 Commits

Author SHA1 Message Date
rMalie c9484e29b2 // The capacity of enable / disable shops and shop groups is temporary disabled
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15760 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-30 12:30:08 +00:00
dMetzger 04985181e3 // Cart rule display in cart summary
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15755 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-30 09:29:55 +00:00
vChabot ed802fe90a [-] BO : BugFix : #PSCFV-2620 : Wrong client age when the age is not filled
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15752 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-30 09:00:38 +00:00
rMalie 01e43be9b8 // Fix Maxence's text
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15751 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-30 08:35:42 +00:00
rMalie e59a4da65d // Automatically duplicate some shop data if the primary data is checked (E.g. export carriers langs if carrier is checked) #PSCFV-2616
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15748 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-30 08:06:57 +00:00
mDeflotte dc7998cc64 [-] BO : #PSCFV-2606 - Fix bug with FastCGI/CGI and url multishopping (we cannot be sure the mod_rewrite is enable or disable)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15747 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-30 07:54:12 +00:00
lLefevre 95763ce483 [-] BO : #PSCFV-2582 : now list customer is not empty when deleting multiple customer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15742 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-29 14:27:11 +00:00
vAugagneur 6a82f72522 [-] BO : fixed bug #PSCFV-2608 - carrier creation fail redirect
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15736 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-29 12:24:09 +00:00
lLefevre 3de1c372a6 [-] BO : fix #PSCFV-2603 : translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15728 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-29 09:40:00 +00:00
rMalie 5d8e092c68 // Fix image alt on icons on admin customer threads page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15726 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-29 09:29:54 +00:00
mDeflotte 77084e7170 // Remove undefined method called
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15723 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-29 08:59:49 +00:00
mDeflotte f00f054ccd [-] BO : #PSCFV-2568 - CmsController and CmsCategoriesController cannot be called dirrectly
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15721 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-29 08:58:32 +00:00
mDeflotte 526d2cac1a [-] BO : #PSCFV-2569 - Fix CMS category duplication
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15713 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-28 14:48:09 +00:00
rMalie cc179c3a49 // Allow to force routes #PSCFV-2592
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15711 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-28 13:41:00 +00:00
rGaillard b953186dbd [-] BO: Fix multishop employee restriction on cart and catalog price rules PSCFV-2505
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15700 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 17:12:55 +00:00
rGaillard 21d5cfab87 [-] BO : Delete backslashes quotes on the BackOffice search
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15699 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 16:21:03 +00:00
lLefevre 858bcdac4d [-] BO : fix #PSCFV-2578 : Not duplicate customers with the CSV file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15696 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 15:12:02 +00:00
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
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