!10982 添加功能

Merge pull request !10982 from 李鹏宇/dev_zhou

yuthon_hr_attendance/views/vacation_overtime_active_views.xml

@@ -6,7 +6,7 @@
         <field name="arch" type="xml">
             <tree string="加班情况(归档）" editable="bottom" js_class="custom_overtime_carryover_export_button" create="false" delete="false" edit="false">
             <header>
-                <button name="revoke" type="object" string="批量撤销" class="oe_highlight"/>
+                <button name="all_revoke" type="object" string="批量撤销" class="oe_highlight"/>
                 <button name="all_unlink" string="删除" type="object" class="oe_highlight" groups="base.group_system" confirm="确定要删除选中的记录吗？"/>
             </header>
                 <field name="employee_id"/>
@@ -22,7 +22,7 @@
                 <field name="select_revoke" widget="badge"
                 decoration-danger="select_revoke == 'done'" decoration-success="select_revoke == 'to_do'"/>
                 <button name="open_record" type="object" string="详情" class="btn btn-blue"/>
-                <button name="revoke" type="object" string="撤销" class="btn btn-blue" invisible="select_revoke == 'done'"/>
+                <button name="revoke" type="object" string="撤销" class="btn btn-blue" invisible="select_revoke == 'done'" confirm="确认要撤销吗？"/>
             </tree>
         </field>
     </record>

yuthon_purchase/models/inherit_purchase_order.py

@@ -36,6 +36,7 @@ class InheritPurchaseOrder(models.Model):
                                       default=lambda self: [(6, 0, [self.env.user.id])])
     pay_way = fields.Selection([('onetime', '一次性'), ('installment', '分期')], string="付款方式", default='onetime')
     reason_text = fields.Text(string="申请事由")
+    is_modify = fields.Boolean(string="可修改")
     pay_line_ids = fields.One2many('purchase.order.pay.line', 'order_id', string="付款详情")
     is_company = fields.Boolean(string="本公司", default=True, compute='_compute_is_company',search='_search_part_of_company')
     

yuthon_purchase/views/inherit_purchase_order_views.xml

@@ -121,6 +121,7 @@
                     <group col="3">
                         <group>
                             <field name="state" string="状态" readonly="1"/>
+                            <field name="is_modify" invisible="1"/>
                         </group>
                     </group>
                 </xpath>