Browse Source

[FIX] account_financial_report: Fix error when generating reports

Some reports crash if account move line implicated are Sections lines or Notes lines in an invoice
pull/749/head
Ernesto Tejeda 5 years ago
committed by João Marques
parent
commit
9eb899825c
  1. 2
      account_financial_report/__manifest__.py
  2. 1699
      account_financial_report/i18n/ar.po
  3. 1576
      account_financial_report/i18n/ca.po
  4. 1818
      account_financial_report/i18n/de.po
  5. 1888
      account_financial_report/i18n/es.po
  6. 1769
      account_financial_report/i18n/fr.po
  7. 1830
      account_financial_report/i18n/fr_CH.po
  8. 1593
      account_financial_report/i18n/hr.po
  9. 1558
      account_financial_report/i18n/hr_HR.po
  10. 1636
      account_financial_report/i18n/it.po
  11. 1530
      account_financial_report/i18n/ja.po
  12. 1812
      account_financial_report/i18n/nl.po
  13. 1547
      account_financial_report/i18n/nl_NL.po
  14. 1558
      account_financial_report/i18n/pt.po
  15. 1888
      account_financial_report/i18n/pt_BR.po
  16. 1674
      account_financial_report/i18n/ro.po
  17. 6
      account_financial_report/report/general_ledger.py
  18. 3
      account_financial_report/report/journal_ledger.py
  19. 6
      account_financial_report/report/trial_balance.py

2
account_financial_report/__manifest__.py

@ -5,7 +5,7 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
{
"name": "Account Financial Reports",
"version": "13.0.1.0.0",
"version": "13.0.1.1.0",
"category": "Reporting",
"summary": "OCA Financial Reports",
"author": "Camptocamp SA,"

1699
account_financial_report/i18n/ar.po
File diff suppressed because it is too large
View File

1576
account_financial_report/i18n/ca.po
File diff suppressed because it is too large
View File

1818
account_financial_report/i18n/de.po
File diff suppressed because it is too large
View File

1888
account_financial_report/i18n/es.po
File diff suppressed because it is too large
View File

1769
account_financial_report/i18n/fr.po
File diff suppressed because it is too large
View File

1830
account_financial_report/i18n/fr_CH.po
File diff suppressed because it is too large
View File

1593
account_financial_report/i18n/hr.po
File diff suppressed because it is too large
View File

1558
account_financial_report/i18n/hr_HR.po
File diff suppressed because it is too large
View File

1636
account_financial_report/i18n/it.po
File diff suppressed because it is too large
View File

1530
account_financial_report/i18n/ja.po
File diff suppressed because it is too large
View File

1812
account_financial_report/i18n/nl.po
File diff suppressed because it is too large
View File

1547
account_financial_report/i18n/nl_NL.po
File diff suppressed because it is too large
View File

1558
account_financial_report/i18n/pt.po
File diff suppressed because it is too large
View File

1888
account_financial_report/i18n/pt_BR.po
File diff suppressed because it is too large
View File

1674
account_financial_report/i18n/ro.po
File diff suppressed because it is too large
View File

6
account_financial_report/report/general_ledger.py

@ -329,7 +329,11 @@ class GeneralLedgerReport(models.AbstractModel):
analytic_tag_ids,
cost_center_ids,
):
domain = [("date", ">=", date_from), ("date", "<=", date_to)]
domain = [
("display_type", "=", False),
("date", ">=", date_from),
("date", "<=", date_to),
]
if account_ids:
domain += [("account_id", "in", account_ids)]
if company_id:

3
account_financial_report/report/journal_ledger.py

@ -79,8 +79,7 @@ class JournalLedgerReport(models.AbstractModel):
return moves.ids, Moves, move_data
def _get_move_lines_domain(self, move_ids, wizard, journal_ids):
return [("move_id", "in", move_ids)]
return [("display_type", "=", False), ("move_id", "in", move_ids)]
def _get_move_lines_order(self, move_ids, wizard, journal_ids):
return ""

6
account_financial_report/report/trial_balance.py

@ -123,7 +123,11 @@ class TrialBalanceReport(models.AbstractModel):
only_posted_moves,
show_partner_details,
):
domain = ["&", ("date", ">=", date_from), ("date", "<=", date_to)]
domain = [
("display_type", "=", False),
("date", ">=", date_from),
("date", "<=", date_to),
]
if company_id:
domain += [("company_id", "=", company_id)]
if account_ids:

Loading…
Cancel
Save