diff --git a/product_warranty/product_warranty.py b/product_warranty/product_warranty.py index 544c3a82..16c5e0bf 100644 --- a/product_warranty/product_warranty.py +++ b/product_warranty/product_warranty.py @@ -4,7 +4,7 @@ # # ######################################################################### # # -# Copyright (C) 2009-2011 Akretion, Emmanuel Samyn # +# Copyright (C) 2009-2011 Akretion, Emmanuel Samyn, Benoît Guillot # # # #This program is free software: you can redistribute it and/or modify # #it under the terms of the GNU General Public License as published by # @@ -21,6 +21,7 @@ ######################################################################### from osv import fields, osv +from tools.translate import _ #===== class return_instruction(osv.osv): @@ -38,37 +39,62 @@ class product_supplierinfo(osv.osv): _inherit = "product.supplierinfo" def get_warranty_return_partner(self, cr, uid, context=None): + result = [ + ('company','Company'), + ('supplier','Supplier'), + ('other','Other'),] if self.pool.get('ir.module.module').search(cr, uid, [('name','like','product_brand'),('state','like','installed')]): - return [ - ('company','Company'), - ('supplier','Supplier'), - ('brand','Brand manufacturer'), - ('other','Other'),] - else: - return [ - ('company','Company'), - ('supplier','Supplier'), - ('other','Other'),] + result.append(('brand','Brand manufacturer'),) + return result # Get selected lines to add to exchange def _get_default_instructions(self, cr, uid,context): instruction_ids = self.pool.get('return.instruction').search(cr, uid, [('is_default','=','FALSE')]) if instruction_ids: - return instruction_ids[0] - # TO DO f(supplier) + other... + return instruction_ids[0] + # TO DO f(supplier) + other. return False - + + def _get_warranty_return_address(self, cr, uid, ids, field_names, arg, context=None): + # 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 ={} + address_obj = self.pool.get('res.partner.address') + for supplier_info in self.browse(cr, uid, ids, context=context): + result[supplier_info.id] = {} + address_id = False + return_partner = supplier_info.warranty_return_partner + if return_partner: + if return_partner == 'supplier': + partner_id = supplier_info.name.id + elif sreturn_partner == 'brand': + if not supplier_info.product_id.product_brand_id.partner_id: + raise osv.except_osv(_('Error !'), _('You need to define a partner for the brand of the product !')) + partner_id = supplier_info.product_id.product_brand_id.partner_id.id + else: + partner_id = supplier_info.company_id.partner_id.id + address_id = address_obj.search(cr, uid, [('partner_id', '=', partner_id), ('type', 'like', 'dedicated_delivery')], context=context) + if not address_id: + address_id = address_obj.search(cr, uid, [('partner_id','=', partner_id), ('type','like','delivery')], context=context) + if not address_id: + address_id = address_obj.search(cr, uid, [('partner_id', '=', partner_id), ('type', 'like', 'default')], context=context) + if not address_id: + raise osv.except_osv(_('Error !'), _('No address define for the %s!') % return_partner) + result[supplier_info.id] = address_id[0] + return result + _columns = { "warranty_duration" : fields.float('Warranty', help="Warranty in month for this product/supplier relation. Only for company/supplier relation (purchase order) ; the customer/company relation (sale order) always use the product main warranty field"), "warranty_return_partner" : fields.selection(get_warranty_return_partner, 'Warrantee return', size=128, help="Who is in charge of the warranty return treatment toward the end customer. Company will use the current compagny delivery or default address and so on for supplier and brand manufacturer. Doesn't necessarly mean that the warranty to be applied is the one of the return partner (ie: can be returned to the company and be under the brand warranty"), 'return_instructions': fields.many2one('return.instruction', 'Instructions',help="Instructions for product return"), 'active_supplier' : fields.boolean('Active supplier', help=""), + 'warranty_return_address': fields.function(_get_warranty_return_address, type='many2one', relation='res.partner.address', string="Warranty return address"), } _defaults = { 'warranty_return_partner': lambda *a: 'company', 'return_instructions': _get_default_instructions, } - -product_supplierinfo() + +product_supplierinfo() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/product_warranty/product_warranty_view.xml b/product_warranty/product_warranty_view.xml index 80c15889..6dae3cb9 100644 --- a/product_warranty/product_warranty_view.xml +++ b/product_warranty/product_warranty_view.xml @@ -23,33 +23,33 @@ - - product.return.instructions.tree - return.instruction - tree - - - - - - - - - - - - product.return.instructions.form - return.instruction - form - -
- - - - - - -
+ + product.return.instructions.tree + return.instruction + tree + + + + + + + + + + + + product.return.instructions.form + return.instruction + form + +
+ + + + + + +
Products return instructions @@ -60,42 +60,44 @@ - + parent="product.prod_config_main" sequence="3"/> - - product.supplierinfo.warranty.tree - product.supplierinfo - - tree - - - - - - - - - - - - - product.supplierinfo.warranty.form - product.supplierinfo - - form - - - - - - - - - + + product.supplierinfo.warranty.tree + product.supplierinfo + + tree + + + + + + + + + + + + + + product.supplierinfo.warranty.form + product.supplierinfo + + form + + + + + + + + + +