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

!1475 1

Browse Source 
Merge pull request !1475 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-02-10 03:37:28 +00:00
committed by Gitee
parent 6a92aae962 cf45d076e2
commit 3daba7071c
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sh_backmate_theme_adv_enterprise/views/send_notifications.xml
+4 -4
View File
@@ -61,9 +61,9 @@
</p>
</field>
</record>
<menuitem name="Web Push Notification" id="sh_push_notification_root"
web_icon="sh_backmate_theme_adv_enterprise,static/src/webpushnotification.png"
groups="sh_backmate_theme_adv_enterprise.sh_push_notification_user"/>
<!-- <menuitem name="Web Push Notification" id="sh_push_notification_root"-->
<!-- web_icon="sh_backmate_theme_adv_enterprise,static/src/webpushnotification.png"-->
<!-- groups="sh_backmate_theme_adv_enterprise.sh_push_notification_user"/>-->
<menuitem name="Send Notification" action="sh_send_notification_action" id="sh_send_notification_item" parent="sh_push_notification_root" sequence="1"/>
<!-- <menuitem name="Send Notification" action="sh_send_notification_action" id="sh_send_notification_item" parent="sh_push_notification_root" sequence="1"/>-->
</odoo>
sh_backmate_theme_adv_enterprise/views/web_push_notification.xml
+1 -1
View File
@@ -37,5 +37,5 @@
</field>
</record>
<menuitem name="Registered User" id="sh_push_notification_registered" action="sh_web_push_notification_action" parent="sh_push_notification_root" groups="sh_backmate_theme_adv_enterprise.sh_push_notification_user" sequence="2" />
<!-- <menuitem name="Registered User" id="sh_push_notification_registered" action="sh_web_push_notification_action" parent="sh_push_notification_root" groups="sh_backmate_theme_adv_enterprise.sh_push_notification_user" sequence="2" />-->
</odoo>
soong_workflow/models/soong_workflow_mixin.py
+1 -1
View File
@@ -477,7 +477,7 @@ class SoongWorkflowMixin(models.AbstractModel):
self.mapped("log_ids").unlink()
record_objs = self.env["soong.workflow.record"].search([("res_model", "=", self._name), ("res_id", "in", self.ids)])
record_objs.unlink()
return super().unlink()
return super(SoongWorkflowMixin, self).unlink()
def action_open_diagram(self):
self.ensure_one()
yuthon_hr_employee_approval/models/inherit_hr_job.py
+8 -4
View File
@@ -12,10 +12,15 @@ class HrJob(models.Model):
def pub_applicant_approval_button(self):
for pub in self:
if pub.is_pub == True:
raise UserError('该岗位已经提交发布申请，请勿重复提交')
if pub.compiling_status != '1':
raise UserError('只有缺编的岗位才可以发布申请')
for rec in self.env['yuthon.recruitment.approval'].search([]):
for i in rec.recruitment_ids:
if pub.id == i.id:
rec.is_pub = True
raise UserError('该岗位已经发布申请，请勿重复提交，到对应流程中查看,流程的流水号为 %s' % rec.code)
hr_job_ids = self.env["hr.job"].browse(self._context.get('active_ids', self._context.get('active_id')))
first_department_id=hr_job_ids[0].department_id
first_department_id = hr_job_ids[0].department_id
for hr_job in hr_job_ids:
if hr_job.department_id != first_department_id:
raise UserError("招聘需部门相同,请重新选择")
@@ -24,7 +29,6 @@ class HrJob(models.Model):
raise UserError('岗位失效，请勿提交')
hr_job_data = [(6, 0, hr_job_ids.ids)]
form_id = self.env.ref("yuthon_hr_employee_approval.view_yuthon_recruitment_approval_form").id
self.is_pub = True
return {
'type': 'ir.actions.act_window',
'name': '提交招聘需求申请',