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

Proposed by Julio Serna-http://www.vauxoo.com
Status: Merged
Merged at revision: 1160
Proposed branch: lp:~vauxoo/addons-vauxoo/7.0-addons-vauxoo-pylint-dev-julio
Merge into: lp:addons-vauxoo/7.0
Diff against target: 51 lines (+5/-0)
3 files modified
account_voucher_tax/account_voucher.py (+2/-0)
hr_expense_replenishment/model/hr_expense.py (+2/-0)
hr_expense_replenishment_tax/model/hr_expense.py (+1/-0)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/7.0-addons-vauxoo-pylint-dev-julio
Reviewer Review Type Date Requested Status
Moisés López - http://www.vauxoo.com Pending
Review via email: mp+241717@code.launchpad.net

Description of the change

applied disable locally errors of pylint

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account_voucher_tax/account_voucher.py'
--- account_voucher_tax/account_voucher.py 2014-11-12 22:19:44 +0000
+++ account_voucher_tax/account_voucher.py 2014-11-13 17:41:57 +0000
@@ -128,6 +128,7 @@
128 move_ids.append(move_create)128 move_ids.append(move_create)
129 return move_ids129 return move_ids
130130
131 # pylint: disable=W0622
131 def _preparate_move_line_tax(self, cr, uid, src_account_id, dest_account_id,132 def _preparate_move_line_tax(self, cr, uid, src_account_id, dest_account_id,
132 move_id, type, partner, period, journal, date,133 move_id, type, partner, period, journal, date,
133 company_currency, reference_amount,134 company_currency, reference_amount,
@@ -520,6 +521,7 @@
520 dat = cr.dictfetchall()521 dat = cr.dictfetchall()
521 return dat522 return dat
522523
524 # pylint: disable=W0622
523 def reconcile(self, cr, uid, ids, type='auto', writeoff_acc_id=False, writeoff_period_id=False, writeoff_journal_id=False, context=None):525 def reconcile(self, cr, uid, ids, type='auto', writeoff_acc_id=False, writeoff_period_id=False, writeoff_journal_id=False, context=None):
524 res = super(account_move_line, self).reconcile(cr, uid, ids=ids,526 res = super(account_move_line, self).reconcile(cr, uid, ids=ids,
525 type='auto', writeoff_acc_id=writeoff_acc_id, writeoff_period_id=writeoff_period_id,527 type='auto', writeoff_acc_id=writeoff_acc_id, writeoff_period_id=writeoff_period_id,
526528
=== modified file 'hr_expense_replenishment/model/hr_expense.py'
--- hr_expense_replenishment/model/hr_expense.py 2014-11-12 22:19:44 +0000
+++ hr_expense_replenishment/model/hr_expense.py 2014-11-13 17:41:57 +0000
@@ -480,6 +480,7 @@
480480
481 return adv_ids + exp_ids + [lc], []481 return adv_ids + exp_ids + [lc], []
482482
483 # pylint: disable=R0911
483 def expense_reconcile_partial_payment(self, cr, uid, ids, aml, context=None):484 def expense_reconcile_partial_payment(self, cr, uid, ids, aml, context=None):
484 """485 """
485 This method make a distribution of the advances, whenever applies486 This method make a distribution of the advances, whenever applies
@@ -1047,6 +1048,7 @@
1047class account_move_line(osv.osv):1048class account_move_line(osv.osv):
1048 _inherit = "account.move.line"1049 _inherit = "account.move.line"
10491050
1051 # pylint: disable=W0622
1050 def reconcile(self, cr, uid, ids, type='auto', writeoff_acc_id=False,1052 def reconcile(self, cr, uid, ids, type='auto', writeoff_acc_id=False,
1051 writeoff_period_id=False, writeoff_journal_id=False,1053 writeoff_period_id=False, writeoff_journal_id=False,
1052 context=None):1054 context=None):
10531055
=== modified file 'hr_expense_replenishment_tax/model/hr_expense.py'
--- hr_expense_replenishment_tax/model/hr_expense.py 2014-11-13 00:57:59 +0000
+++ hr_expense_replenishment_tax/model/hr_expense.py 2014-11-13 17:41:57 +0000
@@ -234,6 +234,7 @@
234class account_move_line(osv.osv):234class account_move_line(osv.osv):
235 _inherit = "account.move.line"235 _inherit = "account.move.line"
236236
237 # pylint: disable=W0622
237 def reconcile(self, cr, uid, ids, type='auto', writeoff_acc_id=False,238 def reconcile(self, cr, uid, ids, type='auto', writeoff_acc_id=False,
238 writeoff_period_id=False, writeoff_journal_id=False,239 writeoff_period_id=False, writeoff_journal_id=False,
239 context=None):240 context=None):