odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] warehouse, usability in form views 

bzr revid: qdp-launchpad@openerp.com-20120717154356-u2mr0s9ef9rr24ws
This commit is contained in:
Quentin (OpenERP) 2012-07-17 17:43:56 +02:00
parent 14ff708e69 3b271f68ee
commit 2a89c6079c
13 changed files with 217 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/account/account_view.xml
View File

@ -921,15 +921,15 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Account Tax" version="7.0"> <form string="Account Tax" version="7.0">
<group> <group>
<group> <group>
<field name="name"/> <field name="name"/>
<field name="description"/> <field name="description"/>
<group> </group>
</group> <group>
<field name="type_tax_use"/> <field name="type_tax_use"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="active"/> <field name="active"/>
</group> </group>
</group> </group>
<notebook> <notebook>
<page string="Tax Definition"> <page string="Tax Definition">

143
addons/delivery/delivery_view.xml
View File

@ -15,60 +15,82 @@
</tree> </tree>
</field> </field>
</record> </record>
<record id="view_delivery_carrier_form" model="ir.ui.view"> <record id="view_delivery_carrier_form" model="ir.ui.view">
<field name="name">delivery.carrier.form</field> <field name="name">delivery.carrier.form</field>
<field name="model">delivery.carrier</field> <field name="model">delivery.carrier</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Carrier" version="7.0"> <form string="Carrier" version="7.0">
<group col="4" name="general"> <div class="oe_title">
<field name="name"/> <label for="name" class="oe_edit_only"/>
<field name="partner_id"/> <h1>
<field name="product_id"/> <field name="name"/>
</h1>
</div>
<group>
<group name="general">
<field name="partner_id"/>
<field name="product_id"/>
</group>
<group>
<field name="active"/> <field name="active"/>
<separator string="Pricing Information" colspan="4"/> </group>
<group colspan="4" col="4"> </group>
<group col="4">
<group string="Pricing Information">
<field name="normal_price" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/> <field name="normal_price" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
<newline/> <label for="free_if_more_than"/>
<field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/> <div>
<field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}"/> <field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
<field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}"/>
</div>
</group> </group>
<newline/> <newline/>
<field name="use_detailed_pricelist"/> <field name="use_detailed_pricelist"/>
</group> </group>
<field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree,form"> <field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree">
<tree string="Delivery grids"> <tree string="Delivery grids">
<field name="sequence"/> <field name="sequence"/>
<field name="name"/> <field name="name"/>
</tree> </tree>
<form string="Delivery grids" version="7.0"> <form string="Delivery grids" version="7.0">
<group col="4"> <group>
<field name="name"/> <group>
<field name="active"/> <field name="name"/>
<field name="sequence"/> </group>
<group>
<field name="active"/>
<field name="sequence"/>
</group>
</group> </group>
<notebook> <notebook>
<page string="Grid definition"> <page string="Grid definition">
<field name="line_ids"/> <field name="line_ids"/>
</page> </page>
<page string="Destination"> <page string="Destination">
<group string="Countries"> <group>
<field colspan="2" name="country_ids" nolabel="1"/> <group>
</group> <field name="country_ids" widget="many2many_tags"/>
<group string="States"> <field name="state_ids" widget="many2many_tags"/>
<field colspan="2" name="state_ids" nolabel="1"/> </group>
</group> <group>
<group col="4"> <label for="zip_from" string="Zip"/>
<field name="zip_from"/> <div>
<field name="zip_to"/> <field name="zip_from" class="oe_inline"/>
</group> -
</page> <field name="zip_to" class="oe_inline"/>
</notebook> </div>
</form> </group>
</group>
</page>
</notebook>
</form>
</field> </field>
</form> </form>
</field> </field>
</record> </record>
<record id="action_delivery_carrier_form" model="ir.actions.act_window"> <record id="action_delivery_carrier_form" model="ir.actions.act_window">
<field name="name">Delivery Method</field> <field name="name">Delivery Method</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
@ -140,18 +162,28 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Grid Lines" version="7.0"> <form string="Grid Lines" version="7.0">
<field colspan="4" name="name"/> <group>
<div> <field name="name"/>
<label string="condition" for="type"/> </group>
<field name="type" class="oe_inline"/> <group>
<field name="operator" class="oe_inline"/> <group>
<field name="max_value" class="oe_inline"/> <label for="type" string="Condition"/>
</div> <div>
<group col="4"> <field name="type" class="oe_inline"/>
<field name="list_price"/> <field name="operator" class="oe_inline"/>
<field name="standard_price"/> <field name="max_value" class="oe_inline"/>
<field name="price_type"/> </div>
<field name="variable_factor" attrs="{'invisible':[('price_type','=','fixed')]}"/> <label for="price_type"/>
<div>
<field name="price_type" class="oe_inline"/>
<label string=" in Function of " class="oe_inline" attrs="{'invisible':[('price_type','=','fixed')]}"/>
<field name="variable_factor" attrs="{'invisible':[('price_type','=','fixed')]}" class="oe_inline"/>
</div>
</group>
<group>
<field name="list_price"/>
<field name="standard_price"/>
</group>
</group> </group>
</form> </form>
</field> </field>
@ -178,7 +210,7 @@
<field name="model">stock.picking.out</field> <field name="model">stock.picking.out</field>
<field name="inherit_id" ref="stock.view_picking_form"/> <field name="inherit_id" ref="stock.view_picking_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="partner_id" position="after"> <field name="min_date" position="after">
<field name="carrier_id"/> <field name="carrier_id"/>
<field name="carrier_tracking_ref"/> <field name="carrier_tracking_ref"/>
<field name="number_of_packages"/> <field name="number_of_packages"/>
@ -230,23 +262,10 @@
<field name="model">stock.move</field> <field name="model">stock.move</field>
<field name="inherit_id" ref="stock.view_move_form"/> <field name="inherit_id" ref="stock.view_move_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="picking_id" position="after"> <xpath expr="//group[@name='main_grp']" position="inside">
<field name="weight"/> <field name="weight"/>
<field name="weight_net"/> <field name="weight_net"/>
</field> </xpath>
</field>
</record>
<record id="view_move_reception_picking_withweight_form" model="ir.ui.view">
<field name="name">stock.move.reception.packing.form.weight</field>
<field name="type">form</field>
<field name="model">stock.move</field>
<field name="inherit_id" ref="stock.view_move_form_reception_picking"/>
<field name="arch" type="xml">
<field name="picking_id">
<field name="weight"/>
<field name="weight_net"/>
</field>
</field> </field>
</record> </record>
@ -264,7 +283,7 @@
<button name="delivery_set" string="Add in Quote" type="object" <button name="delivery_set" string="Add in Quote" type="object"
class="oe_edit_only" class="oe_edit_only"
attrs="{'invisible':['|',('carrier_id','=',False),('state','not in',('draft','sent'))]}"/> attrs="{'invisible':['|',('carrier_id','=',False),('state','not in',('draft','sent'))]}"/>
<br/> <br/>
<label string="If you don't 'Add in Quote', the exact price will be computed when invoicing based on delivery order(s)." <label string="If you don't 'Add in Quote', the exact price will be computed when invoicing based on delivery order(s)."
class="oe_edit_only" class="oe_edit_only"
attrs="{'invisible':['|',('carrier_id','=',False),('state','not in',('draft','sent'))]}"/> attrs="{'invisible':['|',('carrier_id','=',False),('state','not in',('draft','sent'))]}"/>

