# -*- encoding: utf-8 -*-
##############################################################################
#
-# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+# $Id$
#
-# $Id$
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from osv import fields, osv
+from tools.translate import _
+
class product_product(osv.osv):
_inherit = "product.product"
def get_product_available(self,cr,uid,ids,context=None):
if not context:
- context = {}
+ context = {}
states=context.get('states',[])
what=context.get('what',())
if not ids:
return res
if context.get('shop', False):
- cr.execute('select warehouse_id from sale_shop where id=%d', (int(context['shop']),))
+ cr.execute('select warehouse_id from sale_shop where id=%s', (int(context['shop']),))
res2 = cr.fetchone()
if res2:
context['warehouse'] = res2[0]
if context.get('warehouse', False):
- cr.execute('select lot_stock_id from stock_warehouse where id=%d', (int(context['warehouse']),))
+ cr.execute('select lot_stock_id from stock_warehouse where id=%s', (int(context['warehouse']),))
res2 = cr.fetchone()
if res2:
context['location'] = res2[0]
else:
location_ids = context['location']
else:
- cr.execute("select lot_stock_id from stock_warehouse")
- location_ids = [id for (id,) in cr.fetchall()]
+ location_ids = []
+ wids = self.pool.get('stock.warehouse').search(cr, uid, [], context=context)
+ for w in self.pool.get('stock.warehouse').browse(cr, uid, wids, context=context):
+ location_ids.append(w.lot_stock_id.id)
# build the list of ids of children of the location given by id
- child_location_ids = self.pool.get('stock.location').search(cr, uid, [('location_id', 'child_of', location_ids)])
- location_ids= len(child_location_ids) and child_location_ids or location_ids
+ if context.get('compute_child',True):
+ child_location_ids = self.pool.get('stock.location').search(cr, uid, [('location_id', 'child_of', location_ids)])
+ location_ids= len(child_location_ids) and child_location_ids or location_ids
+ else:
+ location_ids= location_ids
states_str = ','.join(map(lambda s: "'%s'" % s, states))
+ uoms_o = {}
product2uom = {}
for product in self.browse(cr, uid, ids, context=context):
product2uom[product.id] = product.uom_id.id
+ uoms_o[product.uom_id.id] = product.uom_id
prod_ids_str = ','.join(map(str, ids))
location_ids_str = ','.join(map(str, location_ids))
to_date=context.get('to_date',False)
date_str=False
if from_date and to_date:
- date_str="date>='%s' and date<='%s'"%(from_date,to_date)
+ date_str="date_planned>='%s' and date_planned<='%s'"%(from_date,to_date)
elif from_date:
- date_str="date>='%s'"%(from_date)
+ date_str="date_planned>='%s'"%(from_date)
elif to_date:
- date_str="date<='%s'"%(to_date)
+ date_str="date_planned<='%s'"%(to_date)
if 'in' in what:
# all moves from a location out of the set to a location in the set
)
results2 = cr.fetchall()
uom_obj = self.pool.get('product.uom')
+ uoms = map(lambda x: x[2], results) + map(lambda x: x[2], results2)
+ if context.get('uom', False):
+ uoms += [context['uom']]
+
+ uoms = filter(lambda x: x not in uoms_o.keys(), uoms)
+ if uoms:
+ uoms = uom_obj.browse(cr, uid, list(set(uoms)), context=context)
+ for o in uoms:
+ uoms_o[o.id] = o
for amount, prod_id, prod_uom in results:
- amount = uom_obj._compute_qty(cr, uid, prod_uom, amount,
- context.get('uom', False) or product2uom[prod_id])
+ amount = uom_obj._compute_qty_obj(cr, uid, uoms_o[prod_uom], amount,
+ uoms_o[context.get('uom', False) or product2uom[prod_id]])
res[prod_id] += amount
for amount, prod_id, prod_uom in results2:
- amount = uom_obj._compute_qty(cr, uid, prod_uom, amount,
- context.get('uom', False) or product2uom[prod_id])
+ amount = uom_obj._compute_qty_obj(cr, uid, uoms_o[prod_uom], amount,
+ uoms_o[context.get('uom', False) or product2uom[prod_id]])
res[prod_id] -= amount
return res
if fields:
if location_info.usage == 'supplier':
if fields.get('virtual_available'):
- res['fields']['virtual_available']['string'] = 'Futur Receptions'
+ res['fields']['virtual_available']['string'] = _('Futur Receptions')
if fields.get('qty_available'):
- res['fields']['qty_available']['string'] = 'Received Qty'
+ res['fields']['qty_available']['string'] = _('Received Qty')
if location_info.usage == 'internal':
if fields.get('virtual_available'):
- res['fields']['virtual_available']['string'] = 'Futur Stock'
+ res['fields']['virtual_available']['string'] = _('Futur Stock')
if location_info.usage == 'customer':
if fields.get('virtual_available'):
- res['fields']['virtual_available']['string'] = 'Futur Deliveries'
+ res['fields']['virtual_available']['string'] = _('Futur Deliveries')
if fields.get('qty_available'):
- res['fields']['qty_available']['string'] = 'Delivered Qty'
+ res['fields']['qty_available']['string'] = _('Delivered Qty')
if location_info.usage == 'inventory':
if fields.get('virtual_available'):
- res['fields']['virtual_available']['string'] = 'Futur P&L'
- res['fields']['qty_available']['string'] = 'P&L Qty'
+ res['fields']['virtual_available']['string'] = _('Futur P&L')
+ res['fields']['qty_available']['string'] = _('P&L Qty')
if location_info.usage == 'procurement':
if fields.get('virtual_available'):
- res['fields']['virtual_available']['string'] = 'Futur Qty'
+ res['fields']['virtual_available']['string'] = _('Futur Qty')
if fields.get('qty_available'):
- res['fields']['qty_available']['string'] = 'Unplanned Qty'
+ res['fields']['qty_available']['string'] = _('Unplanned Qty')
if location_info.usage == 'production':
if fields.get('virtual_available'):
- res['fields']['virtual_available']['string'] = 'Futur Productions'
+ res['fields']['virtual_available']['string'] = _('Futur Productions')
if fields.get('qty_available'):
- res['fields']['qty_available']['string'] = 'Produced Qty'
+ res['fields']['qty_available']['string'] = _('Produced Qty')
return res
product_product()
projects / odoo / odoo.git / blobdiff