Commit Graph

5625 Commits

Author SHA1 Message Date
mDeflotte 27ca8f5481 [-] MO : #PSCFV-2567 - Module CMS block was not merged with new shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15678 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 08:58:11 +00:00
vAugagneur 81f87e0bfe //now PrestaShop need at least PHP 5.1.3 to run
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15677 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 06:53:32 +00:00
mBertholino e161b995a7 //readme-en.txt and readme-fr.txt update
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15676 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 21:27:27 +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 598ffaee32 // Fix translations error
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15672 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 16:27:16 +00:00
fBrignoli 1c980c9fce [-] BO : Total tax doesn't appear on the invoice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15671 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 16:16:09 +00:00
fBrignoli cc880e2186 // Installer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15670 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 16:01:40 +00:00
mMarinetti ebcbb1b628 [-] upgrader : Fix #PSCFV-2563, thanks to Olea for the report
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15669 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 15:56:50 +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
aFolletete fbf58446c9 // fixed add order payment
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15666 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 14:45:25 +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
fGaillard 49965e89fe // Bug fix payment module (with previous commit)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15661 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 13:04:14 +00:00
fGaillard 989f3b46c1 // Bug fix for payment modules (shops informations on validate order)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15660 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 13:01:35 +00:00
tDidierjean 0cea293761 [-] TR : fix #PSCFV-2543
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15659 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 12:39:28 +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
fBrignoli 3efd3f7c01 [-] Installer : Specific price could now be equal to 0
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15657 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 09:11:40 +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
gCharmes b022122499 [-] MO : Fixed typo on module followup french mail
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15653 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-23 17:45:25 +00:00
aFolletete 24f5a6e099 [-] BO : fixed bug #PSCFV-2502 - fixed bug on notification system in back office
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15651 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-23 16:41:02 +00:00
tDidierjean f0dbfc9003 [-] BO : fix #PSCFV-2545 - can't change product out of stock order status
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15650 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-23 16:38:33 +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 7793e106bf // Add spanish translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15646 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-23 15:57:25 +00:00
lLefevre 1ebf42d2c6 // Fix Birthday in customer CSV file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15645 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-23 15:06:47 +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
mDeflotte dccda1c756 [-] MO : #PSCFV-2539 - Module block newsletter don't show success error message correctly
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15640 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-23 13:29:44 +00:00
lLefevre cbbe1e78d0 // Add Deutsch (German) translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15639 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-23 11:58:42 +00:00
mMarinetti 6eecd2b381 // minor fix USING BTREE removed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15635 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-23 11:44:09 +00:00
mMarinetti c0b157b733 // deactivate_custom_modules will return false if file modules_list.xml does not exists
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15634 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-23 11:43:34 +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
mDeflotte 633a32d3ec [-] BO : #PSCFV-2511 - Country visible in all shop
// Normalize

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15631 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-23 07:53:36 +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
rMalie 34c465d642 // Normalize Tools
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15627 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 14:36:46 +00:00
lLefevre c87dedb522 // Fix link troubleshoting for CSV file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15626 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 14:08:24 +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
dMetzger 88156e6eaf // fix issue in AdminPayment
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15624 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 13:54:46 +00:00
tDidierjean 947f98c44e // fix warning with specific price
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15623 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 13:33:45 +00:00
lLefevre e5bf522fe8 // Translations : add the fields translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15622 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 13:31:02 +00:00
tDidierjean 4fcc657a56 [-] BO : fix bug #PSCFV-2522 - Unable to switch a product from virtual to normal
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15621 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 13:23:35 +00:00
rMalie 3c41954293 // Improve multishop page ergonomy
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15620 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 13:16:48 +00:00
dMetzger 3af54b348e // Oups
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15619 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 13:16:41 +00:00
vAugagneur 6c0e7186fb //fixed #PSCFV-2281
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15618 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 13:08:37 +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