diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 0b03f52a1e9..173f0651a90 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -454,4 +454,4 @@ class account_bank_statement_line(osv.osv):
account_bank_statement_line()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index ffcc979169d..0f14fb77bb6 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -95,7 +95,7 @@ class account_cash_statement(osv.osv):
@param arg: User defined arguments
@return: Dictionary of values.
"""
- res ={}
+ res = {}
for statement in self.browse(cr, uid, ids):
amount_total = 0.0
for line in statement.ending_details_ids:
@@ -110,7 +110,7 @@ class account_cash_statement(osv.osv):
@param arg: User defined arguments
@return: Dictionary of values.
"""
- res2={}
+ res2 = {}
for statement in self.browse(cr, uid, ids):
encoding_total=0.0
for line in statement.line_ids:
@@ -297,7 +297,6 @@ class account_cash_statement(osv.osv):
"""
res = {}
balance_start = 0.0
-
if not journal_id:
res.update({
'balance_start': balance_start
@@ -311,8 +310,7 @@ class account_cash_statement(osv.osv):
statement.balance_end_real = statement.balance_end
if statement.balance_end != statement.balance_end_cash:
return False
- else:
- return True
+ return True
def _user_allow(self, cr, uid, statement_id, context=None):
return True
diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index d4abad7d924..dd9c01142c3 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -220,7 +220,7 @@
1113
Reserve and Profit/Loss Account
- payable
+ other
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 01a14fbc4d0..f0f23f8d4e2 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -201,7 +201,7 @@
X1113
Reserve and Profit/Loss - (test)
- payable
+ other
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 8bd7b64f3f4..24bc8ca43c1 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -30,7 +30,7 @@ from tools.translate import _
class account_move_line(osv.osv):
_inherit = 'account.move.line'
- def _unreconciled(self, cr, uid, ids, prop, unknow_none, context):
+ def _unreconciled(self, cr, uid, ids, prop, unknow_none, context=None):
res = {}
for line in self.browse(cr, uid, ids, context=context):
res[line.id] = line.debit - line.credit
@@ -71,7 +71,7 @@ class account_voucher(osv.osv):
res = journal_pool.search(cr, uid, [('type', '=', ttype)], limit=1)
return res and res[0] or False
- def _get_tax(self, cr, uid, context={}):
+ def _get_tax(self, cr, uid, context=None):
journal_pool = self.pool.get('account.journal')
journal_id = context.get('journal_id', False)
if not journal_id:
@@ -207,14 +207,14 @@ class account_voucher(osv.osv):
'tax_id': _get_tax,
}
- def compute_tax(self, cr, uid, ids, context={}):
+ def compute_tax(self, cr, uid, ids, context=None):
tax_pool = self.pool.get('account.tax')
partner_pool = self.pool.get('res.partner')
position_pool = self.pool.get('account.fiscal.position')
voucher_line_pool = self.pool.get('account.voucher.line')
voucher_pool = self.pool.get('account.voucher')
- for voucher in voucher_pool.browse(cr, uid, ids, context):
+ for voucher in voucher_pool.browse(cr, uid, ids, context=context):
voucher_amount = 0.0
for line in voucher.line_ids:
voucher_amount += line.untax_amount or line.amount
@@ -304,10 +304,10 @@ class account_voucher(osv.osv):
due_date = terms[-1][0]
default.update({
'date_due':due_date
- })
+ })
return {'value':default}
- def onchange_journal_voucher(self, cr, uid, ids, line_ids=False, tax_id=False, price=0.0, partner_id=False, journal_id=False, ttype=False, context={}):
+ def onchange_journal_voucher(self, cr, uid, ids, line_ids=False, tax_id=False, price=0.0, partner_id=False, journal_id=False, ttype=False, context=None):
"""price
Returns a dict that contains new values and context
@@ -318,12 +318,11 @@ class account_voucher(osv.osv):
@return: Returns a dict which contains new values, and context
"""
default = {
- 'value':{},
+ 'value': {},
}
if not partner_id or not journal_id:
return default
-
partner_pool = self.pool.get('res.partner')
journal_pool = self.pool.get('account.journal')
@@ -346,7 +345,6 @@ class account_voucher(osv.osv):
vals = self.onchange_journal(cr, uid, ids, journal_id, line_ids, tax_id, partner_id, context)
default['value'].update(vals.get('value'))
-
return default
def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, context=None):
@@ -471,7 +469,7 @@ class account_voucher(osv.osv):
return default
- def onchange_date(self, cr, user, ids, date, context={}):
+ def onchange_date(self, cr, user, ids, date, context=None):
"""
@param date: latest value from user input for field date
@param args: other arguments
@@ -488,7 +486,7 @@ class account_voucher(osv.osv):
}
}
- def onchange_journal(self, cr, uid, ids, journal_id, line_ids, tax_id, partner_id, context={}):
+ def onchange_journal(self, cr, uid, ids, journal_id, line_ids, tax_id, partner_id, context=None):
if not journal_id:
return False
journal_pool = self.pool.get('account.journal')
@@ -510,14 +508,14 @@ class account_voucher(osv.osv):
self.action_move_line_create(cr, uid, ids, context=context)
return True
- def action_cancel_draft(self, cr, uid, ids, context={}):
+ def action_cancel_draft(self, cr, uid, ids, context=None):
wf_service = netsvc.LocalService("workflow")
for voucher_id in ids:
wf_service.trg_create(uid, 'account.voucher', voucher_id, cr)
self.write(cr, uid, ids, {'state':'draft'})
return True
- def cancel_voucher(self, cr, uid, ids, context={}):
+ def cancel_voucher(self, cr, uid, ids, context=None):
reconcile_pool = self.pool.get('account.move.reconcile')
move_pool = self.pool.get('account.move')
@@ -793,7 +791,7 @@ class account_voucher_line(osv.osv):
'name': ''
}
- def onchange_move_line_id(self, cr, user, ids, move_line_id, context={}):
+ def onchange_move_line_id(self, cr, user, ids, move_line_id, context=None):
"""
Returns a dict that contains new values and context
@@ -919,7 +917,6 @@ class account_bank_statement_line(osv.osv):
'amount_reconciled': fields.function(_amount_reconciled,
string='Amount reconciled', method=True, type='float'),
'voucher_id': fields.many2one('account.voucher', 'Payment'),
-
}
def unlink(self, cr, uid, ids, context=None):
@@ -934,4 +931,4 @@ class account_bank_statement_line(osv.osv):
account_bank_statement_line()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file