[MERGE] Merge with lp:openobject-addons

bzr revid: sbh@tinyerp.com-20120516043048-pkd9klih8jdszhni

diff --cc addons/mrp/mrp_view.xml
Simple merge

diff --cc addons/procurement/procurement.py
Simple merge

diff --cc addons/procurement/procurement_view.xml
Simple merge

diff --cc addons/product/product_view.xml
Simple merge

diff --cc addons/project/project.py
Simple merge

diff --cc addons/project/project_view.xml
Simple merge

diff --cc addons/purchase/purchase.py
Simple merge

diff --cc addons/purchase/purchase_view.xml
Simple merge

diff --cc addons/purchase_requisition/purchase_requisition.py
Simple merge

diff --cc addons/sale/sale_view.xml
Simple merge

diff --cc addons/stock/stock_view.xml
index 1baef68,907d814..fd85d73
--- 1/addons/stock/stock_view.xml
--- 2/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@@ -878,137 -919,34 +919,34 @@@
          </record>
          <record id="view_picking_out_form" model="ir.ui.view">
              <field name="name">stock.picking.out.form</field>
-             <field name="model">stock.picking</field>
+             <field name="model">stock.picking.out</field>
+             <field name="inherit_id" ref="view_picking_form"/>
              <field name="type">form</field>
              <field name="arch" type="xml">
-                 <form string="Delivery Orders">
-                     <group col="6" colspan="4">
-                         <group colspan="4" col="4">
-                             <field name="name" readonly="1"/>
-                             <field name="origin" readonly="1"/>
-                             <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4"/>
-                             <field name="invoice_state"/>
-                             <field name="backorder_id" readonly="1"/>
-                         </group>
-                         <group colspan="2" col="2">
-                             <field name="date"/>
-                             <field name="min_date" readonly="1"/>
-                             <field name="stock_journal_id" widget="selection"/>
-                         </group>
-                     </group>
-                     <notebook colspan="4">
-                         <page string="Products">
-                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" context="{'address_out_id': partner_id, 'picking_type': type}" >
-                                 <tree colors="grey:scrapped==True" string="Stock Moves">
-                                     <field name="product_id"/>
-                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                     <field name="product_uom" string="UoM" groups="product.group_uom"/>
-                                     <field name="product_uos" groups="product.group_uos"/>
-                                     <button name="%(stock.move_scrap)d"
-                                         string="Scrap Products" type="action"
-                                         icon="gtk-convert" context="{'scrap': True}"
-                                         states="draft,waiting,confirmed,assigned" />
-                                     <field name="scrapped" invisible="1"/>
-                                     <field name="prodlot_id" groups="stock.group_production_lot"/>
-                                     <button name="%(track_line)d" string="Split in production lots" type="action"
-                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
-                                         states="draft,assigned,confirmed"
-                                         groups="stock.group_production_lot"/>
-                                     <field name="tracking_id" groups="stock.group_tracking_lot"/>
-                                     <button name="setlast_tracking" string="Put in current pack" type="object"
-                                         attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
-                                         groups="stock.group_tracking_lot"
-                                         icon="terp-stock_effects-object-colorize"
-                                         states="draft,assigned,confirmed"/>
-                                     <button name="%(split_into)d" string="Put in a new pack" type="action"
-                                         icon="terp-stock_effects-object-colorize"
-                                         groups="product.group_stock_packaging"
-                                         states="draft,assigned,confirmed"/>
-                                     <field name="location_id"/>
-                                     <field name="date"/>
-                                     <field name="state"/>
-                                     <button name="%(action_partial_move_server)d" string="Process" type="action" states="confirmed,assigned" icon="gtk-go-forward"/>
-                                 </tree>
-                                 <form string="Stock Moves">
-                                     <group colspan="2" col="4">
-                                         <separator colspan="4" string="Move Information"/>
-                                         <field name="name" invisible="1" colspan="4" />
-                                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)" colspan="4" />
-                                         <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3" />
-                                         <button name="%(stock.move_scrap)d"
-                                                 string="Scrap" type="action"
-                                                 icon="gtk-convert" context="{'scrap': True}"
-                                                 states="draft,waiting,confirmed,assigned" colspan="1"/>
-                                         <field name="product_uom" string="Unit Of Measure" colspan="4" groups="product.group_uom"/>
-                                         <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4" />
-                                         <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4" />
-                                         <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]" colspan="4" />
-                                     </group>
- 
-                                     <group colspan="2" col="2">
-                                         <separator string="Locations" colspan="2" />
-                                         <field name="location_id" domain="[('usage','=','internal')]" />
-                                         <field name="location_dest_id" domain="[('usage','&lt;&gt;','view')]" />
-                                     </group>
- 
-                                     <group colspan="2" col="2">
-                                         <separator string="Dates" colspan="2" />
-                                         <field name="create_date" invisible="1"/>
-                                         <field name="date"/>
-                                         <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-                                     </group>
- 
-                                     <group colspan="2" col="4">
-                                         <separator string="Traceability" colspan="4" groups="stock.group_tracking_lot"/>
-                                         <field name="tracking_id" groups="stock.group_tracking_lot" colspan="3" />
-                                           <button name="%(split_into)d" string="New Pack" type="action"
-                                               groups="stock.group_tracking_lot"
-                                               icon="terp-stock_effects-object-colorize"
-                                               states="draft,assigned,confirmed" colspan="1"/>
-                                         <field name="prodlot_id" groups="stock.group_production_lot"
-                                             context="{'location_id':location_id, 'product_id':product_id}"
-                                             domain="[('product_id','=?',product_id)]"
-                                             on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"/>
-                                         <button name="%(track_line)d"
-                                               groups="stock.group_tracking_lot"
-                                               states="draft,waiting,confirmed,assigned"
-                                               string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1" />
-                                     </group>
-                                     <label string="" colspan="4"/>
-                                     <field name="state"/>
-                                     <group col="4" colspan="2">
-                                         <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
-                                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
-                                         <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                         <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                     </group>
-                                 </form>
-                             </field>
-                             <group col="12" colspan="4">
-                                 <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
-                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
-                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
-                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
-                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
-                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                 <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
-                                 <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
-                                 <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" icon="terp-gtk-go-back-rtl"/>
-                             </group>
-                         </page>
-                         <page string="Additional info">
-                             <field name="auto_picking"/>
-                             <field name="date_done"/>
-                             <field name="move_type"/>
-                             <field name="type"/>
-                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                         </page>
-                         <page string="Notes">
-                             <field colspan="4" name="note" nolabel="1"/>
-                         </page>
-                     </notebook>
-                     <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                 </form>
+                 <data>
+                     <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='%(act_stock_return_picking)d']" position="replace">
+                         <button name="%(report_picking_list_out)d" string="Print Delivery Slip" type="action" icon="gtk-print" states="done"/>
+                         <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="terp-gtk-go-back-rtl" />
+                     </xpath>
+                     <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='draft_validate']" position="replace">
+                         <button name="draft_validate" states="draft" string="Confirm &amp; Deliver" type="object" icon="gtk-media-play"/>
+                         <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
+                     </xpath>
+                     <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='action_process']" position="replace">
+                         <button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward"/>
+                     </xpath>
+                     <xpath expr="/form/div[@class='oe_form_topbar']/div[@class='oe_right']/field[@name='state']" position="replace">
+                         <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
+                     </xpath>
+                     <xpath expr="/form/sheet/group/group/field[@name='partner_id']" position="replace">
+                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Customer"/>
+                     </xpath>
+                     <xpath expr="/form/sheet" position="after">
+                         <div class="oe_form_sheet_width">
 -                            <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
