<menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse"
groups="group_stock_manager,group_stock_user" sequence="5"
- web_icon="images/warehouse.png"
- web_icon_hover="images/warehouse-hover.png" action="product.product_normal_action"/>
+ web_icon="images/warehouse.png"
+ web_icon_hover="images/warehouse-hover.png"/>
<menuitem id="menu_stock_warehouse_mgmt" name="Receive/Deliver By Orders" parent="menu_stock_root" sequence="1"/>
<menuitem id="menu_stock_products_moves" name="Receive/Deliver Products" parent="menu_stock_root" sequence="2"/>
<menuitem id="menu_stock_product" name="Products" parent="menu_stock_root" sequence="6"/>
parent="stock.menu_product_in_config_stock" sequence="35" groups="product.group_uom"/>
<menuitem
action="product.product_uom_categ_form_action" id="menu_stock_uom_categ_form_action"
- parent="menu_stock_configuration" sequence="30"/>
+ parent="menu_stock_configuration" sequence="30" groups="product.group_uom"/>
<menuitem
action="product.product_uom_form_action" id="menu_stock_uom_form_action"
- parent="menu_stock_configuration" sequence="35"/>
+ parent="menu_stock_configuration" sequence="35" groups="product.group_uom"/>
<record id="stock_inventory_line_tree" model="ir.ui.view">
<field name="name">stock.inventory.line.tree</field>
<button name="%(stock.action_view_stock_inventory_line_split)d"
string="Split inventory lines" groups="stock.group_inventory_valuation"
type="action" icon="gtk-justify-fill"/>
- <field name="location_id"/>
+ <field name="location_id" groups="stock.group_locations"/>
</tree>
</field>
</record>
<field name="model">stock.inventory.line</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Stock Inventory Lines">
- <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)" select="1" 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"/>
- <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
+ <form string="Stock Inventory Lines" version="7.0">
+ <group col="4">
+ <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"/>
+ <field domain="[('usage','=','internal')]" name="location_id"/>
<button name="%(stock.action_view_stock_inventory_line_split)d"
- string="Split inventory lines" groups="stock.group_inventory_valuation"
+ string="Split Inventory Line" groups="stock.group_inventory_valuation"
type="action" icon="terp-stock_effects-object-colorize"/>
+ </group>
</form>
</field>
</record>
</group>
<newline/>
<group expand="0" string="Group By...">
- <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+ <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
</group>
</search>
<field name="model">stock.inventory</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Physical Inventory">
- <field name="name"/>
- <field name="date"/>
- <field name="company_id" groups="base.group_multi_company" widget="selection"/>
- <notebook colspan="4">
+ <form string="Physical Inventory" version="7.0">
+ <header>
+ <button name="action_confirm" states="draft" string="Confirm Inventory" type="object"/>
+ <button name="action_done" states="confirm" string="Validate Inventory" type="object"/>
+ <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
+ <button name="action_cancel_inventory" states="draft,confirm,done" string="Cancel Inventory" type="object"/>
+ <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
+ </header>
+ <sheet>
+ <div class="oe_form_title">
+ <div class="oe_form_readonly_hidden">
+ <label for="name" />
+ </div>
+ <h1>
+ <field name="name" placeholder="Annual inventory"/>
+ </h1>
+ </div>
+ <group>
+ <group>
+ <field name="date"/>
+ <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+ </group>
+ </group>
+ <notebook>
<page string="General Informations">
- <field colspan="4" name="inventory_line_id" nolabel="1" widget="one2many_list">
+ <field name="inventory_line_id">
<tree string="Products" editable="bottom">
<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')]"/>
type="action" icon="terp-stock_effects-object-colorize" states="draft,confirm"/>
<field name="state" invisible="True"/>
</tree>
- <form string="Products ">
- <field domain="[('usage','=','internal')]" name="location_id"/>
- <newline/>
- <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"/>
- <group colspan="2" col="4">
- <field name="prod_lot_id" groups="stock.group_production_lot"/>
+ <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"/>
</form>
</field>
</page><page string="Posted Inventory">
- <field colspan="2" name="move_ids" nolabel="1" widget="one2many_list" context="{'inventory_id':active_id}" >
- <tree string="Stock Moves">
- <field name="product_id"/>
- <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
- <field name="product_uom" string="UoM" groups="product.group_uom"/>
- <field name="prodlot_id" groups="stock.group_production_lot"/>
- <button name="%(track_line)d" string="Split in production lots" type="action"
- icon="terp-stock_effects-object-colorize"
- attrs="{'invisible': [('prodlot_id','<>',False)]}"
- states="draft,done,cancel"
- context="{'inventory_id':parent.id}"
- groups="stock.group_production_lot"/>
- <field groups="stock.group_tracking_lot" name="tracking_id"/>
- <button name="%(split_into)d" string="Put in a new pack" type="action"
- groups="stock.group_tracking_lot"
- icon="terp-stock_effects-object-colorize"
- context="{'inventory_id':parent.id}"
- states="draft,done,cancel"/>
- <field name="location_id"/>
- <field name="location_dest_id"/>
- <field name="date" string="Date"/>
- <field name="state" invisible="True"/>
- </tree>
- </field>
+ <field name="move_ids" context="{'inventory_id':active_id}" >
+ <tree string="Stock Moves">
+ <field name="product_id"/>
+ <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+ <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
+ <field name="prodlot_id" groups="stock.group_production_lot"/>
+ <button name="%(track_line)d" string="Split in serial numbers" type="action"
+ icon="terp-stock_effects-object-colorize"
+ attrs="{'invisible': [('prodlot_id','<>',False)]}"
+ states="draft,done,cancel"
+ context="{'inventory_id':parent.id}"
+ groups="stock.group_production_lot"/>
+ <field groups="stock.group_tracking_lot" name="tracking_id"/>
+ <button name="%(split_into)d" string="Put in a new pack" type="action"
+ groups="stock.group_tracking_lot"
+ icon="terp-stock_effects-object-colorize"
+ context="{'inventory_id':parent.id}"
+ states="draft,done,cancel"/>
+ <field name="location_id" groups="stock.group_locations"/>
+ <field name="location_dest_id" groups="stock.group_locations"/>
+ <field name="date" string="Date"/>
+ <field name="state" invisible="True"/>
+ </tree>
+ </field>
</page>
</notebook>
- <group col="2" colspan="2">
- <field name="state"/>
- </group>
- <group col="3" colspan="2">
- <button name="action_cancel_inventory" states="draft,confirm,done" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
- <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
- <button name="action_done" states="confirm" string="Validate Inventory" type="object" icon="gtk-jump-to"/>
- <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
- </group>
+ </sheet>
</form>
</field>
</record>
<field name="model">stock.tracking</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Packs">
- <group col="2" colspan="2" groups="product.group_stock_packaging">
- <separator string="Pack Identification" colspan="2"/>
- <field name="name"/>
- <field name="serial"/>
- <field name="date"/>
- <field name="active"/>
- </group>
- <group col="2" colspan="2" groups="stock.group_tracking_lot">
- <separator string="Traceability" colspan="4"/>
- <button name="action_traceability" icon="gtk-go-up" string="Upstream traceability" type="object"
- colspan="2"/>
- <button name="action_traceability" icon="gtk-go-down" string="Downstream traceability" type="object"
- context="{'type': 'move_history_ids'}" colspan="2"/>
+ <form string="Packs" version="7.0">
+ <group>
+ <group groups="product.group_stock_packaging" string="Pack Identification">
+ <field name="name"/>
+ <field name="serial"/>
+ <field name="date"/>
+ <field name="active"/>
+ </group>
+ <group groups="stock.group_tracking_lot" string="Traceability">
+ <button name="action_traceability" icon="gtk-go-up" string="Upstream Traceability" type="object"
+ colspan="2"/>
+ <button name="action_traceability" icon="gtk-go-down" string="Downstream Traceability" type="object"
+ context="{'type': 'move_history_ids'}" colspan="2"/>
+ </group>
</group>
- <notebook colspan="4">
- <page string="Stock Moves">
- <field colspan="2" name="move_ids" nolabel="1"/>
- </page>
- </notebook>
+ <field name="move_ids"/>
</form>
</field>
</record>
<field name="model">stock.production.lot.revision</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Production Lot Revisions">
- <field colspan="4" name="name"/>
- <field colspan="2" name="indice"/>
- <field colspan="2" name="date"/>
- <newline/>
- <field name="author_id" readonly="1"/>
- <newline/>
- <separator string="Description" colspan="4"/>
- <field colspan="4" name="description" nolabel="1"/>
+ <form string="Serial Number Revisions" version="7.0">
+ <group col="4">
+ <field name="name"/>
+ <field name="indice"/>
+ <field name="date"/>
+ <field name="author_id"/>
+ </group>
+ <separator string="Description"/>
+ <field name="description"/>
</form>
</field>
</record>
<field name="model">stock.production.lot.revision</field>
<field name="type">tree</field>
<field name="arch" type="xml">
- <tree string="Production Lot Revisions">
+ <tree string="Serial Number Revisions">
<field name="indice"/>
<field name="author_id"/>
<field name="date"/>
<field name="model">stock.production.lot</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Production Lot">
- <group col="4" colspan="2">
- <separator string="Production Lot Identification" colspan="4"/>
- <field name="product_id" colspan="4"/>
- <field name="prefix" colspan="2"/>
- <field name="name" colspan="2"/>
- <field name="ref" colspan="4"/>
- <field name="date" colspan="4"/>
- </group>
- <group col="2" colspan="2">
- <separator string="Traceability" colspan="2"/>
- <field name="stock_available" colspan="2"/>
- <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"/>
+ <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 colspan="4">
+ <notebook>
<page string="Revisions">
- <field colspan="2" name="revisions" nolabel="1"/>
+ <field name="revisions"/>
</page>
<page string="Stock Moves">
- <field colspan="2" name="move_ids" nolabel="1" widget="one2many_list">
+ <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="UoM" groups="product.group_uom"/>
+ <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"/>
- <field name="location_dest_id"/>
+ <field name="location_id" groups="stock.group_locations"/>
+ <field name="location_dest_id" groups="stock.group_locations"/>
<field name="state"/>
</tree>
</field>
<field name="model">stock.production.lot</field>
<field name="type">tree</field>
<field name="arch" type="xml">
- <tree string="Production Lot">
+ <tree string="Serial Number">
<field name="prefix" />
<field name="name"/>
<field name="ref"/>
</record>
<record id="action_production_lot_form" model="ir.actions.act_window">
- <field name="name">Production Lots</field>
+ <field name="name">Serial Number</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">stock.production.lot</field>
<field name="view_type">form</field>
<tree colors="grey:state == 'cancel'" string="Moves">
<field name="product_id" />
<field name="product_qty" />
- <field name="product_uom" string="UOM" groups="product.group_uom"/>
+ <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
<field name="prodlot_id" groups="stock.group_production_lot"/>
<field name="tracking_id" groups="stock.group_tracking_lot"/>
<field name="product_packaging" domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging"/>
<field name="picking_id"/>
- <field name="location_id" />
- <field name="location_dest_id" />
+ <field name="location_id" groups="stock.group_locations"/>
+ <field name="location_dest_id" groups="stock.group_locations"/>
<field name="create_date" groups="base.group_no_one"/>
<field name="date" string="Date" groups="base.group_no_one"/>
<field name="date_expected" string="Date Expected"/>
<tree colors="grey:state == 'cancel'" string="Moves">
<field name="product_id" />
<field name="product_qty" />
- <field name="product_uom" string="UOM" groups="product.group_uom"/>
+ <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
<field name="prodlot_id" groups="stock.group_production_lot"/>
<field name="tracking_id" groups="stock.group_tracking_lot"/>
<field name="product_packaging" domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging"/>
<field name="picking_id"/>
- <field name="location_id" />
- <field name="location_dest_id" />
+ <field name="location_id" groups="stock.group_locations"/>
+ <field name="location_dest_id" groups="stock.group_locations"/>
<field name="create_date" groups="base.group_no_one"/>
<field name="date" string="Date" groups="base.group_no_one"/>
- <field name="date_expected" string="Date Expected"/>
+ <field name="date_expected" string="Date Expected"/>
<field name="state"/>
</tree>
</field>
<field name="model">stock.location</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Stock Location">
- <group col="2" colspan="2">
- <separator string="Location" colspan="2"/>
- <field name="name"/>
- <field name="usage"/>
- <field name="location_id"/>
- </group>
- <group col="4" colspan="2">
- <separator string="Additional Information" colspan="4"/>
- <field name="partner_id" colspan="4"/>
- <field name="company_id" groups="base.group_multi_company" widget="selection" colspan="4"/>
- <field name="icon" colspan="4"/>
- <field name="scrap_location"/>
- <field name="active"/>
- </group>
- <group col="2" colspan="2">
- <separator string="Chained Locations" colspan="2"/>
- <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 col="2" colspan="2">
- <separator string="Localization" colspan="2"/>
- <field name="posx"/>
- <field name="posy"/>
- <field name="posz"/>
- <separator string="Accounting Information" colspan="2"/>
- <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'))]}"/>
+ <form string="Stock Location" version="7.0">
+ <label for="name" class="oe_form_readonly_hidden"/>
+ <h1><field name="name"/></h1>
+ <label for="location_id" class="oe_form_readonly_hidden"/>
+ <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" colspan="4"/>
- <field colspan="4" name="comment" nolabel="1"/>
+ <separator string="Additional Information"/>
+ <field name="comment"/>
</form>
</field>
</record>
<field name="model">stock.warehouse</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Warehouse">
- <field colspan="4" name="name" select="1"/>
- <field name="lot_input_id"/>
- <field name="lot_stock_id"/>
- <field name="lot_output_id"/>
- <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
- <newline/>
- <field name="partner_id"/>
+ <form string="Warehouse" version="7.0">
+ <label for="name" class="oe_form_readonly_hidden"/>
+ <h1><field name="name"/></h1>
+ <group>
+ <group>
+ <field name="lot_input_id"/>
+ <field name="lot_stock_id"/>
+ <field name="lot_output_id"/>
+ </group>
+ <group>
+ <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+ <field name="partner_id"/>
+ </group>
+ </group>
</form>
</field>
</record>
<menuitem action="action_warehouse_form" id="menu_action_warehouse_form" groups="stock.group_locations"
parent="menu_stock_configuration" sequence="1"/>
+<!--
+ STOCK PICKING
+-->
+
+ <!--
+ #
+ # Defaults and Internal Pickings
+ #
+ -->
+
<record model="ir.ui.view" id="stock_picking_calendar">
<field name="name">stock.picking.calendar</field>
<field name="model">stock.picking</field>
</calendar>
</field>
</record>
+
<record id="vpicktree" model="ir.ui.view">
<field name="name">stock.picking.tree</field>
<field name="model">stock.picking</field>
<field name="invoice_state"/>
<field name="stock_journal_id" widget="selection"/>
<field name="state"/>
- <button name="action_process" states="assigned" groups="stock.group_stock_user" string="Process" type="object" icon="gtk-go-forward"/>
</tree>
</field>
</record>
+
<record id="view_picking_form" model="ir.ui.view">
<field name="name">stock.picking.form</field>
<field name="model">stock.picking</field>
<field name="type">form</field>
<field eval="12" name="priority"/>
<field name="arch" type="xml">
- <form string="Internal Picking List">
- <group colspan="4" col="6">
- <group colspan="4" col="4">
- <field name="name" readonly="1"/>
- <field name="origin"/>
- <field name="partner_id" on_change="onchange_partner_in(partner_id)" colspan="4"/>
- <field name="invoice_state" string="Invoice Control"/>
+ <form string="Internal Picking List" version="7.0">
+ <header>
+ <button name="draft_force_assign" states="draft" string="Confirm" type="object"/>
+ <button name="draft_validate" states="draft" string="Confirm & Transfer" type="object"/>
+ <!-- <button name="action_assign" states="confirmed" string="Check Availability" type="object"/> -->
+ <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
+ <button name="action_process" states="assigned" string="Confirm & Transfer" groups="stock.group_stock_user" type="object"/>
+ <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','<>','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" />
+ <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" />
+ <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel"/>
+ <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
+ </header>
+ <sheet>
+ <label for="name" class="oe_form_readonly_hidden"/>
+ <h1>
+ <field name="name" class="oe_form_inline"/>
+ <span attr="{'invisible': [('origin','=',False)]}"> - </span>
+ <field name="origin" placeholder="PO0032" class="oe_form_inline"/>
+ </h1>
+ <label for="partner_id" class="oe_form_readonly_hidden"/>
+ <h2>
+ <field name="partner_id" on_change="onchange_partner_in(partner_id)"/>
+ </h2>
+ <group>
+ <group>
<field name="backorder_id" readonly="1"/>
+ <field name="invoice_state" string="Invoice Control" groups="account.group_account_invoice"/>
+ <field name="stock_journal_id" widget="selection" groups="account.group_account_user"/>
</group>
- <group colspan="2" col="2">
+ <group>
<field name="date"/>
<field name="min_date" readonly="1"/>
- <field name="stock_journal_id" widget="selection"/>
</group>
</group>
- <notebook colspan="4">
+ <notebook>
<page string="Products">
- <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" context="{'address_in_id': partner_id}">
+ <field name="move_lines" context="{'address_in_id': partner_id}">
<tree colors="grey:scrapped == True" string="Stock Moves">
<field name="product_id"/>
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
- <field name="product_uom" string="UoM" groups="product.group_uom"/>
+ <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
<field name="product_uos" groups="product.group_uos"/>
<button name="%(stock.move_scrap)d"
string="Scrap Products" type="action"
<field name="prodlot_id" groups="stock.group_production_lot"/>
<button
name="%(stock.track_line)d"
- string="Split in production lots"
+ string="Split in Serial Number"
groups="stock.group_production_lot"
type="action" icon="terp-stock_effects-object-colorize"
states="draft,waiting,confirmed,assigned" />
groups="product.group_stock_packaging"
icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed"/>
- <field name="location_dest_id"/>
+ <field name="location_dest_id" groups="stock.group_locations"/>
<field name="date_expected" string="Date Expected"/>
<field name="state"/>
</tree>
- <form string="Stock Moves">
- <group colspan="2" col="4">
- <separator colspan="4" string="Move Information"/>
- <field name="name" invisible="1" colspan="4"/>
- <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)" colspan="4"/>
- <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3"/>
- <button name="%(stock.move_scrap)d"
- string="Scrap" type="action"
- icon="gtk-convert" context="{'scrap': True}"
- states="draft,waiting,confirmed,assigned" colspan="1"/>
- <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" colspan="4"/>
- <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
- <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4"/>
- <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]" colspan="4"/>
- </group>
-
- <group colspan="2" col="2">
- <separator string="Locations" colspan="2" />
- <field name="location_id" domain="[('usage','<>','view')]" />
- <field name="location_dest_id" domain="[('usage','=','internal')]" />
- </group>
-
- <group colspan="2" col="2">
- <separator string="Dates" colspan="2" />
- <field name="create_date" invisible="1"/>
- <field name="date"/>
- <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
- </group>
-
- <group colspan="2" col="4" groups="stock.group_tracking_lot">
- <separator string="Traceability" colspan="4" groups="stock.group_tracking_lot"/>
- <field name="tracking_id" groups="stock.group_tracking_lot" colspan="3"/>
- <button name="%(split_into)d" string="New pack" type="action"
- groups="product.group_stock_packaging"
- icon="terp-stock_effects-object-colorize"
- states="draft,assigned,confirmed" colspan="1"/>
- <field name="prodlot_id" groups="stock.group_production_lot"
- context="{'location_id':location_id, 'product_id':product_id}"
- domain="[('product_id','=?',product_id)]"
- on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"/>
- <button name="%(track_line)d"
- groups="stock.group_tracking_lot"
- states="draft,waiting,confirmed,assigned"
- string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1" />
- </group>
- <label string="" colspan="4"/>
- <field name="state"/>
- <group col="4" colspan="2">
- <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
- <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
+ <form string="Stock Moves" version="7.0">
+ <header>
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
+ <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
<button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
+ <field name="state" widget="statusbar" status_visible="draft,assigned,done" />
+ </header>
+ <group>
+ <group string="Move Information">
+ <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"/>
+ <div>
+ <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
+ <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_form_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" 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_form_inline"/>
+ <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
+ </div>
+ <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
+ </group>
+
+ <group string="Dates">
+ <field name="create_date" invisible="1"/>
+ <field name="date"/>
+ <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
+ </group>
+
+ <group string="Locations" groups="stock.group_locations">
+ <field name="location_id" domain="[('usage','<>','view')]"/>
+ <field name="location_dest_id" domain="[('usage','=','internal')]" groups="stock.group_locations"/>
+ </group>
+
+ <group groups="stock.group_tracking_lot" string="Traceability">
+ <label for="tracking_id"/>
+ <div>
+ <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_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"/>
+ </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)]"
+ on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_form_inline"/>
+ <button name="%(track_line)d"
+ groups="stock.group_tracking_lot"
+ states="draft,waiting,confirmed,assigned"
+ string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+ </div>
+ </group>
</group>
</form>
</field>
- <group col="10" colspan="4">
- <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
- <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
- <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
- <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
- <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
- <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
- <button name="action_process" states="assigned" string="Process" groups="stock.group_stock_user" type="object" icon="gtk-go-forward"/>
- <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','<>','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl" />
- </group>
</page>
<page string="Additional info">
- <field name="auto_picking"/>
- <field name="date_done"/>
- <field name="move_type"/>
- <field name="type"/>
- <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+ <group>
+ <group>
+ <field name="move_type"/>
+ <field name="type"/>
+ <field name="auto_picking"/>
+ </group>
+ <group>
+ <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+ <field name="date_done"/>
+ </group>
+ </group>
</page>
<page string="Notes">
- <field colspan="4" name="note" nolabel="1"/>
+ <field name="note" placeholder="Add an internal note..."/>
</page>
</notebook>
+ </sheet>
</form>
</field>
</record>
- <record id="view_stock_picking_filter" model="ir.ui.view">
- <field name="name">stock.picking.list.select</field>
+ <record id="view_picking_internal_search" model="ir.ui.view">
+ <field name="name">stock.picking.internal.search</field>
<field name="model">stock.picking</field>
<field name="type">search</field>
<field name="arch" type="xml">
- <search string="Search Stock Picking">
+ <search string="Internal Picking List">
<group>
- <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Available Pickings"/>
- <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Pickings"/>
+ <filter icon="terp-check" string="Ready" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
+ <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
<filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Pickings already processed"/>
<separator orientation="vertical"/>
- <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
- <separator orientation="vertical"/>
- <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Internal Pickings to invoice"/>
- <separator orientation="vertical"/>
- <field name="name"/>
+ <field name="name"
+ domain="[('name','ilike', self),('origin','ilike',self)]"/>
<field name="partner_id"/>
<field name="product_id"/>
<field name="stock_journal_id" widget="selection"/>
</group>
<newline/>
<group expand="0" string="Group By...">
- <separator orientation="vertical" />
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+ <separator orientation="vertical"/>
+ <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+ <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'min_date'}"/>
+ <separator orientation="vertical"/>
+ <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
<separator orientation="vertical" />
- <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
- <separator orientation="vertical" />
- <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}" />
+ <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"/>
</group>
</search>
</field>
</record>
+ <record id="action_picking_tree6" model="ir.actions.act_window">
+ <field name="name">Internal Moves</field>
+ <field name="res_model">stock.picking</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form,calendar</field>
+ <field name="domain">[('type','=','internal')]</field>
+ <field name="context">{'contact_display': 'partner_address', 'search_default_available': 1}</field>
+ <field name="search_view_id" ref="view_picking_internal_search"/>
+ <field name="help">Internal Moves display all inventory operations you have to perform in your warehouse. All operations can be categorized into stock journals, so that each worker has his own list of operations to perform in his own journal. Most operations are prepared automatically by OpenERP according to your preconfigured logistics rules, but you can also record manual stock operations.</field>
+ </record>
+
+ <record model="ir.actions.act_window.view" id="action_picking_tree6_tree_view">
+ <field name="sequence" eval="1"/>
+ <field name="view_mode">tree</field>
+ <field name="view_id" ref="vpicktree"/>
+ <field name="act_window_id" ref="action_picking_tree6"/>
+ </record>
+ <record model="ir.actions.act_window.view" id="action_picking_tree6_form_view">
+ <field name="sequence" eval="2"/>
+ <field name="view_mode">form</field>
+ <field name="view_id" ref="view_picking_form"/>
+ <field name="act_window_id" ref="action_picking_tree6"/>
+ </record>
+
<!--
#
# Sending Products
<field name="arch" type="xml">
<tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and min_date < current_date" string="Delivery Orders">
<field name="name"/>
+ <field name="partner_id"/>
<field name="origin"/>
- <field name="date"/>
<field name="min_date"/>
<field name="backorder_id"/>
+ <field name="stock_journal_id" groups="account.group_account_user"/>
<field name="invoice_state"/>
- <field name="stock_journal_id" widget="selection"/>
<field name="state"/>
- <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
</tree>
</field>
</record>
<record id="view_picking_out_form" model="ir.ui.view">
<field name="name">stock.picking.out.form</field>
- <field name="model">stock.picking</field>
+ <field name="model">stock.picking.out</field>
+ <field name="inherit_id" ref="view_picking_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Delivery Orders">
- <group col="6" colspan="4">
- <group colspan="4" col="4">
- <field name="name" readonly="1"/>
- <field name="origin" readonly="1"/>
- <field name="partner_id" on_change="onchange_partner_in(partner_id)" colspan="4"/>
- <field name="invoice_state"/>
- <field name="backorder_id" readonly="1"/>
- </group>
- <group colspan="2" col="2">
- <field name="date"/>
- <field name="min_date" readonly="1"/>
- <field name="stock_journal_id" widget="selection"/>
- </group>
- </group>
- <notebook colspan="4">
- <page string="Products">
- <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" context="{'address_out_id': partner_id, 'picking_type': type}" >
- <tree colors="grey:scrapped==True" string="Stock Moves">
- <field name="product_id"/>
- <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
- <field name="product_uom" string="UoM" groups="product.group_uom"/>
- <field name="product_uos" groups="product.group_uos"/>
- <button name="%(stock.move_scrap)d"
- string="Scrap Products" type="action"
- icon="gtk-convert" context="{'scrap': True}"
- states="draft,waiting,confirmed,assigned" />
- <field name="scrapped" invisible="1"/>
- <field name="prodlot_id" groups="stock.group_production_lot"/>
- <button name="%(track_line)d" string="Split in production lots" type="action"
- icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','<>',False)]}"
- states="draft,assigned,confirmed"
- groups="stock.group_production_lot"/>
- <field name="tracking_id" groups="stock.group_tracking_lot"/>
- <button name="setlast_tracking" string="Put in current pack" type="object"
- attrs="{'invisible': [('tracking_id','<>',False)]}"
- groups="stock.group_tracking_lot"
- icon="terp-stock_effects-object-colorize"
- states="draft,assigned,confirmed"/>
- <button name="%(split_into)d" string="Put in a new pack" type="action"
- icon="terp-stock_effects-object-colorize"
- groups="product.group_stock_packaging"
- states="draft,assigned,confirmed"/>
- <field name="location_id"/>
- <field name="date"/>
- <field name="state"/>
- <button name="%(action_partial_move_server)d" string="Process" type="action" states="confirmed,assigned" icon="gtk-go-forward"/>
- </tree>
- <form string="Stock Moves">
- <group colspan="2" col="4">
- <separator colspan="4" string="Move Information"/>
- <field name="name" invisible="1" colspan="4" />
- <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)" colspan="4" />
- <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3" />
- <button name="%(stock.move_scrap)d"
- string="Scrap" type="action"
- icon="gtk-convert" context="{'scrap': True}"
- states="draft,waiting,confirmed,assigned" colspan="1"/>
- <field name="product_uom" string="Unit Of Measure" colspan="4" groups="product.group_uom"/>
- <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4" />
- <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4" />
- <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]" colspan="4" />
- </group>
-
- <group colspan="2" col="2">
- <separator string="Locations" colspan="2" />
- <field name="location_id" domain="[('usage','=','internal')]" />
- <field name="location_dest_id" domain="[('usage','<>','view')]" />
- </group>
-
- <group colspan="2" col="2">
- <separator string="Dates" colspan="2" />
- <field name="create_date" invisible="1"/>
- <field name="date"/>
- <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
- </group>
-
- <group colspan="2" col="4">
- <separator string="Traceability" colspan="4" groups="stock.group_tracking_lot"/>
- <field name="tracking_id" groups="stock.group_tracking_lot" colspan="3" />
- <button name="%(split_into)d" string="New pack" type="action"
- groups="stock.group_tracking_lot"
- icon="terp-stock_effects-object-colorize"
- states="draft,assigned,confirmed" colspan="1"/>
- <field name="prodlot_id" groups="stock.group_production_lot"
- context="{'location_id':location_id, 'product_id':product_id}"
- domain="[('product_id','=?',product_id)]"
- on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"/>
- <button name="%(track_line)d"
- groups="stock.group_tracking_lot"
- states="draft,waiting,confirmed,assigned"
- string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1" />
- </group>
- <label string="" colspan="4"/>
- <field name="state"/>
- <group col="4" colspan="2">
- <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
- <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
- <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
- <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
- </group>
- </form>
- </field>
- <group col="12" colspan="4">
- <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
- <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
- <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
- <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
- <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
- <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
- <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
- <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
- <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','<>','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl"/>
- </group>
- </page>
- <page string="Additional info">
- <field name="auto_picking"/>
- <field name="date_done"/>
- <field name="move_type"/>
- <field name="type"/>
- <field name="company_id" groups="base.group_multi_company" widget="selection"/>
- </page>
- <page string="Notes">
- <field colspan="4" name="note" nolabel="1"/>
- </page>
- </notebook>
- <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
- </form>
+ <data>
+ <xpath expr="/form/header/button[@name='%(act_stock_return_picking)d']" position="replace">
+ <button name="%(report_picking_list_out)d" string="Print Delivery Slip" type="action" states="done"/>
+ <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" />
+ </xpath>
+ <xpath expr="/form/header/button[@name='draft_validate']" position="replace">
+ <button name="draft_validate" states="draft" string="Confirm & Deliver" type="object"/>
+ <button name="action_assign" states="confirmed" string="Check Availability" type="object"/>
+ </xpath>
+ <xpath expr="/form/header/button[@name='action_process']" position="replace">
+ <button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward"/>
+ </xpath>
+ <xpath expr="/form/header/field[@name='state']" position="replace">
+ <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
+ </xpath>
+ <xpath expr="//field[@name='partner_id']" position="replace">
+ <field name="partner_id" on_change="onchange_partner_in(partner_id)" colspan="4" string="Customer"/>
+ </xpath>
+ <xpath expr="/form/sheet" position="after">
+ <footer>
+ <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+ </footer>
+ </xpath>
+ </data>
</field>
</record>
<separator orientation="vertical"/>
<field name="name"/>
<field name="origin"/>
- <field name="product_id"/>
<field name="stock_journal_id" widget="selection"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<newline/>
<group expand="0" string="Group By...">
<separator orientation="vertical" />
- <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+ <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical" />
<filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
<filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'min_date'}"/>
<record id="action_picking_tree" model="ir.actions.act_window">
<field name="name">Delivery Orders</field>
- <field name="res_model">stock.picking</field>
+ <field name="res_model">stock.picking.out</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar</field>
</record>
<menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_warehouse_mgmt" sequence="3"/>
+ <!--
+ #
+ # Incomming Shipments
+ #
+ -->
<record id="view_picking_in_tree" model="ir.ui.view">
<field name="name">stock.picking.in.tree</field>
- <field name="model">stock.picking</field>
+ <field name="model">stock.picking.in</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree colors="blue:state == 'draft';grey:state == 'done';red:state not in ('cancel', 'done') and date < current_date" string="Picking list">
<field name="name"/>
+ <field name="partner_id"/>
<field name="backorder_id"/>
<field name="origin"/>
<field name="date"/>
<field name="min_date"/>
- <field name="invoice_state"/>
- <field name="stock_journal_id" widget="selection"/>
+ <field name="invoice_state" groups="account.group_account_invoice"/>
+ <field name="stock_journal_id" widget="selection" groups="account.group_account_user"/>
<field name="state"/>
- <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
- <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" confirm="This operation will cancel the shipment. Do you want to continue?" />
</tree>
</field>
</record>
<record id="view_picking_in_form" model="ir.ui.view">
<field name="name">stock.picking.in.form</field>
- <field name="model">stock.picking</field>
+ <field name="model">stock.picking.in</field>
+ <field name="inherit_id" ref="view_picking_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Input Picking List">
- <group colspan="4" col="6">
- <group colspan="4" col="4">
- <field name="name" readonly="1"/>
- <field name="origin"/>
- <field name="partner_id" on_change="onchange_partner_in(partner_id)" colspan="4"/>
- <field name="invoice_state" string="Invoice Control"/>
- <field name="backorder_id" readonly="1"/>
- </group>
- <group colspan="2" col="2">
- <field name="date"/>
- <field name="min_date" readonly="1"/>
- <field name="stock_journal_id" widget="selection"/>
- </group>
- </group>
- <notebook colspan="4">
- <page string="General Information">
- <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" context="{'address_in_id': partner_id, 'picking_type': type}" >
- <tree colors="grey:scrapped==True" string="Stock Moves">
- <field name="product_id" />
- <field name="product_qty" />
- <field name="product_uom" string="UoM" groups="product.group_uom"/>
- <button name="%(stock.move_scrap)d"
- string="Scrap Products" type="action"
- icon="gtk-convert" context="{'scrap': True}"
- states="draft,waiting,confirmed,assigned"/>
- <field name="scrapped" invisible="1"/>
- <field name="prodlot_id" groups="stock.group_production_lot"/>
- <button
- name="%(stock.track_line)d"
- string="Split in production lots"
- groups="stock.group_production_lot"
- type="action" icon="terp-stock_effects-object-colorize"
- states="draft,waiting,confirmed,assigned" />
- <field name="tracking_id" groups="stock.group_tracking_lot"/>
- <button name="setlast_tracking" string="Put in current pack" type="object"
- groups="stock.group_tracking_lot"
- icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('tracking_id','<>',False)]}"
- states="draft,assigned,confirmed"/>
- <button name="%(split_into)d" string="Put in a new pack" type="action"
- groups="product.group_stock_packaging"
- icon="terp-stock_effects-object-colorize"
- states="draft,assigned,confirmed"/>
- <field name="location_dest_id"/>
- <field name="state"/>
- </tree>
- <form string="Stock Moves">
- <group colspan="2" col="4">
- <separator colspan="4" string="Move Information"/>
- <field name="name" invisible="1" colspan="4"/>
- <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)" colspan="4"/>
- <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3"/>
- <button name="%(stock.move_scrap)d"
- string="Scrap" type="action"
- icon="gtk-convert" context="{'scrap': True}"
- states="draft,waiting,confirmed,assigned" colspan="1"/>
- <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" colspan="4"/>
- <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
- <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4"/>
- <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]" colspan="4"/>
- </group>
-
- <group colspan="2" col="2">
- <separator string="Locations" colspan="2" />
- <field name="location_id" domain="[('usage','<>','view')]" />
- <field name="location_dest_id" domain="[('usage','=','internal')]" />
- </group>
-
- <group colspan="2" col="2">
- <separator string="Dates" colspan="2" />
- <field name="create_date" invisible="1"/>
- <field name="date"/>
- <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
- </group>
-
- <group colspan="2" col="4">
- <separator string="Traceability" colspan="4" groups="stock.group_tracking_lot"/>
- <field name="tracking_id" groups="stock.group_tracking_lot" colspan="3" />
- <button name="%(split_into)d" string="New pack" type="action"
- groups="product.group_stock_packaging"
- icon="terp-stock_effects-object-colorize"
- states="draft,assigned,confirmed" colspan="1"/>
- <field name="prodlot_id" groups="stock.group_production_lot"
- context="{'location_id':location_id, 'product_id':product_id}"
- domain="[('product_id','=?',product_id)]"
- on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"/>
- <button name="%(track_line)d"
- groups="stock.group_tracking_lot"
- states="draft,waiting,confirmed,assigned"
- string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1" />
- </group>
- <label string="" colspan="4"/>
- <field name="state"/>
- <group col="4" colspan="2">
- <button name="action_cancel" states="assigned" string="_Cancel" type="object" icon="gtk-cancel"/>
- <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
- <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
- <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
- </group>
- </form>
- </field>
- <group col="10" colspan="4">
- <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
- <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
- <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
- <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
- <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
- <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
- <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
- <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
- <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','<>','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" icon="terp-gtk-go-back-rtl" />
- </group>
- </page>
- <page string="Additional Info">
- <field name="type"/>
- <field name="company_id" groups="base.group_multi_company" widget="selection"/>
- </page>
- <page string="Notes">
- <field colspan="4" name="note" nolabel="1"/>
- </page>
- </notebook>
- <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
- </form>
+ <data>
+ <xpath expr="//button[@name='%(act_stock_return_picking)d']" position="replace">
+ <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" />
+ </xpath>
+ <xpath expr="//button[@name='draft_validate']" position="replace">
+ <button name="draft_validate" states="draft" string="Confirm & Receive" type="object"/>
+ </xpath>
+ <xpath expr="//button[@name='action_process']" position="replace">
+ <button name="action_process" states="assigned" string="Receive" type="object"/>
+ </xpath>
+ <xpath expr="//field[@name='partner_id']" position="replace">
+ <field name="partner_id" on_change="onchange_partner_in(partner_id)" colspan="4" string="Supplier"/>
+ </xpath>
+ <xpath expr="/form/sheet" position="after">
+ <div class="oe_form_bottom">
+ <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+ </div>
+ </xpath>
+ </data>
</field>
</record>
-
<record id="view_picking_in_search" model="ir.ui.view">
<field name="name">stock.picking.in.search</field>
- <field name="model">stock.picking</field>
+ <field name="model">stock.picking.in</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Incoming Shipments">
<separator orientation="vertical" />
<filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
<separator orientation="vertical"/>
- <filter string="To invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" />
+ <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" />
<separator orientation="vertical"/>
- <field name="name"/>
- <field name="origin"/>
+ <field name="name"
+ domain="[('name','ilike',self),('origin','ilike',self)]"/>
<field name="stock_journal_id" widget="selection"/>
- <field name="company_id" widget="selection" groups="base.group_multi_company" />
<field name="product_id"/>
</group>
-
<newline/>
<group expand="0" string="Group By...">
<separator orientation="vertical" />
- <filter icon="terp-stock_effects-object-colorize" name="state" string="State" domain="[]" context="{'group_by':'state'}"/>
+ <filter icon="terp-stock_effects-object-colorize" name="state" string="Status" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical" />
<filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
<filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'min_date'}"/>
<record id="action_picking_tree4" model="ir.actions.act_window">
<field name="name">Incoming Shipments</field>
- <field name="res_model">stock.picking</field>
+ <field name="res_model">stock.picking.in</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar</field>
<field name="domain">[('type','=','in')]</field>
- <field name="context">{'contact_display': 'partner_address'}</field>
+ <field name="context">{'contact_display': 'partner_address', 'default_type': 'in'}</field>
<field name="search_view_id" ref="view_picking_in_search"/>
<field name="help">The Incoming Shipments is the list of all orders you will receive from your suppliers. An incoming shipment contains a list of products to be received according to the original purchase order. You can validate the shipment totally or partially.</field>
</record>
</record>
<menuitem action="action_picking_tree4" id="menu_action_picking_tree4" parent="menu_stock_warehouse_mgmt" sequence="1"/>
- <record id="view_picking_internal_search" model="ir.ui.view">
- <field name="name">stock.picking.internal.search</field>
- <field name="model">stock.picking</field>
- <field name="type">search</field>
- <field name="arch" type="xml">
- <search string="Internal Picking List">
- <group>
- <filter icon="terp-check" string="Ready" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
- <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
- <separator orientation="vertical"/>
- <field name="name"/>
- <field name="origin"/>
- <field name="product_id"/>
- <field name="stock_journal_id" widget="selection"/>
- <field name="company_id" widget="selection"/>
- </group>
- <newline/>
- <group expand="0" string="Group By...">
- <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
- <separator orientation="vertical"/>
- <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
- <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'min_date'}"/>
- <separator orientation="vertical"/>
- <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
- <separator orientation="vertical" />
- <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"/>
- </group>
- </search>
- </field>
- </record>
-
- <record id="action_picking_tree6" model="ir.actions.act_window">
- <field name="name">Internal Moves</field>
- <field name="res_model">stock.picking</field>
- <field name="type">ir.actions.act_window</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form,calendar</field>
- <field name="domain">[('type','=','internal')]</field>
- <field name="context">{'default_type': 'internal', 'contact_display': 'partner_address', 'search_default_available': 1}</field>
- <field name="search_view_id" ref="view_picking_internal_search"/>
- <field name="help">Internal Moves display all inventory operations you have to perform in your warehouse. All operations can be categorized into stock journals, so that each worker has his own list of operations to perform in his own journal. Most operations are prepared automatically by OpenERP according to your preconfigured logistics rules, but you can also record manual stock operations.</field>
- </record>
-
- <record model="ir.actions.act_window.view" id="action_picking_tree6_tree_view">
- <field name="sequence" eval="1"/>
- <field name="view_mode">tree</field>
- <field name="view_id" ref="vpicktree"/>
- <field name="act_window_id" ref="action_picking_tree6"/>
- </record>
- <record model="ir.actions.act_window.view" id="action_picking_tree6_form_view">
- <field name="sequence" eval="2"/>
- <field name="view_mode">form</field>
- <field name="view_id" ref="view_picking_form"/>
- <field name="act_window_id" ref="action_picking_tree6"/>
- </record>
-
-
-
<menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="2"/>
<record id="view_move_tree" model="ir.ui.view">
<field name="create_date" invisible="1" groups="base.group_no_one"/>
<field name="product_id"/>
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
- <field name="product_uom" string="UoM" groups="product.group_uom"/>
+ <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
<field name="product_uos" groups="product.group_uos"/>
<button name="%(stock.move_scrap)d"
string="Scrap Products" type="action"
states="draft,waiting,confirmed,assigned"
/>
<field name="prodlot_id" groups="stock.group_production_lot"/>
- <button name="%(track_line)d" string="Split in production lots" type="action"
+ <button name="%(track_line)d" string="Split in Serial Numbers" type="action"
icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','<>',False)]}"
states="draft,waiting,confirmed,assigned,done"
groups="stock.group_tracking_lot"/>
groups="product.group_stock_packaging"
icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed,done"/>
- <field name="location_id"/>
- <field name="location_dest_id"/>
+ <field name="location_id" groups="stock.group_locations"/>
+ <field name="location_dest_id" groups="stock.group_locations"/>
<field name="date" groups="base.group_no_one"/>
<field name="date_expected"/>
<field name="state"/>
<field name="type">form</field>
<field eval="4" name="priority"/>
<field name="arch" type="xml">
- <form string="Stock Moves">
- <group colspan="4" col="7">
- <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
- <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"/>
- <button name="%(stock.move_scrap)d"
- string="Scrap" type="action"
- icon="gtk-convert" context="{'scrap': True}"
- states="draft,waiting,confirmed,assigned" colspan="1"/>
- <newline/>
- <field name="location_id"/>
- <field name="location_dest_id"/>
- <field name="partner_id" context="{'contact_display':'partner'}"/>
-
- </group>
- <group colspan="2" col="2">
- <separator colspan="2" string="Move Information"/>
- <field name="name" string="Reason"/>
- <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
- <field name="product_uos" groups="product.group_uos" colspan="4"/>
- </group>
-
- <group colspan="2" col="2">
- <separator string="Picking" colspan="2" />
- <field name="picking_id"/>
- <field name="company_id" groups="base.group_multi_company" widget="selection"/>
- </group>
-
- <group colspan="2" col="2">
- <separator string="Dates" colspan="2" />
- <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)"/>
- </group>
-
- <group colspan="2" col="4">
- <separator string="Traceability" colspan="4"/>
- <field name="tracking_id" colspan="3" groups="stock.group_tracking_lot"/>
- <button name="%(split_into)d" string="New pack" type="action"
- groups="product.group_stock_packaging"
- icon="terp-stock_effects-object-colorize"
- states="draft,assigned,confirmed" colspan="1"/>
- <field name="prodlot_id" groups="stock.group_production_lot"
- context="{'location_id':location_id, 'product_id':product_id}"
- domain="[('product_id','=?',product_id)]"
- on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"/>
- <button name="%(track_line)d"
- groups="stock.group_tracking_lot"
- states="draft,waiting,confirmed,assigned"
- string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1"/>
- </group>
-
- <separator colspan="4"/>
+ <form string="Stock Moves" version="7.0">
+ <header>
+ <button name="action_confirm" states="draft" string="Process Later" type="object"/>
+ <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object"/>
+ <button name="force_assign" states="confirmed" string="Set Available" 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"}'/>
- <group col="4" colspan="2">
- <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
- <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
- <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
- <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" icon="gtk-jump-to"/>
+ </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_form_inline"/>
+ <field name="product_uom" groups="product.group_uom" class="oe_form_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_uso_qty" />
+ <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_form_inline"/>
+ <field name="product_uos" groups="product.group_uos" colspan="4" class="oe_form_inline"/>
+ </div>
+ <field name="name" string="Reason"/>
+ </group>
+ <group>
+ <field name="picking_id"/>
+ <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" />
+ <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
+
+ </group>
+ <group>
+ <label for="tracking_id"/>
+ <div>
+ <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_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"/>
+ </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_form_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"
+ states="draft,waiting,confirmed,assigned"
+ string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+ </div>
+ </group>
</group>
+ </sheet>
</form>
</field>
</record>
<filter string="Source" name="groupby_location_id" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'location_id'}"/>
<filter string="Destination" name="groupby_dest_location_id" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'location_dest_id'}"/>
<separator orientation="vertical"/>
- <filter icon="terp-stock_effects-object-colorize" string="State" domain="[]" context="{'group_by':'state'}" />
+ <filter icon="terp-stock_effects-object-colorize" string="Status" domain="[]" context="{'group_by':'state'}" />
<separator orientation="vertical"/>
<filter string="Creation" name="groupby_create_date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
<filter string="Expected" name="groupby_date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
<field name="origin"/>
<field name="product_id"/>
<field name="product_qty" />
- <field name="product_uom" string="UoM" groups="product.group_uom"/>
+ <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
<button name="%(stock.move_scrap)d"
string="Scrap Products" type="action"
icon="gtk-convert" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned"/>
<field name="prodlot_id" groups="stock.group_production_lot"/>
- <button name="%(track_line)d" string="Split in production lots" type="action"
+ <button name="%(track_line)d" string="Split in Serial Numbers" type="action"
icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','<>',False)]}"
states="draft,waiting,confirmed,assigned,done"
groups="stock.group_tracking_lot"/>
states="draft,assigned,confirmed,done"/>
<field name="date" groups="base.group_no_one"/>
<field name="state"/>
- <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
- <button name="action_done" string="Process" type="object" states="confirmed,assigned" icon="gtk-go-forward"/>
</tree>
</field>
</record>
<field name="picking_id" string="Reference"/>
<field name="product_id"/>
<field name="product_qty" />
- <field name="product_uom" string="UoM" groups="product.group_uom"/>
+ <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
<field name="date" groups="base.group_no_one" />
- <button name="action_done" states="confirmed,assigned" string="Process" type="object" icon="gtk-go-forward"/>
</tree>
</field>
</record>
<field name="type">form</field>
<field eval="6" name="priority"/>
<field name="arch" type="xml">
- <form string="Receive Products">
- <group colspan="4" col="7">
+ <form string="Receive Products" version="7.0">
+ <header>
+ <button name="action_confirm" states="draft" string="Process Later" type="object"/>
+ <button name="force_assign" states="confirmed" string="Set Available" type="object"/>
+ <button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned"/>
+ <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)"/>
- <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"/>
- <button name="%(stock.move_scrap)d"
+ <label for="product_qty"/>
+ <div>
+ <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_form_inline"/>
+ <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_form_inline"/>
+ <button name="%(stock.move_scrap)d"
string="Scrap" type="action"
icon="gtk-convert" context="{'scrap': True}"
- states="draft,waiting,confirmed,assigned" colspan="1"/>
- <newline/>
- <field name="location_id"/>
- <field name="location_dest_id"/>
- <field name="partner_id"/>
-
- </group>
- <group colspan="2" col="2">
- <separator colspan="2" string="Move Information"/>
+ states="draft,waiting,confirmed,assigned"/>
+ </div>
+ <label for="product_uos_qty"/>
+ <div>
+ <field name="product_uos_qty" groups="product.group_uos" class="oe_form_inline"
+ on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"/>
+ <field name="product_uos" groups="product.group_uos"/>
+ </div>
<field name="name" string="Reason"/>
- <field name="product_uos_qty" groups="product.group_uos" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"/>
- <field name="product_uos" groups="product.group_uos"/>
</group>
-
- <group colspan="2" col="2">
- <separator string="Picking" colspan="2" />
+ <group>
<field name="picking_id"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
- </group>
-
- <group colspan="2" col="2">
- <separator string="Dates" colspan="2" />
+ <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"/>
<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)"/>
</group>
- <group colspan="2" col="4">
- <separator string="Traceability" colspan="4" groups="stock.group_tracking_lot"/>
- <field name="tracking_id" colspan="3" groups="stock.group_tracking_lot"/>
- <button name="%(split_into)d" string="New pack" type="action"
+ <group>
+ <label name="tracking_id"/>
+ <div>
+ <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_form_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" colspan="1"/>
- <field name="prodlot_id" groups="stock.group_production_lot"
- context="{'location_id':location_id, 'product_id':product_id}"
- domain="[('product_id','=?',product_id)]"
- on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"/>
- <button name="%(track_line)d"
- groups="stock.group_tracking_lot"
- states="draft,waiting,confirmed,assigned,done"
- string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1"/>
- </group>
-
- <separator colspan="4"/>
- <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
- <group col="5" colspan="2">
- <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
- <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
- <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
- <button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned" icon="gtk-go-forward"/>
+ </div>
+ <label name="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_form_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_form_inline"
+ states="draft,waiting,confirmed,assigned,done"
+ string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+ </div>
</group>
+ </group>
+ </sheet>
</form>
</field>
</record>
<filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
<separator orientation="vertical"/>
<filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
- <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+ <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical" groups="base.group_no_one"/>
<filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" groups="base.group_no_one"/>
</group>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
<filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
- <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+ <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical" groups="base.group_no_one"/>
<filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" groups="base.group_no_one"/>
</group>
<field name="model">stock.incoterms</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Incoterms">
- <field colspan="4" name="name" select="1"/>
- <field name="code" select="1"/>
- <field name="active" select="1"/>
+ <form string="Incoterms" version="7.0">
+ <group>
+ <field name="name"/>
+ <field name="code"/>
+ <field name="active"/>
+ </group>
</form>
</field>
</record>
<act_window
context="{'search_default_done': 1,'search_default_product_id': [active_id], 'default_product_id': active_id}"
id="act_product_stock_move_open"
- name="Stock Moves"
+ name="Inventory Move"
res_model="stock.move"
src_model="product.product"/>
<field name="model">stock.journal</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Stock Journal">
- <field name="name"/>
- <field name="user_id"/>
+ <form string="Stock Journal" version="7.0">
+ <group>
+ <field name="name"/>
+ <field name="user_id"/>
+ </group>
</form>
</field>
</record>
<record model="ir.actions.todo.category" id="category_stock_management_config">
<field name="name">Stock Management</field>
</record>
-
- <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse"
- groups="group_stock_manager,group_stock_user" sequence="5" action="product.product_normal_action"/>
</data>
</openerp>
projects / odoo / odoo.git / blobdiff