Commit Graph

639 Commits

Author SHA1 Message Date
lLefevre
595c1384f4 // Fix delete multiple toolbar in AdminPerformanceController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10337 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 11:42:42 +00:00
rMalie
9d10de0848 // Merge -> 10309
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10333 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 11:05:10 +00:00
mMarinetti
f09017dc73 // css harmonization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10329 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 10:29:58 +00:00
tDidierjean
5b908a0844 // fix tpl folder detection in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10327 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 10:11:49 +00:00
lLefevre
c47131aa9f // fix bug display message error or success in AdminAccessController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10326 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 10:11:38 +00:00
tDidierjean
c16ca27155 // Fix price and required display for options
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10320 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 09:34:37 +00:00
lLefevre
a918295ae3 // fix bug : delete submit button and toolbar not fix in AdminLocalizationController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10319 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 09:33:37 +00:00
vKham
c441358b40 // new icon for adminhome, adminmodules and header
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10318 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 09:21:26 +00:00
vKham
3f97d4ab2b // css improvement for adminHome and adminModule
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10316 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 09:15:35 +00:00
mMarinetti
2406935d7a // fixed parsing and display for back office translations
// die2Exception in AdminTranslationsController 

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10305 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-20 23:35:21 +00:00
mMarinetti
08a389a760 // fix product edition textarea rte
// minor fix warning if admin translation file doesnt exists

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10304 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-20 23:06:45 +00:00
tDidierjean
9e8d16ad6a // fix position in list for products, product images. still need to fix display after change position product images
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10302 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-20 19:47:07 +00:00
dMetzger
8fdcb10f78 // BO : cart rules form improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10294 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-20 16:18:04 +00:00
dMetzger
db15eec68b // BO : cart rules form improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10290 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-20 14:50:20 +00:00
tDidierjean
58c35a2152 // HelperForm : 'p' replaced by 'desc'
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10286 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 18:27:48 +00:00
dSevere
226230f58b // Supply Orders : Move ajax product search in the controller -> ajaxProcessSearchProduct()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10283 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 16:57:10 +00:00
mMarinetti
d6ef55b5ed // fix adminProducts > images
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10281 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 16:42:51 +00:00
dSevere
a24764b9b3 // Suppliers : Manage multiple suppliers for a product / product attribute + integration with supply orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10279 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 16:29:50 +00:00
fSerny
928e0a5625 [*] BO : New module interface tab now all html is in tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10278 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 16:14:43 +00:00
tDidierjean
fd90a0313d // Fix AdminThemesController thumbnails
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10275 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 15:30:22 +00:00
lLefevre
716acbaffa // fix delete assign token in AdminController.php, use function smarty {getAdminToken tab=''}
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10273 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 15:00:58 +00:00
lLefevre
d723813173 // fixed bug assign var smarty and delete content.tpl for AdminGeolocationController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10272 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 14:49:02 +00:00
lLefevre
ae4a223509 // fix added toolbar in HelperOptions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10271 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 14:22:53 +00:00
vSchoener
6ae7ef6cbb // Update Accounting, handle errors for Date and fix bug when default_account_number isn't set at all
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10264 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 13:19:13 +00:00
lLefevre
e42cb899ef // fix bug list_skip_action
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10260 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 11:57:33 +00:00
mDeflotte
5e6ab08a00 // Merging multishipping branche on 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10259 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 11:13:31 +00:00
tDidierjean
8a1bd2eb2d // Remove <img> from confirmation messages
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10258 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 11:00:37 +00:00
lLefevre
611b4f7bde //fix change initForm() method in AdminSlipController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10255 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 10:51:27 +00:00
lLefevre
df543a4f14 //fix added toolbar in AdminInvoicesController and change initForm() method
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10250 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 10:28:21 +00:00
tDidierjean
dd01f32fad // Remove BO themes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10249 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 10:27:07 +00:00
mMarinetti
5ef065bbca [+] BO : #PSFV-94 - AdminProduct form features
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10239 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 18:52:54 +00:00
mMarinetti
2eb10a760f // removed unused code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10238 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 18:47:32 +00:00
mMarinetti
11f41ed9c2 // small fix on admininformation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10237 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 18:46:27 +00:00
tDidierjean
740ac7c843 // AdminTab compatibility: Dispatcher for BO now search tabs in database, not on the disk. AdminTabs now uses the new BO theme.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10236 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 18:15:07 +00:00
fBrignoli
e5f3c3ca2a [*] PDF : PDF is now rendered by TCPDF throught HTML template
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10231 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 17:15:23 +00:00
vSchoener
1ca36181db // delete debug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10227 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 16:39:43 +00:00
vSchoener
e050010261 // Update Accounting form
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10226 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 16:38:32 +00:00
lLefevre
4621551acf // fix added form.tpl in AdminWebserviceController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10224 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 16:05:06 +00:00
fSerny
aa7a811258 [*] BO : New module interface tab now accept logo.png
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10211 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 13:26:17 +00:00
lBrieu
f182a82ee9 // Bug fix when deleting a file associated to a virtual product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10210 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 13:25:14 +00:00
lBrieu
b6ab71ecc2 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10206 b9a71923-0436-4b27-9f14-aed3839534dd 2011-11-17 13:11:45 +00:00
lBrieu
14028f0d36 // Bug fix with fillCombination javascript function
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10202 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 11:28:44 +00:00
lBrieu
5784a4cd46 // bug fix when trying to add files to combinations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10200 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 09:54:13 +00:00
mMarinetti
68f2cb80fb // fix adminproduct removing trailing 'loading'
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10196 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 09:06:43 +00:00
mMarinetti
fe5fe7f3db // fix ajax-tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10195 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 09:03:42 +00:00
lBrieu
41b256f637 // bug fix when a product has no default image
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10194 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 08:46:06 +00:00
vKham
d2e80e4fbf //update admin css
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10193 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 08:45:39 +00:00
vAugagneur
89be6d647c [+] BO : adminTab Groups is now a convert to a AdminController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10192 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 08:21:22 +00:00
lLefevre
b01e9b1a8a [*] BO #PSFV-94 : Added AdminShopController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10191 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 08:10:04 +00:00
fSerny
710605dd2a [+] BO : New module tab interface - #PSFV-94
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10188 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 00:43:30 +00:00