Commit Graph

3552 Commits

Author SHA1 Message Date
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
mDeflotte 703db853f1 [-] BO : #PSFV-391 - Country restrictions for payment modules is not effective
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12817 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-30 17:09:17 +00:00
fGaillard 3fe2cdabc4 [-] BO : Template corrected in customers list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12816 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-30 16:49:45 +00:00
bMancone 302f820e13 // norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12813 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-30 16:29:42 +00:00
bMancone 039d19ff97 // Warehouses & supply orders : default country / lang / currency are now loaded by default in the forms
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12812 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-30 16:29:17 +00:00
mDeflotte b7eaa19f7e // Fix bugs with module blocklayered and price + Use the new method to display treeview
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12809 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-30 15:07:10 +00:00
fGaillard 608bc1922b [-] Classes : Undefined index on cities (addresses) corrected
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12807 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-30 14:17:18 +00:00
rMalie 1d888a10d8 // Fix adminnotfound access right
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12805 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-30 14:09:56 +00:00
rMalie 2c7cd17ecb // Tab::getIdFromClassName() is now not sensible to case
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12804 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-30 14:09:34 +00:00
rMalie e5d5443cbe // Fix assignements in if() on AdminTab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12803 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-30 14:08:36 +00:00
bMancone 83506695b8 // Stock valuation translations (warehouses)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12798 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-30 13:23:19 +00:00
rGaillard 099d5165ba // Fix PSTEST-396
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12797 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-30 13:21:12 +00:00
fGaillard 1c6357c1d9 [*] TR : #PSTEST-553 : Replaced can't with cannot
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12796 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-30 12:54:32 +00:00
mBertholino ff74e92f0a // replace id_profile 1 to _PS_ADMIN_PROFILE_
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12794 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-30 12:48:47 +00:00
bMancone 78087fee18 // Fixed #PSTEST-598 #PSTEST-599
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12791 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-30 12:24:25 +00:00
mBertholino 366d7e5f7b // correction norme in AdminEmployeesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12788 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-30 10:19:06 +00:00
mBertholino 8b74487eac [*] BO : A new method in Employee class has been written "getEmployeesByProfile". it returns an array of employees who has the given profile.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12787 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-30 10:16:09 +00:00
fBrignoli 2c688050b6 [-] BO : Bug Fixed #PSTEST-477 - Attribute Generator : Price tax included should be displayed with 2 decimal
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12786 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-30 10:15:57 +00:00
rGaillard fdb2f11885 // Fix PSTEST-364
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12785 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-30 10:12:06 +00:00
bMancone d8f2908666 // SupplyOrder form updated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12784 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-30 10:11:36 +00:00
mDeflotte 22ccb0625b // Add french translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12776 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-30 08:16:00 +00:00
mDeflotte 11566e2577 [-] BO : #PSTEST-590 - Fix bug with undefined smarty variable "HOOK_EXTRACARRIER_ADDR" + By default use the default country of the shop to calculate shipping cost
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12775 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-30 08:07:49 +00:00
mMarinetti c23f882426 // code review of AdminGroupShop - norms
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12764 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-27 16:00:15 +00:00
dMetzger f1dece04f2 [-] BO : partial use fixed for cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12762 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-27 15:56:57 +00:00
jBreux 3208810fe6 // Remove comment
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12758 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-27 15:25:40 +00:00
fSerny 818ec1b476 [*] BO : Adding hook on AdminProducts
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12757 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-27 14:45:35 +00:00
dMetzger 113d3a5174 // Small fixes for cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12756 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-27 14:38:04 +00:00