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

1

Browse Source
This commit is contained in:
李鹏宇
2025-05-07 00:30:37 +08:00
parent ce1ac39cb0
commit 529a84d751
9 changed files with 116 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soong_workflow/__manifest__.py
+1 -1
View File
@@ -18,7 +18,7 @@
"views/soong_approval_users_views.xml",
"views/soong_note_views.xml",
"views/soong_note_setting_views.xml",
# "views/soong_hr_employee_views.xml",
"views/soong_hr_employee_views.xml",
"views/soong_user_role_views.xml",
"views/soong_workflow_node_views.xml",
"views/soong_workflow_link_views.xml",
soong_workflow/models/soong_hr_employee.py
+3 -3
View File
@@ -5,9 +5,9 @@ from odoo import api, fields, models
class YuthonHrEmployee(models.Model):
_inherit = "hr.employee"
user_role_id = fields.Many2one('soong.user.role', string="主角色", store=True,)
user_role_ids = fields.Many2many('soong.user.role', string="辅助角色", store=True, index=True)
department_ids = fields.Many2many('hr.department', string="辅助部门", store=True)
user_role_id = fields.Many2one('soong.user.role', string="主角色")
user_role_ids = fields.Many2many('soong.user.role', string="辅助角色")
department_ids = fields.Many2many('hr.department', string="辅助部门")
@api.onchange('user_role_id')
def _onchange_user_role_id(self):
soong_workflow/models/soong_workflow_record.py
+1 -1
View File
@@ -37,7 +37,7 @@ class SoongWorkflowRecord(models.Model):
approvals_group_id = fields.Many2one(related='workflow_id.approvals_group_id', string="审批分组", store=True)
department_id = fields.Many2one("hr.department", string="部门", required=True)
done_by = fields.Many2one(comodel_name="res.users", string="发起人")
is_department_record = fields.Boolean(string="是否是本部门数据", index=True)
# is_department_record = fields.Boolean(string="是否是本部门数据", index=True)
active = fields.Boolean(string="归档", default=True)
# def get_department_employees(self, department_id):
soong_workflow/views/soong_hr_employee_views.xml
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record id="view_employee_inherit_form_soong" model="ir.ui.view">
<field name="name">hr.employee.inherit.del.form</field>
<field name="name">view.employee.inherit.form.soong</field>
<field name="model">hr.employee</field>
<field name="inherit_id" ref="hr.view_employee_form"/>
<field name="arch" type="xml">
@@ -16,7 +16,7 @@
</record>
<record id="view_employee_inherit_tree_soong" model="ir.ui.view">
<field name="name">hr.employee.inherit.del.form</field>
<field name="name">view.employee.inherit.tree.soong</field>
<field name="model">hr.employee</field>
<field name="inherit_id" ref="hr.view_employee_tree"/>
<field name="arch" type="xml">
soong_workflow/views/soong_workflow_record.xml
+1 -1
View File
@@ -34,7 +34,7 @@
<field name="create_uid"/>
<field name="write_date2"/>
<field name="reclaim_state" column_invisible="1"/>
<field name="is_department_record" optional="hide"/>
<!-- <field name="is_department_record" optional="hide"/>-->
<button name="delete_record" type="object" string="删除" class="btn-primary" confirm="你确定要删除吗?"/>
<button name="reminders_record" type="object" string="催办" class="btn-primary"
groups="soong_workflow.group_soong_workflow_manager"/>
yuthon_hr_attendance/models/__init__.py
+1 -1
View File
@@ -21,7 +21,7 @@ from . import yuthon_abnormal_setting
from . import yuthon_shift_approval
from . import yuthon_special_approval
from . import yuthon_customer_planning
from . import inherit_hr_employee
# from . import inherit_hr_employee
from . import hr_attendance_wechat
from . import hr_attendance_detail_wechat
yuthon_hr_attendance/security/planning_group.xml
+100 -100
View File
@@ -1,107 +1,107 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data>
<record id="module_he_attendance_duty" model="ir.module.category">
<field name="name">值班组</field>
</record>
<record id="group_he_attendance_security_user" model="res.groups">
<field name="name">保安部：用户</field>
<field name="category_id" ref="module_he_attendance_duty"/>
</record>
<record id="group_he_attendance_class_a_duty" model="res.groups">
<field name="name">班组a：用户</field>
<field name="category_id" ref="module_he_attendance_duty"/>
<field name="implied_ids" eval="[(4, ref('group_he_attendance_security_user'))]"/>
</record>
<record id="group_he_attendance_class_b_duty" model="res.groups">
<field name="name">班组b：用户</field>
<field name="category_id" ref="module_he_attendance_duty"/>
<field name="implied_ids" eval="[(4, ref('group_he_attendance_security_user'))]"/>
</record>
<record id="group_he_attendance_class_c_duty" model="res.groups">
<field name="name">班组c：用户</field>
<field name="category_id" ref="module_he_attendance_duty"/>
<field name="implied_ids" eval="[(4, ref('group_he_attendance_security_user'))]"/>
</record>
<record id="group_he_attendance_security_manager" model="res.groups">
<field name="name">保安部管理员</field>
<field name="category_id" ref="module_he_attendance_duty"/>
<field name="implied_ids" eval="[(4, ref('group_he_attendance_class_a_duty')), (4, ref('group_he_attendance_class_b_duty')),
(4, ref('group_he_attendance_class_c_duty'))]"/>
<field name="users" eval="[(4, ref('base.user_admin'))]"/>
</record>
<!-- <record id="module_he_attendance_duty" model="ir.module.category">-->
<!-- <field name="name">值班组</field>-->
<!-- </record>-->
<!-- <record id="group_he_attendance_security_user" model="res.groups">-->
<!-- <field name="name">保安部：用户</field>-->
<!-- <field name="category_id" ref="module_he_attendance_duty"/>-->
<!-- </record>-->
<!-- <record id="group_he_attendance_class_a_duty" model="res.groups">-->
<!-- <field name="name">班组a：用户</field>-->
<!-- <field name="category_id" ref="module_he_attendance_duty"/>-->
<!-- <field name="implied_ids" eval="[(4, ref('group_he_attendance_security_user'))]"/>-->
<!-- </record>-->
<!-- <record id="group_he_attendance_class_b_duty" model="res.groups">-->
<!-- <field name="name">班组b：用户</field>-->
<!-- <field name="category_id" ref="module_he_attendance_duty"/>-->
<!-- <field name="implied_ids" eval="[(4, ref('group_he_attendance_security_user'))]"/>-->
<!-- </record>-->
<!-- <record id="group_he_attendance_class_c_duty" model="res.groups">-->
<!-- <field name="name">班组c：用户</field>-->
<!-- <field name="category_id" ref="module_he_attendance_duty"/>-->
<!-- <field name="implied_ids" eval="[(4, ref('group_he_attendance_security_user'))]"/>-->
<!-- </record>-->
<!-- <record id="group_he_attendance_security_manager" model="res.groups">-->
<!-- <field name="name">保安部管理员</field>-->
<!-- <field name="category_id" ref="module_he_attendance_duty"/>-->
<!-- <field name="implied_ids" eval="[(4, ref('group_he_attendance_class_a_duty')), (4, ref('group_he_attendance_class_b_duty')),-->
<!-- (4, ref('group_he_attendance_class_c_duty'))]"/>-->
<!-- <field name="users" eval="[(4, ref('base.user_admin'))]"/>-->
<!-- </record>-->
<record id="group_he_attendance_engineering_user" model="res.groups">
<field name="name">工程部：用户</field>
<field name="category_id" ref="module_he_attendance_duty"/>
</record>
<record id="group_he_attendance_run_user" model="res.groups">
<field name="name">运行班：用户</field>
<field name="category_id" ref="module_he_attendance_duty"/>
<field name="implied_ids" eval="[(4, ref('group_he_attendance_engineering_user'))]"/>
</record>
<record id="group_he_attendance_run_manager" model="res.groups">
<field name="name">运行班管理员</field>
<field name="category_id" ref="module_he_attendance_duty"/>
<field name="implied_ids" eval="[(4, ref('group_he_attendance_run_user'))]"/>
<field name="users" eval="[(4, ref('base.user_admin'))]"/>
</record>
<record id="group_he_attendance_hv_user" model="res.groups">
<field name="name">高压班：用户</field>
<field name="category_id" ref="module_he_attendance_duty"/>
<field name="implied_ids" eval="[(4, ref('group_he_attendance_engineering_user'))]"/>
</record>
<record id="group_he_attendance_hv_manager" model="res.groups">
<field name="name">高压班管理员</field>
<field name="category_id" ref="module_he_attendance_duty"/>
<field name="implied_ids" eval="[(4, ref('group_he_attendance_hv_user'))]"/>
<field name="users" eval="[(4, ref('base.user_admin'))]"/>
</record>
<record id="group_he_attendance_integrated_user" model="res.groups">
<field name="name">综合班：用户</field>
<field name="category_id" ref="module_he_attendance_duty"/>
<field name="implied_ids" eval="[(4, ref('group_he_attendance_engineering_user'))]"/>
</record>
<record id="group_he_attendance_integrated_manager" model="res.groups">
<field name="name">综合班管理员</field>
<field name="category_id" ref="module_he_attendance_duty"/>
<field name="implied_ids" eval="[(4, ref('group_he_attendance_integrated_user'))]"/>
<field name="users" eval="[(4, ref('base.user_admin'))]"/>
</record>
<record id="group_he_attendance_engineering_manager" model="res.groups">
<field name="name">工程班管理员</field>
<field name="category_id" ref="module_he_attendance_duty"/>
<field name="implied_ids" eval="[(4, ref('group_he_attendance_hv_manager')), (4, ref('group_he_attendance_integrated_manager')),
(4, ref('group_he_attendance_run_manager'))]"/>
<field name="users" eval="[(4, ref('base.user_admin'))]"/>
</record>
<record id="group_he_attendance_lc_user" model="res.groups">
<field name="name">粮储:用户</field>
<field name="category_id" ref="module_he_attendance_duty"/>
</record>
<record id="group_he_attendance_lc_manager" model="res.groups">
<field name="name">粮储管理员</field>
<field name="category_id" ref="module_he_attendance_duty"/>
<field name="implied_ids" eval="[(4, ref('group_he_attendance_lc_user'))]"/>
<field name="users" eval="[(4, ref('base.user_admin'))]"/>
</record>
<record id="group_he_attendance_customer_user" model="res.groups">
<field name="name">客服:用户</field>
<field name="category_id" ref="module_he_attendance_duty"/>
</record>
<record id="group_he_attendance_customer_manager" model="res.groups">
<field name="name">客服管理员</field>
<field name="category_id" ref="module_he_attendance_duty"/>
<field name="implied_ids" eval="[(4, ref('group_he_attendance_customer_user'))]"/>
<field name="users" eval="[(4, ref('base.user_admin'))]"/>
</record>
<record id="group_he_attendance_planning_manager" model="res.groups">
<field name="name">计划考勤管理员</field>
<field name="category_id" ref="module_he_attendance_duty"/>
<field name="implied_ids" eval="[(4, ref('group_he_attendance_customer_manager')), (4, ref('group_he_attendance_engineering_manager')),
(4, ref('group_he_attendance_security_manager'))]"/>
<field name="users" eval="[(4, ref('base.user_admin'))]"/>
</record>
<!-- <record id="group_he_attendance_engineering_user" model="res.groups">-->
<!-- <field name="name">工程部：用户</field>-->
<!-- <field name="category_id" ref="module_he_attendance_duty"/>-->
<!-- </record>-->
<!-- <record id="group_he_attendance_run_user" model="res.groups">-->
<!-- <field name="name">运行班：用户</field>-->
<!-- <field name="category_id" ref="module_he_attendance_duty"/>-->
<!-- <field name="implied_ids" eval="[(4, ref('group_he_attendance_engineering_user'))]"/>-->
<!-- </record>-->
<!-- <record id="group_he_attendance_run_manager" model="res.groups">-->
<!-- <field name="name">运行班管理员</field>-->
<!-- <field name="category_id" ref="module_he_attendance_duty"/>-->
<!-- <field name="implied_ids" eval="[(4, ref('group_he_attendance_run_user'))]"/>-->
<!-- <field name="users" eval="[(4, ref('base.user_admin'))]"/>-->
<!-- </record>-->
<!-- <record id="group_he_attendance_hv_user" model="res.groups">-->
<!-- <field name="name">高压班：用户</field>-->
<!-- <field name="category_id" ref="module_he_attendance_duty"/>-->
<!-- <field name="implied_ids" eval="[(4, ref('group_he_attendance_engineering_user'))]"/>-->
<!-- </record>-->
<!-- <record id="group_he_attendance_hv_manager" model="res.groups">-->
<!-- <field name="name">高压班管理员</field>-->
<!-- <field name="category_id" ref="module_he_attendance_duty"/>-->
<!-- <field name="implied_ids" eval="[(4, ref('group_he_attendance_hv_user'))]"/>-->
<!-- <field name="users" eval="[(4, ref('base.user_admin'))]"/>-->
<!-- </record>-->
<!-- <record id="group_he_attendance_integrated_user" model="res.groups">-->
<!-- <field name="name">综合班：用户</field>-->
<!-- <field name="category_id" ref="module_he_attendance_duty"/>-->
<!-- <field name="implied_ids" eval="[(4, ref('group_he_attendance_engineering_user'))]"/>-->
<!-- </record>-->
<!-- <record id="group_he_attendance_integrated_manager" model="res.groups">-->
<!-- <field name="name">综合班管理员</field>-->
<!-- <field name="category_id" ref="module_he_attendance_duty"/>-->
<!-- <field name="implied_ids" eval="[(4, ref('group_he_attendance_integrated_user'))]"/>-->
<!-- <field name="users" eval="[(4, ref('base.user_admin'))]"/>-->
<!-- </record>-->
<!-- <record id="group_he_attendance_engineering_manager" model="res.groups">-->
<!-- <field name="name">工程班管理员</field>-->
<!-- <field name="category_id" ref="module_he_attendance_duty"/>-->
<!-- <field name="implied_ids" eval="[(4, ref('group_he_attendance_hv_manager')), (4, ref('group_he_attendance_integrated_manager')),-->
<!-- (4, ref('group_he_attendance_run_manager'))]"/>-->
<!-- <field name="users" eval="[(4, ref('base.user_admin'))]"/>-->
<!-- </record>-->
<!-- <record id="group_he_attendance_lc_user" model="res.groups">-->
<!-- <field name="name">粮储:用户</field>-->
<!-- <field name="category_id" ref="module_he_attendance_duty"/>-->
<!-- </record>-->
<!-- <record id="group_he_attendance_lc_manager" model="res.groups">-->
<!-- <field name="name">粮储管理员</field>-->
<!-- <field name="category_id" ref="module_he_attendance_duty"/>-->
<!-- <field name="implied_ids" eval="[(4, ref('group_he_attendance_lc_user'))]"/>-->
<!-- <field name="users" eval="[(4, ref('base.user_admin'))]"/>-->
<!-- </record>-->
<!-- <record id="group_he_attendance_customer_user" model="res.groups">-->
<!-- <field name="name">客服:用户</field>-->
<!-- <field name="category_id" ref="module_he_attendance_duty"/>-->
<!-- </record>-->
<!-- <record id="group_he_attendance_customer_manager" model="res.groups">-->
<!-- <field name="name">客服管理员</field>-->
<!-- <field name="category_id" ref="module_he_attendance_duty"/>-->
<!-- <field name="implied_ids" eval="[(4, ref('group_he_attendance_customer_user'))]"/>-->
<!-- <field name="users" eval="[(4, ref('base.user_admin'))]"/>-->
<!-- </record>-->
<!-- <record id="group_he_attendance_planning_manager" model="res.groups">-->
<!-- <field name="name">计划考勤管理员</field>-->
<!-- <field name="category_id" ref="module_he_attendance_duty"/>-->
<!-- <field name="implied_ids" eval="[(4, ref('group_he_attendance_customer_manager')), (4, ref('group_he_attendance_engineering_manager')),-->
<!-- (4, ref('group_he_attendance_security_manager'))]"/>-->
<!-- <field name="users" eval="[(4, ref('base.user_admin'))]"/>-->
<!-- </record>-->
<record model="ir.rule" id="hr_attendance_month_rule">
<field name="name">出勤统计多公司</field>
<field name="model_id" ref="model_hr_attendance_month"/>
yuthon_hr_employee/views/yuthon_hr_employee_views.xml
+6 -5
View File
@@ -401,11 +401,12 @@
<field name="name">hr.employee.inherit.del.form</field>
<field name="model">hr.employee</field>
<field name="arch" type="xml">
<tree string="通讯录" crate="false" edit="false" delete="false">
<field name="name"/>
<field name="mobile_phone"/>
<field name="department_id"/>
<field name="job_id"/>
<tree string="通讯录" crate="false" delete="false" editable="bottom">
<field name="name" readonly="1"/>
<field name="mobile_phone" readonly="1"/>
<field name="department_id" readonly="1"/>
<field name="job_id" readonly="1"/>
<field name="company_id" column_invisible="1"/>
</tree>
</field>
</record>
yuthon_will_task/models/yuthon_will_task.py
+1 -6
View File
@@ -39,12 +39,7 @@ class YuthonWillTask(models.Model):
self.users_ids = [(6, 0, user_ids)]
def read_number(self):
current_time = datetime.now()
return self.search_count([
('state', '=', 'will'),
('users_ids', 'in', self.env.user.id),
('end_time', '>', current_time)
])
return self.search_count([('state', '=', 'will'), ('users_ids', 'in', self.env.user.id)])
@api.onchange('employee_ids')
def onchange_employee_ids(self):