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

[MERGE] apr's review 2. branch from jke 

bzr revid: qdp-launchpad@openerp.com-20131104142340-fj092665f5exn3rw
This commit is contained in:
Quentin (OpenERP) 2013-11-04 15:23:40 +01:00
parent 3df02e56a5 c50d33cb0f
commit 400b50963c
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/stock/res_config_view.xml
View File

@ -70,12 +70,6 @@
<field name="group_stock_multiple_locations" class="oe_inline"/>
<label for="group_stock_multiple_locations"/>
</div>
<!-- TODOJKE TO REMOVE
<div>
<field name="module_stock_location" class="oe_inline"/>
<label for="module_stock_location"/>
</div>
-->
<div>
<field name="module_claim_from_delivery" class="oe_inline"/>
<label for="module_claim_from_delivery"/>

7
addons/stock/stock.py
View File

@ -2242,8 +2242,9 @@ class stock_warehouse(osv.osv):
def onchange_filter_default_resupply_wh_id(self, cr, uid, ids, default_resupply_wh_id, resupply_wh_ids, context=None):
resupply_wh_ids = set([x['id'] for x in (self.resolve_2many_commands(cr, uid, 'resupply_wh_ids', resupply_wh_ids, ['id']))])
resupply_wh_ids.add(default_resupply_wh_id)
resupply_wh_ids = list(resupply_wh_ids)
if default_resupply_wh_id: #If we are removing the default resupply, we don't have default_resupply_wh_id
resupply_wh_ids.add(default_resupply_wh_id)
resupply_wh_ids = list(resupply_wh_ids)
return {'value': {'resupply_wh_ids': resupply_wh_ids}}
def _get_inter_wh_location(self, cr, uid, warehouse, context=None):
@ -3399,7 +3400,7 @@ class stock_picking_type(osv.osv):
'auto_force_assign': fields.boolean('Automatic Availability', help='This picking type does\'t need to check for the availability in source location.'),
'color': fields.integer('Color Index'),
'delivery': fields.boolean('Print delivery'),
'sequence_id': fields.many2one('ir.sequence', 'Sequence', required=True),
'sequence_id': fields.many2one('ir.sequence', 'Reference Sequence', required=True),
'default_location_src_id': fields.many2one('stock.location', 'Default Source Location'),
'default_location_dest_id': fields.many2one('stock.location', 'Default Destination Location'),
#TODO: change field name to "code" as it's not a many2one anymore

2
addons/stock_complex_routes/stock_complex_routes.xml
View File

@ -12,7 +12,7 @@
<record id="picking_type_dropship" model="stock.picking.type">
<field name="name">dropship</field>
<field name="name">Dropship</field>
<field name="sequence_id" ref="seq_picking_type_dropship"/>
<field name="code_id">incoming</field>
<field name="default_location_dest_id" ref="stock.stock_location_suppliers"/>