From eb4368d9acdeb09d004bf2ec0bab0dfeae902b90 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 19 Jun 2012 17:55:24 +0530
Subject: [PATCH 1/2] [FIX]:Pricelist field should be on Operations tab not on
 Invoicing tab

bzr revid: apa@tinyerp.com-20120619122524-kf7hsjbwl3h0qljn
---
 addons/mrp_repair/mrp_repair_view.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 80ae7ae919f..4f9bae96343 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -67,6 +67,11 @@
                     </group>
                 <notebook>
                     <page string="Operations">
+                        <group col="4">
+                            <field
+                                name="pricelist_id" groups="product.group_sale_pricelist" context="{'product_id':product_id}"
+                                attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
+                        </group>
                         <field name="operations">
                             <form string="Operations" version="7.0">
                                 <notebook>
@@ -123,9 +128,6 @@
                     <page string="Invoicing">
                         <group col="4">
                             <field name="invoice_method"/>
-                            <field
-                                name="pricelist_id" groups="product.group_sale_pricelist" context="{'product_id':product_id}"
-                                attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
                             <field name="partner_invoice_id" attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
                         </group>
                         <!-- <field name="invoice_id"/> -->

From 574bbef10e374eb82190cbdd976227b946d1931f Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 19 Jun 2012 18:20:23 +0530
Subject: [PATCH 2/2] [FIX]:When Before/After Invoicing is selected then
 Partner and Invoice address fields should become required.

bzr revid: apa@tinyerp.com-20120619125023-470ow029ub54a0yx
---
 addons/mrp_repair/mrp_repair_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 4f9bae96343..fb20e465a31 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -53,7 +53,7 @@
                     </h2>
                     <group>
                         <group>
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id,address_id)"/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id,address_id)" attrs="{'required':[('invoice_method','!=','none')]}"/>
                             <field name="address_id"  attrs="{'readonly':[('deliver_bool','=', False)]}"/>
                             <field name="prodlot_id" on_change="onchange_lot_id(prodlot_id,product_id)"/>
                             <field name="move_id" on_change="onchange_move_id(product_id, move_id)" context="{'default_product_id':product_id}"/>
@@ -128,7 +128,7 @@
                     <page string="Invoicing">
                         <group col="4">
                             <field name="invoice_method"/>
-                            <field name="partner_invoice_id" attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
+                            <field name="partner_invoice_id" attrs="{'readonly':[('invoice_method','=', 'none')],'required':[('invoice_method','!=','none')]}"/>
                         </group>
                         <!-- <field name="invoice_id"/> -->
                         <field name="fees_lines">