报表

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({

yuthon_report/views/menu.xml

@@ -37,8 +37,17 @@
         <menuitem id="yuthon_property_income_month_received_menu"
                   sequence="6"
                   name="本月实收"
-                  parent="yuthon_property_income_menu"
-                  action="action_cumulative_arrears_report"/>
+                  parent="yuthon_property_income_menu"/>
+        <menuitem id="yuthon_property_income_month_received_belong_menu"
+                  sequence="1"
+                  name="归属本月"
+                  parent="yuthon_property_income_month_received_menu"
+                  action="action_current_month_received_report"/>
+        <menuitem id="yuthon_property_income_month_received_advance_menu"
+                  sequence="2"
+                  name="本月预收"
+                  parent="yuthon_property_income_month_received_menu"
+                  action="action_monthly_precollection_report"/>
         <menuitem id="yuthon_property_income_cum_arrears_menu"
                   sequence="7"
                   name="累计欠收"