!5135 !5134 添加功能

Merge pull request !5135 from 李鹏宇/dev

yuthon_holiday/models/inherit_hr_leave.py

@@ -624,7 +624,7 @@ class HolidaysRequestBatch(models.Model):
                 'is_abnormal': False,
                 'absenteeism_card': False,
                 'is_workflow': True,
-                'workflow_id': workflow_id,
+                'workflow_id': workflow_id.id,
             })
 
 

yuthon_hr_attendance/models/go_approval.py

@@ -204,8 +204,11 @@ class GoApprovals(models.Model):
                 (date_field, '>=', start),
                 (date_field, '<=', end)
             ])
+            workflow_id = self.env['soong.workflow.record'].search([('code', '=', self.code)], limit=1).id
             if attendance_records:
                 attendance_records.write({
+                    'is_workflow': True,
+                    'workflow_id':workflow_id.id,
                     'is_clock_card': True,
                     'is_no_card': False,
                     'is_early_card': False,
@@ -217,6 +220,8 @@ class GoApprovals(models.Model):
                 current_date = start
                 while current_date <= end:
                     self.env['hr.attendance'].create({
+                        'is_workflow': True,
+                        'workflow_id': workflow_id.id,
                         'employee_id': employee.id,
                         date_field: current_date,
                         'is_clock_card': True,

yuthon_hr_attendance/models/hr_attendance.py

@@ -78,14 +78,14 @@ class HrAttendance(models.Model):
             )
 
     def button_workflow(self):
-        self.ensure_one()
-        return {
-            'name': '流程',
-            'type': 'ir.actions.act_window',
-            'view_mode': 'tree',
-            'res_model': 'soong.workflow.record',
-            'domain': [('id', '=', self.workflow_id.id)],
-        }
+        if self.workflow_record_id:
+            return {
+                "name": "流程详情",
+                'type': 'ir.actions.act_window',
+                'res_model': f'{self.workflow_record_id.res_model}',
+                'res_id': self.workflow_record_id.res_id,
+                'view_mode': 'form',
+            }
 
     def compute_attendance_ids(self):
         for att in self.env["hr.attendance"].browse(self._context.get('active_ids', self._context.get('active_id'))):

yuthon_hr_attendance/models/overtime_approval.py

@@ -237,6 +237,19 @@ class OvertimeApprovals(models.Model):
                 reports_id.write({'meal_fee_ids': [meal_fee_value]})
 
             reports_id.write({'overtime_ids': [(0, 0, overtime_data)]})
+            start_date = fields.Date.to_date(self.start_time)
+            end_date = fields.Date.to_date(self.end_time)
+            attendance_records = self.env['hr.attendance'].search([
+                ('employee_id', '=', employee_id),
+                ('current_data', '>=', start_date),
+                ('current_data', '<=', end_date),
+            ])
+            for attendance_record in attendance_records:
+                workflow_id = self.env['soong.workflow.record'].search([('code', '=', self.code)], limit=1).id
+                if attendance_record:
+                    attendance_record.write({'is_workflow': True,
+                                              'workflow_id': workflow_id.id,
+                                             })
 
     @api.depends('users_id', 'duration')
     def _compute_name(self):

yuthon_property/views/property_meter_archives_views.xml

@@ -112,15 +112,15 @@
         </field>
     </record>
     <record id="view_property_meter_archives_search" model="ir.ui.view">
-            <field name="name">property.meter.archives.search</field>
-            <field name="model">property.meter.archives</field>
-            <field name="arch" type="xml">
-                    <search string="电表">
-                        <field name="name"/>
-                        <field name="yuthon_property_ids"/>
-                        <field name="lessee_id"/>
-                    </search>
-            </field>
+        <field name="name">property.meter.archives.search</field>
+        <field name="model">property.meter.archives</field>
+        <field name="arch" type="xml">
+            <search string="电表">
+                <field name="name"/>
+                <field name="yuthon_property_ids"/>
+                <field name="lessee_id"/>
+            </search>
+        </field>
     </record>
     <record id="action_property_meter_archives" model="ir.actions.act_window">
         <field name="name">电表库</field>

yuthon_property_approval/views/property_lease_contract.xml

@@ -394,7 +394,7 @@
                 <field name="actual_start_time"/>
                 <field name="actual_end_time"/>
                 <field name="contract_date"/>
-                <field name="contract_signature_id" widget="preview_many2one" invisible="not contract_date"/>
+                <field name="contract_signature_ids" widget="preview_many2many" invisible="not contract_date"/>
                 <field name="end_comparison" column_invisible="1"/>
                 <field name="deposit_status" column_invisible="1"/>
 <!--                <field name="lessor_id" string="公司"/>-->