添加功能

yuthon_hr_attendance/models/card_approval.py

@@ -109,7 +109,6 @@ class CardApprovals(models.Model):
 
         workflow_id = self.env['soong.workflow.record'].search([('code', '=', self.code)], limit=1).id
         self.attendance_id.sudo().write({
-            'is_approval': True,
             'is_abnormal': False,
             'is_no_card': False,
             'is_late_card': False,

yuthon_property/models/property_accounts_receivable.py

@@ -77,16 +77,21 @@ class PropertyAccountsReceivable(models.Model):
                 ('due_date', '=', penalty_start_date),
                 ('management_type_id.name', '=', '违约金'),
             ], limit=1)
-
-            penalty_lines = self.env['receivable.modify.line'].search([
-                ('receivable_id', '=', penalty_receivable_id.id),
-                ('reconciliation_date', '!=', False),
-                ('is_penalty', '=', True)
-            ], order='reconciliation_date asc')
+            if penalty_receivable_id:
+                penalty_lines = self.env['receivable.modify.line'].search([
+                    ('receivable_id', '=', penalty_receivable_id.id),
+                    ('reconciliation_date', '!=', False),
+                    ('is_penalty', '=', True)
+                ], order='reconciliation_date asc')
+            else:
+                penalty_lines = self.env['receivable.modify.line']
 
             rent_pay_count = len(modify_lines.filtered(lambda l: not l.is_penalty))  # 租金支付次数
             penalty_pay_count = len(penalty_lines.filtered(lambda l: l.is_penalty))  # 违约金支付次数
-            record.number_of_payments = rent_pay_count + penalty_pay_count
+            if record.management_type_id.name == '押金':
+                record.number_of_payments = rent_pay_count
+            else:
+                record.number_of_payments = rent_pay_count + penalty_pay_count
 
 
     @api.depends('original_amount', 'delivered1', 'discount_amount')