merge

bzr revid: fp@tinyerp.com-20100409183521-ofoiwfbc3w6gdiub
bzr revid: fp@tinyerp.com-20100415085549-n1egqh6lnkf2eu8v

diff --cc addons/account/product_view.xml
index 1000cef,1000cef..dcdf10e
--- 1/addons/account/product_view.xml
--- 2/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@@ -9,10 -9,10 +9,10 @@@
              <field name="arch" type="xml">
                  <notebook position="inside">
                      <page string="Accounting">
--                        <separator string="Sales Properties" colspan="2"/>
--                        <separator string="Purchase Properties" colspan="2"/>
--                        <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" />
--                        <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
++                        <separator string="Sales Properties" colspan="2" groups="base.group_extended"/>
++                        <separator string="Purchase Properties" colspan="2" groups="base.group_extended"/>
++                        <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"  groups="base.group_extended"/>
++                        <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}"  groups="base.group_extended"/>
  
                          <separator string="Sale Taxes" colspan="2"/>
                          <separator string="Purchase Taxes" colspan="2"/>

diff --cc addons/product/product_view.xml
index bf6b2d5,a016498..80f0a08
--- 1/addons/product/product_view.xml
--- 2/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@@ -144,8 -144,8 +144,8 @@@
                              <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                              <field name="list_price"/>
                              <newline/>
--                            <field name="price_margin" select="1"/>
--                            <field name="price_extra" select="1"/>
++                            <field name="price_margin" groups="base.group_extended"/>
++                            <field name="price_extra" groups="base.group_extended"/>
                              <newline/>
                              <field groups="base.group_extended" name="cost_method"/>
                              <newline/>
@@@ -428,8 -428,8 +428,8 @@@
                  <form string="Supplier Information">
                      <field name="name"/>
                      <field name="sequence"/>
--                    <field name="product_name"/>
--                    <field name="product_code"/>
++                    <field name="product_name" groups="base.group_extended"/>
++                    <field name="product_code" groups="base.group_extended"/>
                      <field name="delay"/>
                      <field name="qty"/>
                      <field name="company_id" groups="base.group_multi_company" widget="selection"/>
@@@ -456,7 -456,7 +456,6 @@@
                      <field name="name"/>
                      <field name="delay"/>
                      <field name="qty"/>
--                    <field name="product_code"/>
                      <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                  </tree>
              </field>
@@@ -562,7 -562,7 +561,7 @@@
                              </group>
  
                          </page>
-                         <page string="Procurement &amp; Locations">
 -                        <page string="Requisition &amp; Locations">
++                        <page string="Procurement &amp; Locations" groups="base.group_extended">
                              <group colspan="2" col="2" name="delay">
                                  <separator string="Delays" colspan="2"/>
                                  <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
@@@ -575,7 -575,7 +574,6 @@@
                                  <field name="loc_row"/>
                                  <field name="loc_case"/>
                              </group>
--
                              <group colspan="2" col="2" name="misc">
                                  <separator string="Miscelleanous" colspan="2"/>
                              </group>

diff --cc addons/sale/sale_view.xml
index e193c06,5b49658..fbec8b3
--- 1/addons/sale/sale_view.xml
--- 2/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@@ -98,11 -98,11 +98,11 @@@
                  <form string="Sales order">
                      <group col="6" colspan="4">
                          <field name="name" select="1"/>
--                        <field name="client_order_ref" select="2"/>
--                        <field name="shipped" select="2"/>
--                        <field name="shop_id" on_change="onchange_shop_id(shop_id)" select="2" widget="selection"/>
++                        <field name="client_order_ref"/>
++                        <field name="shipped"/>
++                        <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection"/>
                          <field name="date_order" select="1" string="Order date" />
--                        <field name="invoiced" select="2"/>
++                        <field name="invoiced"/>
                      </group>
                      <notebook colspan="4">
                          <page string="Sale Order">
@@@ -111,8 -111,8 +111,9 @@@
                              <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id"/>
                              <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id"/>
                              <field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended"/>
--                            <field name="project_id" select="2" 
--                                context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}"/>
++                            <field name="project_id" 
++                                context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}"
++                                groups="base.group_extended"/>
                              <newline/>
                              <field colspan="4" mode="tree,form,graph" name="order_line" nolabel="1" widget="one2many_list">
                                  <form string="Sale Order Lines">
