From 35f1240a9047571f931b753f9626c6ce8dd2057e Mon Sep 17 00:00:00 2001
From: Stepan Savelyev <stepan.savelyev@rydlab.ru>
Date: Fri, 27 Dec 2019 19:18:37 +0500
Subject: [PATCH] [FIX] date error

---
 data/fields_default.xml        | 17 +++++++++++------
 models/res_partner_contract.py | 23 +++++++++--------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/data/fields_default.xml b/data/fields_default.xml
index 8f14b1d..0cbac60 100644
--- a/data/fields_default.xml
+++ b/data/fields_default.xml
@@ -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,
diff --git a/models/res_partner_contract.py b/models/res_partner_contract.py
index 0291878..3e81368 100644
--- a/models/res_partner_contract.py
+++ b/models/res_partner_contract.py
@@ -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):