Merge lp:~vauxoo/addons-vauxoo/7.0-addons-vauxoo-pylint-dev-julio into lp:addons-vauxoo/7.0

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

Resolved errors of pylint

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

1159. By Julio Serna-http://www.vauxoo.com on 2014-11-13

[IMP][pylint] applied pylint

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

review: Approve

=== modified file 'account_invoice_tax/account_invoice_tax.py'
--- account_invoice_tax/account_invoice_tax.py	2014-10-03 07:19:35 +0000
+++ account_invoice_tax/account_invoice_tax.py	2014-11-13 00:58:25 +0000
@@ -113,9 +113,9 @@
                     tax_grouped[key]['base_amount'] += val['base_amount']
                     tax_grouped[key]['tax_amount'] += val['tax_amount']
 
-        for t in tax_grouped.values():
-            t['base'] = cur_obj.round(cr, uid, cur, t['base'])
-            t['amount'] = cur_obj.round(cr, uid, cur, t['amount'])
-            t['base_amount'] = cur_obj.round(cr, uid, cur, t['base_amount'])
-            t['tax_amount'] = cur_obj.round(cr, uid, cur, t['tax_amount'])
+        for dat_tax in tax_grouped.values():
+            dat_tax['base'] = cur_obj.round(cr, uid, cur, dat_tax['base'])
+            dat_tax['amount'] = cur_obj.round(cr, uid, cur, dat_tax['amount'])
+            dat_tax['base_amount'] = cur_obj.round(cr, uid, cur, dat_tax['base_amount'])
+            dat_tax['tax_amount'] = cur_obj.round(cr, uid, cur, dat_tax['tax_amount'])
         return tax_grouped

=== modified file 'account_move_line_base_tax/account.py'
--- account_move_line_base_tax/account.py	2014-10-03 07:19:35 +0000
+++ account_move_line_base_tax/account.py	2014-11-13 00:58:25 +0000
@@ -90,21 +90,21 @@
         super(account_invoice_tax, self).move_line_get(cr, uid, invoice_id)
         tax_invoice_ids = self.search(cr, uid, [
             ('invoice_id', '=', invoice_id)], context=context)
-        for t in self.browse(cr, uid, tax_invoice_ids, context=context):
-            if not t.amount and not t.tax_code_id and not t.tax_amount:
+        for inv_t in self.browse(cr, uid, tax_invoice_ids, context=context):
+            if not inv_t.amount and not inv_t.tax_code_id and not inv_t.tax_amount:
                 continue
             res.append({
                 'type': 'tax',
-                'name': t.name,
-                'price_unit': t.amount,
+                'name': inv_t.name,
+                'price_unit': inv_t.amount,
                 'quantity': 1,
-                'price': t.amount or 0.0,
-                'account_id': t.account_id.id or False,
-                'tax_code_id': t.tax_code_id.id or False,
-                'tax_amount': t.tax_amount or False,
-                'account_analytic_id': t.account_analytic_id.id or False,
-                'amount_base': t.base_amount or 0.0,
-                'tax_id_secondary': t.tax_id.id or False,
+                'price': inv_t.amount or 0.0,
+                'account_id': inv_t.account_id.id or False,
+                'tax_code_id': inv_t.tax_code_id.id or False,
+                'tax_amount': inv_t.tax_amount or False,
+                'account_analytic_id': inv_t.account_analytic_id.id or False,
+                'amount_base': inv_t.base_amount or 0.0,
+                'tax_id_secondary': inv_t.tax_id.id or False,
             })
         return res
 
@@ -112,11 +112,11 @@
 class account_invoice(osv.Model):
     _inherit = 'account.invoice'
 
