Techsystech
/
account-financial-reporting
mirror of https://github.com/OCA/account-financial-reporting.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #673 into 13.0 

Signed-off-by pedrobaeza
pull/674/head
OCA-git-bot 2020-04-14 08:31:03 +00:00
parent 6760af4105 a805a4aa22
commit c794962193
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
account_financial_report/report/general_ledger.py
View File

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

3
account_financial_report/report/journal_ledger.py
View File

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

6
account_financial_report/report/trial_balance.py
View File

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