Merge lp:~vauxoo/addons-vauxoo/7.0-addons-vauxoo-pylint-datetime-dev-alan into lp:~vauxoo/addons-vauxoo/7.0-addons-vauxoo-imp-datetime-dev-ernesto

[Jorge Angel Naranjo Rogel - http://www.vauxoo.com]

[lp:~vauxoo/addons-vauxoo/7.0-addons-vauxoo-pylint-datetime-dev-alan]

1124. By Luis Ernesto García Medina - http://www.vauxoo.com on 2014-11-08

[MERGE] merge with lp:~vauxoo/addons-vauxoo/7.0-addons-vauxoo-imp-datetime-dev-ernesto

1125. By Luis Ernesto García Medina - http://www.vauxoo.com on 2014-11-08

from Jorge [IMP][invoice_datetime] Flake8 invoice.py

[Luis Ernesto García Medina - http://www.vauxoo.com (ernesto-gm)]

Probado en local y funciona correctamente

review: Approve

[lp:~vauxoo/addons-vauxoo/7.0-addons-vauxoo-pylint-datetime-dev-alan]

1126. By Jesus Alan Guzman Escalante on 2014-11-11

[FIX] pylint y flake8 in this module

[Luis Ernesto García Medina - http://www.vauxoo.com (ernesto-gm)]

alana te comente en la linea 348

review: Needs Fixing

[lp:~vauxoo/addons-vauxoo/7.0-addons-vauxoo-pylint-datetime-dev-alan]

1127. By Jesus Alan Guzman Escalante on 2014-11-11

[FIX]correction code

=== modified file 'invoice_datetime/__init__.py'
--- invoice_datetime/__init__.py	2014-10-03 00:28:23 +0000
+++ invoice_datetime/__init__.py	2014-11-11 22:10:57 +0000
@@ -7,7 +7,8 @@
 #    info Vauxoo ([e-mail])
 ############################################################################
 #    Coded by: moylop260 ([e-mail])
-#    Launchpad Project Manager for Publication: Nhomar Hernandez - [e-mail]
+#    Launchpad Project Manager for Publication:
+#    Nhomar Hernandez - [e-mail]
 ############################################################################
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -27,4 +28,3 @@
 
 from . import invoice
 from . import res_config
-

=== modified file 'invoice_datetime/__openerp__.py'
--- invoice_datetime/__openerp__.py	2014-10-03 08:22:36 +0000
+++ invoice_datetime/__openerp__.py	2014-11-11 22:10:57 +0000
@@ -6,8 +6,10 @@
 #    All Rights Reserved.
 #    info Vauxoo ([e-mail])
 ############################################################################
-#    Coded by: moylop260 ([e-mail]) modified by [e-mail]
-#    Launchpad Project Manager for Publication: Nhomar Hernandez - [e-mail]
+#    Coded by: moylop260 ([e-mail])
+#    modified by [e-mail]
+#    Launchpad Project Manager for Publication:
+#   Nhomar Hernandez - [e-mail]
 ############################################################################
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -25,28 +27,28 @@
 #
 ##############################################################################
 {
-    "name": "invoice_datetime", 
-    "version": "1.0", 
-    "author": "Vauxoo", 
-    "category": "Localization/Mexico", 
+    "name": "invoice_datetime",
+    "version": "1.0",
+    "author": "Vauxoo",
+    "category": "Localization/Mexico",
     "description": """Add new field invoice_datetime for electronic invoice data
             and add hour & minute to field date_invoice
-    """, 
-    "website": "http://www.vauxoo.com/", 
-    "license": "AGPL-3", 
+    """,
+    "website": "http://www.vauxoo.com/",
+    "license": "AGPL-3",
     "depends": [
         "account"
-    ], 
-    "demo": [], 
+    ],
+    "demo": [],
     "data": [
-        "account_invoice_view.xml", 
+        "account_invoice_view.xml",
         "res_config_acc_view.xml"
-    ], 
-    "test": [], 
-    "js": [], 
-    "css": [], 
-    "qweb": [], 
-    "installable": True, 
-    "auto_install": False, 
+    ],
+    "test": [],
+    "js": [],
+    "css": [],
+    "qweb": [],
+    "installable": True,
+    "auto_install": False,
     "active": False
-}
\ No newline at end of file
+}

=== modified file 'invoice_datetime/invoice.py'
--- invoice_datetime/invoice.py	2014-11-07 18:41:44 +0000
+++ invoice_datetime/invoice.py	2014-11-11 22:10:57 +0000
@@ -7,7 +7,8 @@
 #    info Vauxoo ([e-mail])
 ############################################################################
 #    Coded by: moylop260 ([e-mail])
-#    Launchpad Project Manager for Publication: Nhomar Hernandez - [e-mail]
+#    Launchpad Project Manager for Publication:
+#             * Nhomar Hernandez - [e-mail]
 ############################################################################
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -47,15 +48,16 @@
                     date_ref, '%Y-%m-%d %H:%M:%S'))
             except BaseException:
                 pass
-        return super(account_payment_term, self).compute(cr, uid, ids, value,
-            date_ref, context=context)
+        return super(account_payment_term, self).compute(
+            cr, uid, ids, value, date_ref, context=context)
 
 
 class account_invoice(osv.Model):
     _inherit = 'account.invoice'
-    #_order = 'invoice_datetime asc'
+    # _order = 'invoice_datetime asc'
 
-    def _get_date_invoice_tz(self, cr, uid, ids, field_names=None, arg=False, context=None):
+    def _get_date_invoice_tz(self, cr, uid, ids, field_names=None, arg=False,
+                             context=None):
         if context is None:
             context = {}
         res = {}
@@ -63,9 +65,10 @@
             tz = self.pool.get('res.users').browse(cr, uid, uid).tz
             for invoice in self.browse(cr, uid, ids, context=context):
                 res[invoice.id] = invoice.invoice_datetime and tools.\
-                    server_to_local_timestamp(invoice.invoice_datetime,
-                    tools.DEFAULT_SERVER_DATETIME_FORMAT,
-                    tools.DEFAULT_SERVER_DATETIME_FORMAT, tz) or False
+                    server_to_local_timestamp(
+                        invoice.invoice_datetime,
+                        tools.DEFAULT_SERVER_DATETIME_FORMAT,
+                        tools.DEFAULT_SERVER_DATETIME_FORMAT, tz) or False
         elif release.version < '6':
             # TODO: tz change for openerp5
             for invoice in self.browse(cr, uid, ids, context=context):
@@ -75,33 +78,47 @@
     def _get_field_params(self, cr, uid, ids, name, unknow_none, context=None):
         if context is None:
             context = {}
+        account_setting_obj = self.pool.get("account.config.settings")
         ids = isinstance(ids, (int, long)) and [ids] or ids
         res = {}
-        key_by_company_id = "acc_invoice.date_invoice_type_" + str(self.pool.get("account.config.settings")._default_company(cr, uid))
-        res[ids[0]] = self.pool.get("ir.config_parameter").get_param(cr, uid, key_by_company_id, default='date', context=context)
+        key_by_company_id = "acc_invoice.date_invoice_type_" + \
+                            str(account_setting_obj._default_company(cr, uid))
+        res[ids[0]] = self.pool.get("ir.config_parameter").get_param(
+            cr, uid, key_by_company_id, default='date', context=context)
         return res
 
     _columns = {
         # Extract date_invoice from original, but add datetime
-        #'date_invoice': fields.datetime('Date Invoiced', states={'open':[
-        #('readonly',True)],'close':[('readonly',True)]},
+        # 'date_invoice': fields.datetime('Date Invoiced', states={'open':[
+        # ('readonly',True)],'close':[('readonly',True)]},
         # help="Keep empty to use the current date"),
-        'invoice_datetime': fields.datetime('Date time of invoice',
-            states={'open': [('readonly', True)], 'close': [('readonly', True)]},
+        'invoice_datetime': fields.datetime(
+            'Date time of invoice',
+            states={
+                'open': [('readonly', True)],
+                'close': [('readonly', True)]},
             help="Keep empty to use the current date"),
-        'date_invoice_tz': fields.function(_get_date_invoice_tz, method=True,
-            type='datetime', string='Date Invoiced with TZ', store=True,
+        'date_invoice_tz': fields.function(
+            _get_date_invoice_tz,
+            method=True,
+            type='datetime',
+            string='Date Invoiced with TZ',
+            store=True,
             help='Date of Invoice with Time Zone'),
-        'date_type': fields.function(_get_field_params, storage=False, type='char', string="Date type")
+        'date_type': fields.function(_get_field_params, storage=False,
+                                     type='char', string="Date type")
     }
 
     def _get_default_type(self, cr, uid, ids):
-        key_by_company_id = "acc_invoice.date_invoice_type_" + str(self.pool.get("account.config.settings")._default_company(cr, uid))
-        type_show_date = self.pool.get("ir.config_parameter").get_param(cr, uid, key_by_company_id, default='date')
+        account_setting_obj = self.pool.get("account.config.settings")
+        key_by_company_id = "acc_invoice.date_invoice_type_" + \
+                            str(account_setting_obj._default_company(cr, uid))
+        type_show_date = self.pool.get("ir.config_parameter").get_param(
+            cr, uid, key_by_company_id, default='date')
         return type_show_date
 
     _defaults = {
-        #'date_invoice': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+        # 'date_invoice': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         "date_type": _get_default_type
     }
 
@@ -111,7 +128,8 @@
         if default is None:
             default = {}
         default.update({'invoice_datetime': False, 'date_invoice': False})
-        return super(account_invoice, self).copy(cr, uid, ids, default, context)
+        return super(account_invoice, self).copy(
+            cr, uid, ids, default, context)
 
     def _get_time_zone(self, cr, uid, invoice_id, context=None):
         if context is None:
@@ -123,8 +141,9 @@
             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))
+            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)
@@ -155,9 +174,10 @@
 
         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)
+            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']
 
@@ -168,31 +188,39 @@
                     '%Y-%m-%d %H:%M:%S').date().strftime('%Y-%m-%d')
                 if date_invoice != values['date_invoice']:
                     if self.browse(cr, uid, ids)[0].date_type == 'datetime':
-                        date_invoice = fields.datetime.context_timestamp(cr, uid,
-                            datetime.datetime.strptime(values['invoice_datetime'],
-                            tools.DEFAULT_SERVER_DATETIME_FORMAT), context=context)
+                        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']
                     elif self.browse(cr, uid, ids)[0].date_type == 'date':
-                        user_hour = self._get_time_zone(cr, uid, [], context=context)
+                        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')
+                            date_invoice,
+                            time_invoice).strftime('%Y-%m-%d %H:%M:%S')
 
                         res['invoice_datetime'] = dt_invoice
                         res['date_invoice'] = values['date_invoice']
                     else:
-                        raise osv.except_osv(_('Warning!'), _('Invoice dates should be equal'))
-                    #~ else:
-                        #~ raise osv.except_osv(_('Warning!'), _('Invoice dates should be equal'))
+                        raise osv.except_osv(_('Warning!'),
+                                             _('Invoice dates should be equal')
+                                             )
+                    # ~ else:
+                    # ~ raise osv.except_osv(_('Warning!'),
+                    # _('Invoice dates should be equal'))
 
-        if  not values.get('invoice_datetime', False) and\
+        if not values.get('invoice_datetime', False) and\
                 not values.get('date_invoice', False):
-            res['date_invoice'] = fields.date.context_today(self, cr, uid, context=context)
+            res['date_invoice'] = fields.date.context_today(
+                self, cr, uid, context=context)
             res['invoice_datetime'] = fields.datetime.now()
 
         return res
@@ -200,9 +228,9 @@
     def action_move_create(self, cr, uid, ids, context=None):
         for inv in self.browse(cr, uid, ids, context=context):
             if inv.type in ('out_invoice', 'out_refund'):
-                vals_date = self.assigned_datetime(cr, uid, ids,
-                    {'invoice_datetime': inv.invoice_datetime,
-                        'date_invoice': inv.date_invoice},
+                vals_date = self.assigned_datetime(
+                    cr, uid, ids, {'invoice_datetime': inv.invoice_datetime,
+                                   'date_invoice': inv.date_invoice},
                     context=context)
                 self.write(cr, uid, ids, vals_date, context=context)
         return super(account_invoice,

=== modified file 'invoice_datetime/res_config.py'
--- invoice_datetime/res_config.py	2014-10-03 07:19:35 +0000
+++ invoice_datetime/res_config.py	2014-11-11 22:10:57 +0000
@@ -31,29 +31,45 @@
 
     _columns = {
         'groups_id': fields.many2one('res.groups', 'Category',),
-        'select_date': fields.selection([('date', 'Date'), ('datetime', 'Datetime')], string="Default date of invoices", help="Select the field you want to displayed in the invoice for the selected company."),
+        'select_date': fields.selection([('date', 'Date'), (
+            'datetime', 'Datetime')],
+            string="Default date of invoices",
+            help="Select the field you want to displayed in the \
+                  invoice for the selected company."),
     }
 
     def get_default_select_date(self, cr, uid, fields_name, context=None):
-        key_by_company_id = "acc_invoice.date_invoice_type_" + str(self._default_company(cr, uid))
-        type_show_date = self.pool.get("ir.config_parameter").get_param(cr, uid, key_by_company_id, default='date', context=context)
+        key_by_company_id = "acc_invoice.date_invoice_type_" + str(
+            self._default_company(cr, uid))
+        type_show_date = self.pool.get("ir.config_parameter").get_param(
+            cr, uid, key_by_company_id, default='date', context=context)
         return {'select_date': type_show_date}
 
     def set_default_select_date(self, cr, uid, ids, context=None):
         """ set default sale and purchase taxes for products """
-        if uid != SUPERUSER_ID and not self.pool['res.users'].has_group(cr, uid, 'base.group_erp_manager'):
-            raise openerp.exceptions.AccessError(_("Only administrators can change the settings"))
+        if uid != SUPERUSER_ID and not self.pool['res.users'].has_group(
+                cr, uid, 'base.group_erp_manager'):
+            raise openerp.exceptions.AccessError(
+                _("Only administrators can change the settings"))
         config_parameters = self.pool.get("ir.config_parameter")
         for record in self.browse(cr, uid, ids, context=context):
-            company_id = str(record.company_id and record.company_id.id or self._default_company(cr, uid))
+            company_id = str(record.company_id and
+                             record.company_id.id or
+                             self._default_company(cr, uid))
             key_by_company_id = "acc_invoice.date_invoice_type_" + company_id
-            config_parameters.set_param(cr, uid, key_by_company_id, record.select_date or '', context=context)
+            config_parameters.set_param(
+                cr, uid, key_by_company_id, record.select_date or '',
+                context=context)
 
     def onchange_company_id(self, cr, uid, ids, company_id, context=None):
-        result = super(account_config_settings, self).onchange_company_id(cr, uid, ids, company_id, context=context)
+        result = super(account_config_settings, self).onchange_company_id(
+            cr, uid, ids, company_id, context=context)
         type_date = False
         type_date = result.get('value', {})
-        key_by_company_id = "acc_invoice.date_invoice_type_" + str(company_id or self._default_company(cr, uid))
-        type_date['select_date'] = self.pool.get("ir.config_parameter").get_param(cr, uid, key_by_company_id, default='date', context=context)
+        key_by_company_id = "acc_invoice.date_invoice_type_" + str(
+            company_id or self._default_company(cr, uid))
+        type_date['select_date'] = self.pool.get(
+            "ir.config_parameter").get_param(
+            cr, uid, key_by_company_id, default='date', context=context)
         result.update({'value': type_date})
         return result

=== modified file 'invoice_datetime/tests/__init__.py'
--- invoice_datetime/tests/__init__.py	2014-09-02 23:17:12 +0000
+++ invoice_datetime/tests/__init__.py	2014-11-11 22:10:57 +0000
@@ -25,7 +25,3 @@
 #
 
 from . import test_invoice_datetime
-
-fast_suite = [
-    test_invoice_datetime
-]

=== modified file 'invoice_datetime/tests/test_invoice_datetime.py'
--- invoice_datetime/tests/test_invoice_datetime.py	2014-10-07 21:42:33 +0000
+++ invoice_datetime/tests/test_invoice_datetime.py	2014-11-11 22:10:57 +0000
@@ -25,13 +25,7 @@
 #
 
 from openerp.tests.common import TransactionCase
-from openerp.exceptions import AccessError
-from openerp.osv.orm import except_orm
-from openerp import SUPERUSER_ID
-import mock
-from openerp.addons.invoice_datetime.invoice import account_invoice
 from openerp.tools import mute_logger
-import pytz
 import time
 import datetime
 import logging
@@ -49,37 +43,46 @@
         cr, uid = self.cr, self.uid
         # get datetime of server in string
         dt_server = time.strftime('%Y-%m-%d %H:%M:%S')
-        # I generate object of type datetime to send at function _get_datetime_with_user_tz
+        # I generate object of type datetime
+        # to send at function _get_datetime_with_user_tz
         datetime_object = datetime.datetime.strptime(dt_server,
                                                      '%Y-%m-%d %H:%M:%S')
         # create list with tz to apply in datetime
-        self.user.write(cr, uid, uid, {'tz': 'Europe/Rome'}) #Assign tz to user
-        #call the function _get_datetime_with_user_tz to get the date with tz applied
-        datetime_tz_rome = self.invoice._get_datetime_with_user_tz(cr, uid,
-                                                         datetime_object)
+        self.user.write(cr, uid, uid, {'tz': 'Europe/Rome'})
+        # Assign tz to user
+        # call the function _get_datetime_with_user_tz
+        # to get the date with tz applied
+        datetime_tz_rome = self.invoice._get_datetime_with_user_tz(
+            cr, uid, datetime_object)
         # Create an invoice with last tz of cycle America/Mexico_City
-        invoice_tz_rome_id = self.invoice.create(cr, uid, {
-                                                'partner_id':1,
-                                                'account_id':1,
-                                                'invoice_datetime': dt_server})
-        self.user.write(cr, uid, uid, {'tz': 'America/Mexico_City'}) #Assign tz to user
-        datetime_tz_mx = self.invoice._get_datetime_with_user_tz(cr, uid,
-                                                         datetime_object)
-        invoice_tz_mx_id = self.invoice.create(cr, uid, {
-                                                'partner_id':1,
-                                                'account_id':1,
-                                                'invoice_datetime': dt_server})
-        dt_inv_tz_rome = self.invoice.read(cr, uid, invoice_tz_rome_id, []).get('date_invoice_tz')
-        dt_inv_tz_mx = self.invoice.read(cr, uid, invoice_tz_mx_id, []).get('date_invoice_tz')
+        invoice_tz_rome_id = self.invoice.create(
+            cr, uid,
+            {'partner_id': 1,
+             'account_id': 1,
+             'invoice_datetime': dt_server})
+        self.user.write(cr, uid, uid, {'tz': 'America/Mexico_City'})
+        # Assign tz to user
+        datetime_tz_mx = self.invoice._get_datetime_with_user_tz(
+            cr, uid, datetime_object)
+        invoice_tz_mx_id = self.invoice.create(
+            cr, uid,
+            {'partner_id': 1,
+             'account_id': 1,
+             'invoice_datetime': dt_server})
+        dt_inv_tz_rome = self.invoice.read(
+            cr, uid, invoice_tz_rome_id, []).get('date_invoice_tz')
+        dt_inv_tz_mx = self.invoice.read(
+            cr, uid, invoice_tz_mx_id, []).get('date_invoice_tz')
         _logger.info("Validate datetime of function, for Rome-Mexico_City TZ")
-        self.assertNotEqual(datetime_tz_rome,
-                 datetime_tz_mx, 'Dates are equal, should be different')
+        self.assertNotEqual(
+            datetime_tz_rome,
+            datetime_tz_mx, 'Dates are equal, should be different')
         _logger.info("Validate datetime of function versus invoice datetime")
         self.assertEquals(datetime_tz_rome, dt_inv_tz_rome,
-                'Date calculated and date of invoice are not equals')
+                          'Date calculated and date of invoice are not equals')
         self.assertEquals(datetime_tz_mx, dt_inv_tz_mx,
-                'Date calculated and date of invoice are not equals')
+                          'Date calculated and date of invoice are not equals')
         _logger.info("Validate invoice datetime, for Rome-Mexico_City TZ")
-        self.assertNotEqual(dt_inv_tz_rome,
-                dt_inv_tz_mx, 'Dates are equal, must be different on invoices')
-        
+        self.assertNotEqual(
+            dt_inv_tz_rome,
+            dt_inv_tz_mx, 'Dates are equal, must be different on invoices')