From 60405bcf9b450beab8296dd514ad0d50026c135b Mon Sep 17 00:00:00 2001 From: "uco (Open ERP)" Date: Wed, 4 Aug 2010 10:34:09 +0530 Subject: [PATCH 1/5] [IMP] stock_planning: Cleaning module, removed comments. bzr revid: uco@tinyerp.com-20100804050409-trve7krhf5glxjve --- addons/stock_planning/stock_planning.py | 8 -------- .../stock_planning/wizard/stock_planning_forecast.py | 12 ------------ 2 files changed, 20 deletions(-) diff --git a/addons/stock_planning/stock_planning.py b/addons/stock_planning/stock_planning.py index 4109a94e2d4..c6c19c6f90b 100644 --- a/addons/stock_planning/stock_planning.py +++ b/addons/stock_planning/stock_planning.py @@ -26,8 +26,6 @@ from mx.DateTime import RelativeDateTime, now, DateTime, localtime from osv import osv, fields import netsvc from tools.translate import _ -#from tools import config - def rounding(fl, round_value): if not round_value: @@ -251,11 +249,8 @@ class stock_sale_forecast(osv.osv): dept_obj = self.pool.get('hr.department') dept_id = obj.analyzed_dept_id.id and [obj.analyzed_dept_id.id] or [] dept_ids = dept_obj.search(cr,uid,[('parent_id','child_of',dept_id)]) -# dept_ids_set = ','.join(map(str,dept_ids)) -# cr.execute("SELECT user_id FROM hr_department_user_rel WHERE (department_id IN %s)" ,(tuple(dept_ids),)) cr.execute("SELECT user_id FROM resource_resource rsc, hr_employee emp WHERE (emp.resource_id = rsc.id and emp.department_id IN %s)" ,(tuple(dept_ids),)) dept_users = [x for x, in cr.fetchall()] -# dept_users_set = ','.join(map(str,dept_users)) dept_users_set = map(str,dept_users) else: dept_users = False @@ -264,7 +259,6 @@ class stock_sale_forecast(osv.osv): if period: so_period_ids = so_obj.search(cr, uid, [('date_order','>=',period.date_start),('date_order','<=',period.date_stop) ], context = context) if so_period_ids: - # so_period_set = ','.join(map(str,so_period_ids)) if obj.analyzed_user_id: user_set = str(obj.analyzed_user_id.id) @@ -312,7 +306,6 @@ class stock_planning(osv.osv): _name = "stock.planning" def _get_in_out(self, cr, uid, val, date_start, date_stop, direction, done, context=None): -# res = {} if not context: context = {} product_obj = self.pool.get('product.product') @@ -343,7 +336,6 @@ class stock_planning(osv.osv): product = product_obj.read(cr, uid, prod_id,[], context) product_qty = product[mapping[direction]['field']] res = mapping[direction]['adapter'](product_qty) -# res[val.id] = product_obj['incoming_qty'] return res def _get_outgoing_before(self, cr, uid, val, date_start, date_stop, context=None): diff --git a/addons/stock_planning/wizard/stock_planning_forecast.py b/addons/stock_planning/wizard/stock_planning_forecast.py index 2cf4705cca3..22c5906edac 100644 --- a/addons/stock_planning/wizard/stock_planning_forecast.py +++ b/addons/stock_planning/wizard/stock_planning_forecast.py @@ -27,14 +27,6 @@ class stock_sale_forecast_createlines(osv.osv_memory): _name = "stock.sale.forecast.createlines" _description = "stock.sale.forecast.createlines" -# FIXME Add some period sugestion like below - -# def _get_latest_period(self,cr,uid,context={}): -# cr.execute("select max(date_stop) from stock_period") -# result=cr.fetchone() -# return result and result[0] or False - - _columns = { 'company_id': fields.many2one('res.company', 'Company', required=True, select=1), 'warehouse_id': fields.many2one('stock.warehouse' , 'Warehouse', required=True, \ @@ -71,10 +63,6 @@ class stock_sale_forecast_createlines(osv.osv_memory): ('user_id','=',uid), \ ('warehouse_id','=',f.warehouse_id.id)]))== 0: forecast_qty = 0.0 -# Not sure if it is expected quantity for this feature (copying forecast from previous period) -# because it can take incidental forecast of this warehouse, this product and this user (creating, writing or validating forecast). -# It takes only one forecast line (no sum). If user creates only one forecast per period it will be OK. If not I have no idea how to count it. - prod_uom = False if copy: cr.execute("SELECT period.date_stop, forecast.product_qty, forecast.product_uom \ From 6306f5660ff184b3f05cbfa2fd17a64b13bc6f85 Mon Sep 17 00:00:00 2001 From: "uco (Open ERP)" Date: Wed, 4 Aug 2010 11:52:18 +0530 Subject: [PATCH 2/5] [REF] delivery: Removed unnecessary commented code and spaces. bzr revid: uco@tinyerp.com-20100804062218-bl8nzwwu49402wih --- addons/delivery/report/shipping.py | 45 ++---------------------------- addons/delivery/sale.py | 4 --- 2 files changed, 2 insertions(+), 47 deletions(-) diff --git a/addons/delivery/report/shipping.py b/addons/delivery/report/shipping.py index 3fc36256326..6d3b3598987 100644 --- a/addons/delivery/report/shipping.py +++ b/addons/delivery/report/shipping.py @@ -22,55 +22,14 @@ import time from report import report_sxw -from osv import osv -import pooler class shipping(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): super(shipping, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, -# 'get_address': self._get_address, -# 'get_address_ship':self._get_address_ship }) -# def _get_address(self,data): -# -# self.cr.execute("select sp.id,sp.origin,sp.address_id,so.partner_id,rp.name as name2,so.partner_invoice_id,rpa.name,rpa.street as Street,rpa.city ,rpa.zip,rc.name as country " \ -# "from sale_order as so, stock_picking as sp,res_partner rp,res_partner_address as rpa,res_country as rc " \ -# "where sp.origin=so.name " \ -# "and so.partner_id=rp.id " \ -# "and so.partner_invoice_id=rpa.id " \ -# "and rpa.country_id=rc.id " \ -# "and sp.id=%s", (data.id,)) -# -# add=self.cr.dictfetchall() -# return add -# -# def _get_address_ship(self,data): -# -# self.cr.execute("select sp.id,sp.origin,sp.address_id,so.partner_id,rp.name as name2,so.partner_shipping_id,rpa.name,rpa.street as Street,rpa.city ,rpa.zip,rc.name as country " \ -# "from sale_order as so, stock_picking as sp,res_partner rp,res_partner_address as rpa,res_country as rc " \ -# "where sp.origin=so.name " \ -# "and so.partner_id=rp.id " \ -# "and so.partner_shipping_id=rpa.id " \ -# "and rpa.country_id=rc.id " \ -# "and sp.id=%s", (data.id,)) -# -# ship=self.cr.dictfetchall() -# return ship +report_sxw.report_sxw('report.sale.shipping','stock.picking','addons/delivery/report/shipping.rml',parser=shipping) -# def _sum_total(self,data): -# print "======data=======",data - -# self.cr.execute("SELECT sum(pt.list_price*sm.product_qty) FROM stock_picking as sp "\ -# "LEFT JOIN stock_move sm ON (sp.id = sm.picking_id) "\ -# "LEFT JOIN product_product pp ON (sm.product_id = pp.id) "\ -# "LEFT JOIN product_template pt ON (pp.product_tmpl_id = pt.id) "\ -# "WHERE sm.picking_id = %s", (data['id'],)) -# sum_total = self.cr.fetchone()[0] or 0.00 -# return True - -report_sxw.report_sxw('report.sale.shipping','stock.picking','addons/sale_delivery_report/report/shipping.rml',parser=shipping) - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py index 0133a263960..ee9295eb5d4 100644 --- a/addons/delivery/sale.py +++ b/addons/delivery/sale.py @@ -47,9 +47,5 @@ class sale_order(osv.osv): return result sale_order() - - - - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From eeb042bfbc7488cf762fcae63d16a4ce87d94a73 Mon Sep 17 00:00:00 2001 From: "uco (Open ERP)" Date: Wed, 4 Aug 2010 15:18:20 +0530 Subject: [PATCH 3/5] [REF] stock_planning: Code refactored. bzr revid: uco@tinyerp.com-20100804094820-134jx1e9fnw1iyl3 --- addons/stock_planning/stock_planning.py | 111 +++++++++--------- addons/stock_planning/stock_planning_view.xml | 6 +- 2 files changed, 58 insertions(+), 59 deletions(-) diff --git a/addons/stock_planning/stock_planning.py b/addons/stock_planning/stock_planning.py index c6c19c6f90b..a9bdccacd8e 100644 --- a/addons/stock_planning/stock_planning.py +++ b/addons/stock_planning/stock_planning.py @@ -166,50 +166,48 @@ class stock_sale_forecast(osv.osv): res = {'value': ret} return res - def onchange_uom(self, cr, uid, ids, product_uom=False, product_qty=0.0, active_uom=False): + def onchange_uom(self, cr, uid, ids, product_uom=False, product_qty=0.0, + active_uom=False, product_id=False): ret = {} - if not ids: - return {} - if product_uom: - val1 = self.browse(cr, uid, ids) - val = val1[0] - coeff_uom2def = self._to_default_uom_factor(cr, uid, val, active_uom, {}) - coeff_def2uom, round_value = self._from_default_uom_factor( cr, uid, val, product_uom, {}) + if product_uom and product_id: + coeff_uom2def = self._to_default_uom_factor(cr, uid, product_id, active_uom, {}) + coeff_def2uom, round_value = self._from_default_uom_factor(cr, uid, product_id, product_uom, {}) coeff = coeff_uom2def * coeff_def2uom ret['product_qty'] = rounding(coeff * product_qty, round_value) ret['active_uom'] = product_uom return {'value': ret} - def product_amt_change(self, cr, uid, ids, product_amt = 0.0, product_uom=False): - ret = {} - if not ids: - return {} + def product_amt_change(self, cr, uid, ids, product_amt=0.0, product_uom=False, product_id=False): round_value = 1 - if product_amt: + qty = 0.0 + if product_amt and product_id: + product = self.pool.get('product.product').browse(cr, uid, product_id) coeff_def2uom = 1 - val1 = self.browse(cr, uid, ids) - val = val1[0] - if (product_uom != val.product_id.uom_id.id): - coeff_def2uom, round_value = self._from_default_uom_factor( cr, uid, val, product_uom, {}) - ret['product_qty'] = rounding(coeff_def2uom * product_amt/(val.product_id.product_tmpl_id.list_price), round_value) - res = {'value': ret} + if (product_uom != product.uom_id.id): + coeff_def2uom, round_value = self._from_default_uom_factor(cr, uid, product_id, product_uom, {}) + qty = rounding(coeff_def2uom * product_amt/(product.product_tmpl_id.list_price), round_value) + res = {'value': {'product_qty': qty}} return res - def _to_default_uom_factor(self, cr, uid, val, uom_id, context=None): + def _to_default_uom_factor(self, cr, uid, product_id, uom_id, context=None): uom_obj = self.pool.get('product.uom') + product_obj = self.pool.get('product.product') + product = product_obj.browse(cr, uid, product_id) uom = uom_obj.browse(cr, uid, uom_id, context=context) coef = uom.factor - if uom.category_id.id <> val.product_id.uom_id.category_id.id: - coef = coef / val.product_id.uos_coeff - return val.product_id.uom_id.factor / coef + if uom.category_id.id <> product.uom_id.category_id.id: + coef = coef / product.uos_coeff + return product.uom_id.factor / coef - def _from_default_uom_factor(self, cr, uid, val, uom_id, context): + def _from_default_uom_factor(self, cr, uid, product_id, uom_id, context): uom_obj = self.pool.get('product.uom') + product_obj = self.pool.get('product.product') + product = product_obj.browse(cr, uid, product_id) uom = uom_obj.browse(cr, uid, uom_id, context=context) res = uom.factor - if uom.category_id.id <> val.product_id.uom_id.category_id.id: - res = res / val.product_id.uos_coeff - return res / val.product_id.uom_id.factor, uom.rounding + if uom.category_id.id <> product.uom_id.category_id.id: + res = res / product.uos_coeff + return res / product.uom_id.factor, uom.rounding def _sales_per_users(self, cr, uid, so, so_line, company, users): cr.execute("SELECT sum(sol.product_uom_qty) FROM sale_order_line AS sol LEFT JOIN sale_order AS s ON (s.id = sol.order_id) " \ @@ -254,7 +252,7 @@ class stock_sale_forecast(osv.osv): dept_users_set = map(str,dept_users) else: dept_users = False - factor, round_value = self._from_default_uom_factor(cr, uid, obj, obj.product_uom.id, context=context) + factor, round_value = self._from_default_uom_factor(cr, uid, obj.product_id.id, obj.product_uom.id, context=context) for i, period in enumerate(periods): if period: so_period_ids = so_obj.search(cr, uid, [('date_order','>=',period.date_start),('date_order','<=',period.date_stop) ], context = context) @@ -356,8 +354,8 @@ class stock_planning(osv.osv): if qtys: uom_obj = self.pool.get('product.uom') for qty, prod_uom in qtys: - coef = self._to_default_uom_factor(cr, uid, val, prod_uom, context=context) - res_coef, round_value = self._from_default_uom_factor(cr, uid, val, val.product_uom.id, context=context) + coef = self._to_default_uom_factor(cr, uid, val.product_id.id, prod_uom, context=context) + res_coef, round_value = self._from_default_uom_factor(cr, uid, val.product_id.id, val.product_uom.id, context=context) coef = coef * res_coef res_qty += rounding(qty * coef, round_value) return res_qty @@ -418,8 +416,8 @@ class stock_planning(osv.osv): coef = 1 round_value = 1 if ret[2]: - coef = self._to_default_uom_factor(cr, uid, val, ret[2], context) - res_coef, round_value = self._from_default_uom_factor(cr, uid, val, val.product_uom.id, context=context) + coef = self._to_default_uom_factor(cr, uid, val.product_id.id, ret[2], context) + res_coef, round_value = self._from_default_uom_factor(cr, uid, val.product_id.id, val.product_uom.id, context=context) coef = coef * res_coef res[val.id]['minimum_op'] = rounding(ret[0]*coef, round_value) res[val.id]['maximum_op'] = ret[1]*coef @@ -431,20 +429,17 @@ class stock_planning(osv.osv): result['warehouse_id'] = False return {'value': result} - def onchange_uom(self, cr, uid, ids, product_uom=False): + def onchange_uom(self, cr, uid, ids, product_uom=False, product_id=False, active_uom=False, + planned_outgoing=0.0, to_procure=0.0): ret = {} if not product_uom: return {} - if not ids: - return {} - val1 = self.browse(cr, uid, ids) - val = val1[0] - if val.active_uom: - coeff_uom2def = self._to_default_uom_factor(cr, uid, val, val.active_uom.id, {}) - coeff_def2uom, round_value = self._from_default_uom_factor( cr, uid, val, product_uom, {}) + if active_uom: + coeff_uom2def = self._to_default_uom_factor(cr, uid, product_id, active_uom, {}) + coeff_def2uom, round_value = self._from_default_uom_factor(cr, uid, product_id, product_uom, {}) coeff = coeff_uom2def * coeff_def2uom - ret['planned_outgoing'] = rounding(coeff * val.planned_outgoing, round_value) - ret['to_procure'] = rounding(coeff * val.to_procure, round_value) + ret['planned_outgoing'] = rounding(coeff * planned_outgoing, round_value) + ret['to_procure'] = rounding(coeff * to_procure, round_value) ret['active_uom'] = product_uom return {'value': ret} @@ -524,22 +519,26 @@ class stock_planning(osv.osv): _order = 'period_id' - def _to_default_uom_factor(self, cr, uid, val, uom_id, context=None): + def _to_default_uom_factor(self, cr, uid, product_id, uom_id, context=None): uom_obj = self.pool.get('product.uom') + product_obj = self.pool.get('product.product') + product = product_obj.browse(cr, uid, product_id) uom = uom_obj.browse(cr, uid, uom_id, context=context) coef = uom.factor - if uom.category_id.id != val.product_id.uom_id.category_id.id: - coef = coef / val.product_id.uos_coeff - return val.product_id.uom_id.factor / coef + if uom.category_id.id != product.uom_id.category_id.id: + coef = coef / product.uos_coeff + return product.uom_id.factor / coef - def _from_default_uom_factor(self, cr, uid, val, uom_id, context=None): + def _from_default_uom_factor(self, cr, uid, product_id, uom_id, context=None): uom_obj = self.pool.get('product.uom') + product_obj = self.pool.get('product.product') + product = product_obj.browse(cr, uid, product_id) uom = uom_obj.browse(cr, uid, uom_id, context=context) res = uom.factor - if uom.category_id.id != val.product_id.uom_id.category_id.id: - res = res / val.product_id.uos_coeff - return res / val.product_id.uom_id.factor, uom.rounding + if uom.category_id.id != product.uom_id.category_id.id: + res = res / product.uos_coeff + return res / product.uom_id.factor, uom.rounding def calculate_planning(self, cr, uid, ids, context, *args): one_minute = RelativeDateTime(minutes=1) @@ -574,7 +573,7 @@ class stock_planning(osv.osv): current = True else: current = False - factor, round_value = self._from_default_uom_factor(cr, uid, val, val.product_uom.id, context=context) + factor, round_value = self._from_default_uom_factor(cr, uid, val.product_id.id, val.product_uom.id, context=context) self.write(cr, uid, ids, { 'already_out': rounding(already_out[0]*factor,round_value), 'already_in': rounding(already_in[0]*factor,round_value), @@ -603,16 +602,16 @@ class stock_planning(osv.osv): uom = val.product_uom.id if val.product_id.uos_id: uos = val.product_id.uos_id.id - coeff_uom2def = self._to_default_uom_factor(cr, uid, val, val.product_uom.id, {}) - coeff_def2uom, round_value = self._from_default_uom_factor(cr, uid, val, uos, {}) + coeff_uom2def = self._to_default_uom_factor(cr, uid, val.product_id.id, val.product_uom.id, {}) + coeff_def2uom, round_value = self._from_default_uom_factor(cr, uid, val.product_id.id, uos, {}) uos_qty = rounding(val.incoming_left * coeff_uom2def * coeff_def2uom, round_value) elif val.product_uom.category_id.id == val.product_id.uos_id.category_id.id: - coeff_uom2def = self._to_default_uom_factor(cr, uid, val, val.product_uom.id, {}) + coeff_uom2def = self._to_default_uom_factor(cr, uid, val.product_id.id, val.product_uom.id, {}) uos = val.product_id.uos_id.id - coeff_def2uom, round_value = self._from_default_uom_factor(cr, uid, val, uos, {}) + coeff_def2uom, round_value = self._from_default_uom_factor(cr, uid, val.product_id.id, uos, {}) uos_qty = rounding(val.incoming_left * coeff_uom2def * coeff_def2uom, round_value) uom = val.product_id.uom_id.id - coeff_def2uom, round_value = self._from_default_uom_factor(cr, uid, val, uom, {}) + coeff_def2uom, round_value = self._from_default_uom_factor(cr, uid, val.product_id.id, uom, {}) uom_qty = rounding(val.incoming_left * coeff_uom2def * coeff_def2uom, round_value) return uom_qty, uom, uos_qty, uos diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml index 13a40f5c93b..b4ea1da0f5a 100644 --- a/addons/stock_planning/stock_planning_view.xml +++ b/addons/stock_planning/stock_planning_view.xml @@ -90,12 +90,12 @@ + on_change = "onchange_uom(product_uom, product_qty, active_uom, product_id)"/> - +