@@@ -140,17 -140,17 +141,17 @@@
  
                                              <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                                              <separator colspan="4" string="Manual Description"/>
--                                            <field colspan="4" name="name" select="2"/>
--                                            <field name="price_unit" select="2"/>
++                                            <field colspan="4" name="name"/>
++                                            <field name="price_unit"/>
                                              <field name="discount"/>
--                                            <field name="type"/>
--                                            <field name="delay" select="2"/>
++                                            <field name="type" groups="base.group_extended"/>
++                                            <field name="delay" groups="base.group_extended"/>
                                              <newline/>
                                              <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                                              <separator colspan="4" string="States"/>
--                                            <field name="state" select="2"/>
++                                            <field name="state"/>
                                              <group col="3" colspan="2">
--                                                <field name="invoiced" select="2"/>
++                                                <field name="invoiced"/>
                                                  <button colspan="1"
                                                      name="%(action_view_sale_order_line_make_invoice)d"
                                                      states="confirmed"
@@@ -163,7 -163,7 +164,7 @@@
                                              <field groups="product.group_uos" name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/>
                                              <field groups="product.group_uos" name="product_uos"/>
                                              <field name="th_weight"/>
--                                            <field name="address_allotment_id" select="2"/>
++                                            <field name="address_allotment_id"/>
                                              <separator colspan="4" string="Properties"/>
                                              <field colspan="4" name="property_ids" nolabel="1"/>
                                          </page>
@@@ -196,7 -196,7 +197,7 @@@
                                  <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
                              </group>
                              <group col="13" colspan="4">
--                                <field name="state" select="2"/>
++                                <field name="state"/>
                                  <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
                                  <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-print"/>
                                  <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected" icon="gtk-apply"/>
@@@ -223,13 -223,13 +224,13 @@@
                                  <field name="user_id"/>
                                  <field groups="base.group_extended" name="origin"/>
                              </group>
--                            <group colspan="2" col="2">
++                            <group colspan="2" col="2" groups="base.group_extended">
                                  <separator string="Conditions" colspan="2"/>
                                  <field name="payment_term" widget="selection"/>
--                                <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
--                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
++                                <field name="fiscal_position" widget="selection"/>
++                                <field name="company_id" widget="selection"/>
                              </group>
--                            <group colspan="2" col="2">
++                            <group colspan="2" col="2" groups="base.group_extended">
                                  <separator string="Dates" colspan="2"/>
                                  <field name="create_date" widget="datetime"/>
                                  <field name="date_confirm"/>
@@@ -237,7 -237,7 +238,7 @@@
                              <separator colspan="4" string="Notes"/>
                              <field colspan="4" name="note" nolabel="1"/>
                          </page>
--                        <page string="History">
++                        <page string="History" groups="base.group_extended">
                              <separator colspan="4" string="Related invoices"/>
                              <field colspan="4" name="invoice_ids" nolabel="1"/>
                              <field colspan="4" name="picking_ids" nolabel="1"/>
@@@ -368,43 -368,43 +369,43 @@@
                  <form string="Sales Order Lines">
                      <notebook>
                          <page string="Order Lines">
--                            <separator colspan="4" string="Automatic Declaration"/>
++                            <separator colspan="4" string="General Information"/>
                              <field name="order_id" select="1"/>
                              <field name="order_partner_id" readonly="1" select="1" invisible="1"/>
--                            <field name="product_uom_qty" readonly="1" select="2"/>
++                            <field name="product_uom_qty" readonly="1"/>
                              <field name="product_uom"/>
                              <field name="product_id" readonly="1" select="1"/>
--                            <field name="invoiced" select="2"/>
++                            <field name="invoiced"/>
                              <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                              <separator colspan="4" string="Manual Designation"/>
--                            <field colspan="4" name="name" select="2"/>
--                            <field name="price_unit" select="2"/>
++                            <field colspan="4" name="name"/>
++                            <field name="price_unit"/>
                              <field name="discount"/>
--                            <field name="type"/>
--                            <field name="delay" select="2"/>
++                            <field name="type" groups="base.group_extended"/>
++                            <field name="delay" groups="base.group_extended"/>
                              <field name="price_subtotal"/>
                              <field name="th_weight"/>
                              <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                              <separator colspan="4" string="States"/>
--                            <field name="state" select="2"/>
++                            <field name="state"/>
                              <group col="2" colspan="2">
                                  <button name="button_done"
--                                      states="confirmed,exception"
--                                      string="Done" type="object"
--                                      icon="gtk-jump-to" />
++                                    states="confirmed,exception"
++                                    string="Done" type="object"
++                                    icon="gtk-jump-to" />
                                  <button name="button_cancel"
--                                      states="confirmed,exception"
--                                      string="Cancel" type="object"
--                                      icon="gtk-cancel" />
++                                    states="confirmed,exception"
++                                    string="Cancel" type="object"
++                                    icon="gtk-cancel" />
                              </group>
                          </page>
--                        <page string="Properties">
++                        <page string="Properties" groups="base.group_extended">
                              <field name="property_ids" nolabel="1"/>
                          </page>
                          <page string="Notes">
                              <field colspan="4" name="notes" nolabel="1"/>
                          </page>
--                        <page string="Invoice Lines">
++                        <page string="Invoice Lines" groups="base.group_extended">
                              <field colspan="4" name="invoice_lines" nolabel="1"/>
                          </page>
                      </notebook>

diff --cc addons/stock/product_view.xml
index d027465,d027465..46f4ca6
--- 1/addons/stock/product_view.xml
--- 2/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@@ -2,19 -2,19 +2,19 @@@
  <openerp>
      <data>
  
--          <record id="product_search_form_view_stock" model="ir.ui.view">
++        <record id="product_search_form_view_stock" model="ir.ui.view">
              <field name="name">product.search.stock.form</field>
              <field name="model">product.product</field>
              <field name="type">search</field>
              <field name="inherit_id" ref="product.product_search_form_view"/>
              <field name="arch" type="xml">
--                      <field name="pricelist_id" select="1" widget="selection" position="before">
--                              <field name="location_id" select="1" widget="selection" context="{'location': self}" />
--                              <separator orientation="vertical"/>
--                      </field>
++                   <field name="pricelist_id" select="1" widget="selection" position="before">
++                       <field name="location_id" select="1" widget="selection" context="{'location': self}" />
++                       <separator orientation="vertical"/>
++                   </field>
              </field>
          </record>
--        
++
          <record id="view_category_property_form" model="ir.ui.view">
              <field name="name">product.category.stock.property.form.inherit</field>
              <field name="model">product.category</field>
@@@ -54,20 -54,20 +54,21 @@@
              </field>
          </record>
  
--              <record id="view_product_standard_price_form" model="ir.ui.view">
++        <record id="view_product_standard_price_form" model="ir.ui.view">
              <field name="name">product.product.standard.price.form.inherit</field>
              <field name="model">product.product</field>
              <field name="type">form</field>
              <field name="inherit_id" ref="product.product_normal_form_view"/>
              <field name="arch" type="xml">
--                              <field name="standard_price" position="replace">
--                                      <group col="4" colspan="2">
--                                              <field name="standard_price" readonly="True"/>
--                                              <button name="%(action_view_change_standard_price)d" string="Change Price" type="action" icon="gtk-execute"/>
--                              </group>
--                      </field>
--              </field>
--          </record>
++                <field name="standard_price" position="replace">
++                    <label string="Cost Price" align="1.0"/>
++                    <group col="2" colspan="1">
++                        <field name="standard_price" readonly="True" nolabel="1"/>
++                        <button name="%(action_view_change_standard_price)d" string="Change Price" type="action" icon="gtk-execute"/>
++                    </group>
++                </field>
++            </field>
++        </record>
  
          <record id="view_normal_property_acc_form" model="ir.ui.view">
              <field name="name">product.normal.stock.acc.property.form.inherit</field>
@@@ -77,8 -77,8 +78,8 @@@
              <field name="priority">26</field>
              <field name="arch" type="xml">
                  <field name="property_account_expense" position="after">
--                    <field name="property_stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
--                    <field name="property_stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
++                    <field name="property_stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
++                    <field name="property_stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
                  </field>
              </field>
          </record>
@@@ -112,7 -112,7 +113,7 @@@
              <field name="inherit_id" ref="product.product_normal_form_view"/>
              <field name="arch" type="xml">
                  <group name="store" position="after">
