audrius/contract
1
0
Fork 1
mirror of https://github.com/OCA/contract.git synced 2025-02-13 17:57:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

[UPD] split contract object from AnalyticAccount

Browse Source
This commit is contained in:
Carms Ng
2020-10-14 21:29:42 -04:00
committed by Mathieu Benoit
parent 2aa84e7937
commit 160ee2944d
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contract_digitized_signature/models/__init__.py
View File

@@ -1 +1 @@
from . import account_analytic_account from . import contract

12
contract_digitized_signature/models/account_analytic_account.py → contract_digitized_signature/models/contract.py
View File

@@ -1,16 +1,16 @@
# Copyright 2017 Tecnativa - Vicent Cubells # Copyright 2017 Tecnativa - Vicent Cubells
# Copyright 2020 Technolibre - Carms Ng
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import api, fields, models from odoo import api, fields, models
class AccountAnalyticAccount(models.Model): class ContractContract(models.Model):
_inherit = ['contract.contract']
_name = 'account.analytic.account'
_inherit = ['account.analytic.account', 'mail.thread']
customer_signature = fields.Binary( customer_signature = fields.Binary(
string='Customer acceptance', string='Customer acceptance',
attachment=True
) )
signature_name = fields.Char( signature_name = fields.Char(
string='Signed by', string='Signed by',
@@ -18,7 +18,7 @@ class AccountAnalyticAccount(models.Model):
@api.model @api.model
def create(self, values): def create(self, values):
contract = super(AccountAnalyticAccount, self).create(values) contract = super(ContractContract, self).create(values)
if contract.customer_signature: if contract.customer_signature:
values = {'customer_signature': contract.customer_signature} values = {'customer_signature': contract.customer_signature}
contract._track_signature(values, 'customer_signature') contract._track_signature(values, 'customer_signature')
@@ -27,4 +27,4 @@ class AccountAnalyticAccount(models.Model):
@api.multi @api.multi
def write(self, values): def write(self, values):
self._track_signature(values, 'customer_signature') self._track_signature(values, 'customer_signature')
return super(AccountAnalyticAccount, self).write(values) return super(ContractContract, self).write(values)

2
contract_digitized_signature/tests/test_contract_tracking.py
View File

@@ -12,7 +12,7 @@ class TestContractSignatureTracking(common.SavepointCase):
cls.image = 'R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==' cls.image = 'R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=='
def test_contract_signature_tracking(self): def test_contract_signature_tracking(self):
self.contract = self.env['account.analytic.account'].create({ self.contract = self.env['contract.contract'].create({
'name': 'Test Contract', 'name': 'Test Contract',
'customer_signature': self.image, 'customer_signature': self.image,
}) })

8
contract_digitized_signature/views/contract_views.xml
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<odoo> <odoo>
<record id="account_analytic_account_recurring_form_form" model="ir.ui.view"> <record id="contract_contract_signature_form_view" model="ir.ui.view">
<field name="name">account.analytic.account.invoice.recurring.form.inherit</field> <field name="name">contract.contract form view.signature</field>
<field name="model">account.analytic.account</field> <field name="model">contract.contract</field>
<field name="inherit_id" ref="contract.account_analytic_account_recurring_form_form"/> <field name="inherit_id" ref="contract.contract_contract_form_view"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="partner_id" position="after"> <field name="partner_id" position="after">
<field name="user_id"/> <field name="user_id"/>