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

merge 

bzr revid: fp@tinyerp.com-20080925093039-vym41oibvd1ezys8
This commit is contained in:
Fabien Pinckaers 2008-09-25 11:30:39 +02:00
parent 6b589c87ad
commit 69e8722984
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/stock/product.py
View File

@ -39,7 +39,10 @@ class product_product(osv.osv):
return _('Products: ')+self.pool.get('stock.location').browse(cr, user, context['location'], context).name
return res
def get_product_available(self,cr,uid,ids,context={}):
def get_product_available(self,cr,uid,ids,context=None):
if not context:
context = {}
print 'CONTEXT', context
states=context.get('states',[])
what=context.get('what',())
if not ids:
@ -61,7 +64,10 @@ class product_product(osv.osv):
context['location'] = res2[0]
if context.get('location', False):
location_ids = [context['location']]
if type(context['location']) == type(1):
location_ids = [context['location']]
else:
location_ids = context['location']
else:
cr.execute("select lot_stock_id from stock_warehouse")
location_ids = [id for (id,) in cr.fetchall()]

4
addons/stock/report/product_stock.py
View File

@ -79,6 +79,8 @@ class report_stock(report_int):
for (qty, dt, prod_id) in cr.fetchall():
if dt<=dt_from:
dt= (DateTime.now() + DateTime.RelativeDateTime(days=1)).strftime('%Y-%m-%d')
else:
dt = dt[:10]
products.setdefault(prod_id, [])
products[prod_id].append((dt,-qty))
@ -86,6 +88,8 @@ class report_stock(report_int):
for (qty, dt, prod_id) in cr.fetchall():
if dt<=dt_from:
dt= (DateTime.now() + DateTime.RelativeDateTime(days=1)).strftime('%Y-%m-%d')
else:
dt = dt[:10]
products.setdefault(prod_id, [])
products[prod_id].append((dt,qty))