--                    <group col="2" colspan="2" name="store">
++                    <group col="2" colspan="2" name="store" groups="base.group_extended">
                          <separator string="Counter-Part Locations Properties" colspan="2"/>
                          <field name="property_stock_procurement" widget="selection" domain="[('usage','=','procurement')]"/>
                          <field name="property_stock_production" widget="selection"/>

diff --cc addons/stock/report/report_stock_view.xml
index acb8c34,acb8c34..ec15f12
--- 1/addons/stock/report/report_stock_view.xml
--- 2/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@@ -9,13 -9,13 +9,13 @@@
              <field name="arch" type="xml">
                  <search string="Search Location">
                      <group col="10" colspan="4">
--                        <filter icon="terp-stock" name="in_location" string="Internal Locations" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations" />
--                        <filter icon="terp-stock" string="Customer Locations" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
--                        <filter icon="terp-stock" string="Supplier Locations" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
++                        <filter icon="terp-stock" name="in_location" string="Internal" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations" />
++                        <filter icon="terp-stock" string="Customer" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
++                        <filter icon="terp-stock" string="Supplier" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
  
                          <separator orientation="vertical"/>
--                        <field name="location_id" select="1" />
--                        <field name="product_id" select="1" />
++                        <field name="location_id" select="1"/>
++                        <field name="product_id" select="1" default="1"/>
                      </group>
                      <newline/>
                      <group expand="1" string="Group By..." colspan="4" col="10">
@@@ -35,7 -35,7 +35,7 @@@
                  <form string="Stock by Lots">
                      <field name="location_id"/>
                      <field name="product_id"/>
--                    <field name="prodlot_id"/>
++                    <field name="prodlot_id" groups="base.group_extended"/>
                      <field name="name"/>
                  </form>
              </field>
@@@ -49,18 -49,18 +49,31 @@@
                  <tree string="Stock by Lots">
                      <field name="location_id"/>
                      <field name="product_id"/>
--                    <field name="prodlot_id"/>
++                    <field name="prodlot_id" groups="base.group_extended"/>
                      <field name="name"/>
                  </tree>
              </field>
          </record>
  
++        <record id="stock_report_prodlots_graph" model="ir.ui.view">
++            <field name="name">stock.report.prodlots.view</field>
++            <field name="model">stock.report.prodlots</field>
++            <field name="type">graph</field>
++            <field name="arch" type="xml">
++                <graph string="Stock by Lots" type="bar">
++                    <field name="product_id"/>
++                    <field name="name"/>
++                </graph>
++            </field>
++        </record>
++
++
          <record id="action_stock_report_prodlots_form" model="ir.actions.act_window">
              <field name="name">Inventory by Location</field>
              <field name="type">ir.actions.act_window</field>
              <field name="res_model">stock.report.prodlots</field>
              <field name="view_type">form</field>
--            <field name="view_mode">tree,form</field>
++            <field name="view_mode">tree,graph</field>
              <field name="context">{'full':'1',"search_default_in_location":1}</field>
              <field name="search_view_id" ref="view_stock_report_prodlots_filter" />
          </record>

diff --cc addons/stock/stock_view.xml
index 512acab,8d034b0..34dea11
--- 1/addons/stock/stock_view.xml
--- 2/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@@ -108,7 -108,7 +108,7 @@@
                                  </group>
                              </form>
                          </field>
--                    </page><page string="Posted Inventory">
++                    </page><page string="Posted Inventory" groups="base.group_extended">
                          <field colspan="4" name="move_ids" nolabel="1"/>
                      </page>
                      </notebook>
@@@ -304,7 -304,7 +304,7 @@@
                      <field name="product_id" select="1"/>
                      <field name="product_qty" select="1"/>
                      <field name="product_uom" select="1" string="UOM"/>
--                    <field name="prodlot_id" select="1"/>
++                    <field name="prodlot_id" select="1" groups="base.group_extended"/>
                      <field name="product_packaging" domain="[('product_id','=',product_id)]"/>
                      <field name="picking_id"/>
                      <field name="location_id" select="1"/>
@@@ -326,7 -326,7 +326,7 @@@
                      <field name="product_id" select="1"/>
                      <field name="product_qty" select="1"/>
                      <field name="product_uom" select="1" string="UOM"/>
