[IMP] Stock: Not only service products can be invoiced after shipment, but also lines without product
Purchase lines or sale order lines without product should have the same behaviour when invoicing based on shipments as those with services
This commit is contained in:
parent
3508104c97
commit
872a80c419
|
@ -73,7 +73,7 @@ class stock_move(osv.osv):
|
||||||
purchase_obj = self.pool.get('purchase.order')
|
purchase_obj = self.pool.get('purchase.order')
|
||||||
invoice_line_obj = self.pool.get('account.invoice.line')
|
invoice_line_obj = self.pool.get('account.invoice.line')
|
||||||
purchase_id = move.purchase_line_id.order_id.id
|
purchase_id = move.purchase_line_id.order_id.id
|
||||||
purchase_line_ids = purchase_line_obj.search(cr, uid, [('order_id', '=', purchase_id), ('product_id.type', '=', 'service'), ('invoice_lines', '=', False)], context=context)
|
purchase_line_ids = purchase_line_obj.search(cr, uid, [('order_id', '=', purchase_id), ('invoice_lines', '=', False), '|', ('product_id', '=', False), ('product_id.type', '=', 'service')], context=context)
|
||||||
if purchase_line_ids:
|
if purchase_line_ids:
|
||||||
inv_lines = []
|
inv_lines = []
|
||||||
for po_line in purchase_line_obj.browse(cr, uid, purchase_line_ids, context=context):
|
for po_line in purchase_line_obj.browse(cr, uid, purchase_line_ids, context=context):
|
||||||
|
|
|
@ -370,7 +370,7 @@ class stock_move(osv.osv):
|
||||||
})
|
})
|
||||||
sale_line_obj = self.pool.get('sale.order.line')
|
sale_line_obj = self.pool.get('sale.order.line')
|
||||||
invoice_line_obj = self.pool.get('account.invoice.line')
|
invoice_line_obj = self.pool.get('account.invoice.line')
|
||||||
sale_line_ids = sale_line_obj.search(cr, uid, [('order_id', '=', move.procurement_id.sale_line_id.order_id.id), ('product_id.type', '=', 'service'), ('invoiced', '=', False)], context=context)
|
sale_line_ids = sale_line_obj.search(cr, uid, [('order_id', '=', move.procurement_id.sale_line_id.order_id.id), ('invoiced', '=', False), '|', ('product_id', '=', False), ('product_id.type', '=', 'service')], context=context)
|
||||||
if sale_line_ids:
|
if sale_line_ids:
|
||||||
created_lines = sale_line_obj.invoice_line_create(cr, uid, sale_line_ids, context=context)
|
created_lines = sale_line_obj.invoice_line_create(cr, uid, sale_line_ids, context=context)
|
||||||
invoice_line_obj.write(cr, uid, created_lines, {'invoice_id': invoice_line_vals['invoice_id']}, context=context)
|
invoice_line_obj.write(cr, uid, created_lines, {'invoice_id': invoice_line_vals['invoice_id']}, context=context)
|
||||||
|
|
Loading…
Reference in New Issue