Merge lp:~vauxoo/openerp-mexico-localization/7.0-oml-datetime_invoice-dev-julio into lp:openerp-mexico-localization/7.0

[Julio Serna-http://www.vauxoo.com]

Modifica función que calcula la fecha de la factura dependiendo si el dato que llega es date o datetime

[Moisés López - http://www.vauxoo.com (moylop260)]

¿Porque se usa la fecha de vencimiento en este if?
if inv.date_due and inv.invoice_datetime:

Hay 4 posibilidades de como pueden llegar los datos, estas considerando
todas las solicitadas?
 El 09/09/2013 18:10, "Julio Serna-http://www.vauxoo.com" <email address hidden>
escribió:

> Julio Serna-http://www.vauxoo.com has proposed merging
> lp:~vauxoo/openerp-mexico-localization/7.0-oml-datetime_invoice-dev-julio
> into lp:openerp-mexico-localization/7.0.
>
> Requested reviews:
> Moisés López - http://www.vauxoo.com (moylop260)
>
> For more details, see:
>
> https://code.launchpad.net/~vauxoo/openerp-mexico-localization/7.0-oml-datetime_invoice-dev-julio/+merge/184706
>
> Modifica función que calcula la fecha de la factura dependiendo si el dato
> que llega es date o datetime
> --
>
> https://code.launchpad.net/~vauxoo/openerp-mexico-localization/7.0-oml-datetime_invoice-dev-julio/+merge/184706
> You are requested to review the proposed merge of
> lp:~vauxoo/openerp-mexico-localization/7.0-oml-datetime_invoice-dev-julio
> into lp:openerp-mexico-localization/7.0.
>
> === modified file 'l10n_mx_invoice_datetime/invoice.py'
> --- l10n_mx_invoice_datetime/invoice.py 2013-09-08 04:28:04 +0000
> +++ l10n_mx_invoice_datetime/invoice.py 2013-09-10 01:09:50 +0000
> @@ -104,14 +104,16 @@
> res = self.assigned_datetime(cr, uid, vals, context=context)
> if res:
> vals.update(res)
> - return super(account_invoice, self).write(cr, uid, ids, vals,
> context=context)
> + return super(account_invoice, self).write(cr, uid, ids, vals,
> + context=context)
>
> def assigned_datetime(self, cr, uid, values, context=None):
> if context is None:
> context = {}
> res = {}
> if 'date_invoice' in values:
> - if values['date_invoice']:
> + if values['date_invoice'] and not\
> + values.get('invoice_datetime', False):
> date_ts = tools.server_to_local_timestamp(values[
> 'date_invoice'], tools.DEFAULT_SERVER_DATETIME_FORMAT,
> tools.DEFAULT_SERVER_DATETIME_FORMAT, context.get(
> @@ -123,8 +125,13 @@
> dt_invoice = datetime.datetime.combine(
> date_invoice, time_invoice).strftime('%Y/%m/%d
> %H:%M:%S')
> res['invoice_datetime'] = dt_invoice
> - if 'invoice_datetime' in values:
> - if values['invoice_datetime']:
> + date_invoice = datetime.datetime.strptime(
> + dt_invoice, '%Y/%m/%d
> %H:%M:%S').date().strftime('%Y/%m/%d')
> + res['date_invoice'] = date_invoice
> + return res
> + elif 'invoice_datetime' in values:
> + if values['invoice_datetime'] and not\
> + values.get('date_invoice', False):
> date_ts = tools.server_to_local_timestamp(values[
> 'invoice_datetime'],
> tools.DEFAULT_SERVER_DATETIME_FORMAT,
> tools.DEFAULT_SERVER_DATETIME_FORMAT, context.get(
> @@ -132,17 +139,25 @@
> date_invoice = d...

[lp:~vauxoo/openerp-mexico-localization/7.0-oml-datetime_invoice-dev-julio]

283. By Julio Serna-http://www.vauxoo.com on 2013-09-12

[IMP] modified function assigned_datetime to diferent cases of datetime

284. By Julio Serna-http://www.vauxoo.com on 2013-09-12

[IMP] resolved error in test of invoice

285. By Julio Serna-http://www.vauxoo.com on 2013-09-12

[REF] modified message when date diferent

[Julio Serna-http://www.vauxoo.com (hearthebreaker)]

Modifique función para considerar los 4 posibles casos para las fechas de factura

review: Needs Resubmitting

[lp:~vauxoo/openerp-mexico-localization/7.0-oml-datetime_invoice-dev-julio]

286. By Julio Serna-http://www.vauxoo.com on 2013-09-12

[MERGE] merge 7.0-oml

287. By Julio Serna-http://www.vauxoo.com on 2013-09-12

[IMP] active function action_move_create

288. By Julio Serna-http://www.vauxoo.com on 2013-09-21

[IMP]added validation when date and dateinvoce empty

[Julio Serna-http://www.vauxoo.com (hearthebreaker)]

se corrige que cuando no se ponía ninguna fecha en la factura mostraba diferentes fechas en el campo date y en el datetime por el timezone, se validad ahora cuando las dos fechas vienen vacías tome la de la hora actual y las dos las pase por la función para que tomen el mismo timezone.

review: Needs Resubmitting

[lp:~vauxoo/openerp-mexico-localization/7.0-oml-datetime_invoice-dev-julio]

289. By Julio Serna-http://www.vauxoo.com on 2013-09-21

[MERGE] merge and resolved conflict

290. By Julio Serna-http://www.vauxoo.com on 2013-09-27

[IMP] modified write and function to get datetime of invoice

291. By Julio Serna-http://www.vauxoo.com on 2013-10-01

[IMP] added function tat get number of hour of diferent by time zone of user

[Julio Serna-http://www.vauxoo.com (hearthebreaker)]

Crea fecha datetime con time en 00:00:00 cuando solo se captura la fecha de tipo date, se calcula con función que obtiene diferencia de horas con respecto a la zona horaria de usuario

review: Needs Resubmitting

[lp:~vauxoo/openerp-mexico-localization/7.0-oml-datetime_invoice-dev-julio]

292. By Julio Serna-http://www.vauxoo.com on 2013-10-01

[IMP] added new value to datetime in defcreate

=== modified file 'l10n_mx_invoice_datetime/invoice.py'
--- l10n_mx_invoice_datetime/invoice.py	2013-09-21 20:04:41 +0000
+++ l10n_mx_invoice_datetime/invoice.py	2013-10-01 16:50:49 +0000
@@ -31,7 +31,9 @@
 from openerp import netsvc
 from openerp import release
 import datetime
+from pytz import timezone
 import pytz
+from dateutil.relativedelta import relativedelta
 
 import time
 import os
@@ -101,56 +103,110 @@
     def write(self, cr, uid, ids, vals, context=None):
         if context is None:
             context = {}
-        res = self.assigned_datetime(cr, uid, vals, context=context)
+        res = {}
+        if vals.get('date_invoice', False):
+            vals.update({'invoice_datetime': False})
+            res = self.assigned_datetime(cr, uid, vals, context=context)
+        if vals.get('invoice_datetime', False):
+            vals.update({'date_invoice' : False})
+            res = self.assigned_datetime(cr, uid, vals, context=context)
         if res:
             vals.update(res)
-        return super(account_invoice, self).write(cr, uid, ids, vals, context=context)
+        return super(account_invoice, self).write(cr, uid, ids, vals,
+                                                            context=context)
         
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}
         default.update({'invoice_datetime': False, 'date_invoice' : False})
         return super(account_invoice, self).copy(cr, uid, id, default, context)
-
+    
+    def _get_time_zone(self, cr, uid, invoice_id, context=None):
+        res_users_obj = self.pool.get('res.users')
+        userstz = res_users_obj.browse(cr, uid, [uid])[0].partner_id.tz
+        a = 0
+        if userstz:
+            hours = timezone(userstz)
+            fmt = '%Y-%m-%d %H:%M:%S %Z%z'
+            now = datetime.datetime.now()
+            loc_dt = hours.localize(datetime.datetime(now.year, now.month, now.day,
+                                             now.hour, now.minute, now.second))
+            timezone_loc = (loc_dt.strftime(fmt))
+            diff_timezone_original = timezone_loc[-5:-2]
+            timezone_original = int(diff_timezone_original)
+            s = str(datetime.datetime.now(pytz.timezone(userstz)))
+            s = s[-6:-3]
+            timezone_present = int(s)*-1
+            a = timezone_original + ((
+                timezone_present + timezone_original)*-1)
+        return a
+    
     def assigned_datetime(self, cr, uid, values, context=None):
         if context is None:
             context = {}
         res = {}
-        if 'date_invoice' in values:
-            if values['date_invoice']:
-                date_ts = tools.server_to_local_timestamp(values[
-                    'date_invoice'], tools.DEFAULT_SERVER_DATETIME_FORMAT,
-                    tools.DEFAULT_SERVER_DATETIME_FORMAT, context.get(
-                    'tz_invoice_mx', 'America/Mexico_City'))
-                now = datetime.datetime.now()
-                time_invoice = datetime.time(now.hour, now.minute, now.second)
-                date_invoice = datetime.datetime.strptime(
-                    date_ts, '%Y-%m-%d').date()
-                dt_invoice = datetime.datetime.combine(
-                    date_invoice, time_invoice).strftime('%Y/%m/%d %H:%M:%S')
-                res['invoice_datetime'] = dt_invoice
-        if 'invoice_datetime' in values:
-            if values['invoice_datetime']:
-                date_ts = tools.server_to_local_timestamp(values[
-                    'invoice_datetime'], tools.DEFAULT_SERVER_DATETIME_FORMAT,
-                    tools.DEFAULT_SERVER_DATETIME_FORMAT, context.get(
-                    'tz_invoice_mx', 'America/Mexico_City'))
-                date_invoice = datetime.datetime.strptime(
-                    date_ts, '%Y-%m-%d %H:%M:%S').date().strftime('%Y/%m/%d')
-                res['date_invoice'] = date_invoice
+        if values.get('date_invoice', False) and\
+                                    not values.get('invoice_datetime', False):
+                                    
+            user_hour = self._get_time_zone(cr, uid, [], context=context)
+            time_invoice = datetime.time(abs(user_hour), 0, 0)
+
+            date_invoice = datetime.datetime.strptime(
+                values['date_invoice'], '%Y-%m-%d').date()
+                
+            dt_invoice = datetime.datetime.combine(
+                date_invoice, time_invoice).strftime('%Y-%m-%d %H:%M:%S')
+
+            res['invoice_datetime'] = dt_invoice
+            res['date_invoice'] = values['date_invoice']
+            return res
+            
+        if values.get('invoice_datetime', False) and not\
+            values.get('date_invoice', False):
+            date_invoice = fields.datetime.context_timestamp(cr, uid,
+                datetime.datetime.strptime(values['invoice_datetime'],
+                tools.DEFAULT_SERVER_DATETIME_FORMAT), context=context)
+            res['date_invoice'] = date_invoice
+            res['invoice_datetime'] = values['invoice_datetime']
+            return res
+        
+        if 'invoice_datetime' in values  and 'date_invoice' in values:
+            if values['invoice_datetime'] and values['date_invoice']:
+                date_invoice = datetime.datetime.strptime(
+                    values['invoice_datetime'],
+                    '%Y-%m-%d %H:%M:%S').date().strftime('%Y-%m-%d')
+                if date_invoice != values['date_invoice']:
+                    raise osv.except_osv(_('Warning!'),
+                            _('Invoice dates should be equal'))
+
+        if  not values.get('invoice_datetime', False) and\
+                                        not values.get('date_invoice', False):
+                
+            date_ts = fields.datetime.context_timestamp(cr, uid,
+                datetime.datetime.strptime(fields.datetime.now(),
+                tools.DEFAULT_SERVER_DATETIME_FORMAT), context=context)
+            res['date_invoice'] = date_ts
+            res['invoice_datetime'] = fields.datetime.now()
+            return res
         return res
-    """
-    def action_move_create(self, cr, uid, ids, *args):
-        for inv in self.browse(cr, uid, ids):
-            if inv.move_id:
-                continue
-            if not inv.invoice_datetime:
-                t1 = time.strftime('%Y-%m-%d')
-                t2 = time.strftime('%Y-%m-%d %H:%M:%S')
-                self.write(cr, uid, [inv.id], {
-                           'date_invoice': t1, 'invoice_datetime': t2})
-        return super(account_invoice, self).action_move_create(cr, uid, ids, *args)
-    """
+
+#    def action_move_create(self, cr, uid, ids, *args):
+ #       for inv in self.browse(cr, uid, ids):
+  #          values = {'date_invoice': inv.date_invoice,
+   #                     'invoice_datetime': inv.invoice_datetime}
+    #        date_value = self.assigned_datetime(cr, uid, values)
+     #       if inv.move_id:
+      #          continue
+       #     if inv.date_invoice and inv.invoice_datetime:
+        #        return super(account_invoice, self).action_move_create(cr,
+         #                           uid, ids, *args)
+          #  t1 = time.strftime('%Y-%m-%d')
+           # t2 = time.strftime('%Y-%m-%d %H:%M:%S')
+           # self.write(cr, uid, [inv.id], {
+            #           'date_invoice': date_value.get('date_invoice', t1),
+             #          'invoice_datetime': date_value.get('invoice_datetime', t2)})
+        #return super(account_invoice, self).action_move_create(cr, uid, ids, *args)
+
 # class account_invoice_refund(osv.TransientModel):
  #   _inherit = 'account.invoice.refund'
   #  _columns = {