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

!1045 结束

Browse Source 
Merge pull request !1045 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2025-01-02 07:03:04 +00:00
committed by Gitee
parent 78dbf6506f 9d0747e017
commit 7ce3dbd79d
5 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_holiday/__manifest__.py
+1
View File
@@ -7,6 +7,7 @@
'license': 'LGPL-3',
'data': [
'security/ir.model.access.csv',
'data/yuthon_holiday_data.xml',
'views/inherit_hr_type_views.xml',
'views/inherit_hr_leave_allocation_views.xml',
'views/inherit_hr_leave_accrual_plan_views.xml',
yuthon_holiday/data/yuthon_holiday_data.xml
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="yuthon_holiday_code_sequence" model="ir.sequence">
<field name="name">请假编号</field>
<field name="code">yuthon_holiday_code</field>
<field name="prefix">QJ</field>
<field name="padding">4</field>
<field name="company_id" eval="False"/>
</record>
</odoo>
yuthon_holiday/models/inherit_hr_leave.py
+1 -1
View File
@@ -122,7 +122,7 @@ class HolidaysRequestBatch(models.Model):
raise
return emp
code = fields.Char(string='编号', default='\\')
code = fields.Char(string="物业编号", default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_holiday_code'))
name = fields.Char(string='标题')
employee_id = fields.Many2one(string='员工', comodel_name='hr.employee', required=True, default=_get_default_emp,
index=True)
yuthon_hr_attendance/views/hr_attendance_views.xml
+2 -1
View File
@@ -8,11 +8,11 @@
edit="false" delete="false" create="false"
editable="bottom" banner_route="/attendance/banner/route">
<field name="employee_id" widget="many2one_avatar_user"/>
<field name="current_data" optional="show"/>
<field name="check_in" optional="show" widget="time"/>
<field name="check_out" optional="show" widget="time"/>
<field name="planning_slot_id" optional="show"/>
<field name="create_date" optional="hidden"/>
<field name="current_data" optional="hidden"/>
<field name="week" optional="show"/>
<field name="is_clock_card" optional="show" class="list_width"/>
<field name="is_no_card" optional="show" class="list_width"/>
@@ -32,6 +32,7 @@
<tree string="出勤" decoration-danger="abnormal == 1"
edit="false" delete="false" create="false"
editable="bottom" banner_route="/attendance/banner/route">
<field name="current_data" optional="show"/>
<field name="check_in" optional="show" widget="time"/>
<field name="check_out" optional="show" widget="time"/>
<field name="create_date" optional="hidden"/>
yuthon_property/views/yuthon_property_views.xml
+12 -12
View File
@@ -100,18 +100,6 @@
</group>
</group>
<notebook>
<page string="产权信息">
<field name="title_information_ids">
<tree editable="bottom">
<field name="yuthon_property_id" column_invisible="1"/>
<field name="property_message_id"/>
<field name="owner_id"/>
<field name="title_certificate"/>
<field name="start_time"/>
<field name="end_date"/>
</tree>
</field>
</page>
<page string="管理信息">
<field name="manage_information_ids">
<tree editable="bottom">
@@ -129,6 +117,18 @@
</tree>
</field>
</page>
<page string="产权信息">
<field name="title_information_ids">
<tree editable="bottom">
<field name="yuthon_property_id" column_invisible="1"/>
<field name="property_message_id"/>
<field name="owner_id"/>
<field name="title_certificate"/>
<field name="start_time"/>
<field name="end_date"/>
</tree>
</field>
</page>
<page string="招商信息">
<group>
<group>