[FIX]remove required warehouse_id field on stock_picking_type and remove warehouse_id field from route + rename some route for better understanding
bzr revid: csn@openerp.com-20130903094214-i4knuovdvfdn0b9m
This commit is contained in:
parent
a19a3ae5b2
commit
23dfd3bbbc
|
@ -2395,7 +2395,9 @@ class stock_picking_type(osv.osv):
|
|||
return res
|
||||
reads = self.browse(cr, uid, ids, context=context)
|
||||
for record in reads:
|
||||
name = record.warehouse_id.name+': '+record.name
|
||||
name = record.name
|
||||
if record.warehouse_id:
|
||||
name = record.warehouse_id.name+': '+name
|
||||
res.append((record.id, name))
|
||||
return res
|
||||
|
||||
|
@ -2415,7 +2417,7 @@ class stock_picking_type(osv.osv):
|
|||
'default_location_dest_id': fields.many2one('stock.location', 'Default Destination Location'),
|
||||
'code_id': fields.selection([('incoming', 'Suppliers'), ('outgoing', 'Customers'), ('internal', 'Internal')], 'Picking type code', required=True),
|
||||
'return_picking_type_id': fields.many2one('stock.picking.type', 'Picking Type for Returns'),
|
||||
'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True),
|
||||
'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),
|
||||
|
||||
# Statistics for the kanban view
|
||||
'weekly_picking': fields.function(_get_picking_data,
|
||||
|
|
|
@ -29,28 +29,20 @@ class stock_location_route(osv.osv):
|
|||
_description = "Inventory Routes"
|
||||
_order = 'sequence'
|
||||
|
||||
def _default_warehouse(self, cr, uid, context=None):
|
||||
user = self.pool.get('res.users').browse(cr, uid, uid, context)
|
||||
res = self.pool.get('stock.warehouse').search(cr, uid, [('company_id', '=', user.company_id.id)], limit=1, context=context)
|
||||
return res and res[0] or False
|
||||
|
||||
_columns = {
|
||||
'name': fields.char('Route Name', required=True),
|
||||
'sequence': fields.integer('Sequence'),
|
||||
'pull_ids': fields.one2many('procurement.rule', 'route_id', 'Pull Rules'),
|
||||
'push_ids': fields.one2many('stock.location.path', 'route_id', 'Push Rules'),
|
||||
'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),
|
||||
}
|
||||
_defaults = {
|
||||
'sequence': lambda self,cr,uid,ctx: 0,
|
||||
'warehouse_id': _default_warehouse,
|
||||
}
|
||||
|
||||
class stock_warehouse(osv.osv):
|
||||
_inherit = 'stock.warehouse'
|
||||
_columns = {
|
||||
'route_id': fields.many2one('stock.location.route', 'Default Logistic Route', help='Default route through the warehouse', required=True),
|
||||
'route_ids': fields.one2many('stock.location.route', 'warehouse_id', 'All Routes'),
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
-->
|
||||
|
||||
<record id="route_warehouse0_mts" model='stock.location.route'>
|
||||
<field name="name">Ship only</field>
|
||||
<field name="name">Sale: Ship only</field>
|
||||
<field name="sequence">20</field>
|
||||
</record>
|
||||
|
||||
|
@ -79,7 +79,7 @@
|
|||
</record>
|
||||
|
||||
<record id="route_warehouse0_pack" model='stock.location.route'>
|
||||
<field name="name">Pack + Ship</field>
|
||||
<field name="name">Sale: Pack + Ship</field>
|
||||
<field name="sequence">15</field>
|
||||
</record>
|
||||
|
||||
|
@ -128,7 +128,7 @@
|
|||
|
||||
<!-- Pick + pack + ship -->
|
||||
<record id="route_warehouse0_pickpack" model='stock.location.route'>
|
||||
<field name="name">Pick + Pack + Ship</field>
|
||||
<field name="name">Sale: Pick + Pack + Ship</field>
|
||||
<field name="sequence">20</field>
|
||||
</record>
|
||||
|
||||
|
|
|
@ -156,14 +156,6 @@
|
|||
<xpath expr="//field[@name='partner_id']" position="after">
|
||||
<field name="route_id"/>
|
||||
</xpath>
|
||||
<xpath expr="//group[last()]" position="after">
|
||||
<separator string="All Associated Routes"/>
|
||||
<field name="route_ids" nolabel="1" colspan="4">
|
||||
<tree string="All Routes">
|
||||
<field name="name"/>
|
||||
</tree>
|
||||
</field>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
@ -174,7 +166,6 @@
|
|||
<tree string="Routes">
|
||||
<field name="sequence" widget="handle" />
|
||||
<field name="name"/>
|
||||
<field name="warehouse_id"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
@ -187,7 +178,6 @@
|
|||
<form string="Route">
|
||||
<field name="name" />
|
||||
<field name="sequence" groups="base.group_no_one"/>
|
||||
<field name="warehouse_id"/>
|
||||
<group string="Push Rules" colspan="4" >
|
||||
<field name="push_ids" colspan="4" nolabel="1"/>
|
||||
</group>
|
||||
|
|
Loading…
Reference in New Issue