46
addons/procurement/procurement_view.xml
View File

@ -55,34 +55,46 @@
<field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed" /> <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed" />
</header> </header>
<sheet> <sheet>
<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>
<group> <group>
<group string="References"> <group>
<field name="name"/>
<field name="origin"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<group string="Planification">
<field name="date_planned"/> <field name="date_planned"/>
<field name="procure_method"/> <field name="procure_method"/>
<field name="priority"/> <field name="priority"/>
</group> </group>
<group>
<field name="message"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
</group> </group>
<notebook> <notebook>
<page string="Procurement Details"> <page string="Procurement Details">
<group string="Product &amp; Location" col="4"> <group>
<field name="product_id" on_change="onchange_product_id(product_id)"/> <group>
<field name="location_id" domain="[('usage','=','internal')]"/> <field name="product_id" on_change="onchange_product_id(product_id)"/>
<field name="product_qty"/> <label for="product_qty"/>
<field name="product_uom"/> <div>
<field name="product_qty" class="oe_inline"/>
<field name="product_uos_qty" groups="product.group_uos"/> <field name="product_uom" class="oe_inline"/>
<field name="product_uos" groups="product.group_uos"/> </div>
<label for="product_uos_qty" groups="product.group_uos"/>
<div groups="product.group_uos">
<field name="product_uos_qty" class="oe_inline"/>
<field name="product_uos" class="oe_inline"/>
</div>
</group>
<group>
<field name="location_id" domain="[('usage','=','internal')]"/>
</group>
</group> </group>
<separator string="Status"/>
<field name="message"/>
</page> </page>
<page string="Extra Information"> <page string="Extra Information">
<group string="Details" col="4"> <group>
<field name="move_id"/> <field name="move_id"/>
<field name="date_close"/> <field name="date_close"/>
<field name="close_move"/> <field name="close_move"/>

