[FIX] date error

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

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 = {
"contract_number": self.name,
"dd": date.get('dd'),
"mm": date.get('mm'),
"MM": date.get('MM'),
"yy": date.get('yy'),
"yyyy": date.get('yyyy'),
"dd": dd,
"mm": mm,
"MM": MM,
"yy": yy,
"yyyy": yyyy,
"seller_name": seller.name,
"seller_company_form": seller.company_form,

View File

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