[IMP] stock: Change the layouts of some objects
bzr revid: stephane@openerp.com-20100217151652-smdkqj3fruskyrzr
This commit is contained in:
Stephane Wirtel
parent
13108dcab2
commit
d95103af72
|
|
@ -451,7 +451,7 @@ class stock_picking(osv.osv):
|
|||
|
||||
_columns = {
|
||||
'name': fields.char('Reference', size=64, select=True),
|
||||
'origin': fields.char('Source document', size=64, help="Reference of the document that produced this picking."),
|
||||
'origin': fields.char('Origin', size=64, help="Reference of the document that produced this picking."),
|
||||
'backorder_id': fields.many2one('stock.picking', 'Back Order', help="If the picking is splitted then the picking id in available state of move for this picking is stored in Backorder."),
|
||||
'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."),
|
||||
'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the picking without removing it."),
|
||||
|
|
@ -476,7 +476,7 @@ class stock_picking(osv.osv):
|
|||
\n* The \'Waiting\' state is used in MTO moves when a movement is waiting for another one.'),
|
||||
'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
|
||||
method=True, store=True, type='datetime', string='Planned Date', select=1, help="Planned date for Picking. Default it takes current date"),
|
||||
'date': fields.datetime('Date Order', help="Date of Order"),
|
||||
'date': fields.datetime('Order Date', help="Date of Order"),
|
||||
'date_done': fields.datetime('Date Done', help="Date of completion"),
|
||||
'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
|
||||
method=True, store=True, type='datetime', string='Max. Planned Date', select=2),
|
||||
|
|
@ -1090,7 +1090,7 @@ class stock_move(osv.osv):
|
|||
'company_id': fields.many2one('res.company', 'Company', required=True,select=1),
|
||||
'partner_id': fields.related('picking_id','address_id','partner_id',type='many2one', relation="res.partner", string="Partner"),
|
||||
'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Orders"),
|
||||
'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Source document"),
|
||||
'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin"),
|
||||
'move_stock_return_history': fields.many2many('stock.move', 'stock_move_return_history', 'move_id', 'return_move_id', 'Move Return History',readonly=True),
|
||||
}
|
||||
_constraints = [
|
||||
|
|
|
|||
|
|
@ -8,9 +8,6 @@
|
|||
<menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="6"/>
|
||||
<menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="2"/>
|
||||
|
||||
=============================
|
||||
Inventory Line
|
||||
=============================
|
||||
<record id="stock_inventory_line_tree" model="ir.ui.view">
|
||||
<field name="name">stock.inventory.line.tree</field>
|
||||
<field name="model">stock.inventory.line</field>
|
||||
|
|
@ -41,9 +38,6 @@
|
|||
</field>
|
||||
</record>
|
||||
|
||||
=============================
|
||||
Inventory
|
||||
=============================
|
||||
<record id="view_inventory_tree" model="ir.ui.view">
|
||||
<field name="name">stock.inventory.tree</field>
|
||||
<field name="model">stock.inventory</field>
|
||||
|
|
@ -119,10 +113,6 @@
|
|||
<field name="filter" eval="True"/>
|
||||
</record>
|
||||
|
||||
=============================
|
||||
Lot
|
||||
=============================
|
||||
|
||||
<record id="view_tracking_form" model="ir.ui.view">
|
||||
<field name="name">stock.tracking.form</field>
|
||||
<field name="model">stock.tracking</field>
|
||||
|
|
@ -347,11 +337,6 @@
|
|||
<field eval="True" name="object"/>
|
||||
</record>
|
||||
|
||||
|
||||
|
||||
=============================
|
||||
Location
|
||||
=============================
|
||||
<record id="view_location_form" model="ir.ui.view">
|
||||
<field name="name">stock.location.form</field>
|
||||
<field name="model">stock.location</field>
|
||||
|
|
@ -430,9 +415,6 @@
|
|||
</record>
|
||||
<!-- <menuitem action="action_location_tree" id="menu_action_location_tree" parent="menu_stock_root"/>-->
|
||||
|
||||
=============================
|
||||
Warehouse
|
||||
=============================
|
||||
<record id="view_warehouse" model="ir.ui.view">
|
||||
<field name="name">stock.warehouse</field>
|
||||
<field name="model">stock.warehouse</field>
|
||||
|
|
@ -472,9 +454,6 @@
|
|||
</record>
|
||||
<menuitem action="action_warehouse_form" id="menu_action_warehouse_form" parent="menu_stock_configuration"/>
|
||||
|
||||
==============================
|
||||
Wizard to Fill From Unreceived Products
|
||||
===============================
|
||||
<record id="stock_picking_move_wizard_form" model="ir.ui.view">
|
||||
<field name="name">stock.picking.move.wizard.form</field>
|
||||
<field name="model">stock.picking.move.wizard</field>
|
||||
|
|
@ -504,9 +483,6 @@
|
|||
</record>
|
||||
|
||||
|
||||
=============================
|
||||
Picking
|
||||
=============================
|
||||
<record id="view_stock_split_production_lots" model="ir.ui.view">
|
||||
<field name="name">Split Production Lots</field>
|
||||
<field name="model">stock.split.production.lots</field>
|
||||
|
|
@ -664,20 +640,16 @@
|
|||
<field name="location_dest_id" select="1"/>
|
||||
<field name="name" select="1"/>
|
||||
<field name="address_id" select="1"/>
|
||||
</group>
|
||||
</group>
|
||||
<group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
|
||||
<filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
|
||||
<filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
|
||||
<filter string="Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
|
||||
</group>
|
||||
</search>
|
||||
<filter string="Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
#
|
||||
# Delivery Orders
|
||||
#
|
||||
|
||||
<record id="view_picking_delivery_tree" model="ir.ui.view">
|
||||
<field name="name">stock.picking.delivery.tree</field>
|
||||
<field name="model">stock.picking</field>
|
||||
|
|
@ -790,13 +762,13 @@
|
|||
<field name="address_id" select="1"/>
|
||||
<field name="name" select="1"/>
|
||||
<field name="origin" select="1"/>
|
||||
</group>
|
||||
</group>
|
||||
<group expand="context.get('report',False)" string="Group By..." colspan="4" col="10">
|
||||
<filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
|
||||
<filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
|
||||
<filter string="Order Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
|
||||
</group>
|
||||
</search>
|
||||
<filter string="Order Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
|
@ -995,15 +967,17 @@
|
|||
<field name="model">stock.picking</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree colors="red:state in ('cancel');black:state not in ('cancel')" string="Picking list">
|
||||
<tree colors="grey:state in ('cancel', 'done');black:state in ('confirmed', 'assigned');red:state not in ('cancel', 'done') and date < current_date" string="Picking list">
|
||||
<field name="name"/>
|
||||
<field name="origin"/>
|
||||
<field name="address_id"/>
|
||||
<field name="backorder_id"/>
|
||||
<field name="origin"/>
|
||||
<field name="date"/>
|
||||
<field name="min_date"/>
|
||||
<field name="invoice_state"/>
|
||||
<field name="state"/>
|
||||
<button name="%(partial_picking)d" states="assigned" string="Products Received" type="action" icon="gtk-ok"/>
|
||||
<button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -1014,13 +988,14 @@
|
|||
<field name="arch" type="xml">
|
||||
<form string="Input Picking List">
|
||||
<group colspan="4" col="6">
|
||||
<field name="address_id" on_change="onchange_partner_in(address_id)" select="2" context="{'contact_display':'partner'}"/>
|
||||
<field name="type"/>
|
||||
<field name="origin" select="2"/>
|
||||
<field name="invoice_state" select="2" string="Invoice Control"/>
|
||||
<field name="name" readonly="1" select="1"/>
|
||||
<field name="min_date" select="2" readonly="1"/>
|
||||
<field name="address_id" on_change="onchange_partner_in(address_id)" select="2" context="{'contact_display':'partner'}"/>
|
||||
<field name="origin" select="2"/>
|
||||
<field name="backorder_id" select="2" readonly="1"/>
|
||||
<field name="date"/>
|
||||
<field name="min_date" select="2" readonly="1"/>
|
||||
<field name="invoice_state" select="2" string="Invoice Control"/>
|
||||
<field name="type"/>
|
||||
<field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
|
|
@ -1075,7 +1050,7 @@
|
|||
</field>
|
||||
<group col="7" colspan="4">
|
||||
<label colspan="5"/>
|
||||
<button name="%(act_stock_picking_move_wizard)d" string="Unreceived Products" type="action" states="draft,confirmed,assigned" icon="gtk-redo"/>
|
||||
<button name="%(act_stock_picking_move_wizard)d" string="Unreceived Products" type="action" states="draft" icon="gtk-redo"/>
|
||||
</group>
|
||||
<group col="10" colspan="4">
|
||||
<field name="state" readonly="1"/>
|
||||
|
|
@ -1095,25 +1070,26 @@
|
|||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_picking_in_search" model="ir.ui.view">
|
||||
<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="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Input Picking List">
|
||||
<group col="8" colspan="4">
|
||||
<filter icon="terp-stock" string="To Process" domain="[('state','=','assigned')]" help="Assigned Incoming Orders"/>
|
||||
<filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Incoming Orders"/>
|
||||
<group col="8" colspan="4">
|
||||
<filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Incoming Orders" default="1" />
|
||||
<separator orientation="vertical"/>
|
||||
<filter icon="terp-stock" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order" />
|
||||
<separator orientation="vertical"/>
|
||||
<field name="name" select="1"/>
|
||||
<field name="address_id" select="1"/>
|
||||
<field name="company_id" select="1" widget="selection"/>
|
||||
</group>
|
||||
<group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
|
||||
<field name="company_id" select="1" widget="selection" groups="base.group_multi_company" />
|
||||
</group>
|
||||
<group expand="1" string="Group By..." colspan="4" col="8">
|
||||
<filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
|
||||
<filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
|
||||
<filter string="Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
|
||||
</group>
|
||||
<filter string="Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -1182,14 +1158,6 @@
|
|||
<field name="search_view_id" ref="view_picking_internal_search"/>
|
||||
</record>
|
||||
<menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="2"/>
|
||||
=============================
|
||||
Move Tracking
|
||||
=============================
|
||||
|
||||
|
||||
=============================
|
||||
Move
|
||||
=============================
|
||||
|
||||
<record id="view_move_tree" model="ir.ui.view">
|
||||
<field name="name">stock.move.tree</field>
|
||||
|
|
|
|||
Loading…
Reference in New Issue