添加功能

yuthon_hr_employee/security/hr_company_security_group.xml

@@ -1,39 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-     <record id="inherit_hr_job_views_rule" model="ir.rule">
-        <field name="name">岗位编制公司过滤</field>
+    <record id="module_category_yuthon_employee" model="ir.module.category">
+            <field name="name">人力资源群组</field>
+    </record>
+    <record id="group_employee_user" model="res.groups">
+        <field name="name">用户</field>
+        <field name="category_id" ref="module_category_yuthon_employee"/>
+    </record>
+    <!--岗位-->
+    <record id="hr_job_views_rule_manager" model="ir.rule">
+        <field name="name">yuthon_employee_job_rule_admin</field>
         <field name="model_id" ref="model_hr_job"/>
         <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
-    </record>
-    <record id="inherit_hr_employee_views_rule" model="ir.rule">
-        <field name="name">花名册公司过滤</field>
-        <field name="model_id" ref="model_hr_employee"/>
-        <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
-    </record>
-    <record id="inherit_soong_user_role_views_rule" model="ir.rule">
-        <field name="name">角色公司过滤</field>
-        <field name="model_id" ref="model_soong_user_role"/>
-        <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
+        <field name="groups" eval="[(4, ref('group_employee_user'))]"/>
     </record>
+    <!--部门-->
     <record id="inherit_hr_department_views_rule" model="ir.rule">
-        <field name="name">部门公司过滤</field>
+        <field name="name">inherit_hr_department_views_rule</field>
         <field name="model_id" ref="model_hr_department"/>
         <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>
-        <field name="perm_read" eval="True"/>
-        <field name="perm_write" eval="True"/>
-        <field name="perm_create" eval="True"/>
-        <field name="perm_unlink" eval="True"/>
+        <field name="groups" eval="[(4, ref('group_employee_user'))]"/>
     </record>
-</odoo>
+    <!--花名册-->
+    <record id="inherit_hr_employee_views_rule" model="ir.rule">
+        <field name="name">inherit_hr_employee_views_rule</field>
+        <field name="model_id" ref="model_hr_employee"/>
+        <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>
+        <field name="groups" eval="[(4, ref('group_employee_user'))]"/>
+    </record>
+    <!--角色-->
+    <record id="inherit_soong_user_role_views_rule" model="ir.rule">
+        <field name="name">inherit_soong_user_role_views_rule</field>
+        <field name="model_id" ref="model_soong_user_role"/>
+        <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>
+        <field name="groups" eval="[(4, ref('group_employee_user'))]"/>
+    </record>
+    <!--合同-->
+<!--    <record id="inherit_hr_contract_views_rule" model="ir.rule">-->
+<!--        <field name="name">inherit_hr_contract_views_rule</field>-->
+<!--        <field name="model_id" ref="model_hr_contract"/>-->
+<!--        <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>-->
+<!--        <field name="groups" eval="[(4, ref('group_employee_user'))]"/>-->
+<!--    </record>-->
+</odoo>

yuthon_property/models/yuthon_resource_mgmt_config.py

@@ -158,9 +158,15 @@ class YuthonPropertyProduce(models.Model):
 class YuthonPremisesSetting(models.Model):
     _name = 'yuthon.premises.setting'
     _description = '楼盘配置'
+    _order = 'first_letter, name'
 
-    sequence = fields.Char(string='序号', store=True)
     name = fields.Char(string="名称")
+    first_letter = fields.Char(string='首字母', compute='_compute_first_letter', store=True)
+
+    @api.depends('name')
+    def _compute_first_letter(self):
+        for record in self:
+            record.first_letter = record.name[0].upper() if record.name else ''
 
 
 class RentFreeSetting(models.Model):
@@ -217,4 +223,4 @@ class PropertyFloorSetting(models.Model):
     _description = '楼层配置'
 
     name = fields.Char(string="名称")
-    premises_id =  fields.Many2one('yuthon.premises.setting', string="所属楼盘")
+    premises_ids = fields.Many2many('yuthon.premises.setting', string="所属楼盘")

yuthon_property/views/yuthon_resource_mgmt_config_views.xml

@@ -277,8 +277,8 @@
         <field name="model">yuthon.premises.setting</field>
         <field name="arch" type="xml">
             <tree editable="bottom">
-                <field name="sequence"/>
                 <field name="name"/>
+                <field name="first_letter" column_invisible="1"/>
             </tree>
         </field>
     </record>
@@ -309,7 +309,6 @@
                 <sheet>
                     <group>
                         <field name="name"/>
-
                         <field name="start_time"/>
                         <field name="end_date"/>
                     </group>
@@ -374,7 +373,7 @@
         <field name="arch" type="xml">
             <tree string="楼层配置" editable="bottom">
                 <field name="name"/>
-                <field name="premises_id"/>
+                <field name="premises_ids" widget="many2many_tags"/>
             </tree>
         </field>
     </record>

yuthon_property/wizard/yuthon_property_wizard.py

@@ -24,7 +24,7 @@ class YuthonPropertyWizard(models.Model):
         sh = book.sheet_by_index(0)
         for rx in range(1, sh.nrows):
             row = sh.row(rx)
-            self.yuthon_premises_id(row)
+            self.update_property(row)
 
     def yuthon_property_data(self,row):
         property_name = row[2].value
@@ -200,5 +200,13 @@ class YuthonPropertyWizard(models.Model):
                 'property_floor_id': property_floor_id.id,
             })
 
+    def update_property(self,row):
+        premises_id = self.env['yuthon.premises.setting'].search([('name', '=', row[1].value)])
+        property_floor_id = self.env['property.floor.setting'].search([('name', '=', row[4].value)])
+        if property_floor_id:
+            if premises_id:
+                property_floor_id.write({
+                    'premises_ids': [(4, premises_id.id, 0)]
+                })
 
 

yuthon_property_approval/views/property_evaluate_application_views.xml

@@ -66,7 +66,7 @@
                                     <tree editable="bottom">
                                         <field name="property_message_id" column_invisible="1"/>
                                         <field name="premises_id" required="1" class="list_width"/>
-                                        <field name="property_floor_id" domain="[('premises_id', '=', premises_id)]" class="list_width"/>
+                                        <field name="property_floor_id" domain="[('premises_ids', 'in', premises_id)]" class="list_width"/>
                                         <field name="evaluation_area" string="评估面积m²"/>
                                         <field name="assessment_category" string="评估类别"/>
                                         <field name="owner_id"/>