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

!93 hong

Browse Source 
Merge pull request !93 from dev_hong
This commit is contained in:
李鹏宇
2024-07-04 02:39:29 +00:00
committed by Gitee
parent 27dc609aa4 8476f8a324
commit 337b7b596f
18 changed files with 74 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tianhe_approvals/__manifest__.py
-7
View File
@@ -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',
tianhe_approvals/models/__init__.py
+1 -2
View File
@@ -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
tianhe_approvals/models/inherit_approval_category.py
+1 -7
View File
@@ -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', '会议文档'),
tianhe_approvals/models/tianhe_official_account_cloud_sms_post_submission_approval.py
-9
View File
@@ -1,9 +0,0 @@
from odoo import api, fields, models, tools, _
from odoo.exceptions import ValidationError
class TianHeOfficalAccountCloudSMSPostSubmission(models.Model):
_inherit = "approval.request"
_description = '公众号/云短信发文呈批'
tianhe_approvals/models/tianhe_official_issues.py
+21
View File
@@ -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="重大事项所属类别")
tianhe_approvals/models/tianhe_post_submission_approval.py
-10
View File
@@ -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="重大事项所属类别")
tianhe_approvals/views/tianhe_financing_post_approval.xml
-23
View File
@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="approvals_category_type_code_financing_post_approval" model="ir.ui.view">
<field name="name">approvals.category.type.code.financing.post.approval</field>
<field name="model">approval.request</field>
<field name="inherit_id" ref="approvals.approval_request_view_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='date_confirmed']" position="after">
<field name="servings_number" invisible="approval_category_name != 'financing_post'"/>
<field name="document_number" invisible="approval_category_name != 'financing_post'"/>
<field name="main_flats" invisible="approval_category_name != 'financing_post'"/>
<field name="cp_flats" invisible="approval_category_name != 'financing_post'"/>
<field name="main_text" invisible="approval_category_name != 'financing_post'" colspan="3"/>
</xpath>
<xpath expr="//field[@name='company_id']" position="after">
<field name="approvals_department_id" invisible="approval_category_name != 'financing_post'"/>
<field name="secret_level" widget="radio" options="{'horizontal': true}" invisible="approval_category_name != 'financing_post'"/>
<field name="urgency" widget="radio" options="{'horizontal': true}" invisible="approval_category_name != 'financing_post'"/>
<field name="date" invisible="approval_category_name != 'financing_post'"/>
</xpath>
</field>
</record>
</odoo>
tianhe_approvals/views/tianhe_general_party_branch_post.xml
-24
View File
@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<!-- ('general_party_branch_post', '党总支发文') -->
<record id="approvals_category_type_code_general_party_branch_post_approval" model="ir.ui.view">
<field name="name">approvals.category.type.code.general.party.branch.post.approval</field>
<field name="model">approval.request</field>
<field name="inherit_id" ref="approvals.approval_request_view_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='date_confirmed']" position="after">
<field name="approvals_department_id" invisible="approval_category_name != 'general_party_branch_post'"/>
<field name="servings_number" invisible="approval_category_name != 'general_party_branch_post'"/>
<field name="document_id" invisible="approval_category_name != 'general_party_branch_post'"/>
<field name="main_text" invisible="approval_category_name != 'general_party_branch_post'" colspan="3"/>
</xpath>
<xpath expr="//field[@name='company_id']" position="after">
<field name="urgency" widget="radio" options="{'horizontal': true}" invisible="approval_category_name != 'general_party_branch_post'"/>
<field name="secret_level" widget="radio" options="{'horizontal': true}" invisible="approval_category_name != 'general_party_branch_post'"/>
<field name="main_flats" invisible="approval_category_name != 'general_party_branch_post'"/>
<field name="cp_flats" invisible="approval_category_name != 'general_party_branch_post'"/>
<field name="date" invisible="approval_category_name != 'general_party_branch_post'"/>
</xpath>
</field>
</record>
</odoo>
tianhe_approvals/views/tianhe_official_account_cloud_sms_post_submission_approval.xml
-15
View File
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="approvals_category_type_code_official_account_cloud_sms_post_submission_approval" model="ir.ui.view">
<field name="name">approvals.category.type.code.official.account.cloud.sms.post.submission.approval</field>
<field name="model">approval.request</field>
<field name="inherit_id" ref="approvals.approval_request_view_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='date_confirmed']" position="after">
<field name="remarks" invisible="approval_category_name != 'official_account_cloud_sms_post_submission'" colspan="3"/>
</xpath>
<xpath expr="//field[@name='company_id']" position="after">
</xpath>
</field>
</record>
</odoo>
tianhe_approvals/views/tianhe_official_issues.xml
+16 -9
View File
@@ -5,17 +5,24 @@
<field name="model">approval.request</field>
<field name="inherit_id" ref="approvals.approval_request_view_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='date_confirmed']" position="after">
<field name="come_file_id" string="发文编号" invisible="approval_category_name != 'official_issues'"/>
<field name="main_flats" invisible="approval_category_name != 'official_issues'"/>
<field name="main_text" invisible="approval_category_name != 'official_issues'" colspan="3"/>
<xpath expr="//field[@name='date_confirmed']" position="after">
<field name="document_number" invisible="send_type not in ['general_party_branch_post','party_branch_committee_post','financing_post']"/>
<field name="come_company_id" invisible="send_type != 'official_issues_for_son'"/>
<field name="reference_cold" invisible="send_type != 'post_submission'"/>
<field name="major_event_category" invisible="send_type != 'post_submission'"/>
<field name="send_type" invisible="send_type not in send_type or approval_category_name != 'official_issues'"/>
<field name="remarks" invisible="send_type not in ['official_account_cloud_sms_post_submission','post_submission']" colspan="3"/>
<field name="main_text" invisible="send_type in ['post_submission','official_account_cloud_sms_post_submission']" colspan="3"/>
</xpath>
<xpath expr="//field[@name='company_id']" position="after">
<field name="servings_number" invisible="approval_category_name != 'official_issues'"/>
<field name="urgency" widget="radio" options="{'horizontal': true}" invisible="approval_category_name != 'official_issues'"/>
<field name="secret_level" widget="radio" options="{'horizontal': true}" invisible="approval_category_name != 'official_issues'"/>
<field name="cp_flats" invisible="approval_category_name != 'official_issues'"/>
<field name="date" invisible="approval_category_name != 'official_issues'"/>
<field name="approvals_department_id" invisible="send_type in ['official_account_cloud_sms_post_submission','post_submission','official_issues']"/>
<field name="come_file_id" invisible="send_type not in ['official_issues','official_issues_for_son']"/>
<field name="main_flats" invisible="send_type in ['official_account_cloud_sms_post_submission','official_issues_for_son']"/>
<field name="send_type" invisible="send_type != 'official_issues'"/>
<field name="servings_number" invisible="send_type in ['official_account_cloud_sms_post_submission','official_issues_for_son']"/>
<field name="urgency" invisible="send_type in ['official_account_cloud_sms_post_submission','post_submission']"/>
<field name="secret_level" invisible="send_type in ['official_account_cloud_sms_post_submission','post_submission']"/>
<field name="date" invisible="send_type in ['official_account_cloud_sms_post_submission','post_submission']"/>
</xpath>
</field>
</record>
tianhe_approvals/views/tianhe_official_issues_for_son.xml
-21
View File
@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="approvals_category_type_code_official_issues_for_son" model="ir.ui.view">
<field name="name">approvals.category.type.code.official.issues.for.son</field>
<field name="model">approval.request</field>
<field name="inherit_id" ref="approvals.approval_request_view_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='date_confirmed']" position="after">
<field name="come_file_id" invisible="approval_category_name != 'official_issues_for_son'"/>
<field name="come_company_id" invisible="approval_category_name != 'official_issues_for_son'"/>
<field name="main_text" invisible="approval_category_name != 'official_issues_for_son'" colspan="3"/>
</xpath>
<xpath expr="//field[@name='company_id']" position="after">
<field name="approvals_department_id" invisible="approval_category_name != 'official_issues_for_son'"/>
<field name="urgency" widget="radio" options="{'horizontal': true}" invisible="approval_category_name != 'official_issues_for_son'"/>
<field name="secret_level" widget="radio" options="{'horizontal': true}" invisible="approval_category_name != 'official_issues_for_son'"/>
<field name="date" invisible="approval_category_name != 'official_issues_for_son'"/>
</xpath>
</field>
</record>
</odoo>
tianhe_approvals/views/tianhe_party_branch_committee_post.xml
-23
View File
@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="approvals_category_type_code_party_branch_committee_post_approval" model="ir.ui.view">
<field name="name">approvals.category.type.code.party.branch.committee.post.approval</field>
<field name="model">approval.request</field>
<field name="inherit_id" ref="approvals.approval_request_view_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='company_id']" position="after">
<field name="approvals_department_id" invisible="approval_category_name != 'party_branch_committee_post'"/>
<field name="document_id" invisible="approval_category_name != 'party_branch_committee_post'"/>
<field name="secret_level" invisible="approval_category_name != 'party_branch_committee_post'"/>
<field name="urgency" invisible="approval_category_name != 'party_branch_committee_post'"/>
<field name="servings_number" invisible="approval_category_name != 'party_branch_committee_post'"/>
</xpath>
<xpath expr="//field[@name='date_confirmed']" position="after">
<field name="main_flats" invisible="approval_category_name != 'party_branch_committee_post'"/>
<field name="cp_flats" invisible="approval_category_name != 'party_branch_committee_post'"/>
<field name="date" invisible="approval_category_name != 'party_branch_committee_post'"/>
<field name="main_text" invisible="approval_category_name != 'party_branch_committee_post'" colspan="3"/>
</xpath>
</field>
</record>
</odoo>
tianhe_approvals/views/tianhe_post_submission_approval.xml
-20
View File
@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="approvals_category_type_code_post_submission_approval" model="ir.ui.view">
<field name="name">approvals.category.type.code.post.submission.approval</field>
<field name="model">approval.request</field>
<field name="inherit_id" ref="approvals.approval_request_view_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='date_confirmed']" position="after">
<field name="reference_cold" invisible="approval_category_name != 'post_submission'"/>
<field name="major_event_category" invisible="approval_category_name != 'post_submission'"/>
</xpath>
<xpath expr="//field[@name='company_id']" position="after">
<field name="main_flats" invisible="approval_category_name != 'post_submission'"/>
<field name="cp_flats" invisible="approval_category_name != 'post_submission'"/>
<field name="servings_number" invisible="approval_category_name != 'post_submission'"/>
<field name="remarks" invisible="approval_category_name != 'post_submission'"/>
</xpath>
</field>
</record>
</odoo>
tianhe_approvals/views/wuguan_receipt_submission.xml
-21
View File
@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="approvals_category_type_code_receipt_submission" model="ir.ui.view">
<field name="name">approvals.category.type.code.receipt.submission</field>
<field name="model">approval.request</field>
<field name="inherit_id" ref="approvals.approval_request_view_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='company_id']" position="after">
<field name="document_id" string="收文编号" invisible="approval_category_name != 'receipt_submission'"/>
<field name="secret_level" invisible="approval_category_name != 'receipt_submission'"/>
<field name="date" invisible="approval_category_name != 'receipt_submission'"/>
</xpath>
<xpath expr="//field[@name='date_confirmed']" position="after">
<field name="come_file_id" invisible="approval_category_name != 'receipt_submission'"/>
<field name="come_company_id" invisible="approval_category_name != 'receipt_submission'"/>
<field name="urgency" invisible="approval_category_name != 'receipt_submission'"/>
<field name="main_text" colspan="3" invisible="approval_category_name != 'receipt_submission'"/>
</xpath>
</field>
</record>
</odoo>
yuthon_approval/__manifest__.py
+1
View File
@@ -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,
yuthon_approval/views/send_receive_messages_management.xml
+29
View File
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="send_receive_messages_management_action" model="ir.actions.act_window">
<field name="name">收发文管理</field>
<field name="res_model">approval.request</field>
<field name="domain">[('approval_category_name','in',['official_receipt','official_issues'])]</field>
<field name="view_mode">tree,form</field>
</record>
<record id="approval_request_search_inherited" model="ir.ui.view">
<field name="name">approval.request.search.inherited</field>
<field name="model">approval.request</field>
<field name="inherit_id" ref="approvals.approval_search_view_search"/>
<field name="arch" type="xml">
<xpath expr="//search" position="inside">
<group expand="1" string="Group By">
<filter string="收文发文" name="group_request_receipt_issues" context="{'group_by': 'category_id'}"/>
</group>
</xpath>
</field>
</record>
<menuitem
id="send_receive_messages_management_menu"
parent="approvals.approvals_menu_config"
sequence="6"
name="收发文管理"
action="send_receive_messages_management_action"/>
</odoo>
yuthon_hr_attendance/models/resource_calendar_leaves.py
+4 -1
View File
@@ -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):
"""
通过百度日历接口获取法定节假日信息
yuthon_hr_attendance/views/resource_calendar_leaves_views.xml
+1
View File
@@ -62,6 +62,7 @@
<div invisible="is_allow_late_early_work == False">
<field name="work_after" style="width: 5%"/>分钟
</div>
<field name="resource_user_ids" widget="many2many_tags"/>
</group>
</xpath>
</field>