Merge lp:~openerp-dev/openobject-server/6.1-opw-589975-msh into lp:openobject-server/6.1

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of context_today method, returns wrong date, it returns UTC date if there is no tz key not found, there should be fallback, if tz not found in context then we should read context_tz of user, as context will not always available, it may come blank if context_today is called from method of workflow.

Demo:- Go to Accounting -> Customer Invoices and create one customer invoice in timezone Australia/Hobart wich UTC+11 and create invoice before 11 AM in Australia/Hobart so that in UTC it is 11PM of previous day, or change your system clock to generate this scenario, now validate invoice, so you will get invoice_date previous day even though your system shows 20th March but invoice_date will 19th March.

Reason:- tz not passed in context, so it should be handled if tz not available in context.

Thanks.

[lp:~openerp-dev/openobject-server/6.1-opw-589975-msh]

4348. By Mohammed Shekha<email address hidden> on 2013-04-04

[FIX]Refixed the issue of context timezone.

[Chris Biersbach (OpenERP) (cbi-openerp)]

I reject this because 6.1 is not an LTS and we thus no longer merge in it.

[Anaël Closson (openerp) (acl-openerp)]

I'd like to clarify these points to avoid misunderstandings :

* The merge proposal has been rejected _in trunk_ because it cannot be reproduce in it. It has either been corrected or changes in the code make it obsolete. So no, the bug is not in trunk.

I case you can reproduce it in trunk (or version above 6.1), there might be a mistake from the person who tested it. Please let us know if we fall in that case.

* As we are limited on resources we try to avoid merging in non LTS version. A project should not start in that version so new users won't face the bug, and if the bug hasn't been reported previously in that version we can consider none (or few) user faced it before you.

That's why we provide the patch. Merging into stable means more reviews and testing. It has a cost we can't afford for each issue of each version. That's why we have LTS and STS versions till now.

Though, the patch is available for everyone, and will be merged if we notice it's a recurring issue.

Unmerged revisions

4348. By Mohammed Shekha<email address hidden> on 2013-04-04

[FIX]Refixed the issue of context timezone.

=== modified file 'openerp/osv/fields.py'
--- openerp/osv/fields.py	2012-06-19 15:16:51 +0000
+++ openerp/osv/fields.py	2013-04-04 04:51:22 +0000
@@ -45,6 +45,7 @@
 from openerp.tools.translate import _
 from openerp.tools import float_round, float_repr
 import simplejson
+from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
 
@@ -292,10 +293,15 @@
         """
         today = timestamp or DT.datetime.now()
         context_today = None
+        tz_name = None
         if context and context.get('tz'):
+            tz_name = context['tz']
+        else:
+            tz_name = model.pool.get('res.users').read(cr, SUPERUSER_ID, uid, ['context_tz'])['context_tz']
+        if tz_name:
             try:
                 utc = pytz.timezone('UTC')
-                context_tz = pytz.timezone(context['tz'])
+                context_tz = pytz.timezone(tz_name)
                 utc_today = utc.localize(today, is_dst=False) # UTC = no DST
                 context_today = utc_today.astimezone(context_tz)
             except Exception: