Commit Graph

1145 Commits

Author SHA1 Message Date
bMancone
a2f5ef3084 // Missing translation in AdminWarehousesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13297 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 10:40:08 +00:00
bMancone
8717d76664 // Improved AdminWarehousesController form
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13294 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 10:37:56 +00:00
vChabot
66eea2abb5 [-] BO : BugFix : #PSFV-497 : Root category in AdminTracking removed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13280 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 08:42:47 +00:00
rGaillard
8c2a9eb4e8 // Fix product deletion in backOffice order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13276 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-13 18:38:59 +00:00
dMetzger
ec0798fe8a [-] FO : If a product is given for free in a cart rule and is already in the cart, the price is subtracted #PSTEST-715
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13275 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-13 17:47:40 +00:00
tDidierjean
4b9bcd5932 [-] BO : #PSTEST-705 fix scene image upload
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13273 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-13 17:36:34 +00:00
mDeflotte
f562effdbd [-] BO : #PSFV-498 - On editing attribute (group) the attribute is dupplicated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13271 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-13 17:14:45 +00:00
bMancone
a566a2a3d6 // Fixed #PSFV-418
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13266 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-13 15:38:43 +00:00
tDidierjean
54080062f7 // Finish removing the "id_theme in ImageType" code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13265 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-13 15:35:05 +00:00
bMancone
bac2f8bd46 // Fixed #PSFV-500
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13263 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-13 15:22:10 +00:00
bMancone
9ef6ddb636 // Fixed #PSFV-510
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13258 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-13 14:55:43 +00:00
bMancone
f8750bfafe // Fixed #PSFV-417
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13255 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-13 14:11:46 +00:00
bMancone
f9d982f2dc // Fixed #PSTEST-737
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13240 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-13 09:28:35 +00:00
tDidierjean
326b68e490 [-] BO : fix bug #PSTEST-719 - wrong redirection on product page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13232 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-10 16:01:52 +00:00
rMalie
d056b16654 // Fix default country on address creation in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13229 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-10 15:07:44 +00:00
rGaillard
f49a1940e5 // Re-add multishop association on contacts
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13225 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-10 13:39:55 +00:00
vChabot
9d7a798a4c // little fix about adding a category
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13216 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-10 10:49:44 +00:00
tDidierjean
a1d23ab206 [-] BO : #PSTEST-700 fix attributes value display
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13206 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-10 09:08:33 +00:00
vChabot
54f2dab85e [-] BO : BugFix : #PSTEST-668 : Shop association for Supplier is now for a shop and not a group shop anymore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13198 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-09 17:18:01 +00:00
rMalie
314abcd76c // Fix #PSTEST-424
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13196 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-09 17:13:49 +00:00
mDeflotte
5de6e9e268 [-] BO : Fix Bug #PSTEST-694 - Replace save button by a "return to dashboard" button
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13193 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-09 17:02:07 +00:00
rGaillard
7c51ccaf88 [-] BO: Fix some listing filters bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13192 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-09 16:56:17 +00:00
vChabot
5627f75039 // Home category can be edited
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13186 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-09 15:52:51 +00:00
lLefevre
a4ca8031b5 [*] BO : #PSFV-474 : added folders override/ for translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13170 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-09 10:05:09 +00:00
aNiassy
51674b3547 [-] BO : #PSCFI-4790 : deleted "fr/" directory
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13169 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-09 09:51:01 +00:00
rGaillard
8714b3253f [-] BO: Fix AdminCustomerThread filters
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13165 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-09 09:43:33 +00:00
rGaillard
b986f8e005 [-] BO: Fix AdminReferrers filters
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13162 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-09 09:35:53 +00:00
rGaillard
d9e091ff1c [-] BO: Fix AdminTags filter by ID
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13159 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-09 09:18:14 +00:00
mDeflotte
dad807a267 [-] BO : #PSTEST-686 - Add Warnings to the admin theme page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13157 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-09 09:14:05 +00:00
tDidierjean
64b14de8d2 // Fix AdminController translations not being parsed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13151 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-08 17:58:35 +00:00
bMancone
f2920c2775 // code review
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13131 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-08 14:27:20 +00:00
bMancone
732179078e // code review
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13128 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-08 14:19:52 +00:00
bMancone
4883a94187 // Fixed AdminSupplyOrdersController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13124 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-08 13:44:57 +00:00
rGaillard
91c932f9f9 // Improve BackOffice Order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13122 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-08 13:34:53 +00:00
rGaillard
0ae248a2bc // Improve/debug SpecificPriceRule
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13121 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-08 13:23:04 +00:00
mDeflotte
fce0745413 // Little fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13107 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-08 09:44:02 +00:00
aFolletete
11a74c652a // clean code && fix norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13081 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-07 15:31:59 +00:00
mDeflotte
29002976ed // Fix bug with new logo working
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13080 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-07 15:30:23 +00:00
bMancone
07186ff3b9 // Fixed Supply Orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13073 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-07 14:59:56 +00:00
bMancone
c8145aeca4 // Update supply order templates
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13068 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-07 13:25:12 +00:00
mDeflotte
1785529ea6 [-] BO : #PSTEST-667 - Fix bug with favicon and stores icon and multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13062 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-07 10:10:40 +00:00
mDeflotte
071edbda7a [-] BO : #PSTEST-667 - Fix bug with logo and multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13055 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-07 09:20:01 +00:00
fSerny
2bdf2f6206 [+] BO : Dynamics hooks in helper form
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13049 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-06 17:27:20 +00:00
tDidierjean
6648b4da8d // Rename template/helper to template/helpers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13041 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-06 16:35:49 +00:00
dMetzger
744bf28826 [*] BO : shop restriction added to the cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13032 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-06 14:57:39 +00:00
bMancone
d51002f6fe // Improved Supply Order States
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13027 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-06 14:11:29 +00:00
tDidierjean
96c8e763b9 // Replace public by protected in override methods
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13022 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-06 13:41:51 +00:00
dMetzger
a239000042 // Small display fix on back office homepage
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13021 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-06 13:33:39 +00:00
bMancone
cdbb18038c // Fixed #PSTEST-643
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13017 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-06 10:49:55 +00:00
bMancone
c64a7a55fc // Fixed #PSTEST-657
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13014 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-06 10:20:42 +00:00