Browse Source

Get translated value for account name if it exists in user language.

pull/606/head
Pierre-Yves Berger 6 years ago
parent
commit
349967d617
  1. 13
      account_financial_report_qweb/report/general_ledger.py
  2. 9
      account_financial_report_qweb/report/journal_report.py
  3. 11
      account_financial_report_qweb/report/open_items.py
  4. 9
      account_financial_report_qweb/report/trial_balance.py

13
account_financial_report_qweb/report/general_ledger.py

@ -395,7 +395,7 @@ WITH
SELECT SELECT
a.id, a.id,
a.code, a.code,
a.name,
coalesce(t.value, a.name) AS name,
a.internal_type IN ('payable', 'receivable') a.internal_type IN ('payable', 'receivable')
AS is_partner_account, AS is_partner_account,
a.user_type_id, a.user_type_id,
@ -436,6 +436,14 @@ WITH
atml.account_analytic_tag_id = aat.id atml.account_analytic_tag_id = aat.id
AND aat.id IN %s AND aat.id IN %s
""" """
query_inject_account += """
LEFT JOIN
ir_translation t
ON
a.id = t.res_id
AND t.name = 'account.account,name'
AND t.lang = %s
"""
query_inject_account += """ query_inject_account += """
WHERE WHERE
a.company_id = %s a.company_id = %s
@ -458,7 +466,7 @@ WITH
): ):
query_inject_account += """ query_inject_account += """
GROUP BY GROUP BY
a.id
a.id, t.value
""" """
query_inject_account += """ query_inject_account += """
), ),
@ -567,6 +575,7 @@ AND
tuple(self.filter_analytic_tag_ids.ids), tuple(self.filter_analytic_tag_ids.ids),
) )
query_inject_account_params += ( query_inject_account_params += (
self.env.user.lang,
self.company_id.id, self.company_id.id,
self.unaffected_earnings_account.id, self.unaffected_earnings_account.id,
) )

9
account_financial_report_qweb/report/journal_report.py

@ -291,7 +291,7 @@ class ReportJournalQweb(models.TransientModel):
rjqm.id as report_move_id, rjqm.id as report_move_id,
aml.id as move_line_id, aml.id as move_line_id,
aml.account_id as account_id, aml.account_id as account_id,
aa.name as account,
coalesce(t.value, aa.name) as account,
aa.code as account_code, aa.code as account_code,
aa.internal_type as account_type, aa.internal_type as account_type,
aml.partner_id as partner_id, aml.partner_id as partner_id,
@ -336,6 +336,12 @@ class ReportJournalQweb(models.TransientModel):
LEFT JOIN LEFT JOIN
account_account aa account_account aa
on (aa.id = aml.account_id) on (aa.id = aml.account_id)
LEFT JOIN
ir_translation t
ON
aa.id = t.res_id
AND t.name = 'account.account,name'
AND t.lang = %s
LEFT JOIN LEFT JOIN
res_partner p res_partner p
on (p.id = aml.partner_id) on (p.id = aml.partner_id)
@ -350,6 +356,7 @@ class ReportJournalQweb(models.TransientModel):
""" """
params = ( params = (
self.env.uid, self.env.uid,
self.env.user.lang,
self.id, self.id,
) )
self.env.cr.execute(sql, params) self.env.cr.execute(sql, params)

11
account_financial_report_qweb/report/open_items.py

@ -204,13 +204,19 @@ WITH
SELECT SELECT
a.id, a.id,
a.code, a.code,
a.name,
coalesce (t.value, a.name) AS name,
a.user_type_id, a.user_type_id,
c.id as currency_id c.id as currency_id
FROM FROM
account_account a account_account a
INNER JOIN INNER JOIN
account_move_line ml ON a.id = ml.account_id AND ml.date <= %s account_move_line ml ON a.id = ml.account_id AND ml.date <= %s
LEFT JOIN
ir_translation t
ON
a.id = t.res_id
AND t.name = 'account.account,name'
AND t.lang = %s
LEFT JOIN LEFT JOIN
res_currency c ON a.currency_id = c.id res_currency c ON a.currency_id = c.id
""" """
@ -241,7 +247,7 @@ WITH
""" """
query_inject_account += """ query_inject_account += """
GROUP BY GROUP BY
a.id, c.id
a.id, c.id, t.value
) )
INSERT INTO INSERT INTO
report_open_items_qweb_account report_open_items_qweb_account
@ -267,6 +273,7 @@ FROM
""" """
query_inject_account_params = ( query_inject_account_params = (
self.date_at, self.date_at,
self.env.user.lang,
self.company_id.id, self.company_id.id,
) )
if self.filter_account_ids: if self.filter_account_ids:

9
account_financial_report_qweb/report/trial_balance.py

@ -291,7 +291,7 @@ SELECT
acc.id, acc.id,
acc.group_id, acc.group_id,
acc.code, acc.code,
acc.name,
coalesce(t.value, acc.name) AS name,
coalesce(rag.initial_balance, 0) AS initial_balance, coalesce(rag.initial_balance, 0) AS initial_balance,
coalesce(rag.final_debit - rag.initial_debit, 0) AS debit, coalesce(rag.final_debit - rag.initial_debit, 0) AS debit,
coalesce(rag.final_credit - rag.initial_credit, 0) AS credit, coalesce(rag.final_credit - rag.initial_credit, 0) AS credit,
@ -306,6 +306,12 @@ FROM
account_account acc account_account acc
LEFT OUTER JOIN report_general_ledger_qweb_account AS rag LEFT OUTER JOIN report_general_ledger_qweb_account AS rag
ON rag.account_id = acc.id AND rag.report_id = %s ON rag.account_id = acc.id AND rag.report_id = %s
LEFT JOIN
ir_translation t
ON
acc.id = t.res_id
AND t.name = 'account.account,name'
AND t.lang = %s
WHERE WHERE
acc.id in %s acc.id in %s
""" """
@ -313,6 +319,7 @@ WHERE
self.id, self.id,
self.env.uid, self.env.uid,
self.general_ledger_id.id, self.general_ledger_id.id,
self.env.user.lang,
account_ids._ids, account_ids._ids,
) )
self.env.cr.execute(query_inject_account, query_inject_account_params) self.env.cr.execute(query_inject_account, query_inject_account_params)

Loading…
Cancel
Save