diff --git a/tianhe_approvals/__manifest__.py b/tianhe_approvals/__manifest__.py
index 2c667469d..aa925cf2a 100644
--- a/tianhe_approvals/__manifest__.py
+++ b/tianhe_approvals/__manifest__.py
@@ -13,15 +13,12 @@
'security/ir.model.access.csv',
'data/approval_category_type_data.xml',
'data/approval_group_data.xml',
- 'views/tianhe_general_party_branch_post.xml',
'views/tianhe_dsh_issues_declarations.xml',
- 'views/tianhe_official_issues_for_son.xml',
'views/tianhe_official_issues.xml',
'views/tianhe_construction_business_approval.xml',
'views/tianhe_management_declare_approval.xml',
'views/tianhe_business_statement_approval.xml',
'views/tianhe_contentious_matter_approval.xml',
- 'views/tianhe_financing_post_approval.xml',
'views/tianhe_business_approval.xml',
'views/tianhe_document_processing_approval.xml',
'views/tianhe_process_change_approval.xml',
@@ -38,7 +35,6 @@
'views/tianhe_exercitation_tryout_approval.xml',
'views/generic_forms_reassignment.xml',
'views/tianhe_meeting_minutes_approval.xml',
- 'views/tianhe_party_branch_committee_post.xml',
'views/tianhe_shift_registration_form.xml',
'views/tianhe_engineering_approval.xml',
'views/wuguan_property_right_alter_approval.xml',
@@ -56,12 +52,9 @@
'views/wuguan_information_release_approval_form.xml',
'views/wuguan_construction_works.xml',
'views/wuguan_departmental_collaboration.xml',
- 'views/wuguan_receipt_submission.xml',
'views/tianhe_fee_adjustment_approval.xml',
'views/tianhe_fee_expend_approval.xml',
- 'views/tianhe_post_submission_approval.xml',
'views/tianhe_supervision_worksheets_approval.xml',
- 'views/tianhe_official_account_cloud_sms_post_submission_approval.xml',
'views/wuguan_seal_application.xml',
'views/wuguan_license_call_batch.xml',
'views/wuguan_lease_contract_approval_form.xml',
diff --git a/tianhe_approvals/models/__init__.py b/tianhe_approvals/models/__init__.py
index 032366736..73b6a7644 100644
--- a/tianhe_approvals/models/__init__.py
+++ b/tianhe_approvals/models/__init__.py
@@ -35,9 +35,8 @@ from . import wuguan_invoicing_information_approval_order
from . import wuguan_construction_works
from . import tianhe_fee_adjustment_approval
from . import tianhe_fee_expend_approval
-from . import tianhe_post_submission_approval
from . import tianhe_supervision_worksheets_approval
-from . import tianhe_official_account_cloud_sms_post_submission_approval
from . import wuguan_seal_application
from . import wuguan_license_call_batch
from . import wuguan_lease_contract_approval_form
+from . import tianhe_official_issues
diff --git a/tianhe_approvals/models/inherit_approval_category.py b/tianhe_approvals/models/inherit_approval_category.py
index 3d98e8fe3..c7f91527b 100644
--- a/tianhe_approvals/models/inherit_approval_category.py
+++ b/tianhe_approvals/models/inherit_approval_category.py
@@ -15,13 +15,7 @@ class ApprovalCategory(models.Model):
('contentious_matter', ' 诉讼事项录入表'),
('issue_library_approval', '议题申报表'),
('salary_approval', '工资呈批表'),
- ('general_party_branch_post', '党总支发文'),
- ('party_branch_committee_post', '党支委发文'),
- ('official_issues_for_son', '公文发文(子企业)'),
- ('financing_post', '投融资发文'),
- ('official_account_cloud_sms_post_submission', '公众号/云短信发文呈批'),
- ('post_submission', '发文呈批'),
- ('receipt_submission', '收文呈批'),
+ ('tianhe_dsh_issues_declarations', '董事会议题申报表'),
('official_issues', '公文发文'),
('official_receipt', '公文收文'),
('meeting_file', '会议文档'),
diff --git a/tianhe_approvals/models/tianhe_official_account_cloud_sms_post_submission_approval.py b/tianhe_approvals/models/tianhe_official_account_cloud_sms_post_submission_approval.py
deleted file mode 100644
index 319cc2594..000000000
--- a/tianhe_approvals/models/tianhe_official_account_cloud_sms_post_submission_approval.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from odoo import api, fields, models, tools, _
-from odoo.exceptions import ValidationError
-
-
-class TianHeOfficalAccountCloudSMSPostSubmission(models.Model):
- _inherit = "approval.request"
- _description = '公众号/云短信发文呈批'
-
-
diff --git a/tianhe_approvals/models/tianhe_official_issues.py b/tianhe_approvals/models/tianhe_official_issues.py
new file mode 100644
index 000000000..d3fe7f027
--- /dev/null
+++ b/tianhe_approvals/models/tianhe_official_issues.py
@@ -0,0 +1,21 @@
+from odoo import api, fields, models, tools, _
+from odoo.exceptions import ValidationError
+
+
+class TianHeOfficialIssues(models.Model):
+ _inherit = "approval.request"
+ _description = '公文发文'
+
+ send_type = fields.Selection([
+ ('official_issues', '公文发文'),
+ ('general_party_branch_post', '党总支发文'),
+ ('party_branch_committee_post', '党支委发文'),
+ ('official_issues_for_son', '公文发文(子企业)'),
+ ('financing_post', '投融资发文'),
+ ('official_account_cloud_sms_post_submission', '公众号/云短信发文呈批'),
+ ('post_submission', '发文呈批'),
+ ], default='official_issues', string="发文类型")
+
+ # 发文呈批
+ reference_cold = fields.Integer(string="发文字号")
+ major_event_category = fields.Integer(string="重大事项所属类别")
diff --git a/tianhe_approvals/models/tianhe_post_submission_approval.py b/tianhe_approvals/models/tianhe_post_submission_approval.py
deleted file mode 100644
index c70ce1520..000000000
--- a/tianhe_approvals/models/tianhe_post_submission_approval.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from odoo import api, fields, models, tools, _
-from odoo.exceptions import ValidationError
-
-
-class TianHePostSubmission(models.Model):
- _inherit = "approval.request"
- _description = '发文呈批'
-
- reference_cold = fields.Integer(string="发文字号")
- major_event_category = fields.Integer(string="重大事项所属类别")
\ No newline at end of file
diff --git a/tianhe_approvals/views/tianhe_financing_post_approval.xml b/tianhe_approvals/views/tianhe_financing_post_approval.xml
deleted file mode 100644
index 7e4f4fb89..000000000
--- a/tianhe_approvals/views/tianhe_financing_post_approval.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
- approvals.category.type.code.financing.post.approval
- approval.request
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tianhe_approvals/views/tianhe_general_party_branch_post.xml b/tianhe_approvals/views/tianhe_general_party_branch_post.xml
deleted file mode 100644
index 7297e83e5..000000000
--- a/tianhe_approvals/views/tianhe_general_party_branch_post.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
- approvals.category.type.code.general.party.branch.post.approval
- approval.request
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tianhe_approvals/views/tianhe_official_account_cloud_sms_post_submission_approval.xml b/tianhe_approvals/views/tianhe_official_account_cloud_sms_post_submission_approval.xml
deleted file mode 100644
index 2256b7a00..000000000
--- a/tianhe_approvals/views/tianhe_official_account_cloud_sms_post_submission_approval.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
- approvals.category.type.code.official.account.cloud.sms.post.submission.approval
- approval.request
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tianhe_approvals/views/tianhe_official_issues.xml b/tianhe_approvals/views/tianhe_official_issues.xml
index eda96d9e8..df0f9c3fa 100644
--- a/tianhe_approvals/views/tianhe_official_issues.xml
+++ b/tianhe_approvals/views/tianhe_official_issues.xml
@@ -5,17 +5,24 @@
approval.request
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/tianhe_approvals/views/tianhe_official_issues_for_son.xml b/tianhe_approvals/views/tianhe_official_issues_for_son.xml
deleted file mode 100644
index 662012655..000000000
--- a/tianhe_approvals/views/tianhe_official_issues_for_son.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- approvals.category.type.code.official.issues.for.son
- approval.request
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tianhe_approvals/views/tianhe_party_branch_committee_post.xml b/tianhe_approvals/views/tianhe_party_branch_committee_post.xml
deleted file mode 100644
index 11ad516e0..000000000
--- a/tianhe_approvals/views/tianhe_party_branch_committee_post.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
- approvals.category.type.code.party.branch.committee.post.approval
- approval.request
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tianhe_approvals/views/tianhe_post_submission_approval.xml b/tianhe_approvals/views/tianhe_post_submission_approval.xml
deleted file mode 100644
index 4b4884e2d..000000000
--- a/tianhe_approvals/views/tianhe_post_submission_approval.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
- approvals.category.type.code.post.submission.approval
- approval.request
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tianhe_approvals/views/wuguan_receipt_submission.xml b/tianhe_approvals/views/wuguan_receipt_submission.xml
deleted file mode 100644
index 9c0babb30..000000000
--- a/tianhe_approvals/views/wuguan_receipt_submission.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- approvals.category.type.code.receipt.submission
- approval.request
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/yuthon_approval/__manifest__.py b/yuthon_approval/__manifest__.py
index 5b906c2ef..ca6bcd668 100644
--- a/yuthon_approval/__manifest__.py
+++ b/yuthon_approval/__manifest__.py
@@ -23,6 +23,7 @@
'views/approval_notice_note_views.xml',
'views/approval_user_views.xml',
'views/issue_library_views.xml',
+ 'views/send_receive_messages_management.xml',
'report/all_demo_report.xml',
],
'installable': True,
diff --git a/yuthon_approval/views/send_receive_messages_management.xml b/yuthon_approval/views/send_receive_messages_management.xml
new file mode 100644
index 000000000..4f7daf98f
--- /dev/null
+++ b/yuthon_approval/views/send_receive_messages_management.xml
@@ -0,0 +1,29 @@
+
+
+
+ 收发文管理
+ approval.request
+ [('approval_category_name','in',['official_receipt','official_issues'])]
+ tree,form
+
+
+
+ approval.request.search.inherited
+ approval.request
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yuthon_hr_attendance/models/resource_calendar_leaves.py b/yuthon_hr_attendance/models/resource_calendar_leaves.py
index 348660c59..eecdb53d8 100644
--- a/yuthon_hr_attendance/models/resource_calendar_leaves.py
+++ b/yuthon_hr_attendance/models/resource_calendar_leaves.py
@@ -17,13 +17,16 @@ class ResourceCalendar(models.Model):
card_end_time = fields.Float(string="打卡结束时间")
employee_ids = fields.One2many('hr.employee', 'user_id', string='打卡白名单')
is_elasticity_work_time = fields.Selection([("no", "未启用"), ("is_allow_late_early", "允许迟到早退"),
- ("is_allow_late_early_leave", "早到早走, 晚到晚走")], string="弹性上下班", default='no')
+ ("is_allow_late_early_leave", "早到早走, 晚到晚走")], string="弹性上下班",
+ default='no')
leave_go_allow_late = fields.Selection(selection=selection_list, string="上班允许迟到")
leave_go_allow_early = fields.Selection(selection=selection_list, string="下班允许早退")
is_allow_late_early_work = fields.Boolean(string="下班晚走次日晚到")
work_late = fields.Selection(selection=selection_list, string="下班晚走")
work_after = fields.Selection(selection=selection_list, string="次日可晚到")
+ resource_user_ids = fields.Many2many('hr.employee', string="白名单")
+
def get_baidu_holiday(self):
"""
通过百度日历接口获取法定节假日信息
diff --git a/yuthon_hr_attendance/views/resource_calendar_leaves_views.xml b/yuthon_hr_attendance/views/resource_calendar_leaves_views.xml
index ff0aa51e2..58169dc82 100644
--- a/yuthon_hr_attendance/views/resource_calendar_leaves_views.xml
+++ b/yuthon_hr_attendance/views/resource_calendar_leaves_views.xml
@@ -62,6 +62,7 @@
分钟
+