From 6de46236386444df2e1f90fd8a40eb77993d5933 Mon Sep 17 00:00:00 2001 From: Adrien Peiffer Date: Tue, 19 Aug 2014 17:09:23 +0200 Subject: [PATCH] [IMP] display formatted date with context timezone in exception popup for account_invoice_constraint_chronology addons --- .../model/account_invoice.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/account_invoice_constraint_chronology/model/account_invoice.py b/account_invoice_constraint_chronology/model/account_invoice.py index 572bd0f7e..b964b13e9 100644 --- a/account_invoice_constraint_chronology/model/account_invoice.py +++ b/account_invoice_constraint_chronology/model/account_invoice.py @@ -27,8 +27,10 @@ # # -from openerp import models, api +from openerp import models, api, fields from openerp.tools.translate import _ +from openerp.tools import DEFAULT_SERVER_DATE_FORMAT +from datetime import datetime class account_invoice(models.Model): @@ -47,12 +49,17 @@ class account_invoice(models.Model): ('date_invoice', '<', inv.date_invoice), ('journal_id', '=', inv.journal_id.id)]) if len(invoices) > 0: + date_invoice_format = datetime\ + .strptime(inv.date_invoice, + DEFAULT_SERVER_DATE_FORMAT) + date_invoice_tz = fields\ + .Date.context_today(self, date_invoice_format) raise models.except_orm(_('Error !'), _("Chronology Error!" " Please confirm older draft" " invoices before %s and" " try again.") % - inv.date_invoice) + date_invoice_tz) if inv.internal_number is False: invoices = self.search([('state', 'in', ['open', 'paid']), @@ -61,10 +68,15 @@ class account_invoice(models.Model): ('journal_id', '=', inv.journal_id.id)]) if len(invoices) > 0: + date_invoice_format = datetime\ + .strptime(inv.date_invoice, + DEFAULT_SERVER_DATE_FORMAT) + date_invoice_tz = fields\ + .Date.context_today(self, date_invoice_format) raise models.except_orm(_('Error !'), _("Chronology Error! There" " exist at least one invoice" " with a date posterior" " to %s.") % - inv.date_invoice) + date_invoice_tz) return res