diff --git a/yuthon_report/models/pre_advance_report.py b/yuthon_report/models/pre_advance_report.py index 32f1eac57..c3520af2d 100644 --- a/yuthon_report/models/pre_advance_report.py +++ b/yuthon_report/models/pre_advance_report.py @@ -25,7 +25,8 @@ class PreAdvanceReport(models.Model): domain = [ ('due_date', '>', this_month_last), - ('delivered1', '>', 0), + ('submitted', '=', 0), + ('original_amount', '>', 0), ('is_invalid', '=', False), ] @@ -55,7 +56,7 @@ class PreAdvanceReport(models.Model): total_amount = 0.0 for idx, rec in enumerate(receivables, start=1): contract = rec.contract_id - amount = round(rec.delivered1 or 0.0, 2) + amount = round(rec.original_amount or 0.0, 2) total_amount += amount rows.append({ diff --git a/yuthon_report/views/menu.xml b/yuthon_report/views/menu.xml index 6a347b02f..3226e83ae 100644 --- a/yuthon_report/views/menu.xml +++ b/yuthon_report/views/menu.xml @@ -37,8 +37,17 @@ + parent="yuthon_property_income_menu"/> + +