[FIX] rma_sale

This commit is contained in:
ahenriquez
2019-11-29 16:58:14 +01:00
parent c8e8417be1
commit dfcaa77448

View File

@@ -23,7 +23,6 @@ class RmaLineMakeSaleOrder(models.TransientModel):
def _prepare_item(self, line): def _prepare_item(self, line):
return { return {
'line_id': line.id, 'line_id': line.id,
'rma_line_id': line.id,
'product_id': line.product_id.id, 'product_id': line.product_id.id,
'name': line.product_id.name, 'name': line.product_id.name,
'product_qty': line.qty_to_sell, 'product_qty': line.qty_to_sell,
@@ -59,13 +58,13 @@ class RmaLineMakeSaleOrder(models.TransientModel):
return res return res
@api.model @api.model
def _prepare_sale_order(self, out_warehouse, company): def _prepare_sale_order(self, out_warehouse, company, item):
if not self.partner_id: if not self.partner_id:
raise exceptions.Warning( raise exceptions.Warning(
_('Enter a customer.')) _('Enter a customer.'))
customer = self.partner_id customer = self.partner_id
data = { data = {
'origin': '', 'origin': item.line_id.name,
'partner_id': customer.id, 'partner_id': customer.id,
'warehouse_id': out_warehouse.id, 'warehouse_id': out_warehouse.id,
'company_id': company.id, 'company_id': company.id,
@@ -103,24 +102,20 @@ class RmaLineMakeSaleOrder(models.TransientModel):
if self.sale_order_id: if self.sale_order_id:
sale = self.sale_order_id sale = self.sale_order_id
if not sale: if not sale:
po_data = self._prepare_sale_order(line.out_warehouse_id, po_data = self._prepare_sale_order(
line.company_id) line.out_warehouse_id,
line.company_id,
item)
sale = sale_obj.create(po_data) sale = sale_obj.create(po_data)
so_line_data = self._prepare_sale_order_line(sale, item) so_line_data = self._prepare_sale_order_line(sale, item)
so_line_obj.create(so_line_data) so_line_obj.create(so_line_data)
res.append(sale.id) res.append(sale.id)
return { action = self.env.ref('sale.action_orders')
'domain': "[('id','in', ["+','.join(map(str, res))+"])]", result = action.read()[0]
'name': _('Quotations'), result['domain'] = "[('id','in', ["+','.join(map(str, res))+"])]"
'view_type': 'form', return result
'view_mode': 'tree,form',
'res_model': 'sale.order',
'view_id': False,
'context': False,
'type': 'ir.actions.act_window'
}
class RmaLineMakeSaleOrderItem(models.TransientModel): class RmaLineMakeSaleOrderItem(models.TransientModel):