diff --git a/tianhe_approvals/__manifest__.py b/tianhe_approvals/__manifest__.py index fc2930a21..0415d2c9c 100644 --- a/tianhe_approvals/__manifest__.py +++ b/tianhe_approvals/__manifest__.py @@ -23,6 +23,10 @@ '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_property_submission_approval.xml', 'views/tianhe_rental_receipt_approvals.xml', ], 'application': True, diff --git a/tianhe_approvals/data/approval_category_type_data.xml b/tianhe_approvals/data/approval_category_type_data.xml index 79beb2f40..17e35a044 100644 --- a/tianhe_approvals/data/approval_category_type_data.xml +++ b/tianhe_approvals/data/approval_category_type_data.xml @@ -64,7 +64,26 @@ 诉讼事项录入表 contentious_matter - + + + 投融资发文 + financing_post + + + + 业务呈批表 + business + + + + 文件处理表 + document_processing + + + + 物业部业务呈批表 + property_submission + 天河投资租赁合同收款单 rental_receipt diff --git a/tianhe_approvals/models/__init__.py b/tianhe_approvals/models/__init__.py index 01d995843..9945fd0ec 100644 --- a/tianhe_approvals/models/__init__.py +++ b/tianhe_approvals/models/__init__.py @@ -13,4 +13,8 @@ from . import tianhe_management_declare_approval from . import tianhe_business_statement_approval from . import tianhe_process_change_approval from . import tianhe_contentious_matter_approval +from . import tianhe_financing_post_approval +from . import tianhe_business_approval +from . import tianhe_document_processing_approval +from . import tianhe_property_submission_approval from . import tianhe_rental_receipt_approvals diff --git a/tianhe_approvals/models/inherit_approval_category.py b/tianhe_approvals/models/inherit_approval_category.py index f1767dbc3..6e9f82b4f 100644 --- a/tianhe_approvals/models/inherit_approval_category.py +++ b/tianhe_approvals/models/inherit_approval_category.py @@ -24,5 +24,9 @@ class ApprovalCategory(models.Model): ('business_statement','科创中小企业服务中心业务呈批表'), ('process_change','流程变更申请'), ('contentious_matter','诉讼事项录入表'), + ('financing_post','投融资发文'), + ('business','业务呈批表'), + ('document_processing','文件处理表'), + ('property_submission','物业部业务呈批表'), ('rental_receipt', '租赁合同收款单'), ], string="审批类别") \ No newline at end of file diff --git a/tianhe_approvals/models/tianhe_business_approval.py b/tianhe_approvals/models/tianhe_business_approval.py new file mode 100644 index 000000000..783ccddee --- /dev/null +++ b/tianhe_approvals/models/tianhe_business_approval.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +from odoo import api, fields, models, tools +from odoo.exceptions import ValidationError + + +class TianHeBusinessApproval(models.Model): + _inherit = "approval.request" + _description = '天河业务呈批表' + + cp_department_id = fields.Many2one('hr.department',string="部门") + cp_create_time = fields.Date(string="日期",default=fields.Date.today()) + cp_business_type = fields.Selection([ + ('agreement', '协议(合同)'), + ('staff administration', '人事行政'), + ('finance', '财务'), + ('trade union', '工会'), + ('other', '其他'), + ], string="业务类型") + cp_urgency = fields.Selection([ + ('limited express', '特急'), + ('ordinary', '一般'), + ('none', '无'), + ], string="紧急度") + cp_main_text = fields.Text(string="正文") \ No newline at end of file diff --git a/tianhe_approvals/models/tianhe_business_statement_approval.py b/tianhe_approvals/models/tianhe_business_statement_approval.py index e54bd1ea1..b43a01915 100644 --- a/tianhe_approvals/models/tianhe_business_statement_approval.py +++ b/tianhe_approvals/models/tianhe_business_statement_approval.py @@ -11,7 +11,7 @@ class TianHeManagementDeclareApproval(models.Model): business_type_kc = fields.Selection([ ('agreement', '协议(合同)'), ('staff administration', '人事行政'), - ('finance', '人事行政'), + ('finance', '财务'), ('other', '其他'), ], string="业务类型") urgency = fields.Selection([ diff --git a/tianhe_approvals/models/tianhe_document_processing_approval.py b/tianhe_approvals/models/tianhe_document_processing_approval.py new file mode 100644 index 000000000..c9067398f --- /dev/null +++ b/tianhe_approvals/models/tianhe_document_processing_approval.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +from odoo import api, fields, models, tools +from odoo.exceptions import ValidationError + + +class TianHeDocumentProcessingApproval(models.Model): + _inherit = "approval.request" + _description = '文件处理表' + + wj_department_id = fields.Many2one('hr.department',string="部门") + wj_create_time = fields.Date(string="日期",default=fields.Date.today()) + wj_servings_number = fields.Integer(string="份数") + wj_document_number = fields.Char(string="发文编号") + wj_urgency = fields.Selection([ + ('ordinary', '一般'), + ('none', '无'), + ], string="紧急度") + wj_secret_level = fields.Selection([ + ('ordinary', '一般'), + ('none', '无'), + ], string="密级") + wj_primary_transmission = fields.Char(string="主送") + wj_extracts = fields.Char(string="抄送") + wj_main_text = fields.Text(string="正文") \ No newline at end of file diff --git a/tianhe_approvals/models/tianhe_financing_post_approval.py b/tianhe_approvals/models/tianhe_financing_post_approval.py new file mode 100644 index 000000000..7b5a0406f --- /dev/null +++ b/tianhe_approvals/models/tianhe_financing_post_approval.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +from odoo import api, fields, models, tools +from odoo.exceptions import ValidationError + + +class TianHeFinancingPostApproval(models.Model): + _inherit = "approval.request" + _description = '天河投融资发文' + + rz_department_id = fields.Many2one('hr.department',string="部门") + create_time = fields.Date(string="日期",default=fields.Date.today()) + servings_number = fields.Integer(string="份数") + document_number = fields.Char(string="发文编号") + rz_urgency = fields.Selection([ + ('ordinary', '一般'), + ('none', '无'), + ], string="紧急度") + rz_secret_level = fields.Selection([ + ('ordinary', '一般'), + ('none', '无'), + ], string="密级") + primary_transmission = fields.Char(string="主送") + extracts = fields.Char(string="抄送") + rz_main_text = fields.Text(string="正文") + + diff --git a/tianhe_approvals/models/tianhe_property_submission_approval.py b/tianhe_approvals/models/tianhe_property_submission_approval.py new file mode 100644 index 000000000..573de01d9 --- /dev/null +++ b/tianhe_approvals/models/tianhe_property_submission_approval.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +from odoo import api, fields, models, tools +from odoo.exceptions import ValidationError + + +class TianHeFinancingPostApproval(models.Model): + _inherit = "approval.request" + _description = '天河物业部业务呈批表' + + yp_create_time = fields.Date(string="日期",default=fields.Date.today()) + owned_property = fields.Char(string="所属物业") + lessee = fields.Char(string="承租方") + yp_urgency = fields.Selection([ + ('ordinary', '一般'), + ('none', '无'), + ], string="紧急度") + yp_business_type = fields.Selection([ + ('company business', '公司业务'), + ('subordinate business', '下属单位业务'), + ('agreement', '协议(合同)'), + ('other', '其他'), + ], string="业务类型") + business_text = fields.Text(string="业务内容") + attn = fields.Text(string="经办人") + diff --git a/tianhe_approvals/views/tianhe_business_approval.xml b/tianhe_approvals/views/tianhe_business_approval.xml new file mode 100644 index 000000000..416c0d525 --- /dev/null +++ b/tianhe_approvals/views/tianhe_business_approval.xml @@ -0,0 +1,19 @@ + + + + approvals.category.type.code.business.approval + approval.request + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tianhe_approvals/views/tianhe_document_processing_approval.xml b/tianhe_approvals/views/tianhe_document_processing_approval.xml new file mode 100644 index 000000000..85448eb46 --- /dev/null +++ b/tianhe_approvals/views/tianhe_document_processing_approval.xml @@ -0,0 +1,21 @@ + + + + approvals.category.type.code.document.processing.approval + approval.request + + + + + + + + + + + + + + + + \ 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 new file mode 100644 index 000000000..ed0aa73e3 --- /dev/null +++ b/tianhe_approvals/views/tianhe_financing_post_approval.xml @@ -0,0 +1,21 @@ + + + + approvals.category.type.code.financing.post.approval + approval.request + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tianhe_approvals/views/tianhe_property_submission_approval.xml b/tianhe_approvals/views/tianhe_property_submission_approval.xml new file mode 100644 index 000000000..6905e8892 --- /dev/null +++ b/tianhe_approvals/views/tianhe_property_submission_approval.xml @@ -0,0 +1,21 @@ + + + + approvals.category.type.code.property.submission.approval + approval.request + + + + + + + + + + + + + + + + \ No newline at end of file