@ -509,7 +505,7 @@ class GeneralView(models.TransientModel):
new_filter+=' AND j.id IN %s'%str(
tuple(journals.ids)+tuple([0]))
ifaccounts:
WHERE="WHERE l.account_id IN %s"%str(
WHERE="WHERE l.account_id IN %s"%str(
tuple(accounts.ids)+tuple([0]))
else:
WHERE="WHERE l.account_id IN %s"
@ -518,7 +514,7 @@ class GeneralView(models.TransientModel):
tuple(self.analytic_ids.ids)+tuple([0]))
ifself.analytic_tag_ids:
WHERE+=' AND anltag.account_analytic_tag_id IN %s'%str(
tuple(self.analytic_tags.ids)+tuple([0]))
tuple(self.analytic_tag_ids.ids)+tuple([0]))
sql=("""SELECT 0 AS lid, l.account_id AS account_id, '' AS ldate, '' AS lcode, 0.0 AS amount_currency, '' AS lref, 'Initial Balance' AS lname, COALESCE(SUM(l.debit),0.0) AS debit, COALESCE(SUM(l.credit),0.0) AS credit, COALESCE(SUM(l.debit),0) - COALESCE(SUM(l.credit), 0) as balance, '' AS lpartner_id,\
''ASmove_name,''ASmmove_id,''AScurrency_code,\
@ -538,7 +534,8 @@ class GeneralView(models.TransientModel):
@ -572,11 +569,11 @@ class GeneralView(models.TransientModel):
WHERE="WHERE l.account_id IN %s"
ifself.analytic_ids:
WHERE+=' AND anl.id IN %s'%str(
tuple(self.analytics.ids)+tuple([0]))
tuple(self.analytic_ids.ids)+tuple([0]))
ifself.analytic_tag_ids:
WHERE+=' AND anltag.account_analytic_tag_id IN %s'%str(
tuple(self.analytic_tags.ids)+tuple([0]))
tuple(self.analytic_tag_ids.ids)+tuple([0]))
# Get move lines base on sql query and Calculate the total balance of move lines
sql=('''SELECT l.id AS lid,m.id AS move_id, l.account_id AS account_id, l.date AS ldate, j.code AS lcode, l.currency_id, l.amount_currency, l.ref AS lref, l.name AS lname, COALESCE(SUM(l.debit),0) AS debit, COALESCE(SUM(l.credit),0) AS credit, COALESCE(SUM(l.balance),0) AS balance,\
@ -593,7 +590,6 @@ class GeneralView(models.TransientModel):
+WHERE+new_final_filter+''' GROUP BY l.id, m.id, l.account_id, l.date, j.code, l.currency_id, l.amount_currency, l.ref, l.name, m.name, c.symbol, c.position, p.name ORDER BY l.date''')