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

[IMP] Improve and fix module stock according to APR Review 20131030 

bzr revid: jke@openerp.com-20131104120008-80g7julsalf041ki
This commit is contained in:
jke-openerp 2013-11-04 13:00:08 +01:00
parent 473d530b3e
commit c50d33cb0f
4 changed files with 6 additions and 11 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"/>

5
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):

4
addons/stock/stock_view.xml
View File

@ -1394,7 +1394,7 @@
<field name="arch" type="xml">
<tree string="Picking Types">
<field name="complete_name"/>
<field name="sequence_id"/>
<field name="sequence_id" string="Reference Sequence"/>
<field name="pack"/>
</tree>
</field>
@ -1408,7 +1408,7 @@
<group>
<group>
<field name="name"/>
<field name="sequence_id"/>
<field name="sequence_id" string="Reference Sequence" />
<field name="warehouse_id"/>
<field name="pack"/>
</group>

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"/>