Merge remote-tracking branch 'origin/dev' into dev

yuthon_hr_attendance/controllers/applet_attendance.py

@@ -758,7 +758,7 @@ class AppletAttendance(Controller):
 
         _logger.info(f'月初数据:{start_of_month}')
         records = request.env(user=SUPERUSER_ID)['property.accounts.receivable'].search(
-            [('lessee_id', '=', lessee_id)], order='payout_date desc')
+            [('lessee_id', '=', lessee_id)], order='due_date desc')
 
         # 根据月份分组后再根据物业统计
         # 月份分组数据中有各个物业的合计
@@ -790,7 +790,10 @@ class AppletAttendance(Controller):
             property_dict.get('list').append({
                 'id': record.id,
                 'submitted': float_repr(float_round(record.submitted, precision_rounding=0.01), 2),
-                'management_type': record.management_type_id.name
+                'original_amount': float_repr(float_round(record.original_amount - record.discount_amount, precision_rounding=0.01), 2),
+                'management_type': record.management_type_id.name,
+                'start_date':  fields.Date.to_string(record.due_date),
+                'end_date':  fields.Date.to_string(record.due_date_end) if record.due_date_end else (  fields.Date.to_string(record.payout_date) if record.payout_date else '----'),
             })
 
         result = []