[FIX]compute_qty_to_receive

This commit is contained in:
aheficent
2018-07-30 18:37:14 +02:00
committed by AaronHForgeFlow
parent 6b91aaa282
commit 961023c2a4

View File

@@ -91,10 +91,10 @@ class RmaOrderLine(models.Model):
rec.qty_to_receive = 0.0 rec.qty_to_receive = 0.0
if rec.receipt_policy == 'ordered': if rec.receipt_policy == 'ordered':
rec.qty_to_receive = \ rec.qty_to_receive = \
rec.product_qty - rec.qty_incoming - rec.qty_received rec.product_qty - rec.qty_received
elif rec.receipt_policy == 'delivered': elif rec.receipt_policy == 'delivered':
rec.qty_to_receive = \ rec.qty_to_receive = \
rec.qty_delivered - rec.qty_incoming - rec.qty_received rec.qty_delivered - rec.qty_received
@api.multi @api.multi
@api.depends('move_ids', 'move_ids.state', @api.depends('move_ids', 'move_ids.state',
@@ -164,12 +164,6 @@ class RmaOrderLine(models.Model):
rec.qty_to_supplier_rma = 0.0 rec.qty_to_supplier_rma = 0.0
rec.qty_in_supplier_rma = 0.0 rec.qty_in_supplier_rma = 0.0
@api.multi
def _compute_procurement_count(self):
for rec in self:
rec.procurement_count = len(rec.procurement_ids.filtered(
lambda p: p.state == 'exception'))
@api.multi @api.multi
def _compute_rma_line_count(self): def _compute_rma_line_count(self):
for rec in self.filtered(lambda r: r.type == 'customer'): for rec in self.filtered(lambda r: r.type == 'customer'):
@@ -252,8 +246,6 @@ class RmaOrderLine(models.Model):
string='Price Unit', string='Price Unit',
readonly=True, states={'draft': [('readonly', False)]}, readonly=True, states={'draft': [('readonly', False)]},
) )
procurement_count = fields.Integer(compute=_compute_procurement_count,
string='# of Procurements', copy=False)
in_shipment_count = fields.Integer(compute=_compute_in_shipment_count, in_shipment_count = fields.Integer(compute=_compute_in_shipment_count,
string='# of Shipments') string='# of Shipments')
out_shipment_count = fields.Integer(compute=_compute_out_shipment_count, out_shipment_count = fields.Integer(compute=_compute_out_shipment_count,
@@ -448,12 +440,12 @@ class RmaOrderLine(models.Model):
sm = self.reference_move_id sm = self.reference_move_id
if not sm: if not sm:
return return
if sm.lot_ids: if sm.move_line_ids.lot_id:
if len(sm.lot_ids) > 1: if len(sm.move_line_ids.lot_id) > 1:
raise UserError(_('To manage lots use RMA groups.')) raise UserError(_('To manage lots use RMA groups.'))
else: else:
data = self._prepare_rma_line_from_stock_move( data = self._prepare_rma_line_from_stock_move(
sm, lot=sm.lot_ids[0]) sm, lot=sm.move_line_ids.lot_id[0])
self.update(data) self.update(data)
else: else:
data = self._prepare_rma_line_from_stock_move( data = self._prepare_rma_line_from_stock_move(
@@ -611,23 +603,6 @@ class RmaOrderLine(models.Model):
result['res_id'] = shipments[0] result['res_id'] = shipments[0]
return result return result
@api.multi
def action_view_procurements(self):
action = self.env.ref(
'procurement.procurement_order_action_exceptions')
result = action.read()[0]
procurements = self.procurement_ids.filtered(
lambda p: p.state == 'exception').ids
# choose the view_mode accordingly
if len(procurements) != 1:
result['domain'] = "[('id', 'in', " + \
str(procurements) + ")]"
elif len(procurements) == 1:
res = self.env.ref('procurement.procurement_form_view', False)
result['views'] = [(res and res.id or False, 'form')]
result['res_id'] = procurements[0]
return result
@api.multi @api.multi
def action_view_rma_lines(self): def action_view_rma_lines(self):
if self.type == 'customer': if self.type == 'customer':