添加功能

yuthon_hr_attendance/models/hr_attendance_month.py

@@ -137,6 +137,7 @@ class HrAttendanceMonthDetail(models.Model):
         selection=[
             ('unconfirmed', "未确认"),
             ('confirmed', "已确认"),
+            ('pending' , "待定"),
         ],
         string="状态",
         readonly=True, copy=False, index=True,
@@ -490,6 +491,9 @@ class HrAttendanceMonthDetail(models.Model):
         for detail in attendance_details:
             detail.write({'state': 'confirmed'})
 
+    def button_pending(self):
+        for record in self:
+            record.write({'state': 'pending'})
 
     def button_all_attendance_month(self):
         attendance_details = self.env['hr.attendance.month.detail'].search([])

yuthon_hr_attendance/models/resource_calendar_leaves.py

@@ -24,7 +24,7 @@ class ResourceCalendar(models.Model):
     is_allow_late_early_work = fields.Boolean(string="下班晚走次日晚到")
     work_late = fields.Selection(selection=selection_list, string="下班晚走")
     work_after = fields.Selection(selection=selection_list, string="次日可晚到")
-
+    active_id = fields.Boolean('Active', default=True, tracking=True)
     resource_user_ids = fields.Many2many('hr.employee', string="白名单")
 
     def get_baidu_holiday(self):
@@ -118,4 +118,7 @@ class ResourceCalendarHolidaye(models.Model):
 class ResourceCalendarLeave(models.Model):
     _inherit = "resource.calendar.leaves"
 
-    is_holidays = fields.Boolean(string="法定节假日")
+    is_holidays = fields.Boolean(string="法定节假日")
+    alternate_rest_day = fields.Text(string='调休休息日')
+    shift_replacement_day = fields.Text(string='调班补办日')
+    total_days = fields.Integer(string='总天数')

yuthon_hr_attendance/views/all_attendance_menu.xml

@@ -138,6 +138,11 @@
               parent="attendance_resources_setting_root_board"
               sequence="4"
               action="view_overtime_page_action"/>
+    <menuitem id="menu_hr_resource_calendar_board"
+              name="法定节假日表"
+              parent="attendance_resources_setting_root_board"
+              sequence="6"
+              action="yuthon_hr_attendance.resource_calendar_leaves_action_from_calendar"/>
     <menuitem id="yuthon_attendance_planning_board"
               name="计划排班"
               web_icon="yuthon_work_brand,static/description/planning.png"

yuthon_hr_attendance/views/hr_attendance_month_views.xml

@@ -142,6 +142,7 @@
                 <field name="state" widget="badge" decoration-info="state == 'unconfirmed'"
                        decoration-success="state == 'confirmed'"/>
                 <button name="button_confirm" string="确认" type="object" class="oe_highlight" invisible="state == 'confirmed'"/>
+                <button name="button_pending" string="待定" type="object" class="oe_highlight"/>
             </tree>
         </field>
     </record>

yuthon_hr_attendance/views/resource_calendar_leaves_views.xml

@@ -79,4 +79,33 @@
             </xpath>
         </field>
     </record>
+    <record id="inherit_resource_calendar_leave_tree" model="ir.ui.view">
+        <field name="name">resource.calendar.leave.tree.inherit</field>
+        <field name="model">resource.calendar.leaves</field>
+        <field name="inherit_id" ref="resource.resource_calendar_leave_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//tree/field[@name='date_to']" position="after">
+                <field name="alternate_rest_day"/>
+                <field name="shift_replacement_day"/>
+                <field name="total_days"/>
+            </xpath>
+        </field>
+    </record>
+    <record id="inherit_resource_calendar_leave_form" model="ir.ui.view">
+        <field name="name">resource.calendar.leave.form.inherit</field>
+        <field name="model">resource.calendar.leaves</field>
+        <field name="inherit_id" ref="resource.resource_calendar_leave_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='date_to']" position="after">
+                    <field name="alternate_rest_day"/>
+                    <field name="shift_replacement_day"/>
+                    <field name="total_days"/>
+            </xpath>
+        </field>
+    </record>
+    <record id="resource_calendar_leaves_action_from_calendar" model="ir.actions.act_window">
+        <field name="name">法定节假日表动作</field>
+        <field name="res_model">resource.calendar.leaves</field>
+        <field name="view_mode">tree,form</field>
+    </record>
 </odoo>