!7209 添加功能

Merge pull request !7209 from 李鹏宇/dev_zhou

yuthon_holiday/models/inherit_hr_leave_allocation.py

@@ -193,7 +193,7 @@ class HrLeaveAllocation(models.Model):
                                           'update_type': 'add',
                                           'update_date': fields.Datetime.now(),
                                           'update_lines': leave.number_of_days * 8,
-                                          'text': leave.name
+                                          'text': '上月继承额度'
                                           }])
             elif leave.holiday_status_id.name == '补休':
                 compensatory_list.append([0, 0, {
@@ -205,7 +205,7 @@ class HrLeaveAllocation(models.Model):
                                     'legal_day': 0,
                                     'public_holidays': 0,
                                     'meal_number': 0,
-                                    'text': f"剩余补休"
+                                    'text': f"上月继承额度"
                                 }])
             else:
                 other_list.append([0, 0, {

yuthon_hr_attendance/models/yuthon_vacation_reports.py

@@ -677,13 +677,9 @@ class YuthonVacationReports(models.Model):
     def _update_leave_lines(self, report, allocations, number_of_hours_display):
         for alloc in allocations:
             existing_line = self.env['vacation.leave.line'].search([
-                ('workflow_record_id', '=', False),
                 ('vacation_id', '=', report.id),
                 ('employee_id', '=', report.employee_id.id),
-                ('update_type', '=', 'add'),
-                ('allocation_type', '=', 'allocation'),
-                ('update_lines', '=', number_of_hours_display),
-                ('is_void', '=', False)
+                ('text', '=', '上月额度继承'),
             ], limit=1)
             if existing_line:
                 continue
@@ -702,14 +698,9 @@ class YuthonVacationReports(models.Model):
         """更新补休明细行"""
         for alloc in allocations:
             existing_line = self.env['vacation.over.line'].search([
-                ('workflow_record_id', '=', False),
                 ('vacation_id', '=', report.id),
                 ('employee_id', '=', report.employee_id.id),
-                ('update_type', '=', 'add'),
-                ('workday', '=', number_of_hours_display),
-                ('legal_day', '=', 0),
-                ('public_holidays', '=', 0),
-                ('meal_number', '=', 0),
+                ('text', '=', '上月额度继承'),
             ], limit=1)
             if existing_line:
                 continue

yuthon_property_approval/views/inherit_yuthon_property_views.xml

@@ -417,7 +417,7 @@
             </xpath>
         </field>
     </record>
-    <record id="inherit_property_accounts_receivable_form_tree" model="ir.ui.view">
+    <record id="inherit_property_accounts_receivable_form_tree1" model="ir.ui.view">
         <field name="name">property.accounts.receivable.tree</field>
         <field name="model">property.accounts.receivable</field>
         <field name="inherit_id" ref="yuthon_property.view_property_accounts_receivable_tree1"/>

yuthon_will_task/models/yuthon_will_task.py

@@ -185,11 +185,12 @@ class YuthonWillTask(models.Model):
                 will_id = task.yuthon_will_task_id
                 for employee_id in will_id.employee_ids:
                     url = f'https://oa.thtzjt.com/webh5#/journey?id={will_id.id}'
+                    data_date = '时间:' + task.task_time + '\n'
                     data_name = "事项名称: " + task.yuthon_will_task_id.name + '\n'
                     data_user_ids = '参与人: ' + ', '.join(will_id.employee_ids.mapped('name')) + '\n'
                     data_employee_id = ('司机:' + ', '.join(will_id.employee_ids2.mapped('name')) + '\n') if will_id.employee_ids2 else ''
                     data_nota = ('备注:' + will_id.remarks) if will_id.remarks else ('') + '\n'
-                    data = data_name + data_user_ids + data_nota + data_employee_id
+                    data = data_date + data_name + data_user_ids + data_nota + data_employee_id
                     self.sudo().env["wecom.apps"].sync_send_message_textcard(category='task', user_id=employee_id.wecom_userid, title="日程事项提醒", description=data,
                                                                              url=url, btntxt="详细信息")
                     self.sudo().env["wecom.apps"].sync_send_message_textcard(category='task', user_id="18562027762", title="日程事项提醒", description=data,