pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加功能

Browse Source
This commit is contained in:
zhou
2025-04-03 11:39:43 +08:00
parent 1bd0bb8b3e
commit 9e9d6391a0
28 changed files with 51 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soong_workflow/models/soong_user_role.py
+1 -1
View File
@@ -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):
soong_workflow/views/soong_user_role_views.xml
+1 -1
View File
@@ -28,7 +28,7 @@
<field name="number_people"/>
<field name="pinyin_name" column_invisible="1"/>
<field name="parent_id"/>
<field name="company_id" optional="show"/>
<field name="company_id" optional="show" required="1"/>
<field name="child_ids" column_invisible="1"/>
<field name="create_time" optional="hide"/>
<field name="end_time" optional="hide"/>
yuthon_hr_employee/models/yuthon_hr_department.py
+1 -1
View File
@@ -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):
yuthon_hr_employee/views/inherit_hr_applicant_views.xml
+1 -1
View File
@@ -27,7 +27,7 @@
<group>
<field name="colleges"/>
<field name="department_id" string="部门"/>
<field name="company_id"/>
<field name="company_id" required="1"/>
<field name="tage_ids" widget="many2many_tags"/>
</group>
<group>
yuthon_hr_employee/views/yuthon_hr_department_views.xml
+1 -1
View File
@@ -32,7 +32,7 @@
<field name="is_global_department" column_invisible="1"/>
<field name="start_date"/>
<field name="expiration_date"/>
<field name="company_id" optional="show"/>
<field name="company_id" optional="show" required="1"/>
</xpath>
<field name="manager_id" position="attributes">
<attribute name="column_invisible">1</attribute>
yuthon_hr_employee/wizard/hr_employee_wizard.py
+1 -1
View File
@@ -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,
yuthon_hr_employee_approval/views/yuthon_appointment_approval_views.xml
+2 -2
View File
@@ -7,7 +7,7 @@
<tree>
<field name="code"/>
<field name="users_id"/>
<field name="company_id"/>
<field name="company_id" required="1"/>
<field name="department_id"/>
<field name="entrant_date"/>
<field name="entrant_illustrate"/>
@@ -49,7 +49,7 @@
<field name="department_id" invisible="1"/>
<field name="issues_result" invisible="is_issues == False"/>
<field name="users_id"/>
<field name="company_id"/>
<field name="company_id" required="1"/>
<field name="entrant_date"/>
<field name="work_end" invisible="1"/>
<field name="entrant_illustrate"/>
yuthon_property/views/yuthon_property_views.xml
+1 -1
View File
@@ -123,7 +123,7 @@
<field name="manage_information_ids">
<tree editable="bottom">
<field name="yuthon_property_id" column_invisible="1"/>
<field name="company_id"/>
<field name="company_id" required="1"/>
<field name="tenure_type"/>
<field name="admin_id"/>
<field name="precinct_id"/>
yuthon_property_approval/views/property_accounting_approval_views.xml
+2 -2
View File
@@ -6,7 +6,7 @@
<field name="arch" type="xml">
<tree string="建设工程委托核算合同审批">
<field name="name"/>
<field name="company_id"/>
<field name="company_id" required="1"/>
<field name="company_b_id"/>
<field name="project_content"/>
<field name="start_date"/>
@@ -44,7 +44,7 @@
</group>
<group col="2">
<group>
<field name="company_id"/>
<field name="company_id" required="1"/>
<field name="project_content"/>
<field name="users_id" invisible="1"/>
<field name="department_id" invisible="1"/>
yuthon_property_approval/views/property_approval_views.xml
+1 -1
View File
@@ -52,7 +52,7 @@
<group>
<field name="work_end" invisible="1"/>
<field name="property_source"/>
<field name="company_id"/>
<field name="company_id" required="1"/>
<field name="issues_result" invisible="is_issues == False"/>
<field name="users_id" invisible="1"/>
<field name="department_id" invisible="1"/>
yuthon_property_approval/views/property_construction_approval_views.xml
+2 -2
View File
@@ -6,7 +6,7 @@
<field name="arch" type="xml">
<tree string="施工合同合同审批">
<field name="name"/>
<field name="company_id"/>
<field name="company_id" required="1"/>
<field name="company_b_id"/>
<field name="project_content"/>
<field name="start_date"/>
@@ -45,7 +45,7 @@
<group col="2">
<group>
<field name="work_end" invisible="1"/>
<field name="company_id"/>
<field name="company_id" required="1"/>
<field name="project_content"/>
<field name="users_id" invisible="1"/>
<field name="department_id" invisible="1"/>
yuthon_property_approval/views/property_design_approval_views.xml
+2 -2
View File
@@ -6,7 +6,7 @@
<field name="arch" type="xml">
<tree string="建设工程设计合同审批">
<field name="name"/>
<field name="company_id"/>
<field name="company_id" required="1"/>
<field name="company_b_id"/>
<field name="project_content"/>
<field name="start_date"/>
@@ -45,7 +45,7 @@
<group col="2">
<group>
<field name="work_end" invisible="1"/>
<field name="company_id"/>
<field name="company_id" required="1"/>
<field name="project_content"/>
<field name="users_id" invisible="1"/>
<field name="department_id" invisible="1"/>
yuthon_property_approval/views/property_lease_contract.xml
+1 -1
View File
@@ -293,7 +293,7 @@
<field name="bank_statements_ids" string=" ">
<tree editable="bottom">
<field name="start_time"/>
<field name="company_id"/>
<field name="company_id" required="1"/>
<field name="name"/>
<field name="name_account"/>
<field name="contract_account"/>
yuthon_property_approval/views/property_management.xml
+2 -2
View File
@@ -60,7 +60,7 @@
<tree editable="bottom">
<field name="original_property_id" column_invisible="1"/>
<field name="property_name"/>
<field name="company_id"/>
<field name="company_id" required="1"/>
<field name="tenure_type"/>
<field name="admin_id"/>
<field name="precinct"/>
@@ -73,7 +73,7 @@
<field name="new_property_ids" string=" ">
<tree editable="bottom">
<field name="new_property_id" column_invisible="1"/>
<field name="company_id"/>
<field name="company_id" required="1"/>
<field name="tenure_type"/>
<field name="admin_id"/>
<field name="new_precincts"/>
yuthon_property_approval/views/property_supervising_approval_views.xml
+2 -2
View File
@@ -6,7 +6,7 @@
<field name="arch" type="xml">
<tree string="建设工程委托监理合同审批">
<field name="name"/>
<field name="company_id"/>
<field name="company_id" required="1"/>
<field name="company_b_id"/>
<field name="project_content"/>
<field name="start_date"/>
@@ -45,7 +45,7 @@
<group col="2">
<group>
<field name="work_end" invisible="1"/>
<field name="company_id"/>
<field name="company_id" required="1"/>
<field name="project_content"/>
<field name="users_id" invisible="1"/>
<field name="department_id" invisible="1"/>
yuthon_salary/models/inherit_hr_payroll_structure.py
+1 -1
View File
@@ -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)
yuthon_salary/models/yuthon_payroll_labor.py
+1
View File
@@ -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)
yuthon_salary/models/yuthon_payroll_project.py
+3 -3
View File
@@ -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)
yuthon_salary/models/yuthon_payroll_retired.py
+2 -1
View File
@@ -21,4 +21,5 @@ class YuthonPayrollRetired(models.Model):
('11', '11月份'),
('12', '12月份')
], string="月份")
retired_amount = fields.Float(string='金额')
retired_amount = fields.Float(string='金额')
company_id = fields.Many2one('res.company', string='公司', index=True, default=lambda self: self.env.company)
yuthon_salary/views/inherit_hr_payroll_structure_views.xml
+1 -1
View File
@@ -22,7 +22,7 @@
</xpath>
<xpath expr="//field[@name='name']" position="before">
<field name="sequence"/>
<field name="company_id"/>
<field name="company_id" required="1"/>
<field name="type_id"/>
<field name="level_id" column_invisible="1"/>
<field name="lv_name" column_invisible="1"/>
yuthon_salary/views/inherit_hr_payslip_views.xml
+1 -1
View File
@@ -163,7 +163,7 @@
<tree string="薪资计算" default_order="employee_id" js_class="custom_salary_button" editable="bottom">
<field name="employee_id" string="姓名"/>
<field name="total_before_tax" decoration-danger="1"/>
<field name="company_id" optional="hide"/>
<field name="company_id" optional="hide" required="1"/>
<field name="base_salary"/>
<field name="rank_salary"/>
<field name="post_salary"/>
yuthon_salary/views/yuthon_payroll_labor_views.xml
+1
View File
@@ -8,6 +8,7 @@
<field name="employee_id" domain="[('use_user_type', '=', 'labor')]"/>
<field name="current_year" optional="hide"/>
<field name="current_month" optional="hide"/>
<field name="company_id" required="1"/>
<field name="labor_amount"/>
</tree>
</field>
yuthon_salary/views/yuthon_payroll_project_views.xml
+3 -3
View File
@@ -7,7 +7,7 @@
<tree string="薪资常用项" editable="bottom">
<field name="sequence"/>
<field name="name"/>
<field name="company_id"/>
<field name="company_id" required="1"/>
<field name="before_tax"/>
<field name="attributes"/>
<field name="department_id"/>
@@ -38,7 +38,7 @@
<field name="arch" type="xml">
<tree string="临时工资项" editable="bottom">
<field name="name"/>
<field name="company_id"/>
<field name="company_id" required="1"/>
<field name="attributes"/>
<field name="department_id"/>
<field name="is_before_tax"/>
@@ -58,7 +58,7 @@
<field name="arch" type="xml">
<tree string="五险一金" editable="bottom">
<field name="name"/>
<field name="company_id"/>
<field name="company_id" required="1"/>
<field name="is_base"/>
<field name="proportion_company"/>
<field name="proportion_employee"/>
yuthon_salary/views/yuthon_payroll_retired_views.xml
+1
View File
@@ -8,6 +8,7 @@
<field name="name"/>
<field name="current_year" optional="hide"/>
<field name="current_month" optional="hide"/>
<field name="company_id" required="1"/>
<field name="retired_amount"/>
</tree>
</field>
yuthon_wechat/models/wecom_apps.py
+1 -1
View File
@@ -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失效时间")
yuthon_wechat/views/wecom_apps_views.xml
+2 -2
View File
@@ -9,7 +9,7 @@
<field name="corpid"/>
<field name="agent_id"/>
<field name="corpsecret"/>
<field name="company_id"/>
<field name="company_id" required="1"/>
<field name="access_token"/>
<field name="token_expiration_time"/>
</tree>
@@ -29,7 +29,7 @@
<field name="corpsecret"/>
</group>
<group>
<field name="company_id"/>
<field name="company_id" required="1"/>
<field name="access_token"/>
<field name="token_expiration_time"/>
</group>
yuthon_wechat/wizard/wecom_api_sync_wizard.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<form string="企业微信数据同步">
<group>
<field name="sync_name" />
<field name="company_id" />
<field name="company_id" required="1"/>
</group>
<footer>
<button name="wecom_api_sync_users" id="search_attendance_month" string="开始同步" type="object" class="btn-primary"/>
yuthon_work_brand/views/hr_menus.xml
+12 -2
View File
@@ -428,16 +428,26 @@
name="人力资源"
parent="finance_root_board"
sequence="1"/>
<menuitem id="human_yuthon_payroll_labor_board"
name="劳务费"
parent="finance_manage_employee_root_board"
action="yuthon_salary.action_yuthon_payroll_labor"
sequence="1"/>
<menuitem id="human_yuthon_payroll_retired_board"
name="退休人员费用"
parent="finance_manage_employee_root_board"
action="yuthon_salary.action_yuthon_payroll_retired"
sequence="10"/>
<menuitem id="human_pay_slips_root_board2"
name="个税计算"
parent="finance_manage_employee_root_board"
action="yuthon_salary.action_view_hr_payslip_month_form2"
sequence="3"/>
sequence="20"/>
<menuitem id="human_pay_slips_root_board"
name="薪资发放"
parent="finance_manage_employee_root_board"
action="hr_payroll.action_view_hr_payslip_month_form"
sequence="7"/>
sequence="30"/>
<menuitem id="yuthon_financial_management_menu"
name="物业财务管理"
parent="finance_root_board"