-    def line_get_convert(self, cr, uid, x, part, date, context=None):
-        res = super(account_invoice, self).line_get_convert(cr, uid, x, part,
+    def line_get_convert(self, cr, uid, value, part, date, context=None):
+        res = super(account_invoice, self).line_get_convert(cr, uid, value, part,
             date, context=context)
         res.update({
-            'amount_base': x.get('amount_base', False),
-            'tax_id_secondary': x.get('tax_id_secondary', False),
+            'amount_base': value.get('amount_base', False),
+            'tax_id_secondary': value.get('tax_id_secondary', False),
         })
         return res

=== modified file 'account_voucher_tax/account_voucher.py'
--- account_voucher_tax/account_voucher.py	2014-10-03 07:19:35 +0000
+++ account_voucher_tax/account_voucher.py	2014-11-13 00:58:25 +0000
@@ -182,17 +182,21 @@
             credit_line_vals.update({'debit': credit_line_vals.get('credit', 0.0), 'credit': 0.0})
 
         if type in ('payment', 'purchase'):
-            reference_amount < 0 and\
-                [credit_line_vals.pop('analytic_account_id'),
-                credit_line_vals.update({'amount_base': abs(amount_base),
-                                        'tax_id_secondary': tax_secondary})] or\
-                [debit_line_vals.pop('analytic_account_id'),
-                debit_line_vals.update({'tax_id_secondary': tax_secondary,
-                                        'amount_base': abs(amount_base)})]
+            if reference_amount < 0:
+                credit_line_vals.pop('analytic_account_id')
+                credit_line_vals.update({
+                    'amount_base': abs(amount_base),
+                    'tax_id_secondary': tax_secondary})
+            else:
+                debit_line_vals.pop('analytic_account_id')
+                debit_line_vals.update({
+                    'tax_id_secondary': tax_secondary,
+                    'amount_base': abs(amount_base)})
         else:
-            reference_amount < 0 and\
-                [debit_line_vals.pop('analytic_account_id'),
-                debit_line_vals.pop('tax_id_secondary')] or\
+            if reference_amount < 0:
+                debit_line_vals.pop('analytic_account_id')
+                debit_line_vals.pop('tax_id_secondary')
+            else:
                 credit_line_vals.pop('analytic_account_id')
 
         if not amount_tax_unround:
@@ -233,7 +237,7 @@
 
     def voucher_move_line_create(self, cr, uid, voucher_id, line_total, move_id, company_currency, current_currency, context=None):
         res = super(account_voucher, self).voucher_move_line_create(cr, uid, voucher_id, line_total, move_id, company_currency, current_currency, context=None)
-        new = self.voucher_move_line_tax_create(cr, uid, voucher_id, move_id, context=context)
+        self.voucher_move_line_tax_create(cr, uid, voucher_id, move_id, context=context)
         #~ res[1] and res[1][0]+new
         return res
 
@@ -539,7 +543,7 @@
         for res_diff_id in res_round.items():
             diff_val = abs(res_without_round[res_diff_id[0]]) - abs(res_round[res_diff_id[0]])
             diff_val = round(diff_val, 2)
-            if diff_val <> 0.00:
+            if diff_val != 0.00:
                 move_diff_id = [res_ids[res_diff_id[0]]]
                 for move in self.browse(cr, uid, move_diff_id, context=context):
                     move_line_ids = self.search(cr, uid, [('move_id', '=', move.move_id.id), ('tax_id', '=', move.tax_id.id)])
@@ -564,11 +568,11 @@
         res = {}
 
         for line_tax in self.browse(cr, uid, ids, context=context):
-            sum = 0.0
+            tax_sum = 0.0
             old_ids = self.search(cr, uid, [('move_line_id', '=', line_tax.move_line_id.id), ('id', '!=', line_tax.id)])
             for lin_sum in self.browse(cr, uid, old_ids, context=context):
-                sum += lin_sum.amount_tax
-            res[line_tax.id] = line_tax.original_tax - sum
+                tax_sum += lin_sum.amount_tax
+            res[line_tax.id] = line_tax.original_tax - tax_sum
         return res
 
     def onchange_amount_tax(self, cr, uid, ids, amount, tax):

=== modified file 'account_voucher_tax/invoice.py'
--- account_voucher_tax/invoice.py	2014-10-03 07:19:35 +0000
+++ account_voucher_tax/invoice.py	2014-11-13 00:58:25 +0000
@@ -38,13 +38,13 @@
         inv = self.browse(cr, uid, ids[0], context=context)
         inv_ids = []
         result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'action_voucher_list')
-        id = result and result[1] or False
+        id_pay = result and result[1] or False
         if inv.type == 'out_invoice' or inv.type == 'out_refund':
             view_type = 'view_vendor_receipt_form'
         else:
             view_type = 'view_vendor_payment_form'
         res = mod_obj.get_object_reference(cr, uid, 'account_voucher', view_type)
