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

[MERGE]:lp:~openerp-report/openobject-addons/report-dev

Browse Source 
bzr revid: apa@tinyerp.com-20101026100346-sf6uhcfvzanzje4t
This commit is contained in:
apa-tiny
2010-10-26 15:33:46 +05:30
parent 8bd4923b9b 1bf6db79a8
commit 9f5c55e10c
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/board/board_administration_view.xml
+5 -5
View File
@@ -69,12 +69,12 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Log Analysis">
<field name="name" />
<field name="month" />
<field name="day" />
<field name="res_model" />
<field name="name" invisible="1"/>
<field name="month" invisible="1"/>
<field name="day" invisible="1"/>
<field name="res_model" invisible="1"/>
<field name="nbr" />
<field name="creation_date" />
<field name="creation_date" invisible="1"/>
</tree>
</field>
</record>
addons/project/report/project_report_view.xml
+4 -3
View File
@@ -270,14 +270,15 @@
<field name="res_model">project.vs.hours</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="context">{'group_by':['project'],'group_by_no_leaf':1}</field>
<field name="domain">[('uid','=',uid),('state','=','open')]</field>
<field name="view_id" ref="view_project_vs_planned_total_hours_graph"/>
</record>
<record id="open_view_project_vs_planned_total_hours_tree" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">graph</field>
<field name="view_id" ref="view_project_vs_planned_total_hours_graph"/>
<field eval="2" name="sequence"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_project_vs_planned_total_hours_tree"/>
<field name="act_window_id" ref="action_project_vs_planned_total_hours_graph"/>
</record>
<record id="open_view_project_vs_planned_total_hours_graph" model="ir.actions.act_window.view">
addons/purchase/board_purchase_view.xml
+3 -1
View File
@@ -33,8 +33,8 @@
<field name="arch" type="xml">
<tree string="Monthly Purchase by Category">
<field name="month"/>
<field name="price_total"/>
<field name="category_id"/>
<field name="price_total"/>
</tree>
</field>
</record>
@@ -55,6 +55,7 @@
<field name="res_model">purchase.report</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="context">{'group_by':['month','category_id'],'group_by_no_leaf':1}</field>
<field name="view_id" ref="view_purchase_order_monthly_categ_graph"></field>
</record>
<record id="open_view_purchase_order_monthly_categ_tree" model="ir.actions.act_window.view">
@@ -97,6 +98,7 @@
<field name="res_model">purchase.report</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="context">{'group_by':['partner_id'],'group_by_no_leaf':1}</field>
<field name="view_id" ref="view_negotiation_by_supplier_graph"/>
</record>
<record id="open_view_negotiation_by_supplier_tree" model="ir.actions.act_window.view">
addons/purchase/report/purchase_report_view.xml
+2
View File
@@ -25,6 +25,7 @@
<field name="user_id" invisible="1"/>
<field name="partner_id" invisible="1"/>
<field name="product_id" invisible="1"/>
<field name="category_id" invisible="1"/>
<field name="product_uom" invisible="1"/>
<field name="day" invisible="1"/>
<field name="name" invisible="1"/>
@@ -99,6 +100,7 @@
<filter string="Validated by" icon="terp-personal" context="{'group_by':'validator'}"/>
<separator orientation="vertical"/>
<filter string="Product" name="group_product_id" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
<filter string="Category" name="group_category_id" icon="terp-accessories-archiver" context="{'group_by':'category_id'}"/>
<filter string="Product UOM" name="group_product_uom" icon="terp-accessories-archiver" context="{'group_by':'product_uom'}"/>
<filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}" groups="base.group_extended"/>
<filter string="Destination" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_id'}"/>