Harry (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-warehouse-view-imp-dbr into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-warehouse-view-imp-dbr/+merge/114611
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-warehouse-view-imp-dbr/+merge/114611
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-warehouse-view-imp-dbr.
=== modified file 'delivery/delivery_view.xml'
--- delivery/delivery_view.xml 2012-07-05 15:09:47 +0000
+++ delivery/delivery_view.xml 2012-07-12 11:12:27 +0000
@@ -15,60 +15,76 @@
</tree>
</field>
</record>
+
<record id="view_delivery_carrier_form" model="ir.ui.view">
<field name="name">delivery.carrier.form</field>
<field name="model">delivery.carrier</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Carrier" version="7.0">
- <group col="4" name="general">
- <field name="name"/>
- <field name="partner_id"/>
- <field name="product_id"/>
- <field name="active"/>
- <separator string="Pricing Information" colspan="4"/>
- <group colspan="4" col="4">
- <field name="normal_price" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
+ <sheet>
+ <group col="4" name="general">
+ <field name="name"/>
+ <field name="partner_id"/>
+ <field name="product_id"/>
+ <field name="active"/>
+ <separator string="Pricing Information" colspan="4"/>
+ <group colspan="4" col="4">
+ <group col="2" colspan="2">
+ <field name="normal_price" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
+ <label for="free_if_more_than"/>
+ <div>
+ <field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
+ <field name="amount" attrs="{'required':[('free_if_more_than','<>',False)], 'invisible':[('free_if_more_than','=',False)]}"/>
+ </div>
+ </group>
+ </group>
<newline/>
- <field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
- <field name="amount" attrs="{'required':[('free_if_more_than','<>',False)], 'invisible':[('free_if_more_than','=',False)]}"/>
+ <field name="use_detailed_pricelist"/>
</group>
- <newline/>
- <field name="use_detailed_pricelist"/>
- </group>
- <field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree,form">
- <tree string="Delivery grids">
- <field name="sequence"/>
- <field name="name"/>
- </tree>
- <form string="Delivery grids" version="7.0">
- <group col="4">
- <field name="name"/>
- <field name="active"/>
- <field name="sequence"/>
- </group>
- <notebook>
- <page string="Grid definition">
- <field name="line_ids"/>
- </page>
- <page string="Destination">
- <group string="Countries">
- <field colspan="2" name="country_ids" nolabel="1"/>
- </group>
- <group string="States">
- <field colspan="2" name="state_ids" nolabel="1"/>
- </group>
- <group col="4">
- <field name="zip_from"/>
- <field name="zip_to"/>
- </group>
- </page>
- </notebook>
- </form>
- </field>
+ <field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree,form">
+ <tree string="Delivery grids">
+ <field name="sequence"/>
+ <field name="name"/>
+ </tree>
+ <form string="Delivery grids" version="7.0">
+ <group>
+ <group>
+ <field name="name"/>
+ </group>
+ <group>
+ <field name="active"/>
+ <field name="sequence"/>
+ </group>
+ </group>
+ <notebook>
+ <page string="Grid definition">
+ <field name="line_ids"/>
+ </page>
+ <page string="Destination">
+ <group>
+ <group>
+ <field name="country_ids" widget="many2many_tags"/>
+ <field name="state_ids" widget="many2many_tags"/>
+ </group>
+ <group>
+ <label for="zip_from" string="Zip"/>
+ <div>
+ <field name="zip_from" class="oe_inline"/>
+ -
+ <field name="zip_to" class="oe_inline"/>
+ </div>
+ </group>
+ </group>
+ </page>
+ </notebook>
+ </form>
+ </field>
+ </sheet>
</form>
</field>
</record>
+
<record id="action_delivery_carrier_form" model="ir.actions.act_window">
<field name="name">Delivery Method</field>
<field name="type">ir.actions.act_window</field>
@@ -111,13 +127,15 @@
<field name="line_ids"/>
</page>
<page string="Destination">
- <group string="Countries">
- <field name="country_ids"/>
- </group>
- <group string="States">
- <field colspan="2" name="state_ids" nolabel="1"/>
- <field name="zip_from"/>
- <field name="zip_to"/>
+ <group>
+ <group>
+ <field name="country_ids" widget="many2many_tags"/>
+ <field name="state_ids" widget="many2many_tags"/>
+ </group>
+ <group>
+ <field name="zip_from" class="oe_inline"/>
+ <field name="zip_to" class="oe_inline"/>
+ </group>
</group>
</page>
</notebook>
@@ -140,19 +158,28 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Grid Lines" version="7.0">
- <field colspan="4" name="name"/>
- <div>
- <label string="condition" for="type"/>
- <field name="type" class="oe_inline"/>
- <field name="operator" class="oe_inline"/>
- <field name="max_value" class="oe_inline"/>
- </div>
- <group col="4">
- <field name="list_price"/>
- <field name="standard_price"/>
- <field name="price_type"/>
- <field name="variable_factor" attrs="{'invisible':[('price_type','=','fixed')]}"/>
- </group>
+ <sheet>
+ <label for="name" class="oe_edit_only"/>
+
+ <field name="name" col="4"/>
+
+ <group col="4">
+ <group>
+ <label string="Condition" for="type"/>
+ <div>
+ <field name="type"/>
+ <field name="operator"/>
+ <field name="max_value"/>
+ </div>
+ </group>
+ <group>
+ <field name="list_price"/>
+ <field name="standard_price"/>
+ <field name="price_type"/>
+ <field name="variable_factor" attrs="{'invisible':[('price_type','=','fixed')]}"/>
+ </group>
+ </group>
+ </sheet>
</form>
</field>
</record>
@@ -178,7 +205,7 @@
<field name="model">stock.picking.out</field>
<field name="inherit_id" ref="stock.view_picking_form"/>
<field name="arch" type="xml">
- <field name="partner_id" position="after">
+ <field name="min_date" position="after">
<field name="carrier_id"/>
<field name="carrier_tracking_ref"/>
<field name="number_of_packages"/>
=== modified file 'procurement/procurement_view.xml'
--- procurement/procurement_view.xml 2012-07-03 12:41:11 +0000
+++ procurement/procurement_view.xml 2012-07-12 11:12:27 +0000
@@ -55,31 +55,45 @@
<field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed" />
</header>
<sheet>
- <group>
- <group string="References">
- <field name="name"/>
- <field name="origin"/>
- <field name="company_id" groups="base.group_multi_company" widget="selection"/>
- </group>
- <group string="Planification">
+ <label for="name" class="oe_edit_only"/>
+ <h1>
+ <field name="name" class="oe_inline"/>
+ <label string="-" attrs="{'invisible':[('origin','=',False)]}"/>
+ <field name="origin" class="oe_inline"/>
+ </h1>
+ <label for="message" class="oe_edit_only"/>
+ <h2>
+ <field name="message"/>
+ </h2>
+ <group col="4" colspan="4">
+ <group col="2" colspan="2">
<field name="date_planned"/>
<field name="procure_method"/>
<field name="priority"/>
+ <field name="company_id" groups="base.group_multi_company" widget="selection" invisible="1"/>
</group>
+ <group col="2" colspan="2"/>
</group>
<notebook>
<page string="Procurement Details">
<group string="Product & Location" col="4">
- <field name="product_id" on_change="onchange_product_id(product_id)"/>
- <field name="location_id" domain="[('usage','=','internal')]"/>
- <field name="product_qty"/>
- <field name="product_uom"/>
-
- <field name="product_uos_qty" groups="product.group_uos"/>
- <field name="product_uos" groups="product.group_uos"/>
+ <group>
+ <field name="product_id" on_change="onchange_product_id(product_id)"/>
+ <label for="product_qty" />
+ <div>
+ <field name="product_qty" class="oe_inline"/>
+ <field name="product_uom" class="oe_inline"/>
+ </div>
+ <label for="product_uos_qty" />
+ <div>
+ <field name="product_uos_qty" groups="product.group_uos" class="oe_inline"/>
+ <field name="product_uos" groups="product.group_uos" class="oe_inline"/>
+ </div>
+ </group>
+ <group>
+ <field name="location_id" domain="[('usage','=','internal')]"/>
+ </group>
</group>
- <separator string="Status"/>
- <field name="message"/>
</page>
<page string="Extra Information">
<group string="Details" col="4">
=== modified file 'product_expiry/product_expiry_view.xml'
--- product_expiry/product_expiry_view.xml 2011-01-14 00:11:01 +0000
+++ product_expiry/product_expiry_view.xml 2012-07-12 11:12:27 +0000
@@ -8,7 +8,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<field name="date" position="after">
- <separator string="Dates" colspan="4" />
<field name="life_date" />
<field name="use_date" />
<field name="removal_date" />
=== modified file 'purchase/stock.py'
--- purchase/stock.py 2012-05-08 22:42:13 +0000
+++ purchase/stock.py 2012-07-12 11:12:27 +0000
@@ -39,6 +39,7 @@
_columns = {
'purchase_id': fields.many2one('purchase.order', 'Purchase Order',
ondelete='set null', select=True),
+
}
_defaults = {
'purchase_id': False,
@@ -134,5 +135,6 @@
_columns = {
'purchase_id': fields.many2one('purchase.order', 'Purchase Order',
ondelete='set null', select=True),
+ 'warehouse_id': fields.related('purchase_id', 'warehouse_id', type='many2one', relation='stock.warehouse', string='Warehouse'),
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'purchase/stock_view.xml'
--- purchase/stock_view.xml 2012-06-26 09:00:08 +0000
+++ purchase/stock_view.xml 2012-07-12 11:12:27 +0000
@@ -30,9 +30,12 @@
<field name="type">form</field>
<field name="inherit_id" ref="stock.view_picking_form"/>
<field name="arch" type="xml">
- <xpath expr="/form/sheet/group/group/field[@name='date']" position="before">
+ <xpath expr="//field[@name='date']" position="before">
<field name="purchase_id"/>
</xpath>
+ <xpath expr="//field[@name='company_id']" position="after">
+ <field name="warehouse_id"/>
+ </xpath>
</field>
</record>
=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml 2012-07-03 12:41:11 +0000
+++ stock/stock_view.xml 2012-07-12 11:12:27 +0000
@@ -121,20 +121,16 @@
<field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
</header>
<sheet>
- <div class="oe_title">
- <div class="oe_edit_only">
- <label for="name" />
- </div>
- <h1>
- <field name="name" placeholder="Annual inventory"/>
- </h1>
- </div>
- <group>
- <group>
- <field name="date"/>
+ <label for="name" class="oe_edit_only"/>
+ <h1>
+ <field name="name" placeholder="Annual inventory" class="oe_inline"/>
+ <span> - </span>
+ <field name="date" class="oe_inline"/>
+ </h1>
+ <label for="company_id" class="oe_edit_only"/>
+ <h2>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
- </group>
- </group>
+ </h2>
<notebook>
<page string="General Informations">
<field name="inventory_line_id">
@@ -150,19 +146,31 @@
<field name="state" invisible="True"/>
</tree>
<form string="Products" version="7.0">
- <group col="4">
- <field domain="[('usage','=','internal')]" name="location_id"/>
- <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)" domain="[('type','<>','service')]"/>
- <field name="product_qty"/>
- <field name="product_uom" groups="product.group_uom"/>
- <field name="prod_lot_id" groups="stock.group_production_lot"/>
- <button name="%(stock.action_view_stock_inventory_line_split)d"
- string="Split inventory lines" groups="stock.group_inventory_valuation"
- type="action" icon="terp-stock_effects-object-colorize"/>
- </group>
+ <sheet>
+ <div class="oe_right oe_button_box">
+ <button name="%(stock.action_view_stock_inventory_line_split)d"
+ string="Split inventory lines" groups="stock.group_inventory_valuation"
+ type="action" icon="terp-stock_effects-object-colorize"/>
+ </div>
+ <group>
+ <group>
+ <field domain="[('usage','=','internal')]" name="location_id"/>
+ <field context="{'location':location_id, 'uom':product_uom, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)" domain="[('type','<>','service')]"/>
+ </group>
+ <group>
+ <label for="product_qty"/>
+ <div>
+ <field name="product_qty" class="oe_inline"/>
+ <field name="product_uom" class="oe_inline" groups="product.group_uom"/>
+ </div>
+ <field name="prod_lot_id" groups="stock.group_production_lot"/>
+ </group>
+ </group>
+ </sheet>
</form>
</field>
- </page><page string="Posted Inventory">
+ </page>
+ <page string="Posted Inventory">
<field name="move_ids" context="{'inventory_id':active_id}" >
<tree string="Stock Moves">
<field name="product_id"/>
@@ -331,42 +339,46 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Serial Number" version="7.0">
- <group>
- <group string="Serial Number Identification">
- <field name="product_id"/>
- <field name="prefix"/>
- <field name="name"/>
- <field name="ref"/>
- <field name="date"/>
- </group>
- <group string="Traceability">
- <field name="stock_available"/>
- <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up" colspan="2"/>
- <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down" colspan="2"/>
- </group>
- </group>
- <notebook>
- <page string="Revisions">
- <field name="revisions"/>
- </page>
- <page string="Stock Moves">
- <field name="move_ids">
- <tree string="Stock Moves">
- <field name="picking_id" string="Reference"/>
- <field name="origin"/>
- <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="Unit of Measure" groups="product.group_uom"/>
- <field name="tracking_id" groups="stock.group_tracking_lot"/>
+ <sheet>
+ <group>
+ <group string="Serial Number Identification">
+ <field name="product_id"/>
+ <field name="prefix"/>
+ <field name="name"/>
+ <field name="ref"/>
+ <group string="Dates">
<field name="date"/>
- <field name="prodlot_id"/>
- <field name="location_id" groups="stock.group_locations"/>
- <field name="location_dest_id" groups="stock.group_locations"/>
- <field name="state"/>
- </tree>
- </field>
- </page>
- </notebook>
+ </group>
+ </group>
+ <group string="Traceability">
+ <field name="stock_available"/>
+ <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up" colspan="2"/>
+ <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down" colspan="2"/>
+ </group>
+ </group>
+ <notebook>
+ <page string="Revisions">
+ <field name="revisions"/>
+ </page>
+ <page string="Stock Moves">
+ <field name="move_ids">
+ <tree string="Stock Moves">
+ <field name="picking_id" string="Reference"/>
+ <field name="origin"/>
+ <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="Unit of Measure" groups="product.group_uom"/>
+ <field name="tracking_id" groups="stock.group_tracking_lot"/>
+ <field name="date"/>
+ <field name="prodlot_id"/>
+ <field name="location_id" groups="stock.group_locations"/>
+ <field name="location_dest_id" groups="stock.group_locations"/>
+ <field name="state"/>
+ </tree>
+ </field>
+ </page>
+ </notebook>
+ </sheet>
</form>
</field>
</record>
@@ -512,39 +524,41 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Stock Location" version="7.0">
- <label for="name" class="oe_edit_only"/>
- <h1><field name="name"/></h1>
- <label for="location_id" class="oe_edit_only"/>
- <h2><field name="location_id"/></h2>
- <group>
- <group string="Additional Information">
- <field name="usage"/>
- <field name="partner_id"/>
- <field name="company_id" groups="base.group_multi_company" widget="selection"/>
- <field name="icon"/>
- <field name="scrap_location"/>
- <field name="active"/>
- </group>
- <group string="Chained Locations">
- <field name="chained_location_type"/>
- <field name="chained_location_id" attrs="{'required':[('chained_location_type','=','fixed')]}"/>
- <field name="chained_auto_packing"/>
- <field name="chained_delay"/>
- <field name="chained_journal_id"/>
- <field name="chained_picking_type"/>
- <field name="chained_company_id" widget="selection"/>
- </group>
- <group string="Localization">
- <field name="posx"/>
- <field name="posy"/>
- <field name="posz"/>
- </group><group string="Accounting Information">
- <field name="valuation_in_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
- <field name="valuation_out_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
- </group>
- </group>
- <separator string="Additional Information"/>
- <field name="comment"/>
+ <sheet>
+ <label for="name" class="oe_edit_only"/>
+ <h1><field name="name"/></h1>
+ <label for="location_id" class="oe_edit_only"/>
+ <h2><field name="location_id"/></h2>
+ <group>
+ <group string="Additional Information">
+ <field name="usage"/>
+ <field name="partner_id"/>
+ <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+ <field name="icon"/>
+ <field name="scrap_location"/>
+ <field name="active"/>
+ </group>
+ <group string="Chained Locations">
+ <field name="chained_location_type"/>
+ <field name="chained_location_id" attrs="{'required':[('chained_location_type','=','fixed')]}"/>
+ <field name="chained_auto_packing"/>
+ <field name="chained_delay"/>
+ <field name="chained_journal_id"/>
+ <field name="chained_picking_type"/>
+ <field name="chained_company_id" widget="selection"/>
+ </group>
+ <group string="Localization">
+ <field name="posx"/>
+ <field name="posy"/>
+ <field name="posz"/>
+ </group><group string="Accounting Information">
+ <field name="valuation_in_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
+ <field name="valuation_out_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
+ </group>
+ </group>
+ <separator string="Additional Information"/>
+ <field name="comment"/>
+ </sheet>
</form>
</field>
</record>
@@ -734,7 +748,7 @@
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name" class="oe_inline"/>
- <span attr="{'invisible': [('origin','=',False)]}"> - </span>
+ <label string="-" attrs="{'invisible':[('origin','=',False)]}"/>
<field name="origin" placeholder="PO0032" class="oe_inline"/>
</h1>
<label for="partner_id" class="oe_edit_only"/>
@@ -793,7 +807,7 @@
<field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" />
</header>
<group>
- <group string="Move Information">
+ <group>
<field name="name" invisible="1"/>
<field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
<label for="product_qty"/>
@@ -803,17 +817,17 @@
<button name="%(stock.move_scrap)d"
string="Scrap" type="action"
icon="gtk-convert" context="{'scrap': True}"
- states="draft,waiting,confirmed,assigned" colspan="1"/>
+ states="draft,waiting,confirmed,assigned"/>
</div>
<label for="product_uos_qty" groups="product.group_uos"/>
- <div>
- <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_inline"/>
- <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+ <div groups="product.group_uos">
+ <field name="product_uos_qty" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_inline"/>
+ <field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
</div>
<field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
- </group>
+ </group>
- <group string="Dates">
+ <group>
<field name="create_date" invisible="1"/>
<field name="date"/>
<field name="date_expected" on_change="onchange_date(date,date_expected)"/>
@@ -1251,11 +1265,12 @@
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field name="location_id" groups="stock.group_locations"/>
<field name="location_dest_id" groups="stock.group_locations"/>
- <field name="partner_id" context="{'contact_display':'partner'}"/>
<field name="create_date" groups="base.group_no_one" />
<field name="date" groups="base.group_no_one" />
+ </group>
+ <group>
+ <field name="partner_id" context="{'contact_display':'partner'}"/>
<field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-
</group>
<group>
<label for="tracking_id"/>
@@ -1441,6 +1456,9 @@
<field name="picking_id"/>
<field name="create_date" groups="base.group_no_one" />
<field name="date" groups="base.group_no_one" string="Move Date"/>
+ </group>
+ <group>
+ <field name="partner_id" groups="stock.group_locations"/>
<field name="date_expected" on_change="onchange_date(date,date_expected)"/>
<label for="tracking_id"/>
<div>
=== modified file 'stock_planning/stock_planning_view.xml'
--- stock_planning/stock_planning_view.xml 2012-06-29 12:36:18 +0000
+++ stock_planning/stock_planning_view.xml 2012-07-12 11:12:27 +0000
@@ -242,59 +242,67 @@
<field name="type">form</field>
<field name="priority">50</field>
<field name="arch" type="xml">
- <form string="Stock Planning">
- <group colspan="4" col="7">
- <group colspan ="3" col="2">
- <separator colspan ="2" string = "General Info"/>
- <field name="company_id" widget="selection"
- on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
- <field name="warehouse_id" domain = "[('company_id','=',company_id)] " />
- <field name="period_id" />
- <field name="product_id" on_change="product_id_change(product_id)" />
- <field name="product_uom_categ" invisible = "True"/>
- <field name="product_uos_categ" invisible = "True"/>
- <field name="product_uom"
- domain = "[('category_id','in',[product_uom_categ,product_uos_categ])]"
- on_change = "onchange_uom(product_uom, product_id, active_uom, planned_outgoing, to_procure)"/>
- <field name="active_uom" invisible = "True" />
- <separator colspan ="2" string = "Forecasts"/>
- <field name="warehouse_forecast"/>
- <field name="company_forecast"/>
- <field name="confirmed_forecasts_only"/>
- </group>
- <group colspan ="2" col="2">
- <separator colspan ="2" string = "Current Period Situation"/>
- <field name="stock_start"/>
- <field name="already_out"/>
- <field name="already_in"/>
- <separator colspan ="2" string = "Planning and Situation for Calculated Period"/>
- <field name="planned_outgoing"/>
- <field name="outgoing"/>
- <field name="outgoing_left"/>
- <field name="to_procure"/>
- <field name="incoming"/>
- <field name="incoming_left"/>
- <button name="calculate_planning" string="Calculate Planning" type="object" icon="gtk-execute" colspan="2"/>
- <field name="stock_only"/>
- </group>
- <group colspan ="2" col="2">
- <separator colspan ="2" string = "Minimum Stock Rule Indicators"/>
- <field name="minimum_op"/>
- <field name="maximum_op"/>
- <separator colspan ="2" string = "Calculated Period Simulation"/>
- <field name="outgoing_before"/>
- <field name="incoming_before"/>
- <field name="stock_simulation"/>
- <button name="procure_incomming_left" icon="gtk-convert" string="Procure Incoming Left" type="object" colspan="2"/>
- <field name="procure_to_stock"/>
- <separator colspan ="2" string = "Internal Supply"/>
+ <form string="Stock Planning" version="7.0">
+ <sheet>
+ <group>
+ <group string = "General Info">
+ <field name="company_id" select = "1" widget= "selection"
+ on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
+ <field name="warehouse_id" domain = "[('company_id','=',company_id)] " />
+ <field name="period_id" />
+ <field name="product_id" on_change="product_id_change(product_id)" />
+ <field name="product_uom_categ" invisible = "True"/>
+ <field name="product_uos_categ" invisible = "True"/>
+ <field name="product_uom"
+ domain = "[('category_id','in',[product_uom_categ,product_uos_categ])]"
+ on_change = "onchange_uom(product_uom, product_id, active_uom, planned_outgoing, to_procure)"/>
+ <field name="active_uom" invisible = "True" />
+ </group>
+ <group string = "Minimum Stock Rule Indicators">
+ <field name="minimum_op"/>
+ <field name="maximum_op"/>
+ </group>
+ </group>
+ <group>
+ <group string = "Current Period Situation">
+ <field name="stock_start"/>
+ <field name="already_out"/>
+ <field name="already_in"/>
+ </group>
+ <group string = "Forecasts">
+ <field name="warehouse_forecast"/>
+ <field name="company_forecast"/>
+ <field name="confirmed_forecasts_only"/>
+ </group>
+ </group>
+ <group>
+ <group string = "Planning and Situation for Calculated Period">
+ <field name="planned_outgoing"/>
+ <field name="outgoing"/>
+ <field name="outgoing_left"/>
+ <field name="to_procure"/>
+ <field name="incoming"/>
+ <field name="incoming_left"/>
+ <button name="calculate_planning" string="Calculate Planning" type="object" icon="gtk-execute" colspan="2"/>
+ <field name="stock_only"/>
+ </group>
+ <group string = "Calculated Period Simulation">
+ <field name="outgoing_before"/>
+ <field name="incoming_before"/>
+ <field name="stock_simulation"/>
+ <button name="procure_incomming_left" icon="gtk-convert" string="Procure Incoming Left" type="object" colspan="2"/>
+ <field name="procure_to_stock"/>
+ </group>
+ </group>
+ <group string = "Internal Supply">
<button name="internal_supply" string="Supply from Another Warehouse" icon="gtk-convert" type="object" colspan="2"/>
<field name="supply_warehouse_id" domain = "[('company_id','=',company_id)] "/>
<field name="stock_supply_location"/>
</group>
- </group>
- <separator colspan ="4" string = "Procurement History"/>
- <field name = "history" colspan = "2" nolabel = "1"/>
+ <group string="Procurement History">
+ <field name="history" nolabel = "1"/>
+ </group>
+ </sheet>
</form>
</field>
</record>
=== modified file 'stock_planning/wizard/stock_planning_create_periods_view.xml'
--- stock_planning/wizard/stock_planning_create_periods_view.xml 2012-07-10 16:40:11 +0000
+++ stock_planning/wizard/stock_planning_create_periods_view.xml 2012-07-12 11:12:27 +0000
@@ -10,8 +10,12 @@
<field name="arch" type="xml">
<form string="Stock Periods" version="7.0">
<group col="4">
- <field name="date_start"/>
- <field name="date_stop"/>
+ <label for="date_start" string="Duration"/>
+ <div>
+ <field name="date_start"/>
+ <label string="-"/>
+ <field name="date_stop"/>
+ </div>
</group>
<footer>
<button name="create_stock_periods" string="Create Daily Periods" type="object" class="oe_highlight"/>
=== modified file 'stock_planning/wizard/stock_planning_createlines_view.xml'
--- stock_planning/wizard/stock_planning_createlines_view.xml 2012-07-10 16:40:11 +0000
+++ stock_planning/wizard/stock_planning_createlines_view.xml 2012-07-12 11:12:27 +0000
@@ -9,11 +9,11 @@
<field name="arch" type="xml">
<form string="Create Stock Planning Lines" version="7.0">
<group col="4">
- <field name="period_id" widget="selection"/>
<field name="company_id" widget= "selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
<field name="warehouse_id" domain = "[('company_id','=',company_id)] "/>
<field name="forecasted_products"/>
- <field name="product_categ_id" attrs="{'required':[('forecasted_products','=',0)]}" widget="selection"/>
+ <field name="period_id"/>
+ <field name="product_categ_id" attrs="{'required':[('forecasted_products','=',0)]}"/>
</group>
<footer>
<button name="create_planning" string="Create" type="object" class="oe_highlight"/>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
