pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] account: add pivot views next to graph views

Browse Source 
The graph view has been splitted into pivot/graph view.  This commit add
a pivot view whenever a graph view was defined.
This commit is contained in:
Géry Debongnie
2014-12-19 14:34:23 +01:00
parent 2c08dc0ba6
commit 67a629e75e
9 changed files with 137 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_invoice_view.xml
+17 -6
View File
@@ -14,13 +14,24 @@
</field>
</record>
<record model="ir.ui.view" id="view_invoice_pivot">
<field name="name">account.invoice.pivot</field>
<field name="model">account.invoice</field>
<field name="arch" type="xml">
<pivot string="Invoices" display_quantity="true">
<field name="partner_id"/>
<field name="amount_total" type="measure"/>
</pivot>
</field>
</record>
<record model="ir.ui.view" id="view_invoice_graph">
<field name="name">account.invoice.graph</field>
<field name="model">account.invoice</field>
<field name="arch" type="xml">
<graph string="Invoices" type="bar">
<graph string="Invoices">
<field name="partner_id"/>
<field name="amount_total" operator="+"/>
<field name="amount_total" type="measure"/>
</graph>
</field>
</record>
@@ -521,7 +532,7 @@
<field name="name">Customer Invoices</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="view_mode">tree,form,calendar,pivot,graph</field>
<field eval="False" name="view_id"/>
<field name="domain">[('type','=','out_invoice')]</field>
<field name="context">{'default_type':'out_invoice', 'type':'out_invoice', 'journal_type': 'sale'}</field>
@@ -561,7 +572,7 @@
<field name="name">Supplier Invoices</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="view_mode">tree,form,calendar,pivot,graph</field>
<field eval="False" name="view_id"/>
<field name="domain">[('type','=','in_invoice')]</field>
<field name="context">{'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase'}</field>
@@ -582,7 +593,7 @@
<field name="name">Customer Refunds</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="view_mode">tree,form,calendar,pivot,graph</field>
<field eval="False" name="view_id"/>
<field name="domain">[('type','=','out_refund')]</field>
<field name="context">{'default_type':'out_refund', 'type':'out_refund', 'journal_type': 'sale_refund'}</field>
@@ -618,7 +629,7 @@
<field name="name">Supplier Refunds</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="view_mode">tree,form,calendar,pivot,graph</field>
<field eval="False" name="view_id"/>
<field name="domain">[('type','=','in_refund')]</field>
<field name="context">{'default_type': 'in_refund', 'type': 'in_refund', 'journal_type': 'purchase_refund'}</field>
addons/account/account_view.xml
+13 -2
View File
@@ -637,7 +637,7 @@
<field name="name">Bank Statements</field>
<field name="res_model">account.bank.statement</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="view_mode">tree,form,pivot,graph</field>
<field name="domain">[('journal_id.type', '=', 'bank')]</field>
<field name="context">{'journal_type':'bank'}</field>
<field name="search_view_id" ref="view_bank_statement_search"/>
@@ -2456,6 +2456,17 @@
</form>
</field>
</record>
<record id="account_cash_statement_pivot" model="ir.ui.view">
<field name="name">account.bank.statement.pivot</field>
<field name="model">account.bank.statement</field>
<field name="arch" type="xml">
<pivot string="Account Statistics" >
<field name="date" type="row"/>
<field name="balance_start" type="measure"/>
<field name="balance_end" type="measure"/>
</pivot>
</field>
</record>
<record id="account_cash_statement_graph" model="ir.ui.view">
<field name="name">account.bank.statement.graph</field>
<field name="model">account.bank.statement</field>
@@ -2472,7 +2483,7 @@
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.bank.statement</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="view_mode">tree,form,pivot,graph</field>
<field name="view_id" ref="view_cash_statement_tree"/>
<field name="search_view_id" ref="view_account_bank_statement_filter"/>
<field name="domain">[('journal_id.type', '=', 'cash')]</field>
addons/account/report/account_analytic_entries_report_view.xml
+16 -5
View File
@@ -23,16 +23,27 @@
</search>
</field>
</record>
<record id="view_account_analytic_entries_search" model="ir.ui.view">
<field name="name">account.analytic.entries.graph</field>
<record id="view_account_analytic_entries_pivot" model="ir.ui.view">
<field name="name">account.analytic.entries.pivot</field>
<field name="model">analytic.entries.report</field>
<field name="arch" type="xml">
<graph string="Analytic Entries Analysis" type="pivot">
<pivot string="Analytic Entries Analysis" disable_linking="True">
<field name="account_id" type="row"/>
<field name="date" interval="month" type="col"/>
<field name="nbr" type="measure"/>
<field name="unit_amount" type="measure"/>
<field name="amount" type="measure"/>
</pivot>
</field>
</record>
<record id="view_account_analytic_entries_graph" model="ir.ui.view">
<field name="name">account.analytic.entries.graph</field>
<field name="model">analytic.entries.report</field>
<field name="arch" type="xml">
<graph string="Analytic Entries Analysis">
<field name="account_id"/>
<field name="date" interval="month"/>
<field name="amount" type="measure"/>
</graph>
</field>
</record>
@@ -40,9 +51,9 @@
<field name="name">Analytic Entries Analysis</field>
<field name="res_model">analytic.entries.report</field>
<field name="view_type">form</field>
<field name="view_mode">graph</field>
<field name="view_mode">pivot,graph</field>
<field name="search_view_id" ref="view_analytic_entries_report_search"/>
<field name="context">{'group_by_no_leaf':1, 'search_default_Account':1, 'group_by':[]}</field>
<field name="context">{'search_default_Account':1}</field>
<field name="help">From this view, have an analysis of your different analytic entries following the analytic account you defined matching your business need. Use the tool search to analyse information about analytic entries generated in the system.</field>
</record>
addons/account/report/account_entries_report_view.xml
+15 -5
View File
@@ -31,16 +31,27 @@
</tree>
</field>
</record>
<record id="view_account_entries_report_graph" model="ir.ui.view">
<field name="name">account.entries.report.graph</field>
<record id="view_account_entries_report_pivot" model="ir.ui.view">
<field name="name">account.entries.report.pivot</field>
<field name="model">account.entries.report</field>
<field name="arch" type="xml">
<graph string="Entries Analysis" type="pivot">
<pivot string="Entries Analysis" disable_linking="True">
<field name="user_type" type="row"/>
<field name="period_id" type="col"/>
<field name="debit" type="measure"/>
<field name="credit" type="measure"/>
<field name="balance" type="measure"/>
</pivot>
</field>
</record>
<record id="view_account_entries_report_graph" model="ir.ui.view">
<field name="name">account.entries.report.graph</field>
<field name="model">account.entries.report</field>
<field name="arch" type="xml">
<graph string="Entries Analysis">
<field name="user_type"/>
<field name="period_id"/>
<field name="balance" type="measure"/>
</graph>
</field>
</record>
@@ -97,9 +108,8 @@
<field name="name">Entries Analysis</field>
<field name="res_model">account.entries.report</field>
<field name="view_type">form</field>
<field name="view_mode">graph</field>
<field name="view_mode">pivot,graph</field>
<field name="search_view_id" ref="view_account_entries_report_search"/>
<field name="view_id" ref="view_account_entries_report_graph"/>
<field name="context">{'group_by':[], 'search_default_usertype':1, 'search_default_thisyear':1, 'group_by_no_leaf':1}</field>
<field name="help">From this view, have an analysis of your different financial accounts. The document shows your debit and credit taking in consideration some criteria you can choose by using the search tool.</field>
</record>
addons/account/report/account_invoice_report_view.xml
+16 -5
View File
@@ -1,13 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_account_invoice_report_pivot" model="ir.ui.view">
<field name="name">account.invoice.report.pivot</field>
<field name="model">account.invoice.report</field>
<field name="arch" type="xml">
<pivot string="Invoices Analysis" disable_linking="True">
<field name="categ_id" type="row"/>
<field name="period_id" type="col"/>
<field name="price_total" type="measure"/>
</pivot>
</field>
</record>
<record id="view_account_invoice_report_graph" model="ir.ui.view">
<field name="name">account.invoice.report.graph</field>
<field name="model">account.invoice.report</field>
<field name="arch" type="xml">
<graph string="Invoices Analysis" type="pivot">
<field name="categ_id" type="row"/>
<field name="period_id" type="col"/>
<graph string="Invoices Analysis">
<field name="categ_id"/>
<field name="period_id"/>
<field name="price_total" type="measure"/>
</graph>
</field>
@@ -89,11 +101,10 @@
<field name="name">Invoices Analysis</field>
<field name="res_model">account.invoice.report</field>
<field name="view_type">form</field>
<field name="view_mode">graph</field>
<field name="view_mode">pivot,graph</field>
<field name="context">{'search_default_current':1, 'search_default_customer':1, 'group_by':[], 'group_by_no_leaf':1, 'search_default_year': 1}</field>
<field name="search_view_id" ref="view_account_invoice_report_search"/>
<field name="help">From this report, you can have an overview of the amount invoiced to your customer. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.</field>
</record>
<menuitem action="action_account_invoice_report_all" id="menu_action_account_invoice_report_all" parent="account.menu_finance_reporting" sequence="0"/>
addons/account/report/account_treasury_report_view.xml
+14 -6
View File
@@ -18,14 +18,24 @@
</tree>
</field>
</record>
<record id="view_account_treasury_report_pivot" model="ir.ui.view">
<field name="name">account.treasury.report.pivot</field>
<field name="model">account.treasury.report</field>
<field name="arch" type="xml">
<pivot string="Treasury Analysis" disable_linking="True">
<field name="period_id"/>
<field name="debit" type="measure"/>
<field name="credit" type="measure"/>
<field name="balance" type="measure"/>
</pivot>
</field>
</record>
<record id="view_account_treasury_report_graph" model="ir.ui.view">
<field name="name">account.treasury.report.graph</field>
<field name="model">account.treasury.report</field>
<field name="arch" type="xml">
<graph string="Treasury Analysis" type="pivot">
<graph string="Treasury Analysis">
<field name="period_id" type="row"/>
<field name="debit" type="measure"/>
<field name="credit" type="measure"/>
<field name="balance" type="measure"/>
</graph>
</field>
@@ -48,10 +58,8 @@
<field name="name">Treasury Analysis</field>
<field name="res_model">account.treasury.report</field>
<field name="view_type">form</field>
<field name="view_mode">graph</field>
<field name="view_mode">pivot,graph</field>
<field name="search_view_id" ref="view_account_treasury_report_search"/>
<field name="view_id" ref="view_account_treasury_report_graph"/>
<field name="context">{'group_by':[], 'group_by_no_leaf':0}</field>
<field name="help">From this view, have an analysis of your treasury. It sums the balance of every accounting entries made on liquidity accounts per period.</field>
</record>
<menuitem action="action_account_treasury_report_all" id="menu_action_account_treasury_report_all"
addons/account_asset/report/account_asset_report_view.xml
+14 -4
View File
@@ -2,6 +2,19 @@
<openerp>
<data>
<record model="ir.ui.view" id="action_account_asset_report_pivot">
<field name="name">asset.asset.report.pivot</field>
<field name="model">asset.asset.report</field>
<field name="arch" type="xml">
<pivot string="Assets Analysis" disable_linking="True">
<field name="asset_category_id" type="row"/>
<field name="purchase_date" type="col"/>
<field name="posted_value" type="measure"/>
<field name="gross_value" type="measure"/>
<field name="depreciation_value" type="measure"/>
</pivot>
</field>
</record>
<record model="ir.ui.view" id="action_account_asset_report_graph">
<field name="name">asset.asset.report.graph</field>
<field name="model">asset.asset.report</field>
@@ -9,9 +22,7 @@
<graph string="Assets Analysis" type="pivot">
<field name="asset_category_id" type="row"/>
<field name="purchase_date" type="col"/>
<field name="posted_value" type="measure"/>
<field name="gross_value" type="measure"/>
<field name="depreciation_value" type="measure"/>
</graph>
</field>
</record>
@@ -51,9 +62,8 @@
<field name="name">Assets Analysis</field>
<field name="res_model">asset.asset.report</field>
<field name="view_type">form</field>
<field name="view_mode">graph</field>
<field name="view_mode">pivot,graph</field>
<field name="search_view_id" ref="view_asset_asset_report_search"/>
<field name="context">{'group_by':[], 'group_by_no_leaf':1}</field>
<field name="help" type="html">
<p>
From this report, you can have an overview on all depreciation. The
addons/account_followup/report/account_followup_report.xml
+15 -4
View File
@@ -2,13 +2,24 @@
<openerp>
<data>
<record id="view_account_followup_stat_pivot" model="ir.ui.view">
<field name="name">account_followup.stat.pivot</field>
<field name="model">account_followup.stat</field>
<field name="arch" type="xml">
<pivot string="Follow-up lines" disable_linking="True">
<field name="followup_id" type="row"/>
<field name="date_followup" type="col"/>
<field name="balance" type="measure"/>
</pivot>
</field>
</record>
<record id="view_account_followup_stat_graph" model="ir.ui.view">
<field name="name">account_followup.stat.graph</field>
<field name="model">account_followup.stat</field>
<field name="arch" type="xml">
<graph string="Follow-up lines" type="pivot">
<field name="followup_id" type="row"/>
<field name="date_followup" type="col"/>
<graph string="Follow-up lines">
<field name="followup_id"/>
<field name="date_followup"/>
<field name="balance" type="measure"/>
</graph>
</field>
@@ -42,7 +53,7 @@
<field name="name">Follow-ups Sent</field>
<field name="res_model">account_followup.stat</field>
<field name="view_type">form</field>
<field name="view_mode">graph</field>
<field name="view_mode">pivot,graph</field>
<field name="context">{'search_default_followup_level':1}</field>
<field name="search_view_id" ref="view_account_followup_stat_search"/>
</record>
addons/account_voucher/report/account_voucher_sales_receipt_view.xml
+17 -5
View File
@@ -1,13 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<openerp>
<data>
<record id="view_sale_receipt_report_pivot" model="ir.ui.view">
<field name="name">sale.receipt.report.pivot</field>
<field name="model">sale.receipt.report</field>
<field name="arch" type="xml">
<pivot string="Sales Receipts Analysis" disable_linking="True">
<field name="partner_id" type="row"/>
<field name="date_due" type="col"/>
<field name="price_total" type="measure"/>
</pivot>
</field>
</record>
<record id="view_sale_receipt_report_graph" model="ir.ui.view">
<field name="name">sale.receipt.report.graph</field>
<field name="model">sale.receipt.report</field>
<field name="arch" type="xml">
<graph string="Sales Receipts Analysis" type="pivot">
<field name="partner_id" type="row"/>
<field name="date_due" type="col"/>
<graph string="Sales Receipts Analysis">
<field name="partner_id"/>
<field name="date_due"/>
<field name="price_total" type="measure"/>
</graph>
</field>
@@ -46,8 +58,8 @@
<field name="name">Sales Receipts Analysis</field>
<field name="res_model">sale.receipt.report</field>
<field name="view_type">form</field>
<field name="view_mode">graph</field>
<field name="context">{'search_default_year':1,'search_default_month':1,'search_default_partner':1, 'search_default_customer':1, 'group_by':[], 'group_by_no_leaf':1,}</field>
<field name="view_mode">pivot,graph</field>
<field name="context">{'search_default_year':1,'search_default_month':1,'search_default_partner':1, 'search_default_customer':1}</field>
<field name="search_view_id" ref="view_sale_receipt_report_search"/>
<field name="help" type="html">
<p>