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

[FIX] crm_claim.date is a datetime, error when a product has no supplier, in such case, returns the product to the company's address

Browse Source
This commit is contained in:
Guewen Baconnier
2013-12-03 11:21:07 +01:00
parent 3f16bd68a7
commit 4ed9c3a601
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
crm_claim_rma/crm_claim_rma.py
View File

@@ -25,7 +25,8 @@ import math
from openerp.osv import fields, orm
from datetime import datetime
from dateutil.relativedelta import relativedelta
from openerp.tools import DEFAULT_SERVER_DATE_FORMAT
from openerp.tools import (DEFAULT_SERVER_DATE_FORMAT,
DEFAULT_SERVER_DATETIME_FORMAT)
from openerp.tools.translate import _
@@ -238,7 +239,7 @@ class claim_line(orm.Model):
# If waranty period was defined
if warranty_duration > 0:
claim_date = datetime.strptime(claim_line.claim_id.date,
DEFAULT_SERVER_DATE_FORMAT)
DEFAULT_SERVER_DATETIME_FORMAT)
if limit < claim_date:
warning = _(self.WARRANT_COMMENT['expired'])
else:
@@ -280,15 +281,23 @@ class claim_line(orm.Model):
"""
return_address = None
seller = claim_line.product_id.seller_info_id
claim_company = claim_line.claim_id.company_id
return_address = seller.warranty_return_address.id
return_type = seller.warranty_return_partner
if seller:
return_address_id = seller.warranty_return_address.id
return_type = seller.warranty_return_partner
else:
# when no supplier is configured, returns to the company
company = claim_line.claim_id.company_id
return_address = (company.crm_return_address_id or
company.partner_id)
return_address_id = return_address.id
return_type = 'company'
location_dest_id = self.get_destination_location(
cr, uid, claim_line.product_id.id,
claim_line.claim_id.warehouse_id.id,
context=context)
self.write(cr, uid, ids,
{'warranty_return_partner': return_address,
{'warranty_return_partner': return_address_id,
'warranty_type': return_type,
'location_dest_id': location_dest_id},
context=context)

2
product_warranty/product_warranty.py
View File

@@ -58,7 +58,7 @@ class product_supplierinfo(orm.Model):
# Method to return the partner delivery address or if none, the default address
# dedicated_delivery_address stand for the case a new type of address more particularly
# dedicated to return delivery would be implemented.
result ={}
result = {}
address_obj = self.pool.get('res.partner')
for supplier_info in self.browse(cr, uid, ids, context=context):
result[supplier_info.id] = {}