[FIX] project_mrp: fixed issue with the state field used in an sql query.
bzr revid: tde@openerp.com-20130718084451-z6us9ajaoli2a28c
This commit is contained in:
parent
25439cfb3a
commit
0d68a800e3
|
@ -31,8 +31,7 @@ class ProjectTaskStageMrp(osv.Model):
|
||||||
_inherit = 'project.task.type'
|
_inherit = 'project.task.type'
|
||||||
|
|
||||||
_columns = {
|
_columns = {
|
||||||
'closed': fields.boolean('Close',
|
'closed': fields.boolean('Close', help="Tasks in this stage are considered as closed."),
|
||||||
help="Tasks in this stage are considered as closed."),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_defaults = {
|
_defaults = {
|
||||||
|
@ -72,7 +71,7 @@ class product_product(osv.osv):
|
||||||
|
|
||||||
|
|
||||||
class sale_order(osv.osv):
|
class sale_order(osv.osv):
|
||||||
_inherit ='sale.order'
|
_inherit = 'sale.order'
|
||||||
|
|
||||||
def _prepare_order_line_procurement(self, cr, uid, order, line, move_id, date_planned, context=None):
|
def _prepare_order_line_procurement(self, cr, uid, order, line, move_id, date_planned, context=None):
|
||||||
proc_data = super(sale_order, self)._prepare_order_line_procurement(cr,
|
proc_data = super(sale_order, self)._prepare_order_line_procurement(cr,
|
||||||
|
@ -85,11 +84,12 @@ class sale_order(osv.osv):
|
||||||
return {}
|
return {}
|
||||||
res_sale = {}
|
res_sale = {}
|
||||||
res = super(sale_order, self)._picked_rate(cr, uid, ids, name, arg, context=context)
|
res = super(sale_order, self)._picked_rate(cr, uid, ids, name, arg, context=context)
|
||||||
cr.execute('''select sol.order_id as sale_id, t.state as task_state ,
|
cr.execute('''select sol.order_id as sale_id, stage.closed as task_closed ,
|
||||||
t.id as task_id, sum(sol.product_uom_qty) as total
|
t.id as task_id, sum(sol.product_uom_qty) as total
|
||||||
from project_task as t
|
from project_task as t
|
||||||
left join sale_order_line as sol on sol.id = t.sale_line_id
|
left join sale_order_line as sol on sol.id = t.sale_line_id
|
||||||
where sol.order_id in %s group by sol.order_id,t.state,t.id ''',(tuple(ids),))
|
left join project_task_type as stage on stage.id = t.stage_id
|
||||||
|
where sol.order_id in %s group by sol.order_id,stage.closed,t.id ''',(tuple(ids),))
|
||||||
sale_task_data = cr.dictfetchall()
|
sale_task_data = cr.dictfetchall()
|
||||||
|
|
||||||
if not sale_task_data:
|
if not sale_task_data:
|
||||||
|
@ -109,7 +109,7 @@ class sale_order(osv.osv):
|
||||||
|
|
||||||
for item in sale_task_data:
|
for item in sale_task_data:
|
||||||
res_sale[item['sale_id']]['total_no_task'] += item['total']
|
res_sale[item['sale_id']]['total_no_task'] += item['total']
|
||||||
if item['task_state'] == 'done':
|
if item['task_closed']:
|
||||||
res_sale[item['sale_id']]['number_of_done'] += item['total']
|
res_sale[item['sale_id']]['number_of_done'] += item['total']
|
||||||
|
|
||||||
for sale in self.browse(cr, uid, ids, context=context):
|
for sale in self.browse(cr, uid, ids, context=context):
|
||||||
|
|
Loading…
Reference in New Issue