2
addons/procurement/wizard/schedulers_all_view.xml
View File

@ -10,7 +10,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Scheduler Parameters" version="7.0"> <form string="Scheduler Parameters" version="7.0">
<group string="This wizard allows you to run all procurement, production and/or purchase orders that should be processed based on their configuration. By default, the scheduler is launched automatically every night by OpenERP. You can use this menu to force it to be launched now. Note that it runs in the background, you may have to wait for a few minutes until it has finished computing."> <group>
<field name="automatic"/> <field name="automatic"/>
</group> </group>
<footer> <footer>

1
addons/product_expiry/product_expiry_view.xml
View File

@ -8,7 +8,6 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="date" position="after"> <field name="date" position="after">
<separator string="Dates" colspan="4" />
<field name="life_date" /> <field name="life_date" />
<field name="use_date" /> <field name="use_date" />
<field name="removal_date" /> <field name="removal_date" />

2
addons/purchase/purchase.py
View File

@ -167,7 +167,7 @@ class purchase_order(osv.osv):
help="Put an address if you want to deliver directly from the supplier to the customer. " \ help="Put an address if you want to deliver directly from the supplier to the customer. " \
"Otherwise, keep empty to deliver to your own company." "Otherwise, keep empty to deliver to your own company."
), ),
'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}), 'warehouse_id': fields.many2one('stock.warehouse', 'Destination Warehouse', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}),
'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage','<>','view')]), 'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage','<>','view')]),
'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."), 'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
'state': fields.selection(STATE_SELECTION, 'Status', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True), 'state': fields.selection(STATE_SELECTION, 'Status', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),

2
addons/purchase/stock.py
View File

@ -40,6 +40,7 @@ class stock_picking(osv.osv):
'purchase_id': fields.many2one('purchase.order', 'Purchase Order', 'purchase_id': fields.many2one('purchase.order', 'Purchase Order',
ondelete='set null', select=True), ondelete='set null', select=True),
} }
_defaults = { _defaults = {
'purchase_id': False, 'purchase_id': False,
} }
@ -133,5 +134,6 @@ class stock_picking_in(osv.osv):
_columns = { _columns = {
'purchase_id': fields.many2one('purchase.order', 'Purchase Order', 'purchase_id': fields.many2one('purchase.order', 'Purchase Order',
ondelete='set null', select=True), ondelete='set null', select=True),
'warehouse_id': fields.related('purchase_id', 'warehouse_id', type='many2one', relation='stock.warehouse', string='Destination Warehouse'),
} }
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

9
addons/purchase/stock_view.xml
View File

@ -7,8 +7,8 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="stock.view_move_form"/> <field name="inherit_id" ref="stock.view_move_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//field[@name='tracking_id']" position="before"> <xpath expr="//group[@name='destination_grp']" position="inside">
<field name="purchase_line_id" colspan="2" /> <field name="purchase_line_id"/>
</xpath> </xpath>
</field> </field>
</record> </record>
@ -30,9 +30,12 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="stock.view_picking_form"/> <field name="inherit_id" ref="stock.view_picking_form"/>
<field name="arch" type="xml"> <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"/> <field name="purchase_id"/>
</xpath> </xpath>
<xpath expr="//field[@name='company_id']" position="after">
<field name="warehouse_id"/>
</xpath>
</field> </field>
</record> </record>

