odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] merge with main addons 

bzr revid: psi@tinyerp.com-20120622090913-jtqh47e4h5ndffjg
This commit is contained in:
Purnendu Singh (OpenERP) 2012-06-22 14:39:13 +05:30
parent ecd59426ae 2b85a687e5
commit 4ad7c5d050
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/sale_margin/sale_margin_view.xml
View File

@ -8,12 +8,12 @@
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_form" />
<field name="arch" type="xml">
<xpath expr="//group[@class='oe_subtotal_footer']" position="inside">
<xpath expr="//group[@name='sale_total']" position="inside">
<field name="margin"/>
</xpath>
</field>
</record>
<record model="ir.ui.view" id="sale_margin_sale_order_line">
<field name="name">sale.order.line.margin.view.form</field>
<field name="type">form</field>
@ -25,7 +25,7 @@
</xpath>
</field>
</record>
<record model="ir.ui.view" id="sale_margin_sale_order_line_form">
<field name="name">sale.order.line.tree.margin.view.form</field>
<field name="type">form</field>
@ -37,7 +37,7 @@
</xpath>
</field>
</record>
<record model="ir.ui.view" id="sale_margin_sale_order_tree">
<field name="name">sale.order.margin.view.tree</field>
<field name="type">tree</field>
@ -49,7 +49,7 @@
</field>
</field>
</record>
<record model="ir.ui.view" id="sale_margin_sale_order_line_tree">
<field name="name">sale.order.margin.line.view.tree</field>
<field name="type">tree</field>
@ -60,7 +60,7 @@
<field name="margin"/>
</field>
</field>
</record>
</record>
</data>
</openerp>