From 78e52968aa9337d8511f467df2d355c24dcd7f4d Mon Sep 17 00:00:00 2001
From: Denis Roussel <denis.roussel@acsone.eu>
Date: Fri, 30 Apr 2021 16:18:34 +0200
Subject: [PATCH 1/2] [13.0][FIX] contract: Set layout for section and note in
 portal template

---
 contract/views/contract_portal_templates.xml | 123 ++++++++++++-------
 1 file changed, 77 insertions(+), 46 deletions(-)

diff --git a/contract/views/contract_portal_templates.xml b/contract/views/contract_portal_templates.xml
index 583b8f145..7e4d2e30a 100644
--- a/contract/views/contract_portal_templates.xml
+++ b/contract/views/contract_portal_templates.xml
@@ -227,56 +227,87 @@
                                         t-foreach="contract.contract_line_ids"
                                         t-as="line"
                                     >
-                                        <tr>
-                                            <td name="td_name">
-                                                <span t-field="line.name" />
-                                            </td>
-                                            <td name="td_quantity" class="text-right">
-                                                <span t-field="line.quantity" />
-                                            </td>
-                                            <td name="td_price_unit" class="text-right">
-                                                <span
-                                                    t-field="line.price_unit"
-                                                    t-options='{"widget": "monetary", "display_currency": contract.currency_id}'
-                                                />
-                                            </td>
-                                            <td
-                                                name="td_recurring_interval"
-                                                class="text-right"
+                                        <tr
+                                            t-att-class="'bg-200 font-weight-bold o_line_section' if line.display_type == 'line_section' else 'font-italic o_line_note' if line.display_type == 'line_note' else ''"
+                                        >
+                                            <t t-if="not line.display_type">
+                                                <td name="td_name">
+                                                    <span t-field="line.name" />
+                                                </td>
+                                                <td
+                                                    name="td_quantity"
+                                                    class="text-right"
+                                                >
+                                                    <span t-field="line.quantity" />
+                                                </td>
+                                                <td
+                                                    name="td_price_unit"
+                                                    class="text-right"
+                                                >
+                                                    <span
+                                                        t-field="line.price_unit"
+                                                        t-options='{"widget": "monetary", "display_currency": contract.currency_id}'
+                                                    />
+                                                </td>
+                                                <td
+                                                    name="td_recurring_interval"
+                                                    class="text-right"
+                                                >
+                                                    <span
+                                                        t-field="line.recurring_interval"
+                                                    />
+                                                    <t
+                                                        t-if="line.recurring_rule_type=='daily'"
+                                                    >Day(s)</t>
+                                                    <t
+                                                        t-if="line.recurring_rule_type=='weekly'"
+                                                    >Week(s)</t>
+                                                    <t
+                                                        t-if="line.recurring_rule_type=='monthly'"
+                                                    >Month(s)</t>
+                                                    <t
+                                                        t-if="line.recurring_rule_type=='monthlylastday'"
+                                                    >Month(s) last
+                                                        day</t>
+                                                    <t
+                                                        t-if="line.recurring_rule_type=='quarterly'"
+                                                    >Quarter(s)</t>
+                                                    <t
+                                                        t-if="line.recurring_rule_type=='semesterly'"
+                                                    >Semester(s)</t>
+                                                    <t
+                                                        t-if="line.recurring_rule_type=='yearly'"
+                                                    >Year(s)</t>
+                                                </td>
+                                                <td
+                                                    name="td_recurring_next_date"
+                                                    class="text-right"
+                                                >
+                                                    <span
+                                                        t-field="line.recurring_next_date"
+                                                    />
+                                                </td>
+                                            </t>
+                                            <t
+                                                t-if="line.display_type == 'line_section'"
                                             >
-                                                <span
-                                                    t-field="line.recurring_interval"
+                                                <td colspan="99">
+                                                    <span t-field="line.name" />
+                                                </td>
+                                                <t
+                                                    t-set="current_section"
+                                                    t-value="line"
                                                 />
                                                 <t
-                                                    t-if="line.recurring_rule_type=='daily'"
-                                                >Day(s)</t>
-                                                <t
-                                                    t-if="line.recurring_rule_type=='weekly'"
-                                                >Week(s)</t>
-                                                <t
-                                                    t-if="line.recurring_rule_type=='monthly'"
-                                                >Month(s)</t>
-                                                <t
-                                                    t-if="line.recurring_rule_type=='monthlylastday'"
-                                                >Month(s) last day</t>
-                                                <t
-                                                    t-if="line.recurring_rule_type=='quarterly'"
-                                                >Quarter(s)</t>
-                                                <t
-                                                    t-if="line.recurring_rule_type=='semesterly'"
-                                                >Semester(s)</t>
-                                                <t
-                                                    t-if="line.recurring_rule_type=='yearly'"
-                                                >Year(s)</t>
-                                            </td>
-                                            <td
-                                                name="td_recurring_next_date"
-                                                class="text-right"
-                                            >
-                                                <span
-                                                    t-field="line.recurring_next_date"
+                                                    t-set="current_subtotal"
+                                                    t-value="0"
                                                 />
-                                            </td>
+                                            </t>
+                                            <t t-if="line.display_type == 'line_note'">
+                                                <td colspan="99">
+                                                    <span t-field="line.name" />
+                                                </td>
+                                            </t>
                                         </tr>
                                     </t>
                                 </tbody>

From 69a28f5c0a5b6d8ad92b861f78bd3761f7f29b9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?=
 <victor.martinez@tecnativa.com>
Date: Mon, 24 May 2021 09:41:21 +0200
Subject: [PATCH 2/2] [IMP] contract: Improve code to show recurring_rule_type
 from contract line in portal

---
 contract/views/contract_portal_templates.xml | 25 +++-----------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/contract/views/contract_portal_templates.xml b/contract/views/contract_portal_templates.xml
index 7e4d2e30a..42d66a54c 100644
--- a/contract/views/contract_portal_templates.xml
+++ b/contract/views/contract_portal_templates.xml
@@ -256,28 +256,9 @@
                                                     <span
                                                         t-field="line.recurring_interval"
                                                     />
-                                                    <t
-                                                        t-if="line.recurring_rule_type=='daily'"
-                                                    >Day(s)</t>
-                                                    <t
-                                                        t-if="line.recurring_rule_type=='weekly'"
-                                                    >Week(s)</t>
-                                                    <t
-                                                        t-if="line.recurring_rule_type=='monthly'"
-                                                    >Month(s)</t>
-                                                    <t
-                                                        t-if="line.recurring_rule_type=='monthlylastday'"
-                                                    >Month(s) last
-                                                        day</t>
-                                                    <t
-                                                        t-if="line.recurring_rule_type=='quarterly'"
-                                                    >Quarter(s)</t>
-                                                    <t
-                                                        t-if="line.recurring_rule_type=='semesterly'"
-                                                    >Semester(s)</t>
-                                                    <t
-                                                        t-if="line.recurring_rule_type=='yearly'"
-                                                    >Year(s)</t>
+                                                    <span
+                                                        t-field="line.recurring_rule_type"
+                                                    />
                                                 </td>
                                                 <td
                                                     name="td_recurring_next_date"