From 9e9d6391a0dd8669ee090e76b7f190b01711da95 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Thu, 3 Apr 2025 11:39:43 +0800
Subject: [PATCH] =?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
---
soong_workflow/models/soong_user_role.py | 2 +-
soong_workflow/views/soong_user_role_views.xml | 2 +-
yuthon_hr_employee/models/yuthon_hr_department.py | 2 +-
.../views/inherit_hr_applicant_views.xml | 2 +-
.../views/yuthon_hr_department_views.xml | 2 +-
yuthon_hr_employee/wizard/hr_employee_wizard.py | 2 +-
.../views/yuthon_appointment_approval_views.xml | 4 ++--
yuthon_property/views/yuthon_property_views.xml | 2 +-
.../views/property_accounting_approval_views.xml | 4 ++--
.../views/property_approval_views.xml | 2 +-
.../views/property_construction_approval_views.xml | 4 ++--
.../views/property_design_approval_views.xml | 4 ++--
.../views/property_lease_contract.xml | 2 +-
.../views/property_management.xml | 4 ++--
.../views/property_supervising_approval_views.xml | 4 ++--
.../models/inherit_hr_payroll_structure.py | 2 +-
yuthon_salary/models/yuthon_payroll_labor.py | 1 +
yuthon_salary/models/yuthon_payroll_project.py | 6 +++---
yuthon_salary/models/yuthon_payroll_retired.py | 3 ++-
.../views/inherit_hr_payroll_structure_views.xml | 2 +-
yuthon_salary/views/inherit_hr_payslip_views.xml | 2 +-
yuthon_salary/views/yuthon_payroll_labor_views.xml | 1 +
.../views/yuthon_payroll_project_views.xml | 6 +++---
.../views/yuthon_payroll_retired_views.xml | 1 +
yuthon_wechat/models/wecom_apps.py | 2 +-
yuthon_wechat/views/wecom_apps_views.xml | 4 ++--
yuthon_wechat/wizard/wecom_api_sync_wizard.xml | 2 +-
yuthon_work_brand/views/hr_menus.xml | 14 ++++++++++++--
28 files changed, 51 insertions(+), 37 deletions(-)
diff --git a/soong_workflow/models/soong_user_role.py b/soong_workflow/models/soong_user_role.py
index 71464851c..6bae61132 100644
--- a/soong_workflow/models/soong_user_role.py
+++ b/soong_workflow/models/soong_user_role.py
@@ -22,7 +22,7 @@ class YuthonUserRole(models.Model):
personnel = fields.Text(string="在岗人员", store=True)
employee_ids = fields.One2many('hr.employee', 'user_role_id')
child_ids = fields.One2many('soong.user.role', 'parent_id', string='下级角色', index=True)
- company_id = fields.Many2one('res.company', string="所属公司")
+ company_id = fields.Many2one('res.company', string="所属公司", index=True, default=lambda self: self.env.company)
pinyin_name = fields.Char(string="拼音名称", compute='_compute_pinyin', index=True, store=True)
def write(self, vals):
diff --git a/soong_workflow/views/soong_user_role_views.xml b/soong_workflow/views/soong_user_role_views.xml
index 29f747153..98653ef77 100644
--- a/soong_workflow/views/soong_user_role_views.xml
+++ b/soong_workflow/views/soong_user_role_views.xml
@@ -28,7 +28,7 @@
-
+
diff --git a/yuthon_hr_employee/models/yuthon_hr_department.py b/yuthon_hr_employee/models/yuthon_hr_department.py
index 9dfec9b8e..c2d1a855d 100644
--- a/yuthon_hr_employee/models/yuthon_hr_department.py
+++ b/yuthon_hr_employee/models/yuthon_hr_department.py
@@ -26,7 +26,7 @@ class YuthonHrDepartment(models.Model):
expiration_date = fields.Date(string="失效日期", default=fields.Date.today())
end_date = fields.Date(string="结束时间")
department_code = fields.Char(string="部门序号")
- company_id = fields.Many2one('res.company', string="所属公司")
+ company_id = fields.Many2one('res.company', string="所属公司", index=True, default=lambda self: self.env.company)
pinyin_name = fields.Char(string="拼音名称", compute='_compute_pinyin', index=True, store=True)
def do_department_to_res_groups(self):
diff --git a/yuthon_hr_employee/views/inherit_hr_applicant_views.xml b/yuthon_hr_employee/views/inherit_hr_applicant_views.xml
index 44c18327e..6daa4191d 100644
--- a/yuthon_hr_employee/views/inherit_hr_applicant_views.xml
+++ b/yuthon_hr_employee/views/inherit_hr_applicant_views.xml
@@ -27,7 +27,7 @@
-
+
diff --git a/yuthon_hr_employee/views/yuthon_hr_department_views.xml b/yuthon_hr_employee/views/yuthon_hr_department_views.xml
index 3a7a237e6..b787cfa01 100644
--- a/yuthon_hr_employee/views/yuthon_hr_department_views.xml
+++ b/yuthon_hr_employee/views/yuthon_hr_department_views.xml
@@ -32,7 +32,7 @@
-
+
1
diff --git a/yuthon_hr_employee/wizard/hr_employee_wizard.py b/yuthon_hr_employee/wizard/hr_employee_wizard.py
index 3324641c3..f6fb608eb 100644
--- a/yuthon_hr_employee/wizard/hr_employee_wizard.py
+++ b/yuthon_hr_employee/wizard/hr_employee_wizard.py
@@ -176,7 +176,7 @@ class YuthonHrEmployeeWizard(models.Model):
employee_id = self.env['hr.employee'].search([('name', '=', row[0].value)])
social_base_on = row[1].value if row[1].value else None
social_base_off = row[2].value if row[2].value else None
- last_year_salary = row[3].value if row[3].value else None
+ last_year_salary = row[2].value if row[2].value else None
employee_date = {
'social_base_on': social_base_on,
'social_base_off': social_base_off,
diff --git a/yuthon_hr_employee_approval/views/yuthon_appointment_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_appointment_approval_views.xml
index c76147092..2476be394 100644
--- a/yuthon_hr_employee_approval/views/yuthon_appointment_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_appointment_approval_views.xml
@@ -7,7 +7,7 @@
-
+
@@ -49,7 +49,7 @@
-
+
diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml
index 6a43ce02f..dfdeba5de 100644
--- a/yuthon_property/views/yuthon_property_views.xml
+++ b/yuthon_property/views/yuthon_property_views.xml
@@ -123,7 +123,7 @@
-
+
diff --git a/yuthon_property_approval/views/property_accounting_approval_views.xml b/yuthon_property_approval/views/property_accounting_approval_views.xml
index 85b0ecf5b..d39a107fc 100644
--- a/yuthon_property_approval/views/property_accounting_approval_views.xml
+++ b/yuthon_property_approval/views/property_accounting_approval_views.xml
@@ -6,7 +6,7 @@
-
+
@@ -44,7 +44,7 @@
-
+
diff --git a/yuthon_property_approval/views/property_approval_views.xml b/yuthon_property_approval/views/property_approval_views.xml
index 1c15b10e5..7d8439792 100644
--- a/yuthon_property_approval/views/property_approval_views.xml
+++ b/yuthon_property_approval/views/property_approval_views.xml
@@ -52,7 +52,7 @@
-
+
diff --git a/yuthon_property_approval/views/property_construction_approval_views.xml b/yuthon_property_approval/views/property_construction_approval_views.xml
index b891ae597..4ef08b2ed 100644
--- a/yuthon_property_approval/views/property_construction_approval_views.xml
+++ b/yuthon_property_approval/views/property_construction_approval_views.xml
@@ -6,7 +6,7 @@
-
+
@@ -45,7 +45,7 @@
-
+
diff --git a/yuthon_property_approval/views/property_design_approval_views.xml b/yuthon_property_approval/views/property_design_approval_views.xml
index 5df80752d..18a0b4eb5 100644
--- a/yuthon_property_approval/views/property_design_approval_views.xml
+++ b/yuthon_property_approval/views/property_design_approval_views.xml
@@ -6,7 +6,7 @@
-
+
@@ -45,7 +45,7 @@
-
+
diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml
index 08c570e54..37414aa8f 100644
--- a/yuthon_property_approval/views/property_lease_contract.xml
+++ b/yuthon_property_approval/views/property_lease_contract.xml
@@ -293,7 +293,7 @@
-
+
diff --git a/yuthon_property_approval/views/property_management.xml b/yuthon_property_approval/views/property_management.xml
index 506d27c64..b3b1e0e24 100644
--- a/yuthon_property_approval/views/property_management.xml
+++ b/yuthon_property_approval/views/property_management.xml
@@ -60,7 +60,7 @@
-
+
@@ -73,7 +73,7 @@
-
+
diff --git a/yuthon_property_approval/views/property_supervising_approval_views.xml b/yuthon_property_approval/views/property_supervising_approval_views.xml
index c9b52e505..1ac6c3b62 100644
--- a/yuthon_property_approval/views/property_supervising_approval_views.xml
+++ b/yuthon_property_approval/views/property_supervising_approval_views.xml
@@ -6,7 +6,7 @@
-
+
@@ -45,7 +45,7 @@
-
+
diff --git a/yuthon_salary/models/inherit_hr_payroll_structure.py b/yuthon_salary/models/inherit_hr_payroll_structure.py
index 74112ed3a..5514cc62a 100644
--- a/yuthon_salary/models/inherit_hr_payroll_structure.py
+++ b/yuthon_salary/models/inherit_hr_payroll_structure.py
@@ -20,7 +20,7 @@ class HrPayrollStructure(models.Model):
company_id = self.env['res.company'].search([('name', '=', '天河粮储')])
i.write({'company_id': company_id})
- company_id = fields.Many2one('res.company', string="公司")
+ company_id = fields.Many2one('res.company', string="公司", default=lambda self: self.env.company)
type_id = fields.Many2one('hr.payroll.structure.type', string="职级类型")
level_id = fields.Many2one('yuthon.payroll.type.setting', string="级别")
lv_name = fields.Char(related='level_id.name', string='级别名称', store=True)
diff --git a/yuthon_salary/models/yuthon_payroll_labor.py b/yuthon_salary/models/yuthon_payroll_labor.py
index 8f4d004c5..de40a444f 100644
--- a/yuthon_salary/models/yuthon_payroll_labor.py
+++ b/yuthon_salary/models/yuthon_payroll_labor.py
@@ -22,6 +22,7 @@ class YuthonPayrollLabor(models.Model):
('12', '12月份')
], string="月份")
labor_amount = fields.Float(string='金额')
+ company_id = fields.Many2one('res.company', string='公司', index=True, default=lambda self: self.env.company)
diff --git a/yuthon_salary/models/yuthon_payroll_project.py b/yuthon_salary/models/yuthon_payroll_project.py
index 765ecab84..832c7c617 100644
--- a/yuthon_salary/models/yuthon_payroll_project.py
+++ b/yuthon_salary/models/yuthon_payroll_project.py
@@ -10,7 +10,7 @@ class YuthonPayrollCommon(models.Model):
_order = 'sequence asc'
yuthon_company = fields.Selection([('', '')])
- company_id = fields.Many2one('res.company', string="公司")
+ company_id = fields.Many2one('res.company', string="公司", default=lambda self: self.env.company)
name = fields.Char(string='工资项名称')
sequence = fields.Char(string='序号', store=True)
department_id = fields.Many2one('hr.department', string="部门")
@@ -97,7 +97,7 @@ class YuthonPayrollTemporary(models.Model):
_name = 'yuthon.payroll.temporary'
_description = '薪资临时项'
- company_id = fields.Many2one('res.company', string="公司")
+ company_id = fields.Many2one('res.company', string="公司", default=lambda self: self.env.company)
name = fields.Char(string='工资项名称')
department_id = fields.Many2one('hr.department', string="部门")
attributes = fields.Selection([('increment', '增'), ('deduction', '减')], string="工资项属性", default='increment')
@@ -130,7 +130,7 @@ class YuthonPayrollInsurances (models.Model):
_name = 'yuthon.payroll.insurances'
_description = '五险一金'
- company_id = fields.Many2one('res.company', string="公司")
+ company_id = fields.Many2one('res.company', string="公司", default=lambda self: self.env.company)
name = fields.Char(string='工资项名称')
is_base = fields.Boolean(string='独立基数')
basic_medical_insurance = fields.Float(string='基本医疗保险费', store=True)
diff --git a/yuthon_salary/models/yuthon_payroll_retired.py b/yuthon_salary/models/yuthon_payroll_retired.py
index eb8284bdd..4953987e0 100644
--- a/yuthon_salary/models/yuthon_payroll_retired.py
+++ b/yuthon_salary/models/yuthon_payroll_retired.py
@@ -21,4 +21,5 @@ class YuthonPayrollRetired(models.Model):
('11', '11月份'),
('12', '12月份')
], string="月份")
- retired_amount = fields.Float(string='金额')
\ No newline at end of file
+ retired_amount = fields.Float(string='金额')
+ company_id = fields.Many2one('res.company', string='公司', index=True, default=lambda self: self.env.company)
\ No newline at end of file
diff --git a/yuthon_salary/views/inherit_hr_payroll_structure_views.xml b/yuthon_salary/views/inherit_hr_payroll_structure_views.xml
index 750b3171a..967890eba 100644
--- a/yuthon_salary/views/inherit_hr_payroll_structure_views.xml
+++ b/yuthon_salary/views/inherit_hr_payroll_structure_views.xml
@@ -22,7 +22,7 @@
-
+
diff --git a/yuthon_salary/views/inherit_hr_payslip_views.xml b/yuthon_salary/views/inherit_hr_payslip_views.xml
index 149ba91c3..4e1a0fc76 100644
--- a/yuthon_salary/views/inherit_hr_payslip_views.xml
+++ b/yuthon_salary/views/inherit_hr_payslip_views.xml
@@ -163,7 +163,7 @@
-
+
diff --git a/yuthon_salary/views/yuthon_payroll_labor_views.xml b/yuthon_salary/views/yuthon_payroll_labor_views.xml
index a9a3c97ca..b382a3bca 100644
--- a/yuthon_salary/views/yuthon_payroll_labor_views.xml
+++ b/yuthon_salary/views/yuthon_payroll_labor_views.xml
@@ -8,6 +8,7 @@
+
diff --git a/yuthon_salary/views/yuthon_payroll_project_views.xml b/yuthon_salary/views/yuthon_payroll_project_views.xml
index b5f47f8d9..9d10e1641 100644
--- a/yuthon_salary/views/yuthon_payroll_project_views.xml
+++ b/yuthon_salary/views/yuthon_payroll_project_views.xml
@@ -7,7 +7,7 @@
-
+
@@ -38,7 +38,7 @@
-
+
@@ -58,7 +58,7 @@
-
+
diff --git a/yuthon_salary/views/yuthon_payroll_retired_views.xml b/yuthon_salary/views/yuthon_payroll_retired_views.xml
index 09b267ffd..6e9605bbc 100644
--- a/yuthon_salary/views/yuthon_payroll_retired_views.xml
+++ b/yuthon_salary/views/yuthon_payroll_retired_views.xml
@@ -8,6 +8,7 @@
+
diff --git a/yuthon_wechat/models/wecom_apps.py b/yuthon_wechat/models/wecom_apps.py
index 7f54b02b1..834a8e470 100644
--- a/yuthon_wechat/models/wecom_apps.py
+++ b/yuthon_wechat/models/wecom_apps.py
@@ -13,7 +13,7 @@ class WeComApps(models.Model):
corpid = fields.Char(string="corpid")
agent_id = fields.Char(string="agent_id")
corpsecret = fields.Char(string="corpsecret")
- company_id = fields.Many2one("res.company", string="公司")
+ company_id = fields.Many2one("res.company", string="公司", default=lambda self: self.env.company)
access_token = fields.Char(string="access_token", default="1")
token_expiration_time = fields.Datetime(string="Token失效时间")
diff --git a/yuthon_wechat/views/wecom_apps_views.xml b/yuthon_wechat/views/wecom_apps_views.xml
index c93eb24c4..ff83fb813 100644
--- a/yuthon_wechat/views/wecom_apps_views.xml
+++ b/yuthon_wechat/views/wecom_apps_views.xml
@@ -9,7 +9,7 @@
-
+
@@ -29,7 +29,7 @@
-
+
diff --git a/yuthon_wechat/wizard/wecom_api_sync_wizard.xml b/yuthon_wechat/wizard/wecom_api_sync_wizard.xml
index a4b3d4890..04499b307 100644
--- a/yuthon_wechat/wizard/wecom_api_sync_wizard.xml
+++ b/yuthon_wechat/wizard/wecom_api_sync_wizard.xml
@@ -7,7 +7,7 @@