Merge lp:~vauxoo/addons-vauxoo/7.0-invoice-datetime-dev-sabrina into lp:addons-vauxoo/7.0

[Sabrina Romero - http://www.vauxoo.com]

Variable 'ids' not defined error fixed.

[lp:~vauxoo/addons-vauxoo/7.0-invoice-datetime-dev-sabrina]

1133. By Luis Ernesto García Medina - http://www.vauxoo.com on 2014-09-22

[REF][invoice_datetime] fix warnings of pylint test of variables names.

[Sabrina Romero - http://www.vauxoo.com (sabrina)]

Les dejo el diff de los errores arrojados por pylint:

diff --git a/before b/after
index 2e69268..297c382 100644
--- a/before
+++ b/after
@@ -1,17 +1,3 @@
-************* Module openerp.addons.invoice_datetime.res_config
-openerp.addons.invoice_datetime.res_config:43: [W0621(redefined-outer-name), account_config_settings.get_default_select_date] Redefining name 'fields' from outer scope (line 30)
-openerp.addons.invoice_datetime.res_config:51: [E0602(undefined-variable), account_config_settings.set_default_select_date] Undefined variable 'openerp'
-************* Module openerp.addons.invoice_datetime.invoice
-openerp.addons.invoice_datetime.invoice:45: [W0622(redefined-builtin), account_payment_term.compute] Redefining built-in 'id'
-openerp.addons.invoice_datetime.invoice:52: [W0702(bare-except), account_payment_term.compute] No exception type(s) specified
-openerp.addons.invoice_datetime.invoice:67: [W0612(unused-variable), account_invoice._get_date_invoice_tz] Unused variable 'dt_format'
-openerp.addons.invoice_datetime.invoice:113: [W0622(redefined-builtin), account_invoice.copy] Redefining built-in 'id'
-openerp.addons.invoice_datetime.invoice:126: [C0103(invalid-name), account_invoice._get_time_zone] Invalid variable name "a"
-openerp.addons.invoice_datetime.invoice:136: [C0103(invalid-name), account_invoice._get_time_zone] Invalid variable name "s"
-openerp.addons.invoice_datetime.invoice:137: [C0103(invalid-name), account_invoice._get_time_zone] Invalid variable name "s"
-openerp.addons.invoice_datetime.invoice:139: [C0103(invalid-name), account_invoice._get_time_zone] Invalid variable name "a"
-openerp.addons.invoice_datetime.invoice:175: [E0602(undefined-variable), account_invoice.assigned_datetime] Undefined variable 'ids'
-openerp.addons.invoice_datetime.invoice:181: [E0602(undefined-variable), account_invoice.assigned_datetime] Undefined variable 'ids'
 ************* Module openerp.addons.account_aged_partner_balance_vw.wizard.wizard_open_move_line
 openerp.addons.account_aged_partner_balance_vw.wizard.wizard_open_move_line:43: [W0622(redefined-builtin), wizard_open_move_line._open_window] Redefining built-in 'id'
 openerp.addons.account_aged_partner_balance_vw.wizard.wizard_open_move_line:31: [W0102(dangerous-default-value), wizard_open_move_line._open_window] Dangerous default value {} as argument

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

review: Approve

=== modified file 'invoice_datetime/invoice.py'
--- invoice_datetime/invoice.py	2014-08-05 16:41:41 +0000
+++ invoice_datetime/invoice.py	2014-09-22 22:48:18 +0000
@@ -42,16 +42,16 @@
 class account_payment_term(osv.Model):
     _inherit = "account.payment.term"
 
-    def compute(self, cr, uid, id, value, date_ref=False, context=None):
+    def compute(self, cr, uid, ids, value, date_ref=False, context=None):
         if context is None:
             context = {}
         if date_ref:
             try:
                 date_ref = time.strftime('%Y-%m-%d', time.strptime(
                     date_ref, '%Y-%m-%d %H:%M:%S'))
-            except:
+            except Exception, e:
                 pass
-        return super(account_payment_term, self).compute(cr, uid, id, value,
+        return super(account_payment_term, self).compute(cr, uid, ids, value,
             date_ref, context=context)
 
 
@@ -64,7 +64,6 @@
             context = {}
         res = {}
         if release.version >= '6':
-            dt_format = tools.DEFAULT_SERVER_DATETIME_FORMAT
             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.\
@@ -110,20 +109,20 @@
         "date_type": _get_default_type
     }
         
-    def copy(self, cr, uid, id, default=None, context=None):
+    def copy(self, cr, uid, ids, default=None, context=None):
         if context is None:
             context = {}
         if default is None:
             default = {}
         default.update({'invoice_datetime': False, 'date_invoice' : False})
-        return super(account_invoice, self).copy(cr, uid, id, 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:
             context = {}
         res_users_obj = self.pool.get('res.users')
         userstz = res_users_obj.browse(cr, uid, [uid])[0].partner_id.tz
-        a = 0
+        result = 0
         if userstz:
             hours = timezone(userstz)
             fmt = '%Y-%m-%d %H:%M:%S %Z%z'
@@ -133,14 +132,14 @@
             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 + ((
+            str_datetime = str(datetime.datetime.now(pytz.timezone(userstz)))
+            str_datetime = str_datetime[-6:-3]
+            timezone_present = int(str_datetime)*-1
+            result = timezone_original + ((
                 timezone_present + timezone_original)*-1)
-        return a
+        return result
     
-    def assigned_datetime(self, cr, uid, values, context=None):
+    def assigned_datetime(self, cr, uid, ids, values, context=None):
         if context is None:
             context = {}
         res = {}
@@ -205,7 +204,7 @@
     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,
+                vals_date = self.assigned_datetime(cr, uid, ids,
                     {'invoice_datetime': inv.invoice_datetime,
                         'date_invoice': inv.date_invoice},
                         context=context)

=== modified file 'invoice_datetime/res_config.py'
--- invoice_datetime/res_config.py	2014-08-04 13:52:04 +0000
+++ invoice_datetime/res_config.py	2014-09-22 22:48:18 +0000
@@ -21,6 +21,7 @@
 
 import time
 import datetime
+import openerp
 from dateutil.relativedelta import relativedelta
 from operator import itemgetter
 from os.path import join as opj
@@ -40,7 +41,7 @@
         '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, context=None):
+    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)
         return {'select_date': type_show_date}