!2371 !2370 添加功能

Merge pull request !2371 from 李鹏宇/dev

soong_workflow/__manifest__.py

@@ -19,7 +19,7 @@
         "views/soong_approval_users_views.xml",
         "views/soong_note_views.xml",
         "views/soong_note_setting_views.xml",
-        "views/soong_hr_employee_views.xml",
+        # "views/soong_hr_employee_views.xml",
         "views/soong_user_role_views.xml",
         "views/soong_workflow_node_views.xml",
         "views/soong_workflow_link_views.xml",

soong_workflow/models/soong_workflow_mixin.py

@@ -842,7 +842,7 @@ class SoongWorkflowMixin(models.AbstractModel):
                             id_el = etree.Element("field")
                             id_el.set("name", "log_ids")
                             id_el.set("invisible", "1")
-                            field_inst.set("readonly", "state in %s and log_ids" % readonly_arr)
+                            # field_inst.set("readonly", "state in %s and log_ids" % readonly_arr)
                     if required_arr:
                         field_inst.set("required", "state in %s" % required_arr)
                     if invisible_arr:

soong_workflow/views/soong_hr_employee_views.xml

@@ -25,4 +25,16 @@
             </xpath>
         </field>
     </record>
+
+    <record id="inherit_view_employee_filter_work" model="ir.ui.view">
+        <field name="name">inherit.view.employee.filter</field>
+        <field name="model">hr.employee</field>
+        <field name="inherit_id" ref="hr.view_employee_filter"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='department_id']" position="attributes">
+                <attribute name="groupby">parent_id</attribute>
+                <attribute name="select">multi</attribute>
+            </xpath>
+        </field>
+    </record>
 </odoo>

yuthon_contract/models/inherit_hr_contract.py

@@ -54,3 +54,20 @@ class HrContract(models.Model):
             company_id = contract.employee_id.company_id
             contract.write({
                 'company_id':company_id.id})
+
+    @api.onchange('contract_type_id')
+    def onchange_contract_type_id(self):
+        if self.contract_type_id and self.employee_id:
+            contract_name_mapping = {
+                '正式合同（一签）': 'formal_one',
+                '劳务协议': 'labor',
+                '正式合同（二签）': 'formal_two',
+                '正式合同（无固定）': 'formal_none',
+                '兼职协议': 'part_time',
+                '用工协议': 'employment',
+                '实习协议': 'internship'
+            }
+            contract_name = self.contract_type_id.name
+            if contract_name in contract_name_mapping:
+                user_type = contract_name_mapping[contract_name]
+                self.employee_id.use_user_type = user_type

yuthon_contract/views/inherit_hr_contract_views.xml

@@ -9,7 +9,7 @@
                 <field name="date_of_entry"/>
             </xpath>
             <xpath expr="//field[@name='contract_type_id']" position="attributes">
-                <attribute name="column_invisible">1</attribute>
+                <attribute name="string">用工形式</attribute>
             </xpath>
             <xpath expr="//field[@name='name']" position="attributes">
                 <attribute name="string">合同名称</attribute>

yuthon_will_task/models/yuthon_will_task.py

@@ -19,7 +19,7 @@ class YuthonWillTask(models.Model):
     task_type = fields.Many2one('task.type.setting', string='任务类型')
     task_content = fields.Text(string='任务内容')
     remarks = fields.Text(string='备注')
-    creation_time = fields.Date(string='创建时间')
+    creation_time = fields.Date(string='创建时间', default=fields.Date.today())
     employee_ids = fields.Many2many('hr.employee', 'will_task_employee_rel', 'custom_id', 'employee_id',
                                     string='人员', default=lambda self: self.env.user.employee_id)
     employee_ids2 = fields.Many2many('hr.employee', 'will_task_employee_rel2',

yuthon_will_task/views/yuthon_will_task_views.xml

@@ -50,10 +50,10 @@
                     <group>
                         <group>
                             <field name="employee_ids" widget="many2many_tags"/>
-                            <field name="task_content"/>
+                            <field name="task_content" required="1"/>
                             <field name="task_type"/>
                             <field name="remarks"/>
-                            <field name="creation_time"/>
+                            <field name="creation_time" invisible="1"/>
                         </group>
                         <group>
                             <field name="priority"/>