-        result = act_obj.read(cr, uid, [id], context=context)[0]
+        result = act_obj.read(cr, uid, [id_pay], context=context)[0]
         result['views'] = [(res and res[1] or False, 'form')]
         result['context'] = {
             'default_partner_id': self.pool.get('res.partner')._find_accounting_partner(inv.partner_id).id,

=== modified file 'email_template_att_dinamic/model/email_template.py'
--- email_template_att_dinamic/model/email_template.py	2014-10-03 07:19:35 +0000
+++ email_template_att_dinamic/model/email_template.py	2014-11-13 00:58:25 +0000
@@ -23,6 +23,7 @@
 
 
 from openerp.osv import osv, fields
+import ast
 
 
 class email_template(osv.Model):
@@ -62,7 +63,7 @@
             if template and template.att_other_field:
                 att_field_render = template_obj.render_template(cr, uid,
                     template.att_other_field, template.model, res_id, context=context)
-                attach += [id_att for id_att in eval("[" + att_field_render + "]") if att_field_render]
+                attach += [id_att for id_att in ast.literal_eval("[" + att_field_render + "]") if att_field_render]
 
         attach += res.get('value', {}).pop('attachment_ids', [])
         res.get('value', {}).update({'attachment_ids': [(6, 0, attach)]})

=== modified file 'hr_expense_analytic/hr_expense_analytic.py'
--- hr_expense_analytic/hr_expense_analytic.py	2014-05-09 21:51:34 +0000
+++ hr_expense_analytic/hr_expense_analytic.py	2014-11-13 00:58:25 +0000
@@ -38,7 +38,9 @@
 class hr_expense_line(osv.Model):
     _inherit = "hr.expense.line"
 
-    def _get_analytic(self, cr, uid, context={}):
+    def _get_analytic(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         if context['depto']:
             depto = self.pool.get('hr.department').browse(
                 cr, uid, [context['depto']])[0]

=== modified file 'hr_expense_replenishment/model/account_invoice.py'
--- hr_expense_replenishment/model/account_invoice.py	2014-10-03 07:19:35 +0000
+++ hr_expense_replenishment/model/account_invoice.py	2014-11-13 00:58:25 +0000
@@ -58,12 +58,12 @@
             exp_obj.write(cr, uid, exp_id, {'line_ids': data}, context=context)
         return True
 
-    def copy(self, cr, uid, id, default=None, context=None):
+    def copy(self, cr, uid, ids, default=None, context=None):
         if default is None:
             default = {}
         default = default.copy()
         default.update({'expense_id': False})
-        return super(account_invoice, self).copy(cr, uid, id, default, context=context)
+        return super(account_invoice, self).copy(cr, uid, ids, default, context=context)
 
 
 class account_invoice_line(osv.Model):

=== modified file 'hr_expense_replenishment/model/hr_expense.py'
--- hr_expense_replenishment/model/hr_expense.py	2014-10-03 07:19:35 +0000
+++ hr_expense_replenishment/model/hr_expense.py	2014-11-13 00:58:25 +0000
@@ -61,8 +61,6 @@
         cur_obj = self.pool.get('res.currency')
         res = super(hr_expense_expense, self)._amount(
             cr, uid, ids, field_name, arg, context=context)
-        acc_payable_ids = self.pool.get('account.account').search(
-            cr, uid, [('type', '=', 'payable')], context=context)
         for expense in self.browse(cr, uid, res.keys(), context=context):
             for invoice in expense.invoice_ids:
                 if expense.state in ('draft', 'confirm', 'accepted', 'cancelled'):
@@ -180,7 +178,7 @@
             'Status', readonly=True, track_visibility='onchange',
             help=_('When the expense request is created the status is '
             '\'Draft\'.\n It is confirmed by the user and request is sent to '
-            'admin, the status is \'Waiting Confirmation\'.\ \nIf the admin '
+            'admin, the status is \'Waiting Confirmation\'. \nIf the admin '
             'accepts it, the status is \'Accepted\'.\n If the accounting '
             'entries are made for the expense request, the status is '
             '\'Waiting Payment\'.')),
@@ -250,7 +248,7 @@
         inv_brws = self.browse(cr, uid, ids[0], context=context).invoice_ids
         res = [True]
         if inv_brws:
-            res += map(lambda x: x.state == 'open' and True or False, inv_brws)
+            res += [inv.state == 'open' and True or False for inv in inv_brws]
             res = all(res)
         if not res:
             raise osv.except_osv(
@@ -300,7 +298,7 @@
             cr.execute(('SELECT aml_id FROM expense_advance_rel '
                         'WHERE expense_id != %s'), (exp.id,))
             already_use_aml = cr.fetchall()
-            already_use_aml = map(lambda x: x[0], already_use_aml)
+            already_use_aml = [dat[0] for dat in already_use_aml]
             aml_ids = list(set(aml_ids) - set(already_use_aml))
             vals['advance_ids'] = \
                 [(6, 0, aml_ids)]
@@ -352,10 +350,6 @@
                 [brw.id
                  for brw in exp.account_move_id.line_id
                  if brw.credit > 0.0]
-            if not exp_credit:
-                [brw.id for brw in exp.account_move_id.line_id]
-                # Really!!!
-                #aml_obj.unlink(cr, uid, empty_aml_ids, context=context)
 
             #~ manage the expense move lines
             exp_aml_brws = exp.account_move_id and \
@@ -445,7 +439,7 @@
                 try:
                     aml_obj.reconcile(
                         cr, uid, line_pair, 'manual', context=context)
-                except:
+                except BaseException:
                     new_line_pair = self.invoice_counter_move_lines(cr, uid, exp.id,
                         am_id=exp.account_move_id.id, aml_ids=line_pair,
                         context=context)
@@ -459,7 +453,7 @@
                     cr, uid, line_pair, 'manual', context=context)
         return aml
 
-    def expense_reconcile_partial_deduction(self, cr, uid, ids, d, context=None):
+    def expense_reconcile_partial_deduction(self, cr, uid, ids, aml, context=None):
         """
         This method make a distribution of the advances, whenever applies
         paying fully those invoice that can be paid and leaving just a remaining
@@ -471,23 +465,22 @@
         ids = isinstance(ids, (int, long)) and [ids] or ids
         exp = self.browse(cr, uid, ids[0], context=context)
 
-        adv_ids = d['advances']
-        exp_ids = d['exp']
-
-        sum_adv = d['debit']
-        d['exp_sum']
-        sum_inv = d['inv_sum']
-
-        ld = sum_adv - d['credit']  # Remaining Advance
-        ld and self.expense_debit_lines(cr, uid, exp.id, exp.account_move_id.id,
-                    ld)
-        lc = sum_adv - d['credit'] + sum_inv
+        adv_ids = aml['advances']
+        exp_ids = aml['exp']
+
+        sum_adv = aml['debit']
+        sum_inv = aml['inv_sum']
+
+        ld = sum_adv - aml['credit']  # Remaining Advance
+        if ld:
+            self.expense_debit_lines(cr, uid, exp.id, exp.account_move_id.id, ld)
+        lc = sum_adv - aml['credit'] + sum_inv
         lc = self.expense_credit_lines(cr, uid, exp.id, exp.account_move_id.id,
                     lc)
 
         return adv_ids + exp_ids + [lc], []
 
-    def expense_reconcile_partial_payment(self, cr, uid, ids, d, context=None):
+    def expense_reconcile_partial_payment(self, cr, uid, ids, aml, context=None):
         """
         This method make a distribution of the advances, whenever applies
         paying fully those invoice that can be paid and leaving just a remaining
@@ -499,12 +492,12 @@
         ids = isinstance(ids, (int, long)) and [ids] or ids
         exp = self.browse(cr, uid, ids[0], context=context)
 
-        adv_ids = d['advances']
-        exp_ids = d['exp']
+        adv_ids = aml['advances']
+        exp_ids = aml['exp']
 
-        sum_adv = d['debit']
-        sum_exp = d['exp_sum']
-        sum_inv = d['inv_sum']
+        sum_adv = aml['debit']
+        sum_exp = aml['exp_sum']
+        sum_inv = aml['inv_sum']
         partial_rec = []
         full_rec = []
 
@@ -960,19 +953,18 @@
             self.write(cr, uid, exp.id, {'state': 'paid'}, context=context)
         return True
 
-    def copy(self, cr, uid, id, default=None, context=None):
+    def copy(self, cr, uid, ids, default=None, context=None):
         if default is None:
             default = {}
         default = default.copy()
         default.update({'advance_ids': [],
                         'invoice_ids': [],
                         'payment_ids': [],
-                        'advance_ids': [],
                         'ail_ids': [],
                         'ait_ids': [],
                         'date_post': False,
                         })
-        return super(hr_expense_expense, self).copy(cr, uid, id, default,
+        return super(hr_expense_expense, self).copy(cr, uid, ids, default,
                         context=context)
 
     def show_entries(self, cr, uid, ids, context=None):
@@ -988,7 +980,7 @@
                        for move2 in inv.move_id.line_id]
         return {
             'domain': "[('id','in',\
-                [" + ','.join(map(str, res_exp + res_adv + res_pay + res_inv)) + "])]",
+                [" + ','.join([str(dat) for dat in res_exp + res_adv + res_pay + res_inv]) + "])]",
             'name': _('Entries'),
             'view_type': 'form',
             'view_mode': 'tree,form',
