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

Merge branch 'dev' into dev_zhang

Browse Source
This commit is contained in:
ONIONZHAOXI
2024-07-10 18:10:11 +08:00
parent a1dc6d61b0 a7ec0083db
commit fa72215cbd
4 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tianhe_approvals/models/inherit_approval_category.py
+1 -2
View File
@@ -27,7 +27,6 @@ class ApprovalCategory(models.Model):
('card_approval', '补卡审批'),
('overtime_approval', '加班审批'),
('go_approval', '外出审批'),
('holiday_approval', '请假审批'),
('duty_approval', '值班审批'),
('leave_approval', '调休审批'),
('remove_holiday_approval', '销假审批'),
@@ -39,7 +38,7 @@ class ApprovalCategory(models.Model):
('meeting_minutes', '会议纪要'),
('engineering', '工程立项'),
('property_right_alter', '产权变更表申请表'),
('leave_registration', '请假登记单'),
('leave_registration', '请假'),
('tianhe_property_management_reporting', '物业经营报表管理'),
('tianhe_fire_safety_management', '消防安全管理'),
('tianhe_information_ublish_approval_form', '信息发布呈批表'),
tianhe_approvals/models/inherit_approval_request.py
+2 -2
View File
@@ -52,8 +52,8 @@ class ApprovalRequest(models.Model):
('financial_chapter', '财务章'),
('other_chapter', '其他'),
], string="用章类别")
department_id = fields.Many2one('hr.department', 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="部门")
class ApprovalRequestLine(models.Model):
_name = 'approval.request.line'
tianhe_approvals/models/wuguan_leave_registration_approval.py
+15 -15
View File
@@ -5,20 +5,20 @@ from odoo.exceptions import ValidationError
class WuguanLeaveRegistrationApproval(models.Model):
_inherit = "approval.request"
_description = '请假登记单'
_description = '请假'
leave_category = fields.Selection([('annual leave', '年假'),
('leave in lieu', '调休假'),
('leave', '事假'),
('sick leave', '病假'),
('funeral leave', '丧假'),
('marital leave', '婚假'),
('maternity leave', '产假'),
('paternity leave', '陪产假'),
('nursing leave', '看护假'),
('parental leave', '育儿假'),
('nursing leave', '护理假'),
('family planning leave', '计生假'),
], string="请假类别")
flow_mark = fields.Char(string="流程号")
leave_category = fields.Many2many('holiday.setting', string="请假类别")
leave_time = fields.Char(string="请假时间")
leave_days = fields.Float(string='请假天数', compute='_compute_leave_days', store=True)
@api.depends('date_start', 'date_end')
def _compute_leave_days(self):
for record in self:
if record.date_start and record.date_end:
start_date = fields.Datetime.from_string(record.date_start)
end_date = fields.Datetime.from_string(record.date_end)
duration = end_date - start_date
record.leave_days = duration.days
else:
record.leave_days = 0
tianhe_approvals/views/wuguan_leave_registration_approval.xml
+7 -4
View File
@@ -6,13 +6,16 @@
<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="leave_category" invisible="approval_category_name != 'leave_registration'"/>
<field name="leave_time" invisible="approval_category_name != 'leave_registration'"/>
<field name="leave_category" widget="many2many_tags" invisible="approval_category_name != 'leave_registration'"/>
<field name="date_start" string="请假开始时间" invisible="approval_category_name != 'leave_registration'"/>
<field name="date_end" string="请假结束时间" invisible="approval_category_name != 'leave_registration'"/>
<field name="leave_days" invisible="approval_category_name != 'leave_registration'"/>
</xpath>
<xpath expr="//field[@name='company_id']" position="after">
<field name="department_id" invisible="approval_category_name != 'leave_registration'"/>
<field name="flow_mark" invisible="approval_category_name != 'leave_registration'"/>
<field name="date" string="登记时间" invisible="approval_category_name != 'leave_registration'"/>
<field name="creation_time" invisible="approval_category_name != 'leave_registration'"/>
<field name="main_text" string="申请事由" invisible="approval_category_name != 'leave_registration'"/>
</xpath>
</field>
</record>