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

!453 zhou

Browse Source 
Merge pull request !453 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2024-11-14 08:39:01 +00:00
committed by Gitee
parent 9f4baf29ae e589af9f27
commit b4d4eae4f5
41 changed files with 309 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
preview_easy/__manifest__.py
+1 -1
View File
@@ -11,7 +11,7 @@
'author': 'zxltwins<email:444713077@qq.com>',
'website': "www.odoo.com",
'version': '17.0',
"depends": ["base",'sale'],
"depends": ["base", 'sale'],
"external_dependencies": {"python": ["mammoth"]},
"data": [
'security/ir.model.access.csv',
preview_easy/views/preview.xml
-2
View File
@@ -8,10 +8,8 @@
<field name="arch" type="xml">
<xpath expr="//field[@name='partner_id']" position="after">
<field name="attachment_ids" widget="preview_many2many"/>
<!-- <field name="attachment_ids" widget="many2many_tags"/> -->
</xpath>
</field>
</record>
</data>
</odoo>
soong_workflow/models/soong_workflow_node.py
-7
View File
@@ -113,13 +113,6 @@ class SoongWorkflowNode(models.Model):
},)]
else:
val["button_ids"] = [
(0, 0, {
"name": _("上议题"),
"workflow_id": val['workflow_id'],
"sequence":-1,
"action_type": "code",
"code": "obj.action_meeting()"
}),
(0, 0, {
"name": _("转交"),
"workflow_id": val['workflow_id'],
yuthon_hr_attendance/models/card_approval.py
+15 -11
View File
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
from odoo import api, fields, models, tools, _
from datetime import datetime, time, timedelta
from odoo.exceptions import UserError
class CardApprovals(models.Model):
@@ -23,17 +24,20 @@ class CardApprovals(models.Model):
@api.onchange('is_issues')
def _onchange_is_issues(self):
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
if self.is_issues:
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
elif self.related_issues_id:
raise UserError("已经创建了相关的上会记录，不能取消勾选")
def card_approval(self):
pass
yuthon_hr_attendance/models/duty_approval.py
+15 -11
View File
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
from odoo import api, fields, models, tools, _
from datetime import datetime, time, timedelta
from odoo.exceptions import UserError
class DutyApprovals(models.Model):
@@ -29,17 +30,20 @@ class DutyApprovals(models.Model):
@api.onchange('is_issues')
def _onchange_is_issues(self):
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
if self.is_issues:
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
elif self.related_issues_id:
raise UserError("已经创建了相关的上会记录，不能取消勾选")
class DutyApprovalsLine(models.Model):
_name = 'duty.approval.line'
yuthon_hr_attendance/models/go_approval.py
+15 -11
View File
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
from odoo import api, fields, models, tools, _
from datetime import datetime, time, timedelta
from odoo.exceptions import UserError
class GoApprovals(models.Model):
@@ -21,17 +22,20 @@ class GoApprovals(models.Model):
@api.onchange('is_issues')
def _onchange_is_issues(self):
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
if self.is_issues:
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
elif self.related_issues_id:
raise UserError("已经创建了相关的上会记录，不能取消勾选")
class GoApprovalsLine(models.Model):
_name = 'go.approvals.line'
yuthon_hr_attendance/models/overtime_approval.py
+15 -11
View File
@@ -3,6 +3,7 @@ from odoo import api, fields, models, tools, _
from datetime import datetime, time, timedelta
from odoo.exceptions import UserError
class OvertimeApprovals(models.Model):
_name = 'overtime.approval'
_description = "加班审批"
@@ -23,17 +24,20 @@ class OvertimeApprovals(models.Model):
@api.onchange('is_issues')
def _onchange_is_issues(self):
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
if self.is_issues:
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
elif self.related_issues_id:
raise UserError("已经创建了相关的上会记录，不能取消勾选")
@api.onchange('overtime_department_id')
def onchange_overtime_users(self):
yuthon_hr_attendance/models/remove_holiday_approval.py
+15 -11
View File
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
from odoo import api, fields, models, tools, _
from datetime import datetime, time, timedelta
from odoo.exceptions import UserError
class RemoveHolidayApprovals(models.Model):
@@ -28,17 +29,20 @@ class RemoveHolidayApprovals(models.Model):
@api.onchange('is_issues')
def _onchange_is_issues(self):
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
if self.is_issues:
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
elif self.related_issues_id:
raise UserError("已经创建了相关的上会记录，不能取消勾选")
def remove_holiday_approval(self):
pass
yuthon_hr_attendance/views/card_approval.xml
+1 -1
View File
@@ -38,7 +38,7 @@
<field name="code"/>
<field name="reason_application"/>
<field name="documents_ids" widget="preview_many2many"/>
<field name="is_issues" readonly="is_issues"/>
<field name="is_issues"/>
</group>
</group>
<notebook>
yuthon_hr_attendance/views/duty_approval.xml
+1 -1
View File
@@ -36,7 +36,7 @@
</group>
<group>
<field name="reason_application"/>
<field name="is_issues" readonly="is_issues"/>
<field name="is_issues"/>
</group>
</group>
<notebook>
yuthon_hr_attendance/views/go_approval.xml
+1 -1
View File
@@ -37,7 +37,7 @@
</group>
<group>
<field name="reason_application"/>
<field name="is_issues" readonly="is_issues"/>
<field name="is_issues"/>
</group>
</group>
<notebook>
yuthon_hr_attendance/views/overtime_approval.xml
+1 -1
View File
@@ -39,7 +39,7 @@
<group>
<field name="users_id"/>
<field name="details"/>
<field name="is_issues" readonly="is_issues"/>
<field name="is_issues"/>
</group>
</group>
<notebook>
yuthon_hr_attendance/views/remove_holiday_approval.xml
+1 -1
View File
@@ -34,7 +34,7 @@
<field name="date_end"/>
<field name="date"/>
<field name="code"/>
<field name="is_issues" readonly="is_issues"/>
<field name="is_issues"/>
</group>
</group>
<group string="审批事由">
yuthon_hr_employee_approval/models/yuthon_account_approval.py
-1
View File
@@ -6,6 +6,5 @@ class YuthonAccountApproval(models.Model):
_description = '薪资核算申请表'
_inherit = 'soong.workflow.mixin'
name = fields.Char(string='名称')
code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_account_approval_code'))
yuthon_hr_employee_approval/models/yuthon_appointment_approval.py
+15 -11
View File
@@ -1,4 +1,5 @@
from odoo import models, fields, api
from odoo.exceptions import UserError
class YuthonAppointmentApproval(models.Model):
@@ -23,17 +24,20 @@ class YuthonAppointmentApproval(models.Model):
@api.onchange('is_issues')
def _onchange_is_issues(self):
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
if self.is_issues:
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
elif self.related_issues_id:
raise UserError("已经创建了相关的上会记录，不能取消勾选")
class YuthonAppointmentResultIsDetailed(models.Model):
yuthon_hr_employee_approval/models/yuthon_interview_approval.py
+13 -10
View File
@@ -60,16 +60,19 @@ class YuthonInterviewApproval(models.Model):
@api.onchange('is_issues')
def _onchange_is_issues(self):
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search([("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
if self.is_issues:
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search([("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
elif self.related_issues_id:
raise UserError("已经创建了相关的上会记录，不能取消勾选")
class InterviewApprovalLine(models.Model):
_name = 'interview.approval.line'
yuthon_hr_employee_approval/models/yuthon_leaving_approval.py
+14 -11
View File
@@ -1,4 +1,5 @@
from odoo import models, fields, api
from odoo.exceptions import UserError
class YuthonLeavingApproval(models.Model):
@@ -36,17 +37,19 @@ class YuthonLeavingApproval(models.Model):
@api.onchange('is_issues')
def _onchange_is_issues(self):
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
if self.is_issues:
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search([("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
elif self.related_issues_id:
raise UserError("已经创建了相关的上会记录，不能取消勾选")
class HrJobType(models.Model):
_name = "hr.job.type"
yuthon_hr_employee_approval/models/yuthon_message_login.py
+16 -11
View File
@@ -1,4 +1,6 @@
from odoo import models, fields, api
from odoo.exceptions import UserError
nation_list = [('a', '汉族'), ('b', '壮族'), ('v', '满族'), ('d', '回族'), ('e', '苗族'), ('f', '维吾尔族'),
('g', '土家族'), ('h', '彝族'), ('i', '蒙古族'), ('j', '藏族'), ('k', '布依族'), ('l', '侗族'),
@@ -109,17 +111,20 @@ class YuthonMessageLogin(models.Model):
@api.onchange('is_issues')
def _onchange_is_issues(self):
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
if self.is_issues:
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
elif self.related_issues_id:
raise UserError("已经创建了相关的上会记录，不能取消勾选")
def pub_name_button(self):
code_url = self.get_base_url() + "/hr/employee/create?employee_id=" + str(self.id)
yuthon_hr_employee_approval/models/yuthon_onboard_approval.py
+16 -11
View File
@@ -1,4 +1,6 @@
from odoo import models, fields, api
from odoo.exceptions import UserError
nation_list = [('a', '汉族'), ('b', '壮族'), ('v', '满族'), ('d', '回族'), ('e', '苗族'), ('f', '维吾尔族'),
('g', '土家族'), ('h', '彝族'), ('i', '蒙古族'), ('j', '藏族'), ('k', '布依族'), ('l', '侗族'),
@@ -44,17 +46,20 @@ class YuthonOnboardApproval(models.Model):
@api.onchange('is_issues')
def _onchange_is_issues(self):
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
if self.is_issues:
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
elif self.related_issues_id:
raise UserError("已经创建了相关的上会记录，不能取消勾选")
def put_contract(self):
form_id = self.env.ref('hr_contract.hr_contract_view_form').id
yuthon_hr_employee_approval/models/yuthon_prepare_approval.py
+15 -11
View File
@@ -1,4 +1,5 @@
from odoo import models, fields, api
from odoo.exceptions import UserError
class YuthonPrepareApproval(models.Model):
@@ -58,17 +59,20 @@ class YuthonPrepareApproval(models.Model):
@api.onchange('is_issues')
def _onchange_is_issues(self):
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
if self.is_issues:
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
elif self.related_issues_id:
raise UserError("已经创建了相关的上会记录，不能取消勾选")
class PrepareApprovalLine(models.Model):
_name = 'prepare.approval.line'
yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py
+15 -11
View File
@@ -1,4 +1,5 @@
from odoo import models, fields, api
from odoo.exceptions import UserError
class YuthonReassignmentApproval(models.Model):
@@ -48,17 +49,20 @@ class YuthonReassignmentApproval(models.Model):
@api.onchange('is_issues')
def _onchange_is_issues(self):
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
if self.is_issues:
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
elif self.related_issues_id:
raise UserError("已经创建了相关的上会记录，不能取消勾选")
class HrJobType(models.Model):
_name = "hr.job.type"
yuthon_hr_employee_approval/models/yuthon_recruitment_approval.py
+15 -12
View File
@@ -1,6 +1,7 @@
from numpy.f2py.rules import defmod_rules
from odoo import models, fields, api
from odoo.exceptions import UserError
class YuthonRecruitmentApproval(models.Model):
@@ -23,18 +24,20 @@ class YuthonRecruitmentApproval(models.Model):
@api.onchange('is_issues')
def _onchange_is_issues(self):
self.write({'is_issues': 'Ture'})
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
if self.is_issues:
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
elif self.related_issues_id:
raise UserError("已经创建了相关的上会记录，不能取消勾选")
def put_time_failure(self):
for record in self:
yuthon_hr_employee_approval/models/yuthon_regularization_approval.py
+15 -11
View File
@@ -1,4 +1,5 @@
from odoo import models, fields, api
from odoo.exceptions import UserError
class YuthonRegularizationPrepareApproval(models.Model):
@@ -47,17 +48,20 @@ class YuthonRegularizationPrepareApproval(models.Model):
@api.onchange('is_issues')
def _onchange_is_issues(self):
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
if self.is_issues:
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
elif self.related_issues_id:
raise UserError("已经创建了相关的上会记录，不能取消勾选")
class HrJobType(models.Model):
_name = "hr.job.type"
yuthon_hr_employee_approval/models/yuthon_reward_approval.py
+15 -11
View File
@@ -1,4 +1,5 @@
from odoo import models, fields, api
from odoo.exceptions import UserError
class YuthonRewardApproval(models.Model):
@@ -22,14 +23,17 @@ class YuthonRewardApproval(models.Model):
@api.onchange('is_issues')
def _onchange_is_issues(self):
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
if self.is_issues:
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
elif self.related_issues_id:
raise UserError("已经创建了相关的上会记录，不能取消勾选")
yuthon_hr_employee_approval/models/yuthon_service_approval.py
+15 -11
View File
@@ -1,4 +1,5 @@
from odoo import models, fields, api
from odoo.exceptions import UserError
class YuthonServiceApproval(models.Model):
@@ -21,14 +22,17 @@ class YuthonServiceApproval(models.Model):
@api.onchange('is_issues')
def _onchange_is_issues(self):
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
if self.is_issues:
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
elif self.related_issues_id:
raise UserError("已经创建了相关的上会记录，不能取消勾选")
yuthon_hr_employee_approval/models/yuthon_transfer_approval.py
+16 -12
View File
@@ -1,4 +1,6 @@
from odoo import models, fields, api
from odoo.exceptions import UserError
class YutransferApproval(models.Model):
_name = 'yuthon.transfer.approval'
@@ -31,18 +33,20 @@ class YutransferApproval(models.Model):
@api.onchange('is_issues')
def _onchange_is_issues(self):
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
if self.is_issues:
issue_id = self.env['issue.library'].create({'name': self.name})
self.related_issues_id = issue_id.id
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
self.env['issue.library.approval.line'].create({
'issue_library_id': issue_id.id,
'workflow_record_id': workflow_record_id.id,
'approval_type': workflow_record_id.workflow_id.id,
'code': self.code,
'approval_date': fields.Datetime.now(),
})
elif self.related_issues_id:
raise UserError("已经创建了相关的上会记录，不能取消勾选")
class YuthonTransferDetailLines(models.Model):
_name = "yuthon.transfer.infor.detail.lines"
yuthon_hr_employee_approval/views/yuthon_appointment_approval_views.xml
+1 -1
View File
@@ -37,7 +37,7 @@
<group string="聘任结果" col="2">
<group>
<field name="judge_team_leader"/>
<field name="is_issues" readonly="is_issues"/>
<field name="is_issues"/>
</group>
<group>
<field name="judge_team_member"/>
yuthon_hr_employee_approval/views/yuthon_interview_approval_views.xml
+1 -1
View File
@@ -32,7 +32,7 @@
<group>
<field name="code"/>
<field name="yuthon_company" invisible="1"/>
<field name="is_issues" readonly="is_issues"/>
<field name="is_issues"/>
</group>
</group>
<notebook>
yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml
+1 -1
View File
@@ -66,7 +66,7 @@
</group>
<group>
<field name="leaving_date"/>
<field name="is_issues" readonly="is_issues"/>
<field name="is_issues"/>
</group>
<group>
<field name="handover_person"/>
yuthon_hr_employee_approval/views/yuthon_message_login_views.xml
+1 -1
View File
@@ -33,7 +33,7 @@
<field name="sex"/>
<field name="date_birth"/>
<field name="nation"/>
<field name="is_issues" readonly="is_issues"/>
<field name="is_issues"/>
<field name="is_relatives_work"/>
</group>
<group>
yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
+1 -1
View File
@@ -23,7 +23,7 @@
<group col="2">
<group>
<field name="yuthon_company"/>
<field name="is_issues" readonly="is_issues"/>
<field name="is_issues"/>
</group>
<group>
<field name="contracted_status"/>
yuthon_hr_employee_approval/views/yuthon_prepare_approval_views.xml
+1 -1
View File
@@ -26,7 +26,7 @@
<group>
<field name="code"/>
<field name="department_id" invisible="1"/>
<field name="is_issues" readonly="is_issues"/>
<field name="is_issues"/>
</group>
</group>
<group string="审批事项">
yuthon_hr_employee_approval/views/yuthon_reassignment_approval_views.xml
+1 -1
View File
@@ -72,7 +72,7 @@
<group string="移交信息" col="4">
<group>
<field name="handover_date"/>
<field name="is_issues" readonly="is_issues"/>
<field name="is_issues"/>
</group>
<group>
<field name="handover_person_id"/>
yuthon_hr_employee_approval/views/yuthon_recruitment_approval_views.xml
+1 -1
View File
@@ -25,7 +25,7 @@
<group>
<field name="code"/>
<field name="department_id" invisible="1"/>
<field name="is_issues" readonly="is_issues"/>
<field name="is_issues"/>
</group>
</group>
<group string="审批事项">
yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml
+1 -1
View File
@@ -61,7 +61,7 @@
</group>
<group>
<field name="appraisal_total"/>
<field name="is_issues" readonly="is_issues"/>
<field name="is_issues"/>
</group>
</group>
<notebook>
yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml
+1 -1
View File
@@ -31,7 +31,7 @@
</group>
<group>
<field name="entrant_date"/>
<field name="is_issues" readonly="is_issues"/>
<field name="is_issues"/>
</group>
</group>
<group string="审批事项">
yuthon_hr_employee_approval/views/yuthon_service_approval_views.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<group>
<field name="employee_id"/>
<field name="job_id"/>
<field name="is_issues" readonly="is_issues"/>
<field name="is_issues"/>
</group>
<group>
<field name="tenant_user_card"/>
yuthon_hr_employee_approval/views/yuthon_transfer_approval_views.xml
+1 -1
View File
@@ -50,7 +50,7 @@
</group>
<group>
<field name="handover_person_id"/>
<field name="is_issues" readonly="is_issues"/>
<field name="is_issues"/>
</group>
<group>
<field name="notification_change_id"/>
yuthon_issue/__manifest__.py
+1
View File
@@ -31,6 +31,7 @@
'assets': {
'web.assets_backend': [
'yuthon_issue/static/xml/issue_approval.xml',
'yuthon_issue/static/scss/issue_library_scss.scss',
],
},
'installable': True,
yuthon_issue/static/scss/issue_library_scss.scss
+4
View File
@@ -0,0 +1,4 @@
.list_width{
width: 180px;
max-width: 180px;
}
yuthon_issue/views/issue_library_views.xml
+31 -21
View File
@@ -13,7 +13,7 @@
<button name="all_meeting_issue" string="批量上会" type="object"/>
</header>
<field name="name" column_invisible="1"/>
<field name="name_text"/>
<field name="name_text" class="list_width"/>
<field name="is_party"/>
<field name="is_class"/>
<field name="is_boss"/>
@@ -74,7 +74,7 @@
<field name="issue_library_line_ids">
<tree editable="bottom">
<field name="issue_library_id" column_invisible="1"/>
<field name="issue_approval_decision_id"/>
<field name="issue_approval_decision_id" class="list_width"/>
<field name="ordinal"/>
<field name="council" readonly="1"/>
<field name="team_meet" readonly="1"/>
@@ -130,6 +130,7 @@
decoration-muted="state == 'cancel'">
<field name="code"/>
<field name="name" column_invisible="1"/>
<field name="name_text" class="list_width"/>
<field name="cs_party"/>
<field name="cs_class"/>
<field name="cs_boss"/>
@@ -192,7 +193,7 @@
<field name="issue_library_line_ids">
<tree editable="bottom">
<field name="issue_library_id" column_invisible="1"/>
<field name="issue_approval_decision_id"/>
<field name="issue_approval_decision_id" class="list_width"/>
<field name="ordinal"/>
<field name="council" readonly="1"/>
<field name="team_meet" readonly="1"/>
@@ -359,7 +360,7 @@
<field name="issue_library_line_ids">
<tree editable="bottom">
<field name="issue_library_id" column_invisible="1"/>
<field name="issue_approval_decision_id"/>
<field name="issue_approval_decision_id" class="list_width"/>
<field name="ordinal"/>
<field name="council" readonly="1"/>
<field name="district_bureau" readonly="1"/>
@@ -413,6 +414,7 @@
decoration-muted="state == 'cancel'">
<field name="code"/>
<field name="name" column_invisible="1"/>
<field name="name_text" class="list_width"/>
<field name="cs_party"/>
<field name="cs_class"/>
<field name="cs_boss"/>
@@ -472,7 +474,7 @@
<field name="issue_library_line_ids">
<tree editable="bottom">
<field name="issue_library_id" column_invisible="1"/>
<field name="issue_approval_decision_id"/>
<field name="issue_approval_decision_id" class="list_width"/>
<field name="ordinal"/>
<field name="council" readonly="1"/>
<field name="team_meet" readonly="1"/>
@@ -621,7 +623,7 @@
<field name="issue_library_line_ids">
<tree editable="bottom">
<field name="issue_library_id" column_invisible="1"/>
<field name="issue_approval_decision_id"/>
<field name="issue_approval_decision_id" class="list_width"/>
<field name="ordinal"/>
<field name="team_meet" readonly="1"/>
<field name="district_bureau" readonly="1"/>
@@ -675,6 +677,7 @@
decoration-muted="state == 'cancel'">
<field name="code"/>
<field name="name" column_invisible="1"/>
<field name="name_text" class="list_width"/>
<field name="cs_party"/>
<field name="cs_class"/>
<field name="cs_boss"/>
@@ -734,7 +737,7 @@
<field name="issue_library_line_ids">
<tree editable="bottom">
<field name="issue_library_id" column_invisible="1"/>
<field name="issue_approval_decision_id"/>
<field name="issue_approval_decision_id" class="list_width"/>
<field name="ordinal"/>
<field name="council" readonly="1"/>
<field name="team_meet" readonly="1"/>
@@ -881,7 +884,7 @@
<field name="issue_library_line_ids">
<tree editable="bottom">
<field name="issue_library_id" column_invisible="1"/>
<field name="issue_approval_decision_id"/>
<field name="issue_approval_decision_id" class="list_width"/>
<field name="ordinal"/>
<field name="board_meet" readonly="1"/>
<field name="district_bureau" readonly="1"/>
@@ -946,6 +949,7 @@
decoration-muted="state == 'cancel'">
<field name="code"/>
<field name="name" column_invisible="1"/>
<field name="name_text" class="list_width"/>
<field name="cs_party"/>
<field name="cs_class"/>
<field name="cs_boss"/>
@@ -1005,7 +1009,7 @@
<field name="issue_library_line_ids">
<tree editable="bottom">
<field name="issue_library_id" column_invisible="1"/>
<field name="issue_approval_decision_id"/>
<field name="issue_approval_decision_id" class="list_width"/>
<field name="ordinal"/>
<field name="council" readonly="1"/>
<field name="team_meet" readonly="1"/>
@@ -1140,7 +1144,7 @@
<field name="issue_library_line_ids">
<tree editable="bottom">
<field name="issue_library_id" column_invisible="1"/>
<field name="issue_approval_decision_id"/>
<field name="issue_approval_decision_id" class="list_width"/>
<field name="ordinal"/>
<field name="council" readonly="1"/>
<field name="district_bureau" readonly="1"/>
@@ -1194,6 +1198,7 @@
decoration-muted="state == 'cancel'">
<field name="code"/>
<field name="name" column_invisible="1"/>
<field name="name_text" class="list_width"/>
<field name="cs_party"/>
<field name="cs_class"/>
<field name="cs_boss"/>
@@ -1253,7 +1258,7 @@
<field name="issue_library_line_ids">
<tree editable="bottom">
<field name="issue_library_id" column_invisible="1"/>
<field name="issue_approval_decision_id"/>
<field name="issue_approval_decision_id" class="list_width"/>
<field name="ordinal"/>
<field name="council" readonly="1"/>
<field name="team_meet" readonly="1"/>
@@ -1399,7 +1404,7 @@
<field name="issue_library_line_ids">
<tree editable="bottom">
<field name="issue_library_id" column_invisible="1"/>
<field name="issue_approval_decision_id"/>
<field name="issue_approval_decision_id" class="list_width"/>
<field name="ordinal"/>
<field name="team_meet" readonly="1"/>
<field name="district_bureau" readonly="1"/>
@@ -1453,6 +1458,7 @@
decoration-muted="state == 'cancel'">
<field name="code"/>
<field name="name" column_invisible="1"/>
<field name="name_text" class="list_width"/>
<field name="cs_party"/>
<field name="cs_class"/>
<field name="cs_boss"/>
@@ -1512,7 +1518,7 @@
<field name="issue_library_line_ids">
<tree editable="bottom">
<field name="issue_library_id" column_invisible="1"/>
<field name="issue_approval_decision_id"/>
<field name="issue_approval_decision_id" class="list_width"/>
<field name="ordinal"/>
<field name="council" readonly="1"/>
<field name="team_meet" readonly="1"/>
@@ -1658,7 +1664,7 @@
<field name="issue_library_line_ids">
<tree editable="bottom">
<field name="issue_library_id" column_invisible="1"/>
<field name="issue_approval_decision_id"/>
<field name="issue_approval_decision_id" class="list_width"/>
<field name="ordinal"/>
<field name="council" readonly="1"/>
<field name="district_bureau" readonly="1"/>
@@ -1723,6 +1729,7 @@
decoration-muted="state == 'cancel'">
<field name="code"/>
<field name="name" column_invisible="1"/>
<field name="name_text" class="list_width"/>
<field name="cs_party"/>
<field name="cs_class"/>
<field name="cs_boss"/>
@@ -1782,7 +1789,7 @@
<field name="issue_library_line_ids">
<tree editable="bottom">
<field name="issue_library_id" column_invisible="1"/>
<field name="issue_approval_decision_id"/>
<field name="issue_approval_decision_id" class="list_width"/>
<field name="ordinal"/>
<field name="council" readonly="1"/>
<field name="team_meet" readonly="1"/>
@@ -1917,7 +1924,7 @@
<field name="issue_library_line_ids">
<tree editable="bottom">
<field name="issue_library_id" column_invisible="1"/>
<field name="issue_approval_decision_id"/>
<field name="issue_approval_decision_id" class="list_width"/>
<field name="ordinal"/>
<field name="team_meet" readonly="1"/>
<field name="district_bureau" readonly="1"/>
@@ -1982,6 +1989,7 @@
decoration-muted="state == 'cancel'">
<field name="code"/>
<field name="name" column_invisible="1"/>
<field name="name_text" class="list_width"/>
<field name="cs_party"/>
<field name="cs_class"/>
<field name="cs_boss"/>
@@ -2041,7 +2049,7 @@
<field name="issue_library_line_ids">
<tree editable="bottom">
<field name="issue_library_id" column_invisible="1"/>
<field name="issue_approval_decision_id"/>
<field name="issue_approval_decision_id" class="list_width"/>
<field name="ordinal"/>
<field name="council" readonly="1"/>
<field name="team_meet" readonly="1"/>
@@ -2186,7 +2194,7 @@
<field name="issue_library_line_ids">
<tree editable="bottom">
<field name="issue_library_id" column_invisible="1"/>
<field name="issue_approval_decision_id"/>
<field name="issue_approval_decision_id" class="list_width"/>
<field name="ordinal"/>
<field name="council" readonly="1"/>
<field name="team_meet" readonly="1"/>
@@ -2241,6 +2249,7 @@
decoration-muted="state == 'cancel'">
<field name="code"/>
<field name="name" column_invisible="1"/>
<field name="name_text" class="list_width"/>
<field name="cs_party"/>
<field name="cs_class"/>
<field name="cs_boss"/>
@@ -2300,7 +2309,7 @@
<field name="issue_library_line_ids">
<tree editable="bottom">
<field name="issue_library_id" column_invisible="1"/>
<field name="issue_approval_decision_id"/>
<field name="issue_approval_decision_id" class="list_width"/>
<field name="ordinal"/>
<field name="council" readonly="1"/>
<field name="team_meet" readonly="1"/>
@@ -2464,7 +2473,7 @@
<field name="issue_library_line_ids">
<tree editable="bottom">
<field name="issue_library_id" column_invisible="1"/>
<field name="issue_approval_decision_id"/>
<field name="issue_approval_decision_id" class="list_width"/>
<field name="ordinal"/>
<field name="council" readonly="1"/>
<field name="team_meet" readonly="1"/>
@@ -2520,6 +2529,7 @@
decoration-muted="state == 'cancel'">
<field name="code"/>
<field name="name" column_invisible="1"/>
<field name="name_text" class="list_width"/>
<field name="cs_party"/>
<field name="cs_class"/>
<field name="cs_boss"/>
@@ -2579,7 +2589,7 @@
<field name="issue_library_line_ids">
<tree editable="bottom">
<field name="issue_library_id" column_invisible="1"/>
<field name="issue_approval_decision_id"/>
<field name="issue_approval_decision_id" class="list_width"/>
<field name="ordinal"/>
<field name="council" readonly="1"/>
<field name="team_meet" readonly="1"/>