++                            <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                         </div>
+                     </xpath>
+                 </data>
              </field>
          </record>
  
@@@ -1097,138 -1040,35 +1040,34 @@@
          </record>
          <record id="view_picking_in_form" model="ir.ui.view">
              <field name="name">stock.picking.in.form</field>
-             <field name="model">stock.picking</field>
+             <field name="model">stock.picking.in</field>
+             <field name="inherit_id" ref="view_picking_form"/>
              <field name="type">form</field>
              <field name="arch" type="xml">
-                 <form string="Input Picking List">
-                     <group colspan="4" col="6">
-                         <group colspan="4" col="4">
-                             <field name="name" readonly="1"/>
-                             <field name="origin"/>
-                             <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4"/>
-                             <field name="invoice_state" string="Invoice Control"/>
-                             <field name="backorder_id" readonly="1"/>
-                         </group>
-                         <group colspan="2" col="2">
-                             <field name="date"/>
-                             <field name="min_date" readonly="1"/>
-                             <field name="stock_journal_id" widget="selection"/>
-                         </group>
-                     </group>
-                     <notebook colspan="4">
-                         <page string="General Information">
-                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" context="{'address_in_id': partner_id, 'picking_type': type}" >
-                                 <tree colors="grey:scrapped==True" string="Stock Moves">
-                                     <field name="product_id" />
-                                     <field name="product_qty" />
-                                     <field name="product_uom" string="UoM" groups="product.group_uom"/>
-                                     <button name="%(stock.move_scrap)d"
-                                         string="Scrap Products" type="action"
-                                         icon="gtk-convert" context="{'scrap': True}"
-                                         states="draft,waiting,confirmed,assigned"/>
-                                     <field name="scrapped" invisible="1"/>
-                                     <field name="prodlot_id" groups="stock.group_production_lot"/>
-                                     <button
-                                            name="%(stock.track_line)d"
-                                            string="Split in production lots"
-                                            groups="stock.group_production_lot"
-                                            type="action" icon="terp-stock_effects-object-colorize"
-                                            states="draft,waiting,confirmed,assigned" />
-                                     <field name="tracking_id" groups="stock.group_tracking_lot"/>
-                                     <button name="setlast_tracking" string="Put in current pack" type="object"
-                                         groups="stock.group_tracking_lot"
-                                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
-                                         states="draft,assigned,confirmed"/>
-                                     <button name="%(split_into)d" string="Put in a new pack" type="action"
-                                         groups="product.group_stock_packaging"
-                                         icon="terp-stock_effects-object-colorize"
-                                         states="draft,assigned,confirmed"/>
-                                     <field name="location_dest_id"/>
-                                     <field name="state"/>
-                                 </tree>
-                                 <form string="Stock Moves">
-                                     <group colspan="2" col="4">
-                                         <separator colspan="4" string="Move Information"/>
-                                         <field name="name" invisible="1" colspan="4"/>
-                                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)" colspan="4"/>
-                                         <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3"/>
-                                         <button name="%(stock.move_scrap)d"
-                                                 string="Scrap" type="action"
-                                                 icon="gtk-convert" context="{'scrap': True}"
-                                                 states="draft,waiting,confirmed,assigned" colspan="1"/>
-                                         <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" colspan="4"/>
-                                         <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
-                                         <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4"/>
-                                         <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]" colspan="4"/>
-                                     </group>
- 
-                                     <group colspan="2" col="2">
-                                         <separator string="Locations" colspan="2" />
-                                         <field name="location_id" domain="[('usage','&lt;&gt;','view')]" />
-                                         <field name="location_dest_id" domain="[('usage','=','internal')]" />
-                                     </group>
- 
-                                     <group colspan="2" col="2">
-                                         <separator string="Dates" colspan="2" />
-                                         <field name="create_date" invisible="1"/>
-                                         <field name="date"/>
-                                         <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-                                     </group>
- 
-                                     <group colspan="2" col="4">
-                                         <separator string="Traceability" colspan="4" groups="stock.group_tracking_lot"/>
-                                         <field name="tracking_id" groups="stock.group_tracking_lot" colspan="3" />
-                                         <button name="%(split_into)d" string="New Pack" type="action"
-                                               groups="product.group_stock_packaging"
-                                               icon="terp-stock_effects-object-colorize"
-                                               states="draft,assigned,confirmed" colspan="1"/>
-                                         <field name="prodlot_id" groups="stock.group_production_lot"
-                                             context="{'location_id':location_id, 'product_id':product_id}"
-                                             domain="[('product_id','=?',product_id)]"
-                                             on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"/>
-                                         <button name="%(track_line)d"
-                                               groups="stock.group_tracking_lot"
-                                               states="draft,waiting,confirmed,assigned"
-                                               string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1" />
-                                     </group>
-                                     <label string="" colspan="4"/>
-                                     <field name="state"/>
-                                     <group col="4" colspan="2">
-                                         <button name="action_cancel" states="assigned" string="_Cancel" type="object" icon="gtk-cancel"/>
-                                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
-                                         <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                         <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                     </group>
-                                 </form>
-                             </field>
-                             <group col="10" colspan="4">
-                                 <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
-                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
-                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
-                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
-                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
-                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                 <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
-                                 <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
-                                 <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl" />
-                             </group>
-                         </page>
-                         <page string="Additional Info">
-                             <field name="type"/>
-                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                         </page>
-                         <page string="Notes">
-                             <field colspan="4" name="note" nolabel="1"/>
-                         </page>
-                     </notebook>
-                     <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                 </form>
+                 <data>
+                     <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='%(act_stock_return_picking)d']" position="replace">
+                         <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="terp-gtk-go-back-rtl" />
+                     </xpath>
+                     <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='draft_validate']" position="replace">
+                         <button name="draft_validate" states="draft" string="Confirm &amp; Receive" type="object" icon="gtk-media-play"/>
+                     </xpath>
+                     <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='action_process']" position="replace">
+                         <button name="action_process" states="assigned" string="Receive" type="object" icon="gtk-go-forward"/>
+                     </xpath>
+                     <xpath expr="/form/sheet/group/group/field[@name='partner_id']" position="replace">
+                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Supplier"/>
+                     </xpath>
+                     <xpath expr="/form/sheet" position="after">
+                         <div class="oe_form_sheet_width">
 -                            <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
++                            <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                         </div>
+                     </xpath>
+                 </data>
              </field>
          </record>
--
          <record id="view_picking_in_search" model="ir.ui.view">
              <field name="name">stock.picking.in.search</field>
-             <field name="model">stock.picking</field>
+             <field name="model">stock.picking.in</field>
              <field name="type">search</field>
              <field name="arch" type="xml">
                  <search string="Incoming Shipments">