--                    <field name="prodlot_id" select="1"/>
++                    <field name="prodlot_id" select="1" groups="base.group_extended"/>
                      <field name="product_packaging" domain="[('product_id','=',product_id)]"/>
                      <field name="picking_id"/>
                      <field name="location_id" select="1"/>
@@@ -607,7 -607,7 +607,7 @@@
                                      <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                      <field name="product_uom" string="UOM"/>
                                      <field name="picking_id" select="1"/>
--                                    <field name="prodlot_id"/>
++                                    <field name="prodlot_id" groups="base.group_extended"/>
                                      <field name="location_id"/>
                                      <field name="location_dest_id"/>
                                      <field name="date_planned"/>
@@@ -639,7 -639,7 +639,7 @@@
                                              <field name="date_planned"/>
                                              <field name="address_id" select="1" context="{'contact_display':'partner'}"/>
                                              <field groups="base.group_extended" name="product_packaging"/>
--                                            <field name="prodlot_id" select="2"
++                                            <field name="prodlot_id" select="2" groups="base.group_extended"
                                                  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)"/>
@@@ -656,7 -656,7 +656,7 @@@
                                                  <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
                                              </group>
                                          </page>
--                                        <page string="Return Picking History">
++                                        <page string="Return Picking History" groups="base.group_extended">
                                              <field name="move_stock_return_history" nolabel="1"/>
                                          </page>
                                      </notebook>
@@@ -769,7 -769,7 +769,7 @@@
                                      <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                      <field name="product_uom" string="UOM"/>
                                      <field name="picking_id" select="1"/>
--                                    <field name="prodlot_id"/>
++                                    <field name="prodlot_id" groups="base.group_extended"/>
                                      <field name="location_id"/>
                                      <field name="location_dest_id"/>
                                      <field name="date_planned"/>
@@@ -778,6 -778,6 +778,7 @@@
                                             name="%(stock.track_line)d"
                                             string="Split in production lots"
                                             type="action" icon="gtk-justify-fill"
++                                           groups="base.group_extended"
                                             states="draft,waiting,confirmed,assigned" />
                                         <button name="%(stock.move_scrap)d"
                                          string="Scrap Products" type="action"
@@@ -799,7 -799,7 +800,7 @@@
                                              <field invisible="1" name="date"/>
                                              <field name="date_planned"/>
                                              <field groups="base.group_extended" name="product_packaging"/>
--                                            <field name="prodlot_id" select="2"
++                                            <field name="prodlot_id" select="2" groups="base.group_extended"
                                                  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)"/>
@@@ -958,7 -958,7 +959,7 @@@
                                      <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                      <field name="product_uom" string="UOM"/>
                                      <field name="picking_id" select="1"/>
--                                    <field name="prodlot_id"/>
++                                    <field name="prodlot_id" groups="base.group_extended"/>
                                      <field name="location_id"/>
                                      <field name="location_dest_id"/>
                                      <field name="date_planned"/>
@@@ -989,7 -989,7 +990,7 @@@
                                              <field invisible="1" name="date"/>
                                              <field name="date_planned"/>
                                              <field groups="base.group_extended" name="product_packaging"/>
--                                            <field name="prodlot_id" select="1"
++                                            <field name="prodlot_id" select="1" groups="base.group_extended"
                                                  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)"/>
@@@ -1144,7 -1144,7 +1145,7 @@@
                                      <field name="product_qty"/>
                                      <field name="product_uom"/>
                                      <field name="location_dest_id"/>
--                                    <field name="prodlot_id"/>
++                                    <field name="prodlot_id" groups="base.group_extended"/>
                                      <field name="state"/>
                                      <button
                                             name="%(stock.track_line)d"
@@@ -1173,7 -1173,7 +1174,7 @@@
                                              <newline/>
                                              <field groups="base.group_extended" name="product_packaging"/>
                                              <newline/>
--                                            <field name="prodlot_id" select="1"
++                                            <field name="prodlot_id" select="1" groups="base.group_extended"
                                                  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)"/>
@@@ -1320,7 -1320,7 +1321,7 @@@
                      <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                      <field name="product_uom" string="UOM"/>
                      <field name="picking_id" select="1"/>
