Browse Source

[UPDT]Removed Comments

pull/94/head
Sreejith P 7 years ago
parent
commit
09509fe8a3
  1. 8
      bank_reconciliation/models/account_journal.py
  2. 20
      bank_reconciliation/wizard/bank_statement_wiz.py

8
bank_reconciliation/models/account_journal.py

@ -12,7 +12,6 @@ class AccountJournal(models.Model):
self.bank_statements_source = 'manual'
action = self.env.ref('bank_reconciliation.action_bank_statement_wiz').read()[0]
action.update({
# 'views': [[False, 'form']],
'context': "{'default_journal_id': " + str(self.id) + "}",
})
return action
@ -20,7 +19,6 @@ class AccountJournal(models.Model):
@api.multi
def get_journal_dashboard_datas(self):
res = super(AccountJournal, self).get_journal_dashboard_datas()
print(res)
account_sum = 0.0
bank_balance = 0.0
currency = self.currency_id or self.company_id.currency_id
@ -40,14 +38,10 @@ class AccountJournal(models.Model):
query_results = self.env.cr.dictfetchall()
if query_results and query_results[0].get('sum') != None:
bank_balance = query_results[0].get('sum')
# account_id = self.default_debit_account_id.id or self.default_credit_account_id.id
# domain = [('account_id', '=', account_id),('statement_date', '!=', False)]
# lines = self.env['account.move.line'].search(domain)
# statement_balance += sum([line.balance for line in lines])
difference = currency.round(account_sum - bank_balance) + 0.0
res.update({
'last_balance': formatLang(self.env, currency.round(bank_balance) + 0.0, currency_obj=currency),
'difference': formatLang(self.env, currency.round(difference) + 0.0, currency_obj=currency)
})
print(res)
return res

20
bank_reconciliation/wizard/bank_statement_wiz.py

@ -25,7 +25,6 @@ class BankStatement(models.Model):
@api.one
@api.depends('statement_lines.statement_date')
def _compute_amount(self):
print("_compute_amount")
gl_balance = 0
bank_balance = 0
current_update = 0
@ -46,7 +45,6 @@ class BankStatement(models.Model):
date_from = fields.Date('Date From')
date_to = fields.Date('Date To')
statement_lines = fields.One2many('account.move.line', 'bank_statement_id')
# statement_lines = fields.One2many('bank.statement.line', 'bank_statement_id')
gl_balance = fields.Monetary('Balance as per Company Books', readonly=True, compute='_compute_amount')
bank_balance = fields.Monetary('Balance as per Bank', readonly=True, compute='_compute_amount')
balance_difference = fields.Monetary('Amounts not Reflected in Bank', readonly=True, compute='_compute_amount')
@ -56,21 +54,3 @@ class BankStatement(models.Model):
default=lambda self: self.env['res.company']._company_default_get('bank.statement'))
# class BankStatementLine(models.Model):
# _name = 'bank.statement.line'
#
# bank_statement_id = fields.Many2one('bank.statement', 'Bank Statement')
# move_id = fields.Many2one('account.move.line', 'Journal Item')
# date = fields.Date(related='move_id.date', string='Date')
# name = fields.Char(string="Label", related='move_id.name')
# ref = fields.Char(related='move_id.ref', string='Reference')
# partner_id = fields.Many2one('res.partner', string='Partner', related='move_id.partner_id')
# account_id = fields.Many2one('account.account', 'Account', related='move_id.account_id')
# debit = fields.Monetary(currency_field='company_currency_id', related='move_id.debit')
# credit = fields.Monetary(currency_field='company_currency_id', related='move_id.credit')
# amount_currency = fields.Monetary(related='move_id.amount_currency')
# currency_id = fields.Many2one('res.currency', string='Currency', related='move_id.currency_id')
# company_currency_id = fields.Many2one('res.currency', string="Company Currency", readonly=True,
# related='move_id.currency_id')
# date_maturity = fields.Date(string='Due date', related='move_id.date_maturity')
# statement_date = fields.Date('Bank.St Date', related='move_id.statement_date')

Loading…
Cancel
Save