addons/sale/stock_view.xml

   1 <?xml version="1.0" encoding="utf-8"?>
   2 <openerp>
   3     <data>
   4         <record id="stock_picking_inherit_sale" model="ir.ui.view">
   5             <field name="name">stock.picking.form</field>
   6             <field name="model">stock.picking</field>
   7             <field name="type">form</field>
   8             <field name="inherit_id" ref="stock.view_picking_form"/>
   9             <field name="arch" type="xml">
  10                 <field name="auto_picking" position="after">
  11                     <field name="sale_id"/>
  12                 </field>
  13             </field>
  14         </record>
  15
  16 <<<<<<< TREE
  17 =======
  18         <record id="stock_move_sale" model="ir.ui.view">
  19             <field name="name">stock.move.form</field>
  20             <field name="model">stock.move</field>
  21             <field name="type">form</field>
  22             <field name="inherit_id" ref="stock.view_move_form"/>
  23             <field name="arch" type="xml">
  24                  <xpath expr="/form/group/field[@name='tracking_id']"  position="before">
  25                     <field name="sale_line_id" colspan="2"/>
  26                 </xpath>
  27             </field>
  28         </record>
  29
  30 >>>>>>> MERGE-SOURCE
  31         <act_window
  32             domain="[('sale_id', '=', active_id)]"
  33             id="act_sale_order_2_stock_picking"
  34             name="Picking"
  35             res_model="stock.picking"
  36             src_model="sale.order"
  37             context="{'contact_display': 'partner'}" />
  38
  39 <<<<<<< TREE
  40        <record id="action_sale_picking_in_tree_view" model="ir.actions.act_window.view">
  41 =======
  42        <record id="action_sale_picking_out_tree_view" model="ir.actions.act_window.view">
  43 >>>>>>> MERGE-SOURCE
  44             <field eval="1" name="sequence"/>
  45             <field name="view_mode">tree</field>
  46 <<<<<<< TREE
  47             <field name="view_id" ref="stock.view_picking_in_tree"/>
  48 =======
  49             <field name="view_id" ref="stock.view_picking_out_tree"/>
  50 >>>>>>> MERGE-SOURCE
  51             <field name="act_window_id" ref="act_sale_order_2_stock_picking"/>
  52         </record>
  53 <<<<<<< TREE
  54         <record id="action_sale_picking_in_form_view" model="ir.actions.act_window.view">
  55 =======
  56
  57         <record id="action_sale_picking_out_form_view" model="ir.actions.act_window.view">
  58 >>>>>>> MERGE-SOURCE
  59             <field eval="2" name="sequence"/>
  60             <field name="view_mode">form</field>
  61 <<<<<<< TREE
  62             <field name="view_id" ref="stock.view_picking_in_form"/>
  63 =======
  64             <field name="view_id" ref="stock.view_picking_out_form"/>
  65 >>>>>>> MERGE-SOURCE
  66             <field name="act_window_id" ref="act_sale_order_2_stock_picking"/>
  67         </record>
  68
  69 <<<<<<< TREE
  70
  71
  72 =======
  73 >>>>>>> MERGE-SOURCE
  74         <!-- Adding Sale Order Reference to outgoing picking -->
  75
  76         <record id="stock_picking_out_inherit_sale" model="ir.ui.view">
  77             <field name="name">Outgoing picking Inherited</field>
  78             <field name="model">stock.picking</field>
  79             <field name="type">form</field>
  80             <field name="inherit_id" ref="stock.view_picking_out_form"/>
  81             <field name="arch" type="xml">
  82                 <field name="move_type" position="after">
  83                     <field name="sale_id"/>
  84                 </field>
  85             </field>
  86         </record>
  87
  88     </data>
  89 </openerp>