diff --git a/tianhe_approvals/__manifest__.py b/tianhe_approvals/__manifest__.py index ad3a5d43d..e04ec112f 100644 --- a/tianhe_approvals/__manifest__.py +++ b/tianhe_approvals/__manifest__.py @@ -52,6 +52,11 @@ 'views/wuguan_invoicing_information_approval_order.xml', 'views/liangchu_business_approval_form_grain_depot.xml', 'views/liangchu_general_manager_office_meeting_topics.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', ], 'application': True, 'installable': True, diff --git a/tianhe_approvals/data/approval_category_type_data.xml b/tianhe_approvals/data/approval_category_type_data.xml index 0442dfd5a..4983e8b0a 100644 --- a/tianhe_approvals/data/approval_category_type_data.xml +++ b/tianhe_approvals/data/approval_category_type_data.xml @@ -223,5 +223,30 @@ 物业管理变更申请表 property_management_application + + + 费用调整申请表 + fee_adjustment + + + + 费用支出 + fee_expend + + + + 发文呈批 + post_submission + + + + 督办工作表 + supervision_worksheets + + + + 公众号/云短信发文呈批 + official_account_cloud_sms_post_submission + \ No newline at end of file diff --git a/tianhe_approvals/models/__init__.py b/tianhe_approvals/models/__init__.py index 6c09e6ca1..be7793dbd 100644 --- a/tianhe_approvals/models/__init__.py +++ b/tianhe_approvals/models/__init__.py @@ -32,3 +32,8 @@ from . import tianhe_information_ublish_approval_form from . import tianhe_lease_contract_approval_form from . import wuguan_intertubular_protocol from . import wuguan_invoicing_information_approval_order +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 diff --git a/tianhe_approvals/models/inherit_approval_category.py b/tianhe_approvals/models/inherit_approval_category.py index c2f7ea97e..5cee38073 100644 --- a/tianhe_approvals/models/inherit_approval_category.py +++ b/tianhe_approvals/models/inherit_approval_category.py @@ -48,4 +48,9 @@ class ApprovalCategory(models.Model): ('wuguan_invoicing_information_approval_order', '开票信息审批单'), ('liangchu_business_approval_form_grain_depot', '业务呈批表'), ('liangchu_general_manager_office_meeting_topics', '总经理办公会议议题呈批表'), + ('fee_adjustment', '费用调整申请表'), + ('post_submission', '发文呈批'), + ('fee_expend', '费用支出'), + ('supervision_worksheets', '督办工作表'), + ('official_account_cloud_sms_post_submission', '公众号/云短信发文呈批'), ]) diff --git a/tianhe_approvals/models/tianhe_fee_adjustment_approval.py b/tianhe_approvals/models/tianhe_fee_adjustment_approval.py new file mode 100644 index 000000000..a81d309dc --- /dev/null +++ b/tianhe_approvals/models/tianhe_fee_adjustment_approval.py @@ -0,0 +1,11 @@ +from odoo import api, fields, models, tools, _ +from odoo.exceptions import ValidationError + + +class TianHeFeeAdjustment(models.Model): + _inherit = "approval.request" + _description = '费用调整申请表' + + property_information = fields.Char(string="物业信息") + fee_information = fields.Char(string="费用信息") + adjustment_reason = fields.Char(string="调整原因") diff --git a/tianhe_approvals/models/tianhe_fee_expend_approval.py b/tianhe_approvals/models/tianhe_fee_expend_approval.py new file mode 100644 index 000000000..93169828b --- /dev/null +++ b/tianhe_approvals/models/tianhe_fee_expend_approval.py @@ -0,0 +1,17 @@ +from odoo import api, fields, models, tools, _ +from odoo.exceptions import ValidationError + + +class TianHeFeeExpend(models.Model): + _inherit = "approval.request" + _description = '费用支出' + + payment_date = fields.Date(string="支付日期") + Payer = fields.Char(string="支付人") + affiliation = fields.Many2one("res.company", string="所属公司") + joint_name = fields.Char(string="合同名称") + project_name = fields.Char(string="项目名称") + property_listings = fields.Char(string="物业列表") + property_address = fields.Char(string="物业地址") + payment_type = fields.Char(string="支付类型") + expend_fee = fields.Integer(string="支出金额") 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 new file mode 100644 index 000000000..319cc2594 --- /dev/null +++ b/tianhe_approvals/models/tianhe_official_account_cloud_sms_post_submission_approval.py @@ -0,0 +1,9 @@ +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_post_submission_approval.py b/tianhe_approvals/models/tianhe_post_submission_approval.py new file mode 100644 index 000000000..c70ce1520 --- /dev/null +++ b/tianhe_approvals/models/tianhe_post_submission_approval.py @@ -0,0 +1,10 @@ +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/models/tianhe_supervision_worksheets_approval.py b/tianhe_approvals/models/tianhe_supervision_worksheets_approval.py new file mode 100644 index 000000000..b12d97c44 --- /dev/null +++ b/tianhe_approvals/models/tianhe_supervision_worksheets_approval.py @@ -0,0 +1,13 @@ +from odoo import api, fields, models, tools, _ +from odoo.exceptions import ValidationError + + +class TianHeSupervisionWorksheets(models.Model): + _inherit = "approval.request" + _description = '督办工作表' + + cold = fields.Integer(string="编号") + supervision_basis = fields.Char(string="督办依据") + handling_requirements = fields.Char(string="内容摘要及办理要求") + supervise_work = fields.Char(string="督办工作") + work_undertaking = fields.Char(string="工作承办") diff --git a/tianhe_approvals/views/tianhe_fee_adjustment_approval.xml b/tianhe_approvals/views/tianhe_fee_adjustment_approval.xml new file mode 100644 index 000000000..3db0b5b80 --- /dev/null +++ b/tianhe_approvals/views/tianhe_fee_adjustment_approval.xml @@ -0,0 +1,19 @@ + + + + approvals.category.type.code.fee.adjustment.approval + approval.request + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tianhe_approvals/views/tianhe_fee_expend_approval.xml b/tianhe_approvals/views/tianhe_fee_expend_approval.xml new file mode 100644 index 000000000..2aaa0b126 --- /dev/null +++ b/tianhe_approvals/views/tianhe_fee_expend_approval.xml @@ -0,0 +1,24 @@ + + + + approvals.category.type.code.fee.expend.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 new file mode 100644 index 000000000..2256b7a00 --- /dev/null +++ b/tianhe_approvals/views/tianhe_official_account_cloud_sms_post_submission_approval.xml @@ -0,0 +1,15 @@ + + + + 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_post_submission_approval.xml b/tianhe_approvals/views/tianhe_post_submission_approval.xml new file mode 100644 index 000000000..4b4884e2d --- /dev/null +++ b/tianhe_approvals/views/tianhe_post_submission_approval.xml @@ -0,0 +1,20 @@ + + + + approvals.category.type.code.post.submission.approval + approval.request + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tianhe_approvals/views/tianhe_supervision_worksheets_approval.xml b/tianhe_approvals/views/tianhe_supervision_worksheets_approval.xml new file mode 100644 index 000000000..5b5c34b3d --- /dev/null +++ b/tianhe_approvals/views/tianhe_supervision_worksheets_approval.xml @@ -0,0 +1,22 @@ + + + + approvals.category.type.code.supervision.worksheets.approval + approval.request + + + + + + + + + + + + + + + + + \ No newline at end of file