From 4ce65b4910a9a6be0f4486d2d73f50ed374a3109 Mon Sep 17 00:00:00 2001
From: ahenriquez <ahenriquez@eficent.com>
Date: Fri, 20 Sep 2019 11:33:55 +0200
Subject: [PATCH] [ENH]activate description also fro customer RMAs [ENH]add
 term and conditions field to be printed and send to the partner [FIX]do not
 show rma groups on the rma line form view if they are not activated

---
 rma/__manifest__.py                 |  2 +-
 rma/models/rma_order_line.py        |  1 +
 rma/report/rma_report_templates.xml |  6 +++++-
 rma/views/rma_order_line_view.xml   | 15 ++++++++++-----
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 0b6ab157..d3022fd7 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'RMA (Return Merchandise Authorization)',
-    'version': '12.0.2.2.0',
+    'version': '12.0.2.3.0',
     'license': 'LGPL-3',
     'category': 'RMA',
     'summary': 'Introduces the return merchandise authorization (RMA) process '
diff --git a/rma/models/rma_order_line.py b/rma/models/rma_order_line.py
index d0337e09..44f38557 100644
--- a/rma/models/rma_order_line.py
+++ b/rma/models/rma_order_line.py
@@ -183,6 +183,7 @@ class RmaOrderLine(models.Model):
              ' assigned.', copy=False
     )
     description = fields.Text(string='Description')
+    conditions = fields.Html(string='Terms and conditions')
     origin = fields.Char(
         string='Source Document',
         readonly=True, states={'draft': [('readonly', False)]},
diff --git a/rma/report/rma_report_templates.xml b/rma/report/rma_report_templates.xml
index 2973c2d5..fdefd936 100644
--- a/rma/report/rma_report_templates.xml
+++ b/rma/report/rma_report_templates.xml
@@ -80,10 +80,14 @@
                         </tr>
                     </tbody>
                 </table>
-                <div t-if="doc.type=='supplier' and doc.description">
+                <div t-if="doc.description">
                     <strong><p>Description</p></strong>
                     <span t-field="doc.description"></span>
                 </div>
+                <div t-if="doc.conditions">
+                    <strong><p>Term and conditions</p></strong>
+                    <span t-field="doc.conditions"></span>
+                </div>
             </div>
         </t>
     </template>
diff --git a/rma/views/rma_order_line_view.xml b/rma/views/rma_order_line_view.xml
index de39fd12..49de1218 100755
--- a/rma/views/rma_order_line_view.xml
+++ b/rma/views/rma_order_line_view.xml
@@ -11,7 +11,7 @@
                     <field name="partner_id"/>
                     <field name="product_id"/>
                     <field name="lot_id" groups="stock.group_production_lot"/>
-                    <field name="rma_id"/>
+                    <field name="rma_id" groups="rma.group_rma_groups"/>
                     <field name="origin"/>
                     <field name="operation_id"/>
                     <field name="supplier_address_id"/>
@@ -33,7 +33,7 @@
                     <field name="partner_id"/>
                     <field name="product_id"/>
                     <field name="lot_id" groups="stock.group_production_lot"/>
-                    <field name="rma_id"/>
+                    <field name="rma_id" groups="rma.group_rma_groups"/>
                     <field name="origin"/>
                     <field name="operation_id" domain="[('type','=','supplier')]"/>
                     <field name="uom_id" groups="uom.group_uom"/>
@@ -188,7 +188,8 @@
                             </page>
                             <page name="other" string="Other Info">
                                 <group name="general" string="General">
-                                    <field name="rma_id"/>
+                                    <field name="conditions"/>
+                                    <field name="rma_id" groups="rma.group_rma_groups"/>
                                     <field name="origin"/>
 
                                 </group>
@@ -309,6 +310,9 @@
                             </group>
                         </group>
                         <notebook>
+                            <page name="description" string="Description">
+                                <field name="description" nolabel="1"/>
+                            </page>
                             <page name="route" string="Routes">
                                 <group name="inbound" string="Inbound">
                                     <field name="in_warehouse_id"/>
@@ -357,7 +361,8 @@
                             </page>
                             <page name="other" string="Other Info">
                                 <group name="general" string="General">
-                                    <field name="rma_id"/>
+                                    <field name="conditions"/>
+                                    <field name="rma_id" groups="rma.group_rma_groups"/>
                                     <field name="origin"/>
                                 </group>
                                 <group name="company" string="Company"
@@ -381,7 +386,7 @@
             <field name="arch" type="xml">
                 <search string="Search RMA line">
                     <field name="name"/>
-                    <field name="rma_id"/>
+                    <field name="rma_id" groups="rma.group_rma_groups"/>
                     <field name="partner_id"/>
                     <field name="requested_by"/>
                     <field name="assigned_to"/>