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

[MERGE] 

bzr revid: hmo@tinyerp.com-20100428111527-0kryygc6yrrayfjj
This commit is contained in:
Harry (Open ERP) 2010-04-28 16:45:27 +05:30
parent a1b5bbb606 a51e1755de
commit d1e3a35310
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/stock/stock.py
View File

@ -182,6 +182,7 @@ class stock_location(osv.osv):
'stock_real_value': fields.function(_product_value, method=True, type='float', string='Real Stock Value', multi="stock"),
'stock_virtual_value': fields.function(_product_value, method=True, type='float', string='Virtual Stock Value', multi="stock"),
'company_id': fields.many2one('res.company', 'Company', required=True,select=1),
'scraped': fields.boolean('Scraped'),
}
_defaults = {
'active': lambda *a: 1,
@ -194,6 +195,7 @@ class stock_location(osv.osv):
'posy': lambda *a: 0,
'posz': lambda *a: 0,
'icon': lambda *a: False,
'scraped': lambda *a: False,
}
def chained_location_get(self, cr, uid, location, partner=None, product=None, context={}):
@ -1249,8 +1251,8 @@ class stock_move(osv.osv):
'location_dest_id': _default_location_destination,
'state': lambda *a: 'draft',
'priority': lambda *a: '1',
'scraped' : lambda *a:False,
'product_qty': lambda *a: 1.0,
'scraped' : lambda *a: False,
'date_planned': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.move', context=c)

1
addons/stock/stock_view.xml
View File

@ -404,6 +404,7 @@
<field name="location_id"/>
<field name="address_id" context="{'contact_display':'partner'}"/>
<field name="icon"/>
<field name="scraped"/>
<newline/>
<group col="2" colspan="2" groups="base.group_extended">
<separator string="Chained Locations" colspan="2"/>

3
addons/stock/wizard/stock_move.py
View File

@ -87,8 +87,7 @@ class stock_move_consume(osv.osv_memory):
res.update({'product_uom': move.product_uom.id})
if 'product_qty' in fields:
res.update({'product_qty': move.product_qty})
if 'location_id' in fields:
res.update({'location_id': move.location_id.id})
return res
def do_move_consume(self, cr, uid, ids, context={}):

2
addons/stock/wizard/stock_move_view.xml
View File

@ -73,7 +73,7 @@
<form string="Scrap Move">
<separator string="Scrap Products" colspan="4"/>
<field name="product_id" colspan="4" readonly="1"/>
<field name="location_id" colspan="4" string="Dest. Location" domain="[('usage','&lt;&gt;','view')]"/>
<field name="location_id" colspan="4" string="Dest. Location" domain="[('usage','&lt;&gt;','view'),('scraped','=',True)]"/>
<field name="product_qty" colspan="2"/>
<field name="product_uom" nolabel="1" readonly="1"/>
<newline/>