4
addons/sale/stock_view.xml
View File

@ -19,8 +19,8 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="stock.view_move_form"/> <field name="inherit_id" ref="stock.view_move_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//field[@name='tracking_id']" position="before"> <xpath expr="//group[@name='origin_grp']" position="inside">
<field name="sale_line_id" colspan="2"/> <field name="sale_line_id"/>
</xpath> </xpath>
</field> </field>
</record> </record>

170
addons/stock/stock_view.xml
View File

@ -121,20 +121,16 @@
<field name="state" widget="statusbar" statusbar_visible="draft,confirm"/> <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
</header> </header>
<sheet> <sheet>
<div class="oe_title"> <div>
<div class="oe_edit_only"> <label for="name" class="oe_edit_only"/>
<label for="name" />
</div>
<h1> <h1>
<field name="name" placeholder="Annual inventory"/> <field name="name" placeholder="e.g. Annual inventory" class="oe_inline"/> -
<field name="date" class="oe_inline"/>
</h1> </h1>
</div> </div>
<group>
<group> <group>
<field name="date"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group> </group>
</group>
<notebook> <notebook>
<page string="General Informations"> <page string="General Informations">
<field name="inventory_line_id"> <field name="inventory_line_id">
@ -150,19 +146,27 @@
<field name="state" invisible="True"/> <field name="state" invisible="True"/>
</tree> </tree>
<form string="Products" version="7.0"> <form string="Products" version="7.0">
<group col="4"> <group>
<field domain="[('usage','=','internal')]" name="location_id"/> <group>
<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','&lt;&gt;','service')]"/> <field domain="[('usage','=','internal')]" name="location_id"/>
<field name="product_qty"/> <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','&lt;&gt;','service')]"/>
<field name="product_uom" groups="product.group_uom"/> </group>
<field name="prod_lot_id" groups="stock.group_production_lot"/> <group>
<button name="%(stock.action_view_stock_inventory_line_split)d" <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"/>
<button name="%(stock.action_view_stock_inventory_line_split)d"
string="Split inventory lines" groups="stock.group_inventory_valuation" string="Split inventory lines" groups="stock.group_inventory_valuation"
type="action" icon="terp-stock_effects-object-colorize"/> type="action" icon="terp-stock_effects-object-colorize"/>
</group>
</group> </group>
</form> </form>
</field> </field>
</page><page string="Posted Inventory"> </page>
<page string="Posted Inventory">
<field name="move_ids" context="{'inventory_id':active_id}" > <field name="move_ids" context="{'inventory_id':active_id}" >
<tree string="Stock Moves"> <tree string="Stock Moves">
<field name="product_id"/> <field name="product_id"/>
@ -331,18 +335,25 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Serial Number" version="7.0"> <form string="Serial Number" version="7.0">
<div class="oe_button_box oe_right">
<button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up"/>
<button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down"/>
</div>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name"/>
</h1>
</div>
<group> <group>
<group string="Serial Number Identification"> <group>
<field name="product_id"/> <field name="product_id"/>
<field name="prefix"/> <field name="prefix"/>
<field name="name"/>
<field name="ref"/> <field name="ref"/>
<field name="date"/>
</group> </group>
<group string="Traceability"> <group>
<field name="date"/>
<field name="stock_available"/> <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>
</group> </group>
<notebook> <notebook>
@ -734,7 +745,7 @@
<label for="name" class="oe_edit_only"/> <label for="name" class="oe_edit_only"/>
<h1> <h1>
<field name="name" class="oe_inline"/> <field name="name" class="oe_inline"/>
<span attr="{'invisible': [('origin','=',False)]}"> - </span> <span attrs="{'invisible': [('origin','=',False)]}"> - </span>
<field name="origin" placeholder="PO0032" class="oe_inline"/> <field name="origin" placeholder="PO0032" class="oe_inline"/>
</h1> </h1>
<label for="partner_id" class="oe_edit_only"/> <label for="partner_id" class="oe_edit_only"/>
@ -793,7 +804,7 @@
<field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" /> <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" />
</header> </header>
<group> <group>
<group string="Move Information"> <group>
<field name="name" invisible="1"/> <field name="name" invisible="1"/>
<field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/> <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
<label for="product_qty"/> <label for="product_qty"/>
@ -803,17 +814,16 @@
<button name="%(stock.move_scrap)d" <button name="%(stock.move_scrap)d"
string="Scrap" type="action" string="Scrap" type="action"
icon="gtk-convert" context="{'scrap': True}" icon="gtk-convert" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" colspan="1"/> states="draft,waiting,confirmed,assigned"/>
</div> </div>
<label for="product_uos_qty" groups="product.group_uos"/> <label for="product_uos_qty" groups="product.group_uos"/>
<div> <div groups="product.group_uos">
<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 name="product_uos_qty" 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"/> <field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
</div> </div>
<field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/> <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
</group> </group>
<group>
<group string="Dates">
<field name="create_date" invisible="1"/> <field name="create_date" invisible="1"/>
<field name="date"/> <field name="date"/>
<field name="date_expected" on_change="onchange_date(date,date_expected)"/> <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
@ -1216,14 +1226,15 @@
<form string="Stock Moves" version="7.0"> <form string="Stock Moves" version="7.0">
<header> <header>
<button name="action_confirm" states="draft" string="Process Later" type="object" class="oe_highlight"/> <button name="action_confirm" states="draft" string="Process Later" type="object" class="oe_highlight"/>
<button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" class="oe_highlight"/> <button name="%(action_partial_move_server)d" string="Process Partially" type="action" states="assigned" class="oe_highlight"/>
<button name="action_done" states="draft,assigned,confirmed" string="Process Entirely" type="object" class="oe_highlight"/>
<button name="force_assign" states="confirmed" string="Set Available" type="object" class="oe_highlight"/> <button name="force_assign" states="confirmed" string="Set Available" type="object" class="oe_highlight"/>
<button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/> <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/> <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
</header> </header>
<sheet> <sheet>
<group> <group>
<group> <group name="main_grp" string="Details">
<field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/> <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
<label for="product_qty"/> <label for="product_qty"/>
<div> <div>
@ -1236,28 +1247,28 @@
icon="gtk-convert" context="{'scrap': True}" icon="gtk-convert" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" colspan="1"/> states="draft,waiting,confirmed,assigned" colspan="1"/>
</div> </div>
<label for="product_uso_qty" /> <label for="product_uos_qty" groups="product.group_uos"/>
<div> <div groups="product.group_uos">
<field name="product_uos_qty" <field name="product_uos_qty"
groups="product.group_uos"
on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"
class="oe_inline"/> class="oe_inline"/>
<field name="product_uos" groups="product.group_uos" colspan="4" class="oe_inline"/> <field name="product_uos" class="oe_inline"/>
</div> </div>
<field name="name" string="Reason"/> <field name="name" string="Reason"/>
</group>
<group>
<field name="picking_id"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<group name="origin_grp" string="Origin">
<field name="picking_id"/>
<field name="location_id" groups="stock.group_locations"/> <field name="location_id" groups="stock.group_locations"/>
<field name="create_date" groups="base.group_no_one"/>
</group>
<group name="destination_grp" string="Destination">
<field name="location_dest_id" groups="stock.group_locations"/> <field name="location_dest_id" groups="stock.group_locations"/>
<field name="partner_id" context="{'contact_display':'partner'}"/> <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" />
<field name="date_expected" on_change="onchange_date(date,date_expected)"/> <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
<field name="date" groups="base.group_no_one" />
</group> </group>
<group> <group string="Tracability">
<label for="tracking_id"/> <label for="tracking_id"/>
<div> <div>
<field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/> <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
@ -1397,77 +1408,6 @@
</field> </field>
</record> </record>
<record id="view_move_form_reception_picking" model="ir.ui.view">
<field name="name">stock.move.form2</field>
<field name="model">stock.move</field>
<field name="type">form</field>
<field eval="6" name="priority"/>
<field name="arch" type="xml">
<form string="Receive Products" version="7.0">
<header>
<button name="action_confirm" states="draft" string="Process Later" type="object" class="oe_highlight"/>
<button name="force_assign" states="confirmed" string="Set Available" type="object" class="oe_highlight"/>
<button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned" class="oe_highlight"/>
<button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
</header>
<sheet>
<group>
<group>
<field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
<label for="product_qty"/>
<div>
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
<field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
<button name="%(stock.move_scrap)d"
string="Scrap" type="action"
icon="gtk-convert" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" colspan="1"/>
</div>
<label for="product_uos_qty"/>
<div>
<field name="product_uos_qty" groups="product.group_uos" class="oe_inline"
on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"/>
<field name="product_uos" groups="product.group_uos" class="oe_inline"/>
</div>
<field name="name" string="Reason"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="location_id" groups="stock.group_locations"/>
<field name="location_dest_id" groups="stock.group_locations"/>
<field name="partner_id" groups="stock.group_locations"/>
</group>
<group>
<field name="picking_id"/>
<field name="create_date" groups="base.group_no_one" />
<field name="date" groups="base.group_no_one" string="Move Date"/>
<field name="date_expected" on_change="onchange_date(date,date_expected)"/>
<label for="tracking_id"/>
<div>
<field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
<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,done" class="oe_inline"/>
</div>
<label for="prodlot_id"/>
<div>
<field name="prodlot_id" groups="stock.group_production_lot"
context="{'location_id':location_id, 'product_id':product_id}"
domain="[('product_id','=?',product_id)]" class="oe_inline"
on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"/>
<button name="%(track_line)d"
groups="stock.group_tracking_lot" class="oe_inline"
states="draft,waiting,confirmed,assigned,done"
string="Split" type="action" icon="terp-stock_effects-object-colorize" />
</div>
</group>
</group>
</sheet>
</form>
</field>
</record>
<record id="view_move_search_reception_incoming_picking" model="ir.ui.view"> <record id="view_move_search_reception_incoming_picking" model="ir.ui.view">
<field name="name">stock.move.incoming.search2</field> <field name="name">stock.move.incoming.search2</field>
<field name="model">stock.move</field> <field name="model">stock.move</field>
@ -1552,7 +1492,7 @@
<record model="ir.actions.act_window.view" id="action_move_reception_picking_form"> <record model="ir.actions.act_window.view" id="action_move_reception_picking_form">
<field name="sequence" eval="2"/> <field name="sequence" eval="2"/>
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="view_id" ref="view_move_form_reception_picking"/> <field name="view_id" ref="view_move_form"/>
<field name="act_window_id" ref="action_reception_picking_move"/> <field name="act_window_id" ref="action_reception_picking_move"/>
</record> </record>

