pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] Merge stock_planning,delivery module changes for removed comments and code refactored lp:~openerp-commiter/openobject-addons/trunk-addons-cleaning

Browse Source 
bzr revid: sbh@tinyerp.com-20100804104550-2burnills9i8kr8l
This commit is contained in:
UCO(OpenERP)
2010-08-04 16:15:50 +05:30
committed by sbh (Open ERP)
parent fd0169cb95 8ff5bafcbb
commit ab17cbe2fd
6 changed files with 71 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/delivery/report/shipping.py
+2 -43
View File
@@ -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:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/delivery/sale.py
-4
View File
@@ -47,9 +47,5 @@ class sale_order(osv.osv):
return result
sale_order()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/stock_planning/stock_planning.py
+66 -78
View File
@@ -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:
@@ -129,7 +127,7 @@ class stock_sale_forecast(osv.osv):
}
def action_validate(self, cr, uid, ids, *args):
self.write(cr, uid, ids, {'state':'validated','user_id':uid})
self.write(cr, uid, ids, {'state': 'validated','user_id': uid})
return True
def unlink(self, cr, uid, ids, context=None):
@@ -140,7 +138,7 @@ class stock_sale_forecast(osv.osv):
unlink_ids.append(t['id'])
else:
raise osv.except_osv(_('Invalid action !'), _('Cannot delete Validated Sale Forecasts !'))
osv.osv.unlink(self, cr, uid, unlink_ids,context=context)
osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
return True
def onchange_company(self, cr, uid, ids, company_id=False):
@@ -168,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) " \
@@ -251,23 +247,18 @@ 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
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)
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)
sales[i][0] = self._sales_per_users(cr, uid, so_period_ids, so_line_product_ids, obj.company_id.id, user_set)
sales[i][0] *= factor
if dept_users:
@@ -303,7 +294,6 @@ class stock_sale_forecast(osv.osv):
})
return True
stock_sale_forecast()
# The main Stock Planning object
@@ -312,7 +302,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')
@@ -334,16 +323,14 @@ class stock_planning(osv.osv):
context['compute_child'] = True
prod_id = val.product_id.id
if done:
c1 = context.copy()
c1.update({ 'states':('done',), 'what':(direction,) })
context.update({ 'states':('done',), 'what':(direction,) })
prod_ids = [prod_id]
st = product_obj.get_product_available(cr,uid, prod_ids, context=c1)
st = product_obj.get_product_available(cr, uid, prod_ids, context=context)
res = mapping[direction]['adapter'](st.get(prod_id,0.0))
else:
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):
@@ -364,8 +351,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
@@ -426,8 +413,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
@@ -439,20 +426,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}
@@ -532,22 +516,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)
@@ -571,18 +559,18 @@ class stock_planning(osv.osv):
day = mx.DateTime.strptime(start_date_current_period, '%Y-%m-%d %H:%M:%S')
dbefore = mx.DateTime.DateTime(day.year, day.month, day.day) - one_minute
date_for_start = dbefore.strftime('%Y-%m-%d %H:%M:%S') # one day before current period
already_out = self._get_in_out(cr, uid, val, start_date_current_period, current_date_end, direction='out', done = True, context=context),
already_in = self._get_in_out(cr, uid, val, start_date_current_period, current_date_end, direction='in', done = True, context=context),
outgoing = self._get_in_out(cr, uid, val, val.period_id.date_start, val.period_id.date_stop, direction='out', done = False, context=context),
incoming = self._get_in_out(cr, uid, val, val.period_id.date_start, val.period_id.date_stop, direction='in', done = False, context=context),
already_out = self._get_in_out(cr, uid, val, start_date_current_period, current_date_end, direction='out', done=True, context=context),
already_in = self._get_in_out(cr, uid, val, start_date_current_period, current_date_end, direction='in', done=True, context=context),
outgoing = self._get_in_out(cr, uid, val, val.period_id.date_start, val.period_id.date_stop, direction='out', done=False, context=context),
incoming = self._get_in_out(cr, uid, val, val.period_id.date_start, val.period_id.date_stop, direction='in', done=False, context=context),
outgoing_before = self._get_outgoing_before(cr, uid, val, start_date_current_period, day_before_calculated_period, context=context),
incoming_before = self._get_in_out(cr, uid, val, start_date_current_period, day_before_calculated_period, direction='in', done = False, context=context),
incoming_before = self._get_in_out(cr, uid, val, start_date_current_period, day_before_calculated_period, direction='in', done=False, context=context),
stock_start = self._get_stock_start(cr, uid, val, date_for_start, context=context),
if start_date_current_period == val.period_id.date_start: # current period is calculated
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),
@@ -611,16 +599,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
@@ -661,7 +649,7 @@ class stock_planning(osv.osv):
self.calculate_planning(cr, uid, ids, context)
prev_text = obj.history or ""
self.write(cr, uid, ids, {
'history' : prev_text + _('Requisition (') + str(user.login) + ", " + time.strftime('%Y.%m.%d %H:%M) ') + str(obj.incoming_left) + \
'history': prev_text + _('Requisition (') + str(user.login) + ", " + time.strftime('%Y.%m.%d %H:%M) ') + str(obj.incoming_left) + \
" " + obj.product_uom.name + "\n",
})
return True
@@ -680,7 +668,7 @@ class stock_planning(osv.osv):
'origin': _('MPS(') + str(user.login) +') '+ obj.period_id.name,
'type': 'internal',
'state': 'auto',
'date' : obj.period_id.date_start,
'date': obj.period_id.date_start,
'move_type': 'direct',
'invoice_state': 'none',
'company_id': obj.company_id.id,
addons/stock_planning/stock_planning_view.xml
+3 -3
View File
@@ -90,12 +90,12 @@
<field name="product_uos_categ" invisible = "True"/>
<field name="product_uom"
domain = "[('category_id','in',[product_uom_categ,product_uos_categ])]"
on_change = "onchange_uom(product_uom, product_qty, active_uom)"/>
on_change = "onchange_uom(product_uom, product_qty, active_uom, product_id)"/>
<field name="active_uom" invisible = "True" />
</group>
<group colspan = "2" col="2" >
<field name="user_id"/>
<field name="product_amt" on_change="product_amt_change( product_amt, product_uom)" />
<field name="product_amt" on_change="product_amt_change(product_amt, product_uom, product_id)" />
<field name="product_qty" />
<field name="state"/>
<label string = ""/>
@@ -246,7 +246,7 @@
<field name="product_uos_categ" invisible = "True"/>
<field name="product_uom"
domain = "[('category_id','in',[product_uom_categ,product_uos_categ])]"
on_change = "onchange_uom(product_uom)"/>
on_change = "onchange_uom(product_uom, product_id, active_uom, planned_outgoing, to_procure)"/>
<!-- <field name="state"/> -->
<separator colspan ="2" string = "Forecasts"/>
<field name="warehouse_forecast"/>
addons/stock_planning/wizard/stock_planning_createlines.py
-2
View File
@@ -88,9 +88,7 @@ class stock_planning_createlines(osv.osv_memory):
ORDER BY period.date_stop DESC",
(uid, uid, f.warehouse_id.id, p.id, f.period_id.date_stop) )
ret=cr.fetchone()
# forecast_qty = ret and ret[0] or 0.0
if ret:
# raise osv.except_osv(_('Error !'), _('ret is %s %s %s %s %s %s')%(ret[0],ret[2],ret[3],ret[4],ret[5],ret[6],))
prod_uom = ret[1]
planned_out = ret[2]
to_procure = ret[3]
addons/stock_planning/wizard/stock_planning_forecast.py
-4
View File
@@ -64,10 +64,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 \