|
|
|
@ -54,10 +54,22 @@ class AccountTrialBalance(models.TransientModel): |
|
|
|
[('date', '<', get_month(today)[0]), |
|
|
|
('account_id', '=', account_id.id), |
|
|
|
('parent_state', '=', 'posted')]) |
|
|
|
initial_total_debit = round( |
|
|
|
|
|
|
|
# Calculate raw totals |
|
|
|
initial_total_debit_raw = round( |
|
|
|
sum(initial_move_line_ids.mapped('debit')), 2) |
|
|
|
initial_total_credit = round( |
|
|
|
initial_total_credit_raw = round( |
|
|
|
sum(initial_move_line_ids.mapped('credit')), 2) |
|
|
|
|
|
|
|
# Calculate NET initial balance |
|
|
|
initial_diff = initial_total_debit_raw - initial_total_credit_raw |
|
|
|
if initial_diff > 0: |
|
|
|
initial_total_debit = initial_diff |
|
|
|
initial_total_credit = 0.0 |
|
|
|
else: |
|
|
|
initial_total_debit = 0.0 |
|
|
|
initial_total_credit = abs(initial_diff) |
|
|
|
|
|
|
|
move_line_ids = self.env['account.move.line'].search( |
|
|
|
[('date', '>=', get_month(today)[0]), |
|
|
|
('account_id', '=', account_id.id), |
|
|
|
@ -161,12 +173,23 @@ class AccountTrialBalance(models.TransientModel): |
|
|
|
if method is not None and 'cash' in method: |
|
|
|
domain.append(('journal_id', 'in', |
|
|
|
self.env.company.tax_cash_basis_journal_id.ids)) |
|
|
|
initial_move_line_ids = self.env['account.move.line'].search( |
|
|
|
domain) |
|
|
|
initial_total_debit = round( |
|
|
|
initial_move_line_ids = self.env['account.move.line'].search(domain) |
|
|
|
|
|
|
|
# Calculate raw totals |
|
|
|
initial_total_debit_raw = round( |
|
|
|
sum(initial_move_line_ids.mapped('debit')), 2) |
|
|
|
initial_total_credit = round( |
|
|
|
initial_total_credit_raw = round( |
|
|
|
sum(initial_move_line_ids.mapped('credit')), 2) |
|
|
|
|
|
|
|
# Calculate NET initial balance |
|
|
|
initial_diff = initial_total_debit_raw - initial_total_credit_raw |
|
|
|
if initial_diff > 0: |
|
|
|
initial_total_debit = initial_diff |
|
|
|
initial_total_credit = 0.0 |
|
|
|
else: |
|
|
|
initial_total_debit = 0.0 |
|
|
|
initial_total_credit = abs(initial_diff) |
|
|
|
|
|
|
|
if comparison_number: |
|
|
|
if comparison_type == 'year': |
|
|
|
for i in range(1, eval(comparison_number) + 1): |
|
|
|
|