audrius/rma
1
0
Fork 1
mirror of https://github.com/OCA/rma.git synced 2025-02-16 17:11:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from jgrandguillaume/rma-fix-lp1311520_rde

Browse Source 
Port LP MP https://code.launchpad.net/~camptocamp/openerp-rma/rma-fix-lp1311520_rde/+merge/216839
This commit is contained in:
Joël Grand-Guillaume
2014-07-16 14:13:08 +02:00
parent ee191e6966 aaccc7da14
commit 72c7471121
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crm_claim_rma/crm_claim_rma.py
View File

@@ -268,8 +268,10 @@ class claim_line(orm.Model):
"""Compute and return the destination location ID to take
for a return. Always take 'Supplier' one when return type different
from company."""
prod_obj = self.pool.get('product.product')
prod = prod_obj.browse(cr, uid, product_id, context=context)
prod = False
if product_id:
prod_obj = self.pool.get('product.product')
prod = prod_obj.browse(cr, uid, product_id, context=context)
wh_obj = self.pool.get('stock.warehouse')
wh = wh_obj.browse(cr, uid, warehouse_id, context=context)
location_dest_id = wh.lot_stock_id.id
@@ -465,14 +467,15 @@ class crm_claim(orm.Model):
invoice_lines = invoice_line_obj.browse(cr, uid, invoice_line_ids,
context=context)
for invoice_line in invoice_lines:
product_id = invoice_line.product_id and invoice_line.product_id.id or False
location_dest_id = claim_line_obj.get_destination_location(
cr, uid, invoice_line.product_id.id,
cr, uid, product_id,
warehouse_id, context=context)
claim_lines.append({
'name': invoice_line.name,
'claim_origine': "none",
'invoice_line_id': invoice_line.id,
'product_id': invoice_line.product_id.id,
'product_id': product_id,
'product_returned_quantity': invoice_line.quantity,
'unit_sale_price': invoice_line.price_unit,
'location_dest_id': location_dest_id,