--                    <field name="prodlot_id"/>
++                    <field name="prodlot_id" groups="base.group_extended"/>
                      <field name="location_id"/>
                      <field name="location_dest_id"/>
                      <field name="date_planned"/>
@@@ -1368,7 -1368,7 +1369,7 @@@
                              <group colspan="2" col="4">
                                  <separator string="Traceability" colspan="4" />
                                  <field name="tracking_id" select="1" colspan="4" />
--                                <field name="prodlot_id" select="2"
++                                <field name="prodlot_id" select="2" groups="base.group_extended"
                                      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)"/>
@@@ -1398,13 -1398,13 +1399,12 @@@
              <field name="arch" type="xml">
                  <search string="Stock Moves">
                      <group col="8" colspan="4">
--                        <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Available Moves"/>
--                        <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Moves"/>
--                        <filter icon="terp-stock" string="Waiting" domain="[('state','=','waiting')]" help="Waiting"/>
++                        <filter icon="terp-stock" string="Available" domain="[('state','=','done')]" help="Done"/>
++                        <filter icon="terp-stock" string="Available" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Future"/>
                          <separator orientation="vertical"/>
--                        <field name="location_id" select="1"/>
--                        <field name="location_dest_id" select="1"/>
--                        <field name="product_id" select="1"/>
++                        <field name="location_id"/>
++                        <field name="location_dest_id"/>
++                        <field name="product_id"/>
                      </group>
                      <newline/>
                      <group expand="1" string="Group By..." colspan="4" col="8">
@@@ -1444,7 -1444,7 +1444,7 @@@
                      <field name="product_id"/>
                      <field name="product_qty" />
                      <field name="product_uom" string="UOM"/>
--                    <field name="prodlot_id" string="Lot"/>
++                    <field name="prodlot_id" string="Lot" groups="base.group_extended"/>
                      <field name="date_planned"/>
                      <field name="backorder_id"/>
                      <field name="state"/>
@@@ -1464,22 -1464,22 +1464,22 @@@
                      <notebook colspan="4">
                          <page string="General Information">
                              <separator colspan="4" string="Move Information"/>
--                            <field name="location_id" select="1"/>
--                            <field name="location_dest_id" select="1"/>
--                            <field colspan="4" name="product_id" select="1" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
++                            <field name="location_id"/>
++                            <field name="location_dest_id"/>
++                            <field colspan="4" name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
                              <field name="product_qty" select="2" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                              <field name="product_uom" select="2"/>
                              <field name="product_uos" select="2"/>
                              <field colspan="4" name="name" select="2"/>
                              <field name="date"/>
--                            <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
++                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                              <field name="date_planned"/>
                              <field name="priority"/>
                              <field name="address_id" select="2" context="{'contact_display':'partner'}"/>
                              <newline/>
                              <field name="picking_id" select="2"/>
                              <newline/>
--                            <field name="prodlot_id" select="2"
++                            <field name="prodlot_id" select="2" groups="base.group_extended"
                                  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)"/>
@@@ -1488,7 -1488,7 +1488,7 @@@
                              <label/>
                              <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
                              <separator colspan="4" string="Move State"/>
--                            <field name="state" select="1"/>
++                            <field name="state"/>
                              <group col="5" colspan="2">
                                  <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                  <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
@@@ -1517,8 -1517,8 +1517,8 @@@
                          <filter icon="terp-stock" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Back Orders"/>
                          <filter icon="terp-stock" string="Planned Today" domain="[('date_planned::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Orders planned for today"/>
                          <separator orientation="vertical"/>
-                         <field name="origin" string="Latest Procurement" select="1"/>
-                         <field name="partner_id" string="Supplier" select="1"/>
 -                        <field name="origin" string="Latest Requisition" select="1"/>
 -                        <field name="partner_id" string="Supplier" select="1"/>
++                        <field name="origin" string="Latest Procurement"/>
++                        <field name="partner_id" string="Supplier"/>
                          <field name="product_id"/>
                      </group>
                      <newline/>
@@@ -1568,7 -1568,7 +1568,7 @@@
              <field name="arch" type="xml">
                  <tree string="Incoterms">
                      <field name="code"/>
--                    <field colspan="4" name="name" select="1"/>
++                    <field colspan="4" name="name"/>
                  </tree>
              </field>
          </record>