Yaltik/docx_report_generation
2
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

Merge branch 'development' into 'master'

Browse Source 
[FIX] cant install module

See merge request odoo/client_contracts!12
This commit is contained in:
Иван Широких 2020-02-05 11:27:07 +05:00
commit 8ed5326208
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
models/res_partner_contract.py
View File

@ -36,10 +36,21 @@ class PartnerContract(models.Model, IDocument, Extension):
"""Returns timestamp of now by local datetime""" """Returns timestamp of now by local datetime"""
return datetime.datetime.now().timestamp() return datetime.datetime.now().timestamp()
partner_id = fields.Many2one(
"res.partner",
string="Partner",
default=lambda self: self.env.context.get("active_id"),
required=True,
)
company_id = fields.Many2one(
"res.partner",
string="Company",
default=lambda self: self.env.user.company_id.partner_id,
)
create_date_ts = fields.Char(default=_get_default_create_date_ts)
res_model = fields.Char(default=lambda self: self._name) res_model = fields.Char(default=lambda self: self._name)
name = fields.Char(string="Contract number", default=_get_default_name,) name = fields.Char(string="Contract number", default=_get_default_name,)
create_date = fields.Datetime(string="Created on") create_date = fields.Datetime(string="Created on")
create_date_ts = fields.Char(default=_get_default_create_date_ts)
date_conclusion = fields.Date(string="Date of system conclusion",) date_conclusion = fields.Date(string="Date of system conclusion",)
date_conclusion_fix = fields.Date( date_conclusion_fix = fields.Date(
string="Date of manual conclusion", string="Date of manual conclusion",
@ -55,17 +66,6 @@ class PartnerContract(models.Model, IDocument, Extension):
contract_annex_number = fields.Integer( contract_annex_number = fields.Integer(
default=1, help="Counter for generate Annex name" default=1, help="Counter for generate Annex name"
) )
partner_id = fields.Many2one(
"res.partner",
string="Partner",
default=lambda self: self.env.context.get("active_id"),
required=True,
)
company_id = fields.Many2one(
"res.partner",
string="Company",
default=lambda self: self.env.user.company_id.partner_id,
)
state = fields.Selection( state = fields.Selection(
[("draft", "New"), ("sign", "Signed"), ("close", "Closed"),], [("draft", "New"), ("sign", "Signed"), ("close", "Closed"),],
string="Status", string="Status",