!293 zhou

Merge pull request !293 from 李鹏宇/dev

yuthon_holiday/models/yuthon_holiday_type.py

@@ -6,7 +6,8 @@ class HrLeaveType(models.Model):
     _inherit = 'hr.leave.type'
 
 
-    holiday_days = fields.Char(string='假期天数', required=True)
+    holiday_days = fields.Float(string='假期天数')
+    vacation_days_description = fields.Text(string='假期天数说明')
     vacation_type_id = fields.Many2one('holiday.type.setting', string='假期类型')
     travel_leave = fields.Char(string='路程假')
     treated = fields.Text(string='待遇')

yuthon_holiday/views/holiday_type_setting.xml

@@ -4,28 +4,15 @@
         <field name="name">holiday.type.setting.tree</field>
         <field name="model">holiday.type.setting</field>
         <field name="arch" type="xml">
-            <tree string="假期类别配置">
+            <tree string="假期类别配置" editable="bottom">
                 <field name="name"/>
             </tree>
         </field>
     </record>
-    <record id="view_holiday_type_setting_form" model="ir.ui.view">
-        <field name="name">holiday.type.setting.form</field>
-        <field name="model">holiday.type.setting</field>
-        <field name="arch" type="xml">
-            <form string="假期类别配置">
-                <sheet>
-                    <group>
-                        <field name="name"/>
-                    </group>
-                </sheet>
-            </form>
-        </field>
-    </record>
     <record id="view_holiday_type_setting_action" model="ir.actions.act_window">
         <field name="name">假期类别配置</field>
         <field name="res_model">holiday.type.setting</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">tree</field>
     </record>
 
 </odoo>

yuthon_holiday/views/yuthon_holiday_type.xml

@@ -24,15 +24,22 @@
             <xpath expr="//group[@name='leave_validation']" position="after">
                 <group string="假期需求及待遇">
                     <field name="vacation_type_id"/>
-                    <field name="holiday_days" string="假期天数"/>
-                    <field name="travel_leave" string="路程假"/>
-                    <field name="treated" string="待遇"/>
-                    <field name="remarks" string="备注"/>
+                    <field name="holiday_days"/>
+                    <field name="vacation_days_description"/>
+                    <field name="travel_leave"/>
+                    <field name="treated"/>
+                    <field name="remarks"/>
                 </group>
             </xpath>
             <xpath expr="//field[@name='allocation_validation_type']" position="attributes">
                    <attribute name="invisible">1</attribute>
             </xpath>
+            <xpath expr="//field[@name='responsible_ids']" position="attributes">
+                   <attribute name="invisible">1</attribute>
+            </xpath>
+            <xpath expr="//field[@name='support_document']" position="attributes">
+                   <attribute name="invisible">1</attribute>
+            </xpath>
         </field>
     </record>
 </odoo>