@@ -1109,7 +1101,7 @@
 class hr_expense_line(osv.Model):
     _inherit = "hr.expense.line"
 
-    def _get_analytic(self, cr, uid, context={}):
+    def _get_analytic(self, cr, uid, context=None):
         context = context or {}
         res = super(hr_expense_line, self)._get_analytic(cr, uid,
             context=context)

=== modified file 'hr_expense_replenishment_tax/model/hr_expense.py'
--- hr_expense_replenishment_tax/model/hr_expense.py	2014-10-03 07:19:35 +0000
+++ hr_expense_replenishment_tax/model/hr_expense.py	2014-11-13 00:58:25 +0000
@@ -35,13 +35,13 @@
                                     digits_compute=dp.get_precision('Account'))
     }
 
-    def copy(self, cr, uid, id, default=None, context=None):
+    def copy(self, cr, uid, ids, default=None, context=None):
         if default is None:
             default = {}
         default = default.copy()
         default.update({'fully_applied_vat': False,
                         })
-        return super(hr_expense_expense, self).copy(cr, uid, id, default,
+        return super(hr_expense_expense, self).copy(cr, uid, ids, default,
                         context=context)
 
     def payment_reconcile(self, cr, uid, ids, context=None):
@@ -69,10 +69,12 @@
             self.apply_round_tax(cr, uid, exp.id, context=context)
         return True
 
-    def create_her_tax(self, cr, uid, ids, aml={}, context=None):
+    def create_her_tax(self, cr, uid, ids, aml=None, context=None):
         aml_obj = self.pool.get('account.move.line')
         acc_voucher_obj = self.pool.get('account.voucher')
         context = context or {}
+        if aml is None:
+            aml = {}
         ids = isinstance(ids, (int, long)) and [ids] or ids
         exp = self.browse(cr, uid, ids, context=context)[0]
 
@@ -136,7 +138,7 @@
                         tax.base_amount, factor, context=context)
 
                     for move_line_tax in move_lines_tax:
-                        move_create = aml_obj.create(cr, uid, move_line_tax,
+                        aml_obj.create(cr, uid, move_line_tax,
                                                 context=context)
 
         self.write(cr, uid, ids,
@@ -171,7 +173,9 @@
         ])
         return move_tax_ids
 
-    def unlink_move_tax(self, cr, uid, exp, context={}):
+    def unlink_move_tax(self, cr, uid, exp, context=None):
+        if context is None:
+            context = {}
         aml_obj = self.pool.get('account.move.line')
         move_ids = self.move_tax_expense(cr, uid, exp, context=context)
         aml_obj.unlink(cr, uid, move_ids)
@@ -191,7 +195,7 @@
                     move_without_round += abs(move.amount_tax_unround)
             move_diff = abs(move_without_round) - abs(move_round)
             move_diff = round(move_diff, 2)
-            if move_diff <> 0.00:
+            if move_diff != 0.00:
                 move_ids.sort()
                 for move_line in aml_obj.browse(cr, uid, move_ids[-2:],
                                                 context=context):