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

调整

Browse Source
This commit is contained in:
李鹏宇
2024-07-10 18:17:16 +08:00
parent ea6fcb87c6
commit a14ffeb87a
14 changed files with 62 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tianhe_approvals/models/__init__.py
-2
View File
@@ -1,7 +1,6 @@
# -*- coding: utf-8 -*-
from . import inherit_approval_category
from . import inherit_approval_request
from . import tianhe_dsh_issues_declarations
from . import tianhe_construction_business_approval
from . import tianhe_management_declare_approval
from . import tianhe_process_change_approval
@@ -16,7 +15,6 @@ from . import tianhe_exercitation_tryout_approval
from . import tianhe_shift_registration_form
from . import tianhe_meeting_minutes_approval
from . import generic_forms_replacement_card
from . import generic_forms_overtime
from . import generic_forms_outing
from . import generic_forms_remove_holiday
from . import tianhe_dimission_approval
tianhe_approvals/models/generic_forms_overtime.py
-18
View File
@@ -1,18 +0,0 @@
# -*- coding: utf-8 -*-
from odoo import api, fields, models, tools
from odoo.exceptions import ValidationError
class GenericFormsOvertime(models.Model):
_inherit = "approval.request"
_description = '加班'
type_overtime = fields.Selection([('work', '工作日',), ('rest', '休息日',), ('holiday', '节假日')],
string="加班类型")
compensation_mode = fields.Selection([('salary', '薪资',), ('rest', '调休',)], string="补偿方式")
is_male_pay = fields.Boolean(string="加班餐费")
# approvals_other_user_ids = fields.Many2many('res.users', string="传阅人", compute="_compute_other_user", store=True)
#
# @api.depends('department_id')
# def _compute_other_user(self):
# pass
tianhe_approvals/models/inherit_approval_request.py
+26 -4
View File
@@ -54,12 +54,15 @@ class ApprovalRequest(models.Model):
], string="用章类别")
creation_time = fields.Datetime(string='创建时间', default=lambda self: fields.Datetime.now())
department_id = fields.Many2one('hr.department', related="request_owner_id.employee_id.department_id", string="部门")
approval_request_ids = fields.One2many('approval.request.line', 'approval_request_id', string="审批明细行")
overtime_user_ids = fields.One2many('overtime.user.line', 'approval_request_id', string="审批明细行")
class ApprovalRequestLine(models.Model):
_name = 'approval.request.line'
_description = '明细行'
approval_request_id = fields.Many2one('approval.request')
approval_request_id = fields.Many2one('approval.request', string="关联审批单")
# 董事会议题申报表
topic = fields.Char(string='议题')
@@ -86,11 +89,30 @@ class ApprovalRequestLine(models.Model):
name = fields.Char(string="名称")
servings_number = fields.Integer(string="份数")
subtotal = fields.Integer(string="小计")
unit= fields.Char(string="单位")
detail= fields.Char(string="详情")
unit = fields.Char(string="单位")
detail = fields.Char(string="详情")
# 建设工程审批单
payment_scheduling = fields.Char(string="支付进度")
percentage = fields.Char(string="百分比")
money = fields.Char(string="金额")
# 加班
class OvertimeUserLine(models.Model):
_name = 'overtime.user.line'
_rec_name = 'approval_request_id'
approval_request_id = fields.Many2one('approval.request', string="关联审批单")
user_id = fields.Many2one('res.users', string="请假人员")
start_time = fields.Datetime(string="开始时间")
end_time = fields.Datetime(string="结束时间")
overtime_hours = fields.Float(string="加班时长")
type_overtime = fields.Selection([('work', '工作日',), ('rest', '休息日',), ('holiday', '节假日')],
string="加班类型", default="work")
compensation_mode = fields.Selection([('salary', '薪资',), ('rest', '调休',)], string="补偿方式")
is_male_pay = fields.Boolean(string="加班餐费")
user_attendance = fields.Char(string="考勤信息")
tianhe_approvals/models/tianhe_dsh_issues_declarations.py
-11
View File
@@ -1,11 +0,0 @@
# -*- coding: utf-8 -*-
from odoo import api, fields, models, tools
from odoo.exceptions import ValidationError
class TianHeDshIssuesDeclarations(models.Model):
_inherit = "approval.request"
_description = '天河投资办公室——董事会议题申报表'
approval_request_ids = fields.One2many('approval.request.line', 'approval_request_id', string="")
# issues = fields.Char(string="议题")
tianhe_approvals/models/tianhe_information_ublish_approval_form.py
-1
View File
@@ -8,7 +8,6 @@ class TianHeTianhetianheInformationUblishApprovalForm(models.Model):
_description = '信息发布审批表'
type_release = fields.Selection([('official_account', '公众号'), ('portal', '门户网站')], string="发布类型")
pub_department_id = fields.Many2one('approval.request', string="审批")
tianhe_approvals/security/ir.model.access.csv
+1
View File
@@ -1,3 +1,4 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_approval_request_line,approval_request_line,model_approval_request_line,base.group_user,1,1,1,1
access_overtime_user_line,approval_overtime_user_line,model_overtime_user_line,base.group_user,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_approval_request_line approval_request_line model_approval_request_line base.group_user 1 1 1 1
3 access_overtime_user_line approval_overtime_user_line model_overtime_user_line base.group_user 1 1 1 1
4
tianhe_approvals/views/generic_forms_overtime.xml
+35 -9
View File
@@ -6,18 +6,44 @@
<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="date_start" invisible="approval_category_name != 'overtime_approval'"/>
<field name="date_end" invisible="approval_category_name != 'overtime_approval'"/>
<field name="department_id" invisible="approval_category_name != 'overtime_approval'"/>
<field name="reason_application" string="申请事由" invisible="approval_category_name != 'overtime_approval'"/>
</xpath>
<xpath expr="//field[@name='company_id']" position="after">
<field name="type_overtime" invisible="approval_category_name != 'overtime_approval'"/>
<field name="compensation_mode" invisible="approval_category_name != 'overtime_approval'"/>
<field name="is_male_pay" invisible="approval_category_name != 'overtime_approval'"/>
<field name="reason_application" string="申请事由"
invisible="approval_category_name != 'overtime_approval'"/>
<xpath expr="//page[@name='approvers']" position="before">
<page string="加班人员明细" invisible="approval_category_name != 'overtime_approval'">
<field name="overtime_user_ids">
<tree>
<field name="user_id"/>
<field name="start_time"/>
<field name="end_time"/>
<field name="overtime_hours"/>
<field name="type_overtime"/>
<field name="compensation_mode"/>
<field name="is_male_pay"/>
<field name="user_attendance"/>
</tree>
<form>
<sheet>
<group>
<group>
<field name="approval_request_id" invisible="1"/>
<field name="user_id"/>
<field name="start_time"/>
<field name="end_time"/>
<field name="overtime_hours"/>
</group>
<group>
<field name="type_overtime"/>
<field name="compensation_mode"/>
<field name="is_male_pay"/>
<field name="user_attendance"/>
</group>
</group>
</sheet>
</form>
</field>
</page>
</xpath>
</field>
</record>
</odoo>
tianhe_approvals/views/liangchu_fixed_assets_purchase_order.xml
-14
View File
@@ -8,20 +8,6 @@
<xpath expr="//field[@name='company_id']" position="after">
<field name="reason_application" invisible="approval_category_name != 'liangchu_fixed_assets_purchase_order'"/>
</xpath>
<xpath expr="//group" position="after" >
<group invisible="approval_category_name != 'liangchu_fixed_assets_purchase_order'">
<field name="approval_request_ids" string="">
<tree editable="bottom">
<field name="name"/>
<field name="unit_price"/>
<field name="servings_number"/>
<field name="subtotal"/>
<field name="unit"/>
<field name="detail"/>
</tree>
</field>
</group>
</xpath>
</field>
</record>
</odoo>
tianhe_approvals/views/liangchu_general_manager_office_meeting_topics.xml
-9
View File
@@ -8,15 +8,6 @@
<xpath expr="//field[@name='company_id']" position="after">
<field name="department_id" invisible="approval_category_name != 'liangchu_general_manager_office_meeting_topics'"/>
</xpath>
<xpath expr="//group" position="after" >
<group invisible="approval_category_name != 'liangchu_general_manager_office_meeting_topics'">
<field name="approval_request_ids" string="">
<tree editable="bottom">
<field name="topic"/>
</tree>
</field>
</group>
</xpath>
</field>
</record>
</odoo>
tianhe_approvals/views/tianhe_dsh_issues_declarations.xml
-9
View File
@@ -8,15 +8,6 @@
<xpath expr="//field[@name='company_id']" position="after">
<field name="department_id" invisible="approval_category_name != 'tianhe_dsh_issues_declarations'"/>
</xpath>
<xpath expr="//group" position="after" >
<group invisible="approval_category_name != 'tianhe_dsh_issues_declarations'">
<field name="approval_request_ids" string="">
<tree editable="bottom">
<field name="topic"/>
</tree>
</field>
</group>
</xpath>
</field>
</record>
</odoo>
tianhe_approvals/views/tianhe_engineering_approval.xml
-12
View File
@@ -12,18 +12,6 @@
<xpath expr="//field[@name='date_confirmed']" position="after">
<field name="date_start" string="立项日期" invisible="approval_category_name != 'engineering'"/>
</xpath>
<xpath expr="//page[@name='description']" position="after">
<page string="项目物业列表" invisible="approval_category_name != 'engineering'">
<field name="approval_request_ids">
<tree editable="bottom">
<field name="property_name"/>
<field name="area"/>
<field name="property_id"/>
<field name="project_flow"/>
</tree>
</field>
</page>
</xpath>
</field>
</record>
</odoo>
tianhe_approvals/views/tianhe_lease_contract_approval_form.xml
-12
View File
@@ -18,18 +18,6 @@
<field name="uses" invisible="approval_category_name != 'tianhe_lease_contract_approval_form'"/>
<field name="payment_method" invisible="approval_category_name != 'tianhe_lease_contract_approval_form'"/>
</xpath>
<xpath expr="//group" position="after">
<group invisible="approval_category_name != 'tianhe_lease_contract_approval_form'">
<field name="approval_request_ids" string="租金信息">
<tree editable="bottom">
<field name="unit_price"/>
<field name="rent"/>
<field name="date_start"/>
<field name="date_end"/>
</tree>
</field>
</group>
</xpath>
<xpath expr="//page[@name='approvers']" position="before">
<page string="参考信息" invisible="approval_category_name != 'tianhe_lease_contract_approval_form'">
<from>
tianhe_approvals/views/wuguan_construction_works.xml
-21
View File
@@ -16,27 +16,6 @@
<field name="works_text" invisible="approval_category_name != 'construction_works'"/>
<field name="contract_money" invisible="approval_category_name != 'construction_works'"/>
</xpath>
<xpath expr="//page[@name='description']" position="after">
<page string="结算方式" invisible="approval_category_name != 'construction_works'">
<field name="approval_request_ids">
<tree editable="bottom">
<field name="payment_scheduling"/>
<field name="percentage"/>
<field name="money"/>
</tree>
</field>
</page>
</xpath>
<xpath expr="//page[@name='description']" position="after">
<page string="物业地址" invisible="approval_category_name != 'construction_works'">
<field name="approval_request_ids">
<tree editable="bottom">
<field name="property_name"/>
<field name="area"/>
</tree>
</field>
</page>
</xpath>
</field>
</record>
</odoo>
tianhe_approvals/views/wuguan_property_management_application.xml
-13
View File
@@ -15,19 +15,6 @@
<field name="new_administrator" invisible="approval_category_name != 'property_management_application'"/>
<field name="date" string="起始生效日期" invisible="approval_category_name != 'property_management_application'"/>
</xpath>
<xpath expr="//page[@name='description']" position="after">
<page string="原物业信息" invisible="approval_category_name != 'property_management_application'">
<field name="approval_request_ids">
<tree editable="bottom">
<field name="property_name"/>
<field name="subordinate_companies"/>
<field name="administrator"/>
<field name="district"/>
<field name="manage_type"/>
</tree>
</field>
</page>
</xpath>
</field>
</record>
</odoo>