Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-review-dashboards-account-tpa into
lp:~openerp-dev/openobject-addons/trunk-review-dashboards.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-review-dashboards-account-tpa/+merge/108882
Account
=============================================================
[IMP]: improved view of dashboard and remove unnecessary code
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-review-dashboards-account-tpa/+merge/108882
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-review-dashboards.
=== modified file 'account/board_account_view.xml'
--- account/board_account_view.xml 2012-05-01 13:20:24 +0000
+++ account/board_account_view.xml 2012-06-06 06:12:40 +0000
@@ -1,38 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
- <record id="action_aged_receivable" model="ir.actions.act_window">
- <field name="name">Receivable Accounts</field>
- <field name="res_model">report.account.receivable</field>
- <field name="view_type">form</field>
- <field name="view_mode">graph,tree</field>
- <field name="domain">[('type','=','receivable')]</field>
- </record>
- <record id="action_aged_income" model="ir.actions.act_window">
- <field name="name">Income Accounts</field>
- <field name="res_model">report.account.receivable</field>
- <field name="view_type">form</field>
- <field name="view_mode">graph,tree</field>
- <field name="domain">[('type','=','income')]</field>
- </record>
- <record id="action_company_analysis_tree" model="ir.actions.act_window">
- <field name="name">Company Analysis</field>
- <field name="res_model">account.entries.report</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,graph</field>
- <field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
- <field name="view_id" ref="account.view_account_entries_report_tree"/>
- <field name="domain">[('year','=',time.strftime('%Y'))]</field>
- </record>
- <record id="action_treasory_graph" model="ir.actions.act_window">
- <field name="name">Treasury</field>
- <field name="res_model">account.account</field>
- <field name="view_type">form</field>
- <field name="view_mode">graph,tree</field>
- <field name="domain">[('type','=','liquidity')]</field>
- <field name="context">{'default_type': 'liquidity'}</field>
- <field name="view_id" ref="account.view_treasory_graph"/>
- </record>
+
+ <record id="action_company_analysis_tree" model="ir.actions.act_window">
+ <field name="name">Company Analysis</field>
+ <field name="res_model">account.entries.report</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,graph</field>
+ <field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
+ <field name="view_id" ref="account.view_account_entries_report_tree"/>
+ <field name="domain">[('year','=',time.strftime('%Y'))]</field>
+ </record>
+
+ <record id="action_treasory_graph" model="ir.actions.act_window">
+ <field name="name">Treasury</field>
+ <field name="res_model">account.account</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">graph,tree</field>
+ <field name="domain">[('type','=','liquidity')]</field>
+ <field name="context">{'default_type': 'liquidity'}</field>
+ <field name="view_id" ref="account.view_treasory_graph"/>
+ </record>
+
<record id="board_account_form" model="ir.ui.view">
<field name="name">board.account.form</field>
<field name="model">board.board</field>
@@ -45,7 +34,7 @@
<action name="%(action_company_analysis_tree)d" string="Company Analysis"/>
</column>
<column>
- <action name="%(action_treasory_graph)d" string="Treasury"/> <!--groups="account.group_account_manager,account.group_account_user"-->
+ <action name="%(action_treasory_graph)d" string="Treasury"/>
</column>
</board>
</form>
@@ -61,8 +50,7 @@
<field name="view_id" ref="board_account_form"/>
</record>
- <menuitem id="menu_dashboard_acc" name="Accounting" sequence="30" parent="base.menu_reporting_dashboard" groups="group_account_user,group_account_manager"/>
- <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
+ <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="base.menu_reporting_dashboard" groups="group_account_user,group_account_manager" sequence="25"/>
</data>
</openerp>
=== modified file 'account/report/account_report_view.xml'
--- account/report/account_report_view.xml 2012-04-24 06:05:32 +0000
+++ account/report/account_report_view.xml 2012-06-06 06:12:40 +0000
@@ -81,156 +81,5 @@
<field name="view_mode">graph,tree</field>
</record>
- <!-- Created Invoice for random activities of service dashboard -->
-
- <record id="board_view_created_invoice" model="ir.ui.view">
- <field name="name">report.invoice.created.tree</field>
- <field name="model">report.invoice.created</field>
- <field name="type">tree</field>
- <field name="arch" type="xml">
- <tree colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state in('paid','cancel') " string="Invoices">
- <field name="create_date" select="1"/>
- <field name="name" select="1"/>
- <field name="type"/>
- <field name="number"/>
- <field name="partner_id"/>
- <field name="amount_untaxed" sum="Untaxed Amount"/>
- <field name="amount_total" sum="Total Amount"/>
- <field name="currency_id"/>
- <field name="date_invoice"/>
- <field name="date_due" select="1"/>
- <field name="residual"/>
- <field name="state" select="2"/>
- <field name="origin"/>
- </tree>
- </field>
- </record>
-
- <record id="action_view_created_invoice_dashboard" model="ir.actions.act_window">
- <field name="name">Invoices Created Within Past 15 Days</field>
- <field name="res_model">report.invoice.created</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="view_id" ref="board_view_created_invoice"/>
- </record>
-
- <record id="view_report_account_sales_tree" model="ir.ui.view">
- <field name="name">report.account.sales.tree</field>
- <field name="model">report.account.sales</field>
- <field name="type">tree</field>
- <field name="arch" type="xml">
- <tree string="Sales by Account">
- <field name="name" select="1"/>
- <field name="month" select="1"/>
- <field name="product_id"/>
- <field name="account_id"/>
- <field name="quantity"/>
- <field name="amount_total"/>
- <field name="currency_id"/>
- </tree>
- </field>
- </record>
-
- <record id="view_report_account_sales_graph" model="ir.ui.view">
- <field name="name">report.account.sales.graph</field>
- <field name="model">report.account.sales</field>
- <field name="type">graph</field>
- <field name="arch" type="xml">
- <graph string="Sales by Account" type="pie">
- <field name="account_id"/>
- <field name="amount_total"/>
- </graph>
- </field>
- </record>
-
- <record id="view_report_account_sales_search" model="ir.ui.view">
- <field name="name">report.account.sales.search</field>
- <field name="model">report.account.sales</field>
- <field name="type">search</field>
- <field name="arch" type="xml">
- <search string="Sales by Account">
- <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="This year's Sales by type"/>
- <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This months' Sales by type"/>
- <separator orientation="vertical"/>
- <field name="name"/>
- <field name="month"/>
- </search>
- </field>
- </record>
-
- <record id="action_report_account_sales_tree_all" model="ir.actions.act_window">
- <field name="name">Sales by Account</field>
- <field name="res_model">report.account.sales</field>
- <field name="view_type">form</field>
- <field name="view_mode">graph,tree</field>
- <field name="search_view_id" ref="view_report_account_sales_search"/>
- </record>
-
- <record id="view_report_account_type_sales_tree" model="ir.ui.view">
- <field name="name">report.account_type.sales.tree</field>
- <field name="model">report.account_type.sales</field>
- <field name="type">tree</field>
- <field name="arch" type="xml">
- <tree string="Sales by Account Type">
- <field name="name"/>
- <field name="month"/>
- <field name="period_id"/>
- <field name="product_id"/>
- <field name="user_type"/>
- <field name="quantity"/>
- <field name="amount_total"/>
- <field name="currency_id"/>
- </tree>
- </field>
- </record>
-
- <record id="view_report_account_type_sales_form" model="ir.ui.view">
- <field name="name">report.account_type.sales.form</field>
- <field name="model">report.account_type.sales</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <tree string="Sales by Account Type">
- <field name="name" select="1"/>
- <field name="month" select="1"/>
- <field name="product_id" select="1"/>
- </tree>
- </field>
- </record>
-
- <record id="view_report_account_type_sales_graph" model="ir.ui.view">
- <field name="name">report.account_type.sales.graph</field>
- <field name="model">report.account_type.sales</field>
- <field name="type">graph</field>
- <field name="arch" type="xml">
- <graph string="Sales by Account" type="pie">
- <field name="user_type"/>
- <field name="amount_total"/>
- </graph>
- </field>
- </record>
-
- <record id="view_report_account_type_sales_search" model="ir.ui.view">
- <field name="name">report.account_type.sales.search</field>
- <field name="model">report.account_type.sales</field>
- <field name="type">search</field>
- <field name="arch" type="xml">
- <search string="Sales by Account">
- <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="All Months Sales by type"/>
- <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by type"/>
- <separator orientation="vertical"/>
- <field name="name"/>
- <field name="month"/>
- </search>
- </field>
- </record>
-
- <record id="action_report_account_type_sales_tree_all" model="ir.actions.act_window">
- <field name="name">Sales by Account Type</field>
- <field name="res_model">report.account_type.sales</field>
- <field name="view_type">form</field>
- <field name="view_mode">graph,tree</field>
- <field name="search_view_id" ref="view_report_account_type_sales_search"/>
- </record>
-
</data>
</openerp>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
