From 2907f422e478ff68d6d33252920ba95f2d5f49bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Mon, 2 Feb 2026 20:12:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../models/soong_workflow_record.py | 1 - .../models/property_fee_spending.py | 1 + .../views/property_fee_spending_view.xml | 44 +++++++++++++------ yuthon_work_brand/views/hr_menus.xml | 5 +++ 4 files changed, 36 insertions(+), 15 deletions(-) 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_property_approval/models/property_fee_spending.py b/yuthon_property_approval/models/property_fee_spending.py index 781532dd9..0a3918489 100644 --- a/yuthon_property_approval/models/property_fee_spending.py +++ b/yuthon_property_approval/models/property_fee_spending.py @@ -30,6 +30,7 @@ class PropertyFeeSpending(models.Model): spending_fee = fields.Float(string="支付金额") pay_date = fields.Date(string="支付日期") expenses_type = fields.Many2one('yuthon.expenses.type', string="支出类型") + creart_datetime = fields.Date(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..427f66f3b 100644 --- a/yuthon_property_approval/views/property_fee_spending_view.xml +++ b/yuthon_property_approval/views/property_fee_spending_view.xml @@ -9,17 +9,18 @@ + - property.fee.spending.form - property.fee.spending - -
+ property.fee.spending.form + property.fee.spending + + + invisible="urgency_level != 'normal'"/> - -
+ + + + + 费用支出搜索 + 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"/> + Date: Mon, 2 Feb 2026 20:15:12 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_property_approval/models/property_fee_spending.py | 3 ++- yuthon_property_approval/views/property_fee_spending_view.xml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/yuthon_property_approval/models/property_fee_spending.py b/yuthon_property_approval/models/property_fee_spending.py index 0a3918489..f7697ee71 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,7 +27,7 @@ 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="支出类型") diff --git a/yuthon_property_approval/views/property_fee_spending_view.xml b/yuthon_property_approval/views/property_fee_spending_view.xml index 427f66f3b..4c1530257 100644 --- a/yuthon_property_approval/views/property_fee_spending_view.xml +++ b/yuthon_property_approval/views/property_fee_spending_view.xml @@ -6,6 +6,7 @@ + From 7f498800a6cd2bd1c277a1d88821da10b9cd3b37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Mon, 2 Feb 2026 20:16:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_property_approval/models/property_fee_spending.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yuthon_property_approval/models/property_fee_spending.py b/yuthon_property_approval/models/property_fee_spending.py index f7697ee71..461f01ac2 100644 --- a/yuthon_property_approval/models/property_fee_spending.py +++ b/yuthon_property_approval/models/property_fee_spending.py @@ -31,7 +31,7 @@ class PropertyFeeSpending(models.Model): spending_fee = fields.Float(string="支付金额") pay_date = fields.Date(string="支付日期") expenses_type = fields.Many2one('yuthon.expenses.type', string="支出类型") - creart_datetime = fields.Date(string="创建日期", default=fields.Datetime.now) + creart_datetime = fields.Datetime(string="创建日期", default=fields.Datetime.now) remake = fields.Text(string="备注") def _get_default_name_title(self): From 11f93f3a21ffff48222965dcc89bbd14814aefd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Tue, 3 Feb 2026 09:55:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=AF=B7=E5=81=87=E7=BB=93=E6=9D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_holiday/models/inherit_hr_leave.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: