[IMP] Improved code.

bzr revid: psa@tinyerp.com-20130918111959-1dzkuxv4acjys8kl
This commit is contained in:
Paramjit Singh Sahota 2013-09-18 16:49:59 +05:30
parent c5814d3e6f
commit e00111a061
4 changed files with 5 additions and 6 deletions

View File

@ -463,11 +463,9 @@ class account_bank_statement(osv.osv):
return {}
res = {}
balance_start = self._compute_balance_end_real(cr, uid, journal_id, context=context)
res['balance_start'] = balance_start
journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
res['company_id'] = journal.company_id.id
currency = journal.currency or journal.company_id.currency_id
res['currency'] = currency.id
res = {'balance_start' : balance_start, 'company_id' : journal.company_id.id, 'currency' : currency.id}
if journal.type == 'cash':
res['cash_control'] = journal.cash_control
return {'value': res}

View File

@ -227,6 +227,7 @@ class account_cash_statement(osv.osv):
journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
if journal and (journal.type == 'cash'):
last_pieces = None
if journal.with_last_closing_balance == True:
domain = [('journal_id', '=', journal.id),
('state', '=', 'confirm')]
@ -244,7 +245,6 @@ class account_cash_statement(osv.osv):
'pieces' : value.pieces
}
details_ids.append([0, False, nested_values])
return details_ids
def create(self, cr, uid, vals, context=None):
@ -268,6 +268,7 @@ class account_cash_statement(osv.osv):
@return: True on success, False otherwise
"""
cashbox_pool = self.pool.get('account.cashbox.line')
if vals.get('journal_id', False):
cashbox_ids = cashbox_pool.search(cr, uid, [('bank_statement_id', 'in', ids)], context=context)

View File

@ -16,4 +16,4 @@
.openerp .oe_account_reconciliation>div>div {
display: table-cell;
width: 50%:
}
}

View File

@ -222,7 +222,7 @@ class pos_session(osv.osv):
'state' : fields.selection(POS_SESSION_STATE, 'Status',
required=True, readonly=True,
select=1),
'cash_control' : fields.function(_compute_cash_all,
multi='cash',
type='boolean', string='Has Cash Control'),