Commit Graph

3578 Commits

Author SHA1 Message Date
vChabot ecdc4a67db [-] BO : BugFix : PSTEST-196 : Adding a supplier with a photo redirects you to the list and not to the edition of this supplier anymore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12903 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-01 15:09:09 +00:00
bMancone e88732e30b // Improved supply orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12901 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-01 14:59:45 +00:00
rMalie 7ebff4d7ae // Modules langs files moved to modules/*/translations/ folder
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12900 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-01 14:42:15 +00:00
bMancone 4f55989c22 // Added number of features + norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12899 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-01 14:38:00 +00:00
aFolletete 5615dca5c1 [-] Classes : fixed bug #PSTEST-550 - Add current_state attribute on Order class
[~] Deprecated : OrderHistory::getLastOrderState()

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12898 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-01 14:34:17 +00:00
bMancone 558efddd17 // Fixed #PSTEST-621
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12896 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-01 14:07:44 +00:00
rGaillard e26b46ba6f // Fix logo link on the header
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12894 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-01 13:37:45 +00:00
dMetzger 8870ab1daf [-] Installer : Engine and charset were missing for some tables
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12893 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-01 13:27:59 +00:00
bMancone 8c50bee736 // Fixed #PSTEST-610
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12889 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-01 10:34:01 +00:00
rMalie 131efc02f8 // Merge AdminController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12888 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-01 10:14:46 +00:00
mDeflotte 7adda2822f // Blocklayered : Increase version number
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12886 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-01 10:06:02 +00:00
mDeflotte c61fb6df53 // Blocklayered : Fix bug with ordering and some old theme
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12885 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-01 10:01:44 +00:00
vChabot 21bce7a4e4 [-] MO : BugFix : PSTEST-185 : categories and customer group permissions fixed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12884 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-01 10:00:28 +00:00
rMalie 846eb566c8 // Fix adminhome and clean Dispatcher
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12883 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-01 09:56:02 +00:00
rMalie 1435f340ef // Revert unfinished job on collections
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12882 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-01 09:55:41 +00:00
mDeflotte d23f4c505c // Blocklayered : Avoid js undefined var on the blocklayered
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12881 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-01 09:46:28 +00:00
fGaillard b7eb4f0a96 [-] BO : #PSFV-393 : BugFix jquery.fancybox.js was not found
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12880 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-01 09:10:37 +00:00
mDeflotte af56e95330 [-] BO : #PSTEST-614 - Fix bug with not selectable carrier in the BO order creation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12877 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-01 08:30:24 +00:00
lLefevre 184be61bb3 // fix bug id_theme
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12873 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 17:02:09 +00:00
rMalie 9739089c32 [*] classes : new module architecture
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12872 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 16:57:19 +00:00
vChabot 03038c4aed // categories multishop install fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12869 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 15:47:08 +00:00
vChabot b36be68154 // order_by improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12868 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 15:33:10 +00:00
vChabot 7f7b7361fb // little fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12867 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 15:31:57 +00:00
vChabot ccd7bad05c // categories multishop improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12866 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 15:31:32 +00:00
vChabot 33426e0d9a // norm fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12865 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 15:29:35 +00:00
vChabot 781e4ec0e5 // norm fix
// rename Shop::has_dependency() in Shop::hasDependency()

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12864 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 15:28:43 +00:00
aFolletete 7ec00f63d1 // Clean code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12861 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 15:24:02 +00:00
vChabot 34d6f4b9cb // norm fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12859 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 15:15:01 +00:00
fGaillard 9dc2dedc56 [-] MO : #PNM-45 : Changed template text 24/24 with 24/7
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12858 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 15:13:33 +00:00
vChabot 8c45f904a0 [*] BO : you can set positions to categories using multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12856 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 15:11:27 +00:00
bMancone 3be4528c77 // Fixed Suppliers controller
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12854 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 15:03:12 +00:00
mDeflotte 569eaf1841 // Fix Bug with adding attribute values when attribute type is pre-selected to a color option
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12853 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 15:03:05 +00:00
aFolletete 22483a0320 [-] Classes : fixed bug #PSTEST-549 - Clean useless code
[-] BO : fixed bug on sorting feature on AdminOrdersController
// Clean code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12850 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 14:34:59 +00:00
bMancone 0369213cbb // Fixed #PSTEST-612
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12848 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 14:00:36 +00:00
mDeflotte a39ec10607 // Fix Bug with blocklayered and product ordering
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12846 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 13:56:08 +00:00
mBertholino a8491d1cc0 [-] BO : #PSTEST-609
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12842 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 13:39:46 +00:00
bMancone 5625f92454 // update StockInstantState
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12840 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 13:31:11 +00:00
bMancone 1fbf8c1ab4 // Installer: lite mode
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12839 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 13:21:39 +00:00
mBertholino 9ae0bd8726 [-] BO : #PSTEST-613 translation done
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12838 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 12:53:22 +00:00
mDeflotte 2d4a9167fa // Bug Fix : use the PS_COUNTRY_DEFAULT to calculate shipping fees
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12837 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 10:50:24 +00:00
bMancone 0f27a5b955 // Fixed #PSTEST-610
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12832 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 09:40:18 +00:00
bMancone 8d60520f15 // Added warning in SupplyOrdersController if there is not a least one warehouse
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12830 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 09:25:27 +00:00
vKham 2901a2c80e // fix quicklinck dashboard
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12829 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 09:21:47 +00:00
mDeflotte b2293bb146 [-] MO : #PSTEST-606 - Fix Bug with product description line of ajax cart not removed when the product is removed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12827 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 09:15:44 +00:00
fGaillard db71e56b85 [-] BO : User id for Newsletter & Opt-in subscripion corrected
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12825 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 08:44:20 +00:00
mDeflotte f567b36d0f // Fix bug with product ordering by manufaturer name on the function Tools::getProductsOrder
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12824 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 08:30:49 +00:00
mDeflotte 0b3984f8ca [-] BO : #PSTEST-595 - Fix Bug with image uploading
[-] BO : #PSTEST-596 - Fix Bug with image uploading
[-] BO : #PSTEST-597 - Fix Bug with image uploading

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12822 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 08:26:33 +00:00
mDeflotte 0bbdc8a47b // Fix bug with product ordering by manufaturer name on the function Tools::getProductOrder
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12821 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 08:17:24 +00:00
vChabot 37c92878bc [-] BO : BugFix : PSTEST-608 Removing the possibility to edit or remove Root category in AdminTrackingController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12819 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-30 17:28:33 +00:00
vKham 967a025211 // change layout dashboard flexible, add button change view module list normal favorite
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12818 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-30 17:26:28 +00:00