Commit Graph

5782 Commits

Author SHA1 Message Date
fBrignoli f96d1be863 // prefix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15878 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 13:48:20 +00:00
rMalie 522eea75c0 // Reorder taxes and tax rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15876 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 12:25:50 +00:00
mDeflotte ecdde166da // #PSCFV-2559 - Remove debug line
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15875 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 09:56:06 +00:00
fBrignoli be88e22f6e // toolbar 2nd part
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15874 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 09:52:26 +00:00
mDeflotte 2abfb340a4 // Trads
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15873 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 09:50:03 +00:00
vChabot 3114aa6fc8 // correction translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15872 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 09:45:38 +00:00
fBrignoli fb66b1817a [-] BO : Bug Fixed #2676 - Missing button in group shop tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15871 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 09:41:13 +00:00
vChabot 0dc3d1b996 [-] BO : BugFix : #PSCFV-2644 : Unable to remove stock to a product with advanced stock management
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15870 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 09:37:06 +00:00
mDeflotte e54b4c54cb [-] BO : #PSCFV-2635 - Confirmation message asked multiple times
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15869 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 09:30:54 +00:00
rMalie 88f537c23d // Fix Product::sqlStock() (use restrictions in left join instead of restrictions in where)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15868 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 09:16:03 +00:00
dMetzger 8446bd2e4e // Drop table IF EXISTS #PSCFV-2689
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15867 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 09:05:10 +00:00
fSerny 49fd8708a1 [+] PROJECT : Add method Module::isEnabled
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15866 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 08:58:13 +00:00
vChabot 1c03997f30 [-] BO : BugFix : #PSCFV-2639 : The search autocomplete does not work in multi store mod
// norm

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15865 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 08:32:59 +00:00
aFolletete 516437f312 [-] Installer : fixed bug #PSCFV-2690 - wrong back office screenshot in the installer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15864 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 08:10:46 +00:00
vAugagneur a1ac2c1d85 //small thing
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15861 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 06:40:44 +00:00
fBrignoli f18ffe592e [-] BO : Bug Fixed #PSCFV-2677 - You shouldn't be allowed to put spaces in virtual url
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15860 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-05 16:18:48 +00:00
mDeflotte e999610768 [-] MO : #PNM-240 - Fix bug with blocklayered price filter on IE
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15854 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-05 14:33:09 +00:00
vAugagneur 60abb93efd //AdminStatusesController.php refacto
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15853 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-05 14:07:57 +00:00
rMalie a15520b3b1 // Rename jquery.cookie with jquery.cooki (because of apache security mod ...)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15851 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-05 13:27:53 +00:00
dMetzger 9e6341df71 // Code cleaning
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15849 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-05 11:51:46 +00:00
vAugagneur 0d58f46c28 //remove duplicate code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15847 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-05 09:28:42 +00:00
vAugagneur 1e1452468c //remove unused variable
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15846 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-05 09:24:15 +00:00
mDeflotte 0fc967b388 // Trads
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15843 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-05 08:59:29 +00:00
rMalie 86ee04e6d7 // category_lang are always duplicated on shop creation #PSCFV-2648
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15842 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-05 08:48:48 +00:00
mDeflotte de24e08df7 [-] BO : #PSCFV-2559 - Ask user to reload all product tabs not loaded correctly
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15841 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-05 08:41:20 +00:00
vAugagneur 6698bc091b //trads
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15840 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-05 08:06:06 +00:00
vAugagneur 37fb7b4775 //trads
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15837 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 15:56:17 +00:00
aFolletete b734c47616 [-] BO : fixed bug #PSCFV-2584 - fix translations issue in product page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15836 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 15:53:43 +00:00
rMalie 62e52b1306 // Rename "Genders" in "Social titles" (ty Xavier)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15835 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 14:48:42 +00:00
vChabot b8e537816e [-] BO : BugFix : #PSCFV-2597 : Category tree is not loaded with context shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15834 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 14:40:33 +00:00
rMalie e78b6d02ab // Translate installer title #PSCFV-2548
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15833 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 14:30:12 +00:00
lLefevre 5cbb6138bf [*] BO : add method for import translations tabs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15832 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 14:13:08 +00:00
rMalie 42d1630bc4 // Fix modules sort by author #PSCFV-2653
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15831 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 14:07:35 +00:00
aFolletete 12148fa938 [-] FO : fixed bug #PSCFV-2669 - fix bug on product customization in order process
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15830 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 13:47:59 +00:00
vAugagneur 18385569b7 //oups
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15829 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 13:41:11 +00:00
vAugagneur aa6d9d5430 //fixed bug #PSCFV-2632
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15828 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 13:40:32 +00:00
mDeflotte 3a0031c60e // Normalization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15827 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 13:25:57 +00:00
mDeflotte f109695cbd // Fix bugs on adding products to an orders on the BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15826 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 13:25:35 +00:00
vAugagneur 99342ff375 //fixed bug #PSCFV-2666
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15825 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 13:10:15 +00:00
rMalie 649fec49df // Some performance improvement #PSCFV-2658
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15824 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 12:58:52 +00:00
mDeflotte 5dfc0e3824 // Fix little bug (undefined index) on canceling a product (BO order tab)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15823 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 12:26:55 +00:00
vAugagneur 4179bc4d74 //added bulk action for enable or disable item
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15822 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 12:00:09 +00:00
mMarinetti 71d8a9ff92 // removed debug functions, added more verbose output if error
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15819 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 10:59:17 +00:00
rMalie f413764813 // Install fr lang
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15818 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 09:49:49 +00:00
rMalie b81f2d87dc // Add a warning in welcome page for installer if use has already a previous version of PrestaShop installed #PSCFV-2161
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15817 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 09:45:52 +00:00
mDeflotte 12dfd76711 // Blocklayered : Copy translation from branche 1.4
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15816 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 09:45:13 +00:00
vChabot e3722a71e0 // little fix Shop class condition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15815 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 09:43:25 +00:00
mDeflotte eb475b1a78 [-] MO : #PSCFV-2640 - Fix bug with blocklayered and multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15813 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 09:41:18 +00:00
lLefevre 3431b10465 [-] BO : #PSCFV-2661 : Fix translation when use parent::displayError() in modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15811 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 09:17:33 +00:00
mDeflotte 0cf1fc870c // Fix bug with bad SQL request on changing state of an order paid by check
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15810 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 09:09:51 +00:00