From 160ee2944d736c674b77931dcef0ff564df80b59 Mon Sep 17 00:00:00 2001
From: Carms Ng <carms.ng@technolibre.ca>
Date: Wed, 14 Oct 2020 21:29:42 -0400
Subject: [PATCH] [UPD] split contract object from AnalyticAccount

---
 contract_digitized_signature/models/__init__.py      |  2 +-
 .../{account_analytic_account.py => contract.py}     | 12 ++++++------
 .../tests/test_contract_tracking.py                  |  2 +-
 .../views/contract_views.xml                         |  8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)
 rename contract_digitized_signature/models/{account_analytic_account.py => contract.py} (70%)

diff --git a/contract_digitized_signature/models/__init__.py b/contract_digitized_signature/models/__init__.py
index 97bd42434..99a5468ac 100644
--- a/contract_digitized_signature/models/__init__.py
+++ b/contract_digitized_signature/models/__init__.py
@@ -1 +1 @@
-from . import account_analytic_account
+from . import contract
diff --git a/contract_digitized_signature/models/account_analytic_account.py b/contract_digitized_signature/models/contract.py
similarity index 70%
rename from contract_digitized_signature/models/account_analytic_account.py
rename to contract_digitized_signature/models/contract.py
index 12fde964a..4bd4393c2 100644
--- a/contract_digitized_signature/models/account_analytic_account.py
+++ b/contract_digitized_signature/models/contract.py
@@ -1,16 +1,16 @@
 # Copyright 2017 Tecnativa - Vicent Cubells
+# Copyright 2020 Technolibre - Carms Ng
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import api, fields, models
 
 
-class AccountAnalyticAccount(models.Model):
-
-    _name = 'account.analytic.account'
-    _inherit = ['account.analytic.account', 'mail.thread']
+class ContractContract(models.Model):
+    _inherit = ['contract.contract']
 
     customer_signature = fields.Binary(
         string='Customer acceptance',
+        attachment=True
     )
     signature_name = fields.Char(
         string='Signed by',
@@ -18,7 +18,7 @@ class AccountAnalyticAccount(models.Model):
 
     @api.model
     def create(self, values):
-        contract = super(AccountAnalyticAccount, self).create(values)
+        contract = super(ContractContract, self).create(values)
         if contract.customer_signature:
             values = {'customer_signature': contract.customer_signature}
             contract._track_signature(values, 'customer_signature')
@@ -27,4 +27,4 @@ class AccountAnalyticAccount(models.Model):
     @api.multi
     def write(self, values):
         self._track_signature(values, 'customer_signature')
-        return super(AccountAnalyticAccount, self).write(values)
+        return super(ContractContract, self).write(values)
diff --git a/contract_digitized_signature/tests/test_contract_tracking.py b/contract_digitized_signature/tests/test_contract_tracking.py
index ce1498d86..5ffe6125d 100644
--- a/contract_digitized_signature/tests/test_contract_tracking.py
+++ b/contract_digitized_signature/tests/test_contract_tracking.py
@@ -12,7 +12,7 @@ class TestContractSignatureTracking(common.SavepointCase):
         cls.image = 'R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=='
 
     def test_contract_signature_tracking(self):
-        self.contract = self.env['account.analytic.account'].create({
+        self.contract = self.env['contract.contract'].create({
             'name': 'Test Contract',
             'customer_signature': self.image,
         })
diff --git a/contract_digitized_signature/views/contract_views.xml b/contract_digitized_signature/views/contract_views.xml
index 1aedfbe5f..8867a4d9f 100644
--- a/contract_digitized_signature/views/contract_views.xml
+++ b/contract_digitized_signature/views/contract_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" ?>
 <odoo>
 
-    <record id="account_analytic_account_recurring_form_form" model="ir.ui.view">
-        <field name="name">account.analytic.account.invoice.recurring.form.inherit</field>
-        <field name="model">account.analytic.account</field>
-        <field name="inherit_id" ref="contract.account_analytic_account_recurring_form_form"/>
+    <record id="contract_contract_signature_form_view" model="ir.ui.view">
+        <field name="name">contract.contract form view.signature</field>
+        <field name="model">contract.contract</field>
+        <field name="inherit_id" ref="contract.contract_contract_form_view"/>
         <field name="arch" type="xml">
             <field name="partner_id" position="after">
                 <field name="user_id"/>