From 3d954080a8afae0535323e2f0d6addadcddd9052 Mon Sep 17 00:00:00 2001 From: manu Date: Tue, 3 Jan 2012 16:28:42 +0100 Subject: [PATCH] [UPDATE] --- crm_claim_rma/crm_claim_rma_view.xml | 9 +++++++++ .../wizard/returned_lines_from_invoice_wizard_view.xml | 2 +- product_warranty/product_warranty.py | 4 +++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/crm_claim_rma/crm_claim_rma_view.xml b/crm_claim_rma/crm_claim_rma_view.xml index 222d9ce1..7d2b4c37 100644 --- a/crm_claim_rma/crm_claim_rma_view.xml +++ b/crm_claim_rma/crm_claim_rma_view.xml @@ -326,6 +326,15 @@ res_model="stock.picking" src_model="crm.claim"/> + + + diff --git a/crm_claim_rma/wizard/returned_lines_from_invoice_wizard_view.xml b/crm_claim_rma/wizard/returned_lines_from_invoice_wizard_view.xml index b94f805f..4365d78e 100644 --- a/crm_claim_rma/wizard/returned_lines_from_invoice_wizard_view.xml +++ b/crm_claim_rma/wizard/returned_lines_from_invoice_wizard_view.xml @@ -25,7 +25,7 @@ - returned_lines_from_invoice_wiew + returned_lines_from_invoice_view returned_lines_from_invoice_invoice.wizard form diff --git a/product_warranty/product_warranty.py b/product_warranty/product_warranty.py index b11858e3..544c3a82 100644 --- a/product_warranty/product_warranty.py +++ b/product_warranty/product_warranty.py @@ -54,7 +54,9 @@ class product_supplierinfo(osv.osv): 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] + return instruction_ids[0] + # TO DO f(supplier) + other... + return False _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"),