52
addons/stock_planning/stock_planning_view.xml
View File

@ -242,10 +242,9 @@
<field name="type">form</field> <field name="type">form</field>
<field name="priority">50</field> <field name="priority">50</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Stock Planning"> <form string="Stock Planning" version="7.0">
<group colspan="4" col="7"> <group>
<group colspan ="3" col="2"> <group string="General Info">
<separator colspan ="2" string = "General Info"/>
<field name="company_id" widget="selection" <field name="company_id" widget="selection"
on_change="onchange_company(company_id)" groups="base.group_multi_company"/> on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
<field name="warehouse_id" domain = "[('company_id','=',company_id)] " /> <field name="warehouse_id" domain = "[('company_id','=',company_id)] " />
@ -256,45 +255,48 @@
<field name="product_uom" <field name="product_uom"
domain = "[('category_id','in',[product_uom_categ,product_uos_categ])]" domain = "[('category_id','in',[product_uom_categ,product_uos_categ])]"
on_change = "onchange_uom(product_uom, product_id, active_uom, planned_outgoing, to_procure)"/> on_change = "onchange_uom(product_uom, product_id, active_uom, planned_outgoing, to_procure)"/>
<field name="active_uom" invisible = "True" /> <field name="active_uom" invisible = "True"/>
<separator colspan ="2" string = "Forecasts"/> <separator string="Current Period Situation" colspan="2"/>
<field name="stock_start"/>
<field name="already_out"/>
<field name="already_in"/>
<separator string="Minimum Stock Rule Indicators" colspan="2"/>
<field name="minimum_op"/>
<field name="maximum_op"/>
<separator string="Forecasts" colspan="2"/>
<field name="warehouse_forecast"/> <field name="warehouse_forecast"/>
<field name="company_forecast"/> <field name="company_forecast"/>
<field name="confirmed_forecasts_only"/> <field name="confirmed_forecasts_only"/>
</group> </group>
<group colspan ="2" col="2">
<separator colspan ="2" string = "Current Period Situation"/> <group>
<field name="stock_start"/> <button name="calculate_planning" string="Compute Planning" type="object" icon="gtk-execute"/>
<field name="already_out"/> <separator string="Planning and Situation for Calculated Period" colspan="2"/>
<field name="already_in"/>
<separator colspan ="2" string = "Planning and Situation for Calculated Period"/>
<field name="planned_outgoing"/> <field name="planned_outgoing"/>
<field name="outgoing"/> <field name="outgoing"/>
<field name="outgoing_left"/> <field name="outgoing_left"/>
<field name="to_procure"/> <field name="to_procure"/>
<field name="incoming"/> <field name="incoming"/>
<field name="incoming_left"/> <label for="incoming_left"/>
<button name="calculate_planning" string="Calculate Planning" type="object" icon="gtk-execute" colspan="2"/> <div>
<field name="incoming_left" class="oe_inline"/>
<button name="procure_incomming_left" icon="gtk-convert" string="Make Procurement" type="object" class="oe_inline"/>
<button name="internal_supply" string="Make Picking" help="Supply from Another Warehouse" icon="gtk-convert" type="object" class="oe_inline"/>
</div>
<field name="stock_only"/> <field name="stock_only"/>
</group> <separator string="Calculated Period Simulation" colspan="2"/>
<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="outgoing_before"/>
<field name="incoming_before"/> <field name="incoming_before"/>
<field name="stock_simulation"/> <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"/> <field name="procure_to_stock"/>
<separator colspan ="2" string = "Internal Supply"/> <separator string="Internal Supply" colspan="2"/>
<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="supply_warehouse_id" domain = "[('company_id','=',company_id)] "/>
<field name="stock_supply_location"/> <field name="stock_supply_location"/>
</group> </group>
</group> </group>
<separator colspan ="4" string = "Procurement History"/> <group string="Procurement History" colspan="4">
<field name = "history" colspan = "2" nolabel = "1"/> <field name="history" nolabel="1" colspan="4"/>
</group>
</form> </form>
</field> </field>
</record> </record>

