diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py
index 82c35eb5e..179662de8 100644
--- a/soong_workflow/models/soong_workflow_record.py
+++ b/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')
diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py
index 89ef499cf..4ed026a2b 100644
--- a/yuthon_holiday/models/inherit_hr_leave.py
+++ b/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:
diff --git a/yuthon_property_approval/models/property_fee_spending.py b/yuthon_property_approval/models/property_fee_spending.py
index 781532dd9..461f01ac2 100644
--- a/yuthon_property_approval/models/property_fee_spending.py
+++ b/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):
diff --git a/yuthon_property_approval/views/property_fee_spending_view.xml b/yuthon_property_approval/views/property_fee_spending_view.xml
index c4cb20f42..4c1530257 100644
--- a/yuthon_property_approval/views/property_fee_spending_view.xml
+++ b/yuthon_property_approval/views/property_fee_spending_view.xml
@@ -6,20 +6,22 @@
+
+
- property.fee.spending.form
- property.fee.spending
-
-
+
+
+
+ 费用支出搜索
+ property.fee.spending
+
+
+
+
+
+
+
+
+ 费用支出
+ property.fee.spending
+ tree,form
- yuthon.expenses.type.tree
- yuthon.expenses.type
-
-
-
-
-
+ yuthon.expenses.type.tree
+ yuthon.expenses.type
+
+
+
+
+
\ No newline at end of file
diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml
index 0cb458894..9ff830707 100644
--- a/yuthon_work_brand/views/hr_menus.xml
+++ b/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"/>
+