diff options
| author | Jay (Open ERP) <jvo@tinyerp.com> | 2009-03-04 17:23:18 +0530 |
|---|---|---|
| committer | Jay (Open ERP) <jvo@tinyerp.com> | 2009-03-04 17:23:18 +0530 |
| commit | 391d5c8166b8f8d6486fbfaaef52ab1eb4f7b0fd (patch) | |
| tree | 5d4f543fda5c59bcb43c1283ae2a1153ef473d8a /addons | |
| parent | 7531415448b582104f84745d943704912b5bc0ea (diff) | |
Added graph view for non-done states to amount_total for service dashboard
bzr revid: jvo@tinyerp.com-20090304115318-gjs2k9fwzimd50af
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/account/report/account_balance.py | 2 | ||||
| -rw-r--r-- | addons/report_sale/report_sale_view.xml | 25 |
2 files changed, 23 insertions, 4 deletions
diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index 379e01cdf6f..64db67efea5 100644 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -57,7 +57,7 @@ class account_balance(report_sxw.rml_parse): def get_periods(self, form): result='' - if form.has_key('periods'): + if form.has_key('periods') and form['periods'][0][2]: period_ids = ",".join([str(x) for x in form['periods'][0][2] if x]) self.cr.execute("select name from account_period where id in (%s)" % (period_ids)) res=self.cr.fetchall() diff --git a/addons/report_sale/report_sale_view.xml b/addons/report_sale/report_sale_view.xml index eba8fe71223..1cfb0509ae1 100644 --- a/addons/report_sale/report_sale_view.xml +++ b/addons/report_sale/report_sale_view.xml @@ -149,9 +149,28 @@ <field name="domain">[('date_order','>=',time.strftime('%Y-%m-01')),('state','<>','draft'),('state','<>','cancel')]</field> </record> <menuitem action="action_order_sale_list" id="menu_report_order_sale_list" parent="report_sale.next_id_81"/> + + <record id="view_so_pipeline_graph" model="ir.ui.view"> + <field name="name">sale.order.dashboard.graph</field> + <field name="model">sale.order</field> + <field name="type">graph</field> + <field name="arch" type="xml"> + <graph string="Sales by State" type="bar"> + <field name="state"/> + <field name="amount_total"/> + </graph> + </field> + </record> - - - + <record id="action_so_pipeline" model="ir.actions.act_window"> + <field name="name">Sales by State</field> + <field name="res_model">sale.order</field> + <field name="view_type">form</field> + <field name="view_mode">graph,tree</field> + <field name="view_id" ref="view_so_pipeline_graph"/> + <field name="domain">[('state','<>','done')]</field> + </record> + + </data> </openerp> |