From d14a0d90b62f461e3e08abb40e870901f945def6 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 6 Jun 2012 10:49:51 +0530 Subject: [PATCH 1/4] [IMP] account:improved view of dashboard and remove unnecessary code bzr revid: tpa@tinyerp.com-20120606051951-1g5gxxex1rf5i6h9 --- addons/account/board_account_view.xml | 58 +++---- addons/account/report/account_report_view.xml | 151 ------------------ 2 files changed, 23 insertions(+), 186 deletions(-) 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/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 - - - From 237848247904a86fd39f40029f1cd4873427645d Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 6 Jun 2012 11:32:47 +0530 Subject: [PATCH 2/4] [IMP] stock:improved view of dashboard and remove unnecessary code bzr revid: tpa@tinyerp.com-20120606060247-ybov0fg52uukj1i4 --- addons/stock/board_warehouse_view.xml | 21 ++++++++++++++----- .../stock/report/report_stock_move_view.xml | 12 +---------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml index 38412228723..50374eeabc3 100644 --- a/addons/stock/board_warehouse_view.xml +++ b/addons/stock/board_warehouse_view.xml @@ -1,6 +1,19 @@ + + + report.stock.move.graph + report.stock.move + graph + + + + + + + + Incoming Shipments stock.move @@ -27,7 +40,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 +49,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 +81,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 From 3c35c470b857714c9ee8028ac2c8a825fdab5124 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 6 Jun 2012 12:34:39 +0530 Subject: [PATCH 3/4] [IMP] Account:remove unnecessary code from account.pot bzr revid: tpa@tinyerp.com-20120606070439-a9bq6mhevf9w2888 --- addons/account/i18n/account.pot | 39 --------------------------------- 1 file changed, 39 deletions(-) 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." From a66a465afac14cdf1194284951b0b707f24666b9 Mon Sep 17 00:00:00 2001 From: "Randhir Mayatra (OpenERP)" Date: Wed, 6 Jun 2012 13:40:28 +0530 Subject: [PATCH 4/4] [MARGE] Knowledge : Improve the Knowledge Dashboard bzr revid: rma@tinyerp.com-20120606081028-dptz6vkwscy34kff --- addons/document/board_document_view.xml | 58 ++----------------- .../document/report/document_report_view.xml | 48 ++------------- 2 files changed, 10 insertions(+), 96 deletions(-) diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml index acfcf4cb63a..d599b857f0e 100644 --- a/addons/document/board_document_view.xml +++ b/addons/document/board_document_view.xml @@ -12,6 +12,9 @@ + - + - - - - - board.document.manager.form1 - board.board - form - -
- - - - - - - - - - - -
-
-
- - - - Statistics by User - board.board - form - form - - - - diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml index e6e1847cd56..66dd803fc43 100644 --- a/addons/document/report/document_report_view.xml +++ b/addons/document/report/document_report_view.xml @@ -83,27 +83,7 @@ - - report.document.wall.tree - report.document.wall - tree - - - - - - - - - - - Wall of Shame - report.document.wall - form - tree,form - - - + @@ -112,7 +92,7 @@ report.document.user graph - + @@ -127,7 +107,7 @@ report.document.file graph - + @@ -161,7 +141,7 @@ report.document.user graph - + @@ -195,26 +175,6 @@ - - report.document.user.graph - report.document.user - graph - - - - - - - - - - Files By Users - report.document.user - - form - tree - -