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

[FIX] sale : Corrections

Browse Source 
bzr revid: jma@tinyerp.com-20101012124616-ab7ia1hc0n5vzdqa
This commit is contained in:
JMA (OpenERP)
2010-10-12 18:16:16 +05:30
parent 3f0a808c8b
commit 110e5ac904
1 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/sale/stock_view.xml
-24
View File
@@ -13,8 +13,6 @@
</field>
</record>
<<<<<<< TREE
=======
<record id="stock_move_sale" model="ir.ui.view">
<field name="name">stock.move.form</field>
<field name="model">stock.move</field>
@@ -27,7 +25,6 @@
</field>
</record>
>>>>>>> MERGE-SOURCE
<act_window
domain="[('sale_id', '=', active_id)]"
id="act_sale_order_2_stock_picking"
@@ -36,41 +33,20 @@
src_model="sale.order"
context="{'contact_display': 'partner'}" />
<<<<<<< TREE
<record id="action_sale_picking_in_tree_view" model="ir.actions.act_window.view">
=======
<record id="action_sale_picking_out_tree_view" model="ir.actions.act_window.view">
>>>>>>> MERGE-SOURCE
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<<<<<<< TREE
<field name="view_id" ref="stock.view_picking_in_tree"/>
=======
<field name="view_id" ref="stock.view_picking_out_tree"/>
>>>>>>> MERGE-SOURCE
<field name="act_window_id" ref="act_sale_order_2_stock_picking"/>
</record>
<<<<<<< TREE
<record id="action_sale_picking_in_form_view" model="ir.actions.act_window.view">
=======
<record id="action_sale_picking_out_form_view" model="ir.actions.act_window.view">
>>>>>>> MERGE-SOURCE
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<<<<<<< TREE
<field name="view_id" ref="stock.view_picking_in_form"/>
=======
<field name="view_id" ref="stock.view_picking_out_form"/>
>>>>>>> MERGE-SOURCE
<field name="act_window_id" ref="act_sale_order_2_stock_picking"/>
</record>
<<<<<<< TREE
=======
>>>>>>> MERGE-SOURCE
<!-- Adding Sale Order Reference to outgoing picking -->
<record id="stock_picking_out_inherit_sale" model="ir.ui.view">