Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang

soong_workflow/models/soong_workflow_record.py

@@ -103,7 +103,6 @@ class SoongWorkflowRecord(models.Model):
     def copy(self, default=None):
         default = default or {}
         default['code'] = False
-        default['name'] = False
         return super(SoongWorkflowRecord, self).copy(default=default)
 
     @api.depends('node_update_time', 'write_date2')

yuthon_holiday/models/inherit_hr_leave.py

@@ -549,7 +549,7 @@ class HolidaysRequestBatch(models.Model):
             })
             ('start_time', '>=', datetime(2025, 12, 1)),
             remaining_deduct = deduct_days
-            vacation_report.vacation_report += deduct_days
+            vacation_report.used_this_year1 += deduct_days
             # 优先扣减上年剩余（补休）
             if vacation_report.dynamic_previous_year1 > 0:
                 if vacation_report.dynamic_previous_year1 >= remaining_deduct:

yuthon_property_approval/models/property_fee_spending.py

@@ -15,6 +15,7 @@ class PropertyFeeSpending(models.Model):
     property_address = fields.Text(string="物业地址")
     users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
     department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
+    company_id = fields.Many2one(related='users_id.employee_id.company_id',string="公司")
     code = fields.Char(string="编号",
                        default=lambda self: self.env['ir.sequence'].next_by_code('property_fee_spending_code'))
     is_issues = fields.Boolean(string='是否上会')
@@ -26,10 +27,11 @@ class PropertyFeeSpending(models.Model):
                                      default='normal')
     active = fields.Boolean('Active', default=True, tracking=True)
     work_end = fields.Boolean(string="结束")
-    company_id = fields.Many2one('yuthon.property.company', string="所属公司")
+    company_id1 = fields.Many2one('yuthon.property.company', string="所属公司")
     spending_fee = fields.Float(string="支付金额")
     pay_date = fields.Date(string="支付日期")
     expenses_type = fields.Many2one('yuthon.expenses.type', string="支出类型")
+    creart_datetime = fields.Datetime(string="创建日期", default=fields.Datetime.now)
     remake = fields.Text(string="备注")
 
     def _get_default_name_title(self):

yuthon_property_approval/views/property_fee_spending_view.xml

@@ -6,20 +6,22 @@
         <field name="arch" type="xml">
             <tree string="费用支出">
                 <field name="name"/>
+                <field name="company_id1"/>
                 <field name="spending_fee"/>
                 <field name="expenses_type"/>
                 <field name="users_id"/>
+                <field name="creart_datetime"/>
             </tree>
         </field>
     </record>
     <record id="view_property_fee_spending_form" model="ir.ui.view">
-            <field name="name">property.fee.spending.form</field>
-            <field name="model">property.fee.spending</field>
-            <field name="arch" type="xml">
-                <form string="费用支出">
+        <field name="name">property.fee.spending.form</field>
+        <field name="model">property.fee.spending</field>
+        <field name="arch" type="xml">
+            <form string="费用支出">
                 <sheet>
                     <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
-                        invisible="urgency_level != 'normal'"/>
+                            invisible="urgency_level != 'normal'"/>
                     <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
                             invisible="urgency_level != 'urgent'"/>
                     <widget name="web_ribbon" title="特级" bg_color="text-bg-danger"
@@ -69,16 +71,31 @@
                         <field name="spending_fee"/>
                     </group>
                 </sheet>
-                </form>
-            </field>
+            </form>
+        </field>
+    </record>
+    <record id="view_yuthon_expenses_type_search" model="ir.ui.view">
+        <field name="name">费用支出搜索</field>
+        <field name="model">property.fee.spending</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="name"/>
+                <field name="users_id"/>
+            </search>
+        </field>
+    </record>
+    <record id="view_yuthon_expenses_type_action" model="ir.actions.act_window">
+        <field name="name">费用支出</field>
+        <field name="res_model">property.fee.spending</field>
+        <field name="view_mode">tree,form</field>
     </record>
     <record id="view_yuthon_expenses_type_tree" model="ir.ui.view">
-            <field name="name">yuthon.expenses.type.tree</field>
-            <field name="model">yuthon.expenses.type</field>
-            <field name="arch" type="xml">
-                    <tree string="支出类型" editable="bottom">
-                            <field name="name"/>
-                    </tree>
-            </field>
+        <field name="name">yuthon.expenses.type.tree</field>
+        <field name="model">yuthon.expenses.type</field>
+        <field name="arch" type="xml">
+            <tree string="支出类型" editable="bottom">
+                <field name="name"/>
+            </tree>
+        </field>
     </record>
 </odoo>

yuthon_work_brand/views/hr_menus.xml

@@ -926,6 +926,11 @@
               name="对账(借)"
               parent="yuthon_financial_management_menu"
               action="yuthon_property.view_property_bank_statements_action_borrow"/>
+    <menuitem id="yuthon_expenses_type_menu"
+              sequence="25"
+              name="费用支出"
+              parent="yuthon_financial_management_menu"
+              action="yuthon_property_approval.view_yuthon_expenses_type_action"/>
     <menuitem id="yuthon_bank_statement_menu1"
               sequence="23"
               name="银行流水"