diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml index 3037c9d3b0d..0aff6319cff 100644 --- a/addons/account/board_account_view.xml +++ b/addons/account/board_account_view.xml @@ -1,38 +1,27 @@ - - Receivable Accounts - report.account.receivable - form - graph,tree - [('type','=','receivable')] - - - Income Accounts - report.account.receivable - form - graph,tree - [('type','=','income')] - - - Company Analysis - account.entries.report - form - tree,graph - {'group_by':['user_type'], 'group_by_no_leaf':1} - - [('year','=',time.strftime('%Y'))] - - - Treasury - account.account - form - graph,tree - [('type','=','liquidity')] - {'default_type': 'liquidity'} - - + + + Company Analysis + account.entries.report + form + tree,graph + {'group_by':['user_type'], 'group_by_no_leaf':1} + + [('year','=',time.strftime('%Y'))] + + + + Treasury + account.account + form + graph,tree + [('type','=','liquidity')] + {'default_type': 'liquidity'} + + + board.account.form board.board @@ -45,7 +34,7 @@ - + @@ -61,8 +50,7 @@ - - + diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index 781ead6b30e..6b0f4a355af 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -168,11 +168,6 @@ msgstr "" msgid "All Analytic Entries" msgstr "" -#. module: account -#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard -msgid "Invoices Created Within Past 15 Days" -msgstr "" - #. module: account #: field:accounting.report,label_filter:0 msgid "Column Label" @@ -626,18 +621,6 @@ msgstr "" msgid "To reconcile the entries company should be the same for all entries" msgstr "" -#. module: account -#: view:account.account:0 -#: selection:account.aged.trial.balance,result_selection:0 -#: selection:account.common.partner.report,result_selection:0 -#: selection:account.partner.balance,result_selection:0 -#: selection:account.partner.ledger,result_selection:0 -#: code:addons/account/report/account_partner_balance.py:297 -#: model:ir.actions.act_window,name:account.action_aged_receivable -#, python-format -msgid "Receivable Accounts" -msgstr "" - #. module: account #: constraint:account.move.line:0 msgid "The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal." @@ -1557,11 +1540,6 @@ msgstr "" msgid "Responsible" msgstr "" -#. module: account -#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all -msgid "Sales by Account Type" -msgstr "" - #. module: account #: view:account.invoice.refund:0 msgid "Cancel Invoice: Creates the refund invoice, validate and reconcile it to cancel the current invoice." @@ -2544,13 +2522,6 @@ msgstr "" msgid "Configure Your Chart of Accounts" msgstr "" -#. module: account -#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all -#: view:report.account.sales:0 -#: view:report.account_type.sales:0 -msgid "Sales by Account" -msgstr "" - #. module: account #: view:account.use.model:0 msgid "This wizard will create recurring accounting entries" @@ -5908,11 +5879,6 @@ msgstr "" msgid "Supplier Refund" msgstr "" -#. module: account -#: model:ir.ui.menu,name:account.menu_dashboard_acc -msgid "Dashboard" -msgstr "" - #. module: account #: field:account.bank.statement,move_line_ids:0 msgid "Entry lines" @@ -6411,11 +6377,6 @@ msgid "You can specify year, month and date in the name of the model using the f "e.g. My model on %(date)s" msgstr "" -#. module: account -#: model:ir.actions.act_window,name:account.action_aged_income -msgid "Income Accounts" -msgstr "" - #. module: account #: help:report.invoice.created,origin:0 msgid "Reference of the document that generated this invoice report." diff --git a/addons/account/report/account_report_view.xml b/addons/account/report/account_report_view.xml index fe2b8a3940a..3d0b4a65b60 100644 --- a/addons/account/report/account_report_view.xml +++ b/addons/account/report/account_report_view.xml @@ -81,156 +81,5 @@ graph,tree - - - - report.invoice.created.tree - report.invoice.created - tree - - - - - - - - - - - - - - - - - - - - - Invoices Created Within Past 15 Days - report.invoice.created - form - tree,form - - - - - report.account.sales.tree - report.account.sales - tree - - - - - - - - - - - - - - - report.account.sales.graph - report.account.sales - graph - - - - - - - - - - report.account.sales.search - report.account.sales - search - - - - - - - - - - - - - Sales by Account - report.account.sales - form - graph,tree - - - - - report.account_type.sales.tree - report.account_type.sales - tree - - - - - - - - - - - - - - - - report.account_type.sales.form - report.account_type.sales - form - - - - - - - - - - - report.account_type.sales.graph - report.account_type.sales - graph - - - - - - - - - - report.account_type.sales.search - report.account_type.sales - search - - - - - - - - - - - - - Sales by Account Type - report.account_type.sales - form - graph,tree - - - diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml index acfcf4cb63a..b4285a7df98 100644 --- a/addons/document/board_document_view.xml +++ b/addons/document/board_document_view.xml @@ -12,6 +12,9 @@ + board.board form form - - + + name="Knowledge Dashboard" + id="menu_reports_document" + parent="base.menu_reporting_dashboard" + sequence="50" + action="open_board_document_manager" + icon="terp-graph"/> - - - - - board.document.manager.form1 - board.board - form - -
- - - - - - - - - - - -
- - - - - - Statistics by User - board.board - form - form - - - - diff --git a/addons/document/report/document_report.py b/addons/document/report/document_report.py index 34b61f01c01..7b09f131178 100644 --- a/addons/document/report/document_report.py +++ b/addons/document/report/document_report.py @@ -64,41 +64,8 @@ class report_document_user(osv.osv): group by to_char(f.create_date, 'YYYY'), to_char(f.create_date, 'MM'),d.name,f.parent_id,d.type,f.create_date,f.user_id,f.file_size,u.name,d.type,f.write_date,f.datas_fname ) """) -report_document_user() - -class report_files_partner(osv.osv): - _name = "report.files.partner" - _description = "Files details by Partners" - _auto = False - _columns = { - 'name': fields.char('Year',size=64,required=False, readonly=True), - 'file_size': fields.integer('File Size', readonly=True), - 'nbr':fields.integer('# of Files', readonly=True), - 'partner':fields.char('Partner',size=64,readonly=True), - 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'), - ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True), - } - def init(self, cr): - tools.drop_view_if_exists(cr, 'report_files_partner') - cr.execute(""" - CREATE VIEW report_files_partner as ( - SELECT min(f.id) AS id, - COUNT(*) AS nbr, - to_char(date_trunc('month', f.create_date),'YYYY') AS name, - to_char(date_trunc('month', f.create_date),'MM') AS month, - SUM(f.file_size) AS file_size, - p.name AS partner - - FROM ir_attachment f - LEFT JOIN res_partner p ON (f.partner_id=p.id) - WHERE f.datas_fname IS NOT NULL - GROUP BY p.name, date_trunc('month', f.create_date) - ) - """) -report_files_partner() - class report_document_file(osv.osv): _name = "report.document.file" _description = "Files details by Directory" @@ -122,37 +89,5 @@ class report_document_file(osv.osv): ) """) -report_document_file() - -class report_document_wall(osv.osv): - _name = "report.document.wall" - _description = "Users that did not inserted documents since one month" - _auto = False - _columns = { - 'name': fields.date('Month', readonly=True), - 'user_id':fields.many2one('res.users', 'Owner',readonly=True), - 'user':fields.char('User',size=64,readonly=True), - 'month': fields.char('Month', size=24,readonly=True), - 'last':fields.datetime('Last Posted Time', readonly=True), - } - - def init(self, cr): - tools.drop_view_if_exists(cr, 'report_document_wall') - cr.execute(""" - create or replace view report_document_wall as ( - select max(f.id) as id, - to_char(min(f.create_date),'YYYY-MM-DD HH24:MI:SS') as last, - f.user_id as user_id, f.user_id as user, - to_char(f.create_date,'Month') as month - from ir_attachment f - where f.create_date in ( - select max(i.create_date) - from ir_attachment i - inner join res_users u on (i.user_id=u.id) - group by i.user_id) group by f.user_id,f.create_date - having (CURRENT_DATE - to_date(to_char(f.create_date,'YYYY-MM-DD'),'YYYY-MM-DD')) > 30 - ) - """) -report_document_wall() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml index e6e1847cd56..3ec11e206c5 100644 --- a/addons/document/report/document_report_view.xml +++ b/addons/document/report/document_report_view.xml @@ -55,8 +55,6 @@ - All Users files @@ -67,74 +65,20 @@ - - - - report.document.wall.form - report.document.wall - form - -
- - - - - -
- - - report.document.wall.tree - report.document.wall - tree - - - - - - - - - - - Wall of Shame - report.document.wall - form - tree,form - - - - - - - - report.document.resource.graph - report.document.user - graph - - - - - - - - - - - - + report.document.user.graph report.document.file graph - + - + - + report.document.user.tree report.document.file tree @@ -145,6 +89,7 @@ + File Size by Month report.document.file @@ -153,20 +98,15 @@ tree - - - + report.file.month.graph report.document.user graph - + - - - @@ -193,31 +133,6 @@ - - - - report.document.user.graph - report.document.user - graph - - - - - - - - - - Files By Users - report.document.user - - form - tree - - - - - view.files.partner.graph report.files.partner @@ -230,41 +145,5 @@ - - - view.files.partner.tree - report.files.partner - tree - - - - - - - - - - - - view.files.partner.form - report.files.partner - form - - - - - - - - - - - - Files Per Partner - report.files.partner - - form - tree - - - + + diff --git a/addons/document/security/ir.model.access.csv b/addons/document/security/ir.model.access.csv index 36f0aa86dff..a82b9acd838 100644 --- a/addons/document/security/ir.model.access.csv +++ b/addons/document/security/ir.model.access.csv @@ -15,11 +15,6 @@ access_res_partner_group_user,res.partner user,base.model_res_partner,base.group access_document_directory_dctx_all,document.directory.dctx all,model_document_directory_dctx,,1,0,0,0 access_document_directory_dctx_group_document_manager,document.directory.dctx document manager,model_document_directory_dctx,base.group_system,1,1,1,1 access_report_document_user_group_document_manager,report.document.user document manager,model_report_document_user,base.group_system,1,0,0,0 -access_report_files_partner_group_document_manager,report.files.partner document manager,model_report_files_partner,base.group_system,1,0,0,0 access_report_document_file_group_document_manager,report.document.file document manager,model_report_document_file,base.group_system,1,0,0,0 -access_report_document_wall_group_document_manager,report.document.wall document manager,model_report_document_wall,base.group_system,1,0,0,0 -access_report_document_wall_group_system,report.document.wall group system,model_report_document_wall,base.group_system,1,0,0,0 -access_report_files_partner_group_document,report.files.partner document manager,model_report_files_partner,base.group_document_user,1,0,0,0 access_report_document_file_group_document,report.document.file document manager,model_report_document_file,base.group_document_user,1,0,0,0 -access_report_document_wall_group_document,report.document.wall document manager,model_report_document_wall,base.group_document_user,1,0,0,0 access_report_document_user_knowledgeuser,report.document.user knowledgeuser,document.model_report_document_user,base.group_document_user,1,0,0,0 diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml index 38412228723..32286652a64 100644 --- a/addons/stock/board_warehouse_view.xml +++ b/addons/stock/board_warehouse_view.xml @@ -1,6 +1,20 @@ + + + report.stock.move.graph + report.stock.move + graph + + + + + + + + + Incoming Shipments stock.move @@ -27,7 +41,7 @@ form graph,tree [('type','=','in'),('day','<=', time.strftime('%Y-%m-%d')),('day','>',(datetime.date.today()-datetime.timedelta(days=15)).strftime('%Y-%m-%d'))] - + {'search_default_in':1} @@ -36,7 +50,7 @@ form graph,tree [('type','=','out'),('day','<=', time.strftime('%Y-%m-%d')),('day','>',(datetime.date.today()-datetime.timedelta(days=15)).strftime('%Y-%m-%d'))] - + {'search_default_out':1} @@ -68,9 +82,7 @@ - - - + diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml index dc457bc4ea8..7fbecedd00b 100644 --- a/addons/stock/report/report_stock_move_view.xml +++ b/addons/stock/report/report_stock_move_view.xml @@ -49,17 +49,7 @@ - - report.stock.move.graph - report.stock.move - graph - - - - - - - + report.stock.move.search report.stock.move