添加功能

yuthon_hr_attendance/__manifest__.py

@@ -12,7 +12,7 @@
     'category': 'Human Resources/Attendances',
     'sequence': 240,
     'website': 'https://www.pengyuthon.com',
-    'depends': ['hr_attendance', 'resource', 'base', 'hr', 'mail', 'soong_workflow','yuthon_issue'],
+    'depends': ['hr_attendance', 'resource', 'base', 'hr', 'mail', 'soong_workflow','yuthon_issue','planning'],
     'data': [
         'security/ir.model.access.csv',
         # 'security/approval_attendance.xml',

yuthon_hr_attendance/models/__init__.py

@@ -21,7 +21,7 @@ from . import remove_holiday_approval
 from . import card_approval
 from . import planning_template_inherit
 from . import overtime_page
-
+from . import inherit_planning_role
 
 
 

yuthon_hr_attendance/models/inherit_planning_role.py

@@ -0,0 +1,8 @@
+from odoo import api, fields, models, tools
+from odoo.exceptions import ValidationError
+
+
+class PlanningRole(models.Model):
+    _inherit = 'planning.role'
+
+    name = fields.Char(string='班次名称', required=True)

yuthon_hr_employee/__manifest__.py

@@ -11,7 +11,7 @@
     'license': 'LGPL-3',
     'author': 'pengyuthon',
     'website': 'https://www.pengyuthon.com',
-    'depends': ['base', 'hr', 'hr_recruitment', 'soong_workflow'],
+    'depends': ['base', 'hr', 'hr_recruitment', 'soong_workflow','documents'],
     'data': [
         'data/yuthon.job.lv.csv',
         'data/job_lv_groups_data.xml',

yuthon_hr_employee/models/inherit_hr_applicant.py

@@ -15,7 +15,7 @@ class HrApplicant(models.Model):
     original_position = fields.Char(string='原工作岗位')
     previous_position = fields.Char(string='原职务')
     status_first = fields.Selection([('in_service', '尚在职'), ('retired', '办理离职'), ('leaving', '已离职')] ,string='现就业状态')
-    documents_ids = fields.Many2many('documents.document', string="附件")
+    documents_ids = fields.Many2many('ir.attachment', string="附件")
     tage_ids = fields.Many2many('applicant.tage.setting', string="应聘标签")
     is_interview_status = fields.Boolean(string="面试状态")
 

yuthon_hr_employee/views/inherit_hr_applicant_views.xml

@@ -18,7 +18,7 @@
                             <field name="job_id" required="1" string="岗位"/>
                             <field name="takes_time"/>
                             <field name="stage_id"/>
-                            <field name="documents_ids" widget="many2many_tags"/>
+                            <field name="documents_ids" widget="preview_many2many"/>
                         </group>
                         <group>
                             <field name="colleges"/>

yuthon_hr_employee_approval/controllers/employee_login.py

@@ -20,15 +20,15 @@ class EmployeeLogin(Controller):
         values['political'] = record.political
         values['email'] = record.email
         values['home_address'] = record.home_address
-        values['sex'] = record.sex
-        values['date_birth'] = record.date_birth.strftime('%Y/%m/%d')
-        values['party_time'] = record.party_time.strftime('%Y/%m/%d')
-        values['marital_status'] = record.marital_status
-        values['working_time'] = record.working_time.strftime('%Y/%m/%d')
+        # values['sex'] = record.sex
+        # values['date_birth'] = record.date_birth.strftime('%Y/%m/%d')
+        # values['party_time'] = record.party_time.strftime('%Y/%m/%d')
+        # values['marital_status'] = record.marital_status
+        # values['working_time'] = record.working_time.strftime('%Y/%m/%d')
         values['home_phone'] = record.home_phone
         values['origin'] = record.origin
         values['nation'] = record.nation
-        values['house_type'] = 'city'
+        # values['house_type'] = 'city'
         values['current_address'] = record.current_address
         values['house_hold'] = record.house_hold
         if request.httprequest.method == 'POST':

yuthon_work_brand/views/hr_menus.xml

@@ -400,14 +400,14 @@
               sequence="9"/>
     <menuitem id="menu_hr_plan_set_role_board"
               name="班次名称"
-              parent="menu_hr_plan_set_request_board"
+              parent="attendance_resources_setting_root_board"
               action="planning.planning_action_roles"
-              sequence="7"/>
+              sequence="1"/>
     <menuitem id="menu_hr_plan_set_formwork_board"
               name="班次模板"
-              parent="menu_hr_plan_set_request_board"
+              parent="attendance_resources_setting_root_board"
               action="planning.planning_action_shift_template"
-              sequence="9"/>
+              sequence="2"/>
     <menuitem id="menu_hr_attendance_work_board"
               name="考勤时间表配置"
               parent="attendance_resources_setting_root_board"