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

[FIX] date error

Browse Source
This commit is contained in:
Stepan Savelyev 2019-12-27 19:18:37 +05:00
parent 1771cba477
commit 35f1240a90
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
data/fields_default.xml
View File

@ -22,17 +22,22 @@ months = ["",
"мая", "июня", "июля", "августа", "мая", "июня", "июля", "августа",
"сентября", "октября", "ноября", "декабря", "сентября", "октября", "ноября", "декабря",
] ]
date = self.get_date_context() date = self.get_date()
dd = date.day
mm = date.month
yyyy = date.year
yy = yyyy % 100
MM = months[mm]
# ctx keys must be declared in this xml # ctx keys must be declared in this xml
ctx = { ctx = {
"contract_number": self.name, "contract_number": self.name,
"dd": date.get('dd'), "dd": dd,
"mm": date.get('mm'), "mm": mm,
"MM": date.get('MM'), "MM": MM,
"yy": date.get('yy'), "yy": yy,
"yyyy": date.get('yyyy'), "yyyy": yyyy,
"seller_name": seller.name, "seller_name": seller.name,
"seller_company_form": seller.company_form, "seller_company_form": seller.company_form,

23
models/res_partner_contract.py
View File

@ -1,6 +1,7 @@
import datetime import datetime
from odoo import _, api, fields, models from odoo import _, api, fields, models
from odoo.tools.misc import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
class PartnerContract(models.Model): class PartnerContract(models.Model):
@ -97,20 +98,14 @@ class PartnerContract(models.Model):
"context": {"self_id": self.id}, "context": {"self_id": self.id},
} }
def get_date_context(self): def get_date(self):
months = ["", date = self.date_conclusion_fix or self.date_conclusion
"января", "февраля", "марта", "апреля", if date:
"мая", "июня", "июля", "августа", date = datetime.datetime.strptime(date, DEFAULT_SERVER_DATE_FORMAT)
"сентября", "октября", "ноября", "декабря", else:
] date = self.create_date
date = self.date_conclusion_fix or self.date_conclusion_fix or self.create_date date = datetime.datetime.strptime(date, DEFAULT_SERVER_DATETIME_FORMAT)
return { return date
"dd": date.day,
"mm": date.month,
"yyyy": date.year,
"yy": date.year % 100,
"MM": months[date.month],
}
class PrintTemplate(models.Model): class PrintTemplate(models.Model):