8
addons/stock_planning/wizard/stock_planning_create_periods_view.xml
View File

@ -10,8 +10,12 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Stock Periods" version="7.0"> <form string="Stock Periods" version="7.0">
<group col="4"> <group col="4">
<field name="date_start"/> <label for="date_start" string="Duration"/>
<field name="date_stop"/> <div>
<field name="date_start"/>
<label string="-"/>
<field name="date_stop"/>
</div>
</group> </group>
<footer> <footer>
<button name="create_stock_periods" string="Create Daily Periods" type="object" class="oe_highlight"/> <button name="create_stock_periods" string="Create Daily Periods" type="object" class="oe_highlight"/>

6
addons/stock_planning/wizard/stock_planning_createlines_view.xml
View File

@ -9,16 +9,16 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Create Stock Planning Lines" version="7.0"> <form string="Create Stock Planning Lines" version="7.0">
<group col="4"> <group col="4">
<field name="period_id" widget="selection"/> <field name="period_id"/>
<field name="company_id" widget= "selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/> <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="warehouse_id" domain = "[('company_id','=',company_id)] "/>
<field name="forecasted_products"/> <field name="forecasted_products"/>
<field name="product_categ_id" attrs="{'required':[('forecasted_products','=',0)]}" widget="selection"/> <field name="product_categ_id" attrs="{'required':[('forecasted_products','=',0)]}"/>
</group> </group>
<footer> <footer>
<button name="create_planning" string="Create" type="object" class="oe_highlight"/> <button name="create_planning" string="Create" type="object" class="oe_highlight"/>
or or
<button string="Cancel" class="oe_link" special="cancel" /> <button string="Cancel" class="oe_link" special="cancel"/>
</footer> </footer>
</form> </form>
</field> </field>