Commit Graph

663 Commits

Author SHA1 Message Date
lLefevre
b0366ed9ac // fix bug in AdminBackupController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10431 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 14:44:54 +00:00
rGaillard
2ad9e4aa20 // Fix bugs AdminShopController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10423 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 14:22:11 +00:00
mMarinetti
7056c69af1 // fix products informations page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10414 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 13:28:24 +00:00
lLefevre
f632af5e7a // fix bug statsforecast and added toolbar in AdminDbController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10411 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 13:23:23 +00:00
dSevere
d0c1167d6c // Stock Available : bug fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10395 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 12:39:30 +00:00
rMontagne
bb524bf7a5 // Refactoring images.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10392 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 09:35:34 +00:00
fSerny
1723512579 // Change Addons login Position
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10386 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 09:19:41 +00:00
lLefevre
7025caef50 // small fixes to BO and norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10383 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 09:03:03 +00:00
fSerny
c333d84530 [*] BO : Admin Modules now works in Ajax :)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10379 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 21:44:52 +00:00
mMarinetti
2ee1dd5813 // AdminProducts informations fix, saveAndStay fix,
[+] BO : if json, ajax-layout.tpl can generate json with conf, _errors, warnings, informations and page var
// HelpAccess improvement
// now Product does not require quantity anymore

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10377 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 19:26:30 +00:00
dSevere
a9b5f70767 // Product Warehouse location : Manage multiple warehouses and location associated for a product / product attribute
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10375 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 18:43:04 +00:00
bMancone
de6d9c7bbe // Supply Orders: the supply order form is now generated (PDF)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10374 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 18:31:44 +00:00
tDidierjean
5dc1c8a71c // small fixes to BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10372 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 17:49:47 +00:00
vKham
ff30d33e8f // add new images config checklist dashboard
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10370 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 17:32:43 +00:00
vKham
2a83293a54 // new bloc homepage configuration checklist, link
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10368 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 17:24:02 +00:00
lLefevre
e902d3e1dd // added tpl in AdminTrackingController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10366 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 17:11:51 +00:00
fSerny
2190551536 [*] BO : New module interface tab now connected to PrestaShop Addons
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10365 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 17:11:01 +00:00
mMarinetti
8a82865591 // fix tracking
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10359 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 15:46:07 +00:00
tDidierjean
e941c6df4a // Fix escaping in AdminTranslations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10357 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 15:39:31 +00:00
tDidierjean
18c81442d1 // Fix AdminCmsControllers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10355 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 14:30:26 +00:00
mMarinetti
5c8b5334a8 // removed blank line in layout-ajax.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10354 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 14:28:27 +00:00
mMarinetti
703e77cae2 // removed blank line
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10352 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 14:26:51 +00:00
lLefevre
975bce4de9 // button submit added in toolbar for AdminImportController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10350 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 14:00:24 +00:00
lLefevre
b0fbfbfd88 // fix added leadin link and norm in AdminCategoriesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10346 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 13:34:08 +00:00
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