From 314365d700a6cca796cc48789a54012c94d547cf Mon Sep 17 00:00:00 2001
From: tarteo <d.sluijk@onestein.nl>
Date: Tue, 8 Jan 2019 13:54:41 +0100
Subject: [PATCH] [FIX] name_on_contract requirement

---
 contract/migrations/11.0.4.0.1/post-migration.py  | 8 --------
 contract/models/account_analytic_contract_line.py | 1 -
 contract/report/report_contract.xml               | 2 +-
 contract/views/account_analytic_account_view.xml  | 2 +-
 contract/views/account_analytic_contract_view.xml | 2 +-
 5 files changed, 3 insertions(+), 12 deletions(-)
 delete mode 100644 contract/migrations/11.0.4.0.1/post-migration.py

diff --git a/contract/migrations/11.0.4.0.1/post-migration.py b/contract/migrations/11.0.4.0.1/post-migration.py
deleted file mode 100644
index 911f7866..00000000
--- a/contract/migrations/11.0.4.0.1/post-migration.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2018 Onestein
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-
-def migrate(cr, version):
-    """Copy the name to name_on_contract."""
-    cr.execute("""UPDATE account_analytic_contract_line
-        SET name_on_contract = name""")
diff --git a/contract/models/account_analytic_contract_line.py b/contract/models/account_analytic_contract_line.py
index f3a9da73..d78ac028 100644
--- a/contract/models/account_analytic_contract_line.py
+++ b/contract/models/account_analytic_contract_line.py
@@ -35,7 +35,6 @@ class AccountAnalyticContractLine(models.Model):
     )
     name_on_contract = fields.Text(
         string='Description (on contract)',
-        required=True,
     )
     quantity = fields.Float(
         default=1.0,
diff --git a/contract/report/report_contract.xml b/contract/report/report_contract.xml
index 7b21e6d2..624ebd0f 100644
--- a/contract/report/report_contract.xml
+++ b/contract/report/report_contract.xml
@@ -56,7 +56,7 @@
                                     <tr class="border-black">
                                         <td><strong>Total</strong></td>
                                         <td class="text-right">
-                                            <span t-esc="recurring_invoice_total" t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
+                                            <span t-esc="o.recurring_invoice_total" t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
                                         </td>
                                     </tr>
                                 </table>
diff --git a/contract/views/account_analytic_account_view.xml b/contract/views/account_analytic_account_view.xml
index 7b45759e..a839b70c 100644
--- a/contract/views/account_analytic_account_view.xml
+++ b/contract/views/account_analytic_account_view.xml
@@ -79,7 +79,7 @@
                             <field name="sequence" widget="handle" />
                             <field name="product_id"/>
                             <field name="name"/>
-                            <field name="name_on_contract" />
+                            <field name="name_on_contract" required="1" />
                             <field name="quantity"/>
                             <field name="uom_id"/>
                             <field name="automatic_price"/>
diff --git a/contract/views/account_analytic_contract_view.xml b/contract/views/account_analytic_contract_view.xml
index 857e0a28..3dc29685 100644
--- a/contract/views/account_analytic_contract_view.xml
+++ b/contract/views/account_analytic_contract_view.xml
@@ -37,7 +37,7 @@
                             <field name="sequence" widget="handle" />
                             <field name="product_id" />
                             <field name="name" />
-                            <field name="name_on_contract" />
+                            <field name="name_on_contract" required="1" />
                             <field name="quantity" />
                             <field name="uom_id" />
                             <field name="automatic_price" attrs="{'column_invisible': [('parent.contract_type','=','purchase')]}"/>