!1339 结束

Merge pull request !1339 from 李鹏宇/dev
2025-01-14 12:38:41 +00:00
parent 033c3fc3db 8be2b408b5
commit e6bed31849
3 changed files with 3 additions and 3 deletions
@@ -99,7 +99,7 @@
              sequence="13"
              action="approval_request_card"/>
    <menuitem id="menu_hr_leave_batch_action_all_board"
-              name="休假"
+              name="休假申请"
              parent="menu_hr_attendance_approval_request_board"
              action="yuthon_holiday.hr_leave_batch_action_all"
              sequence="1"/>
@@ -51,7 +51,7 @@
                <button name="button_duty_approval" type="object" string="外出" class="oe_highlight"
                        invisible="not is_abnormal"/>
                <button name="button_correct_approval" type="object" string="修正" class="oe_highlight"
-                            invisible="not is_abnormal" groups="yuthon_hr_attendance.group_he_attendance_planning_manager"/>
+                        invisible="not is_abnormal" groups="yuthon_hr_attendance.group_he_attendance_planning_manager"/>
            </tree>
        </field>
    </record>
@@ -49,7 +49,7 @@
                            <field name="lessee_id"/>
                            <field name="state"/>
                            <field name="other"/>
-                            <field name="meter_type"/>
+                            <field name="meter_type" required="1"/>
                            <field name="payment_account"/>
                            <field name="billing_period"/>
                            <field name="is_push"/>