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

添加功能

Browse Source
This commit is contained in:
zhou
2025-01-17 18:19:02 +08:00
parent 43a1e77a26
commit 91c203d722
29 changed files with 114 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_holiday/views/hr_leave_batch.xml
+3 -1
View File
@@ -19,7 +19,9 @@
<field name="arch" type="xml">
<form>
<sheet>
<field name="code" readonly="1"/>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<div class="oe_title">
<label for="name"/>
<h1>
yuthon_hr_attendance/views/card_approval.xml
+3
View File
@@ -18,6 +18,9 @@
<field name="arch" type="xml">
<form>
<sheet>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<div class="col-12 text-center">
<h1>
<field name="name" required="1" placeholder="请输入标题"/>
yuthon_hr_attendance/views/duty_approval.xml
+5 -5
View File
@@ -17,20 +17,20 @@
<field name="arch" type="xml">
<form>
<sheet>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<div class="oe_title">
<label for="name" placeholder="请输入标题"/>
<h1>
<field name="name" required="1"/>
</h1>
</div>
<group>
<group col="2">
<group>
<field name="users_id"/>
<field name="yuthon_company" invisible="1"/>
</group>
<group>
<field name="code"/>
<field name="department_id" invisible="1"/>
<field name="department_id" invisible="1"/>
</group>
<group>
<field name="reason_application" />
yuthon_hr_attendance/views/go_approval.xml
+3 -1
View File
@@ -18,7 +18,9 @@
<field name="arch" type="xml">
<form>
<sheet>
<field name="code" readonly="1"/>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<div class="oe_title">
<label for="name"/>
<h1>
yuthon_hr_attendance/views/leave_approval.xml
+3 -1
View File
@@ -25,6 +25,9 @@
<button name="leave_approval" string="发起申请" type="object" class="oe_highlight"/>
<field name="statu" widget="statusbar"/>
</header>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<sheet>
<div class="oe_title">
<label for="name" placeholder="请输入标题"/>
@@ -39,7 +42,6 @@
</group>
<group>
<field name="date"/>
<field name="code"/>
</group>
</group>
</sheet>
yuthon_hr_attendance/views/overtime_approval.xml
+3 -1
View File
@@ -21,6 +21,9 @@
<button name="put_hr_employee" type="object" string="Approve" class="oe_highlight"/>
</header>
<sheet>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<div class="oe_title">
<label for="name"/>
<h1>
@@ -30,7 +33,6 @@
<group>
<group>
<field name="users_id"/>
<field name="code"/>
<field name="start_time"/>
<field name="end_time"/>
<field name="duration"/>
yuthon_hr_attendance/views/remove_holiday_approval.xml
+3 -1
View File
@@ -21,6 +21,9 @@
<field name="arch" type="xml">
<form>
<sheet>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group string="审批事由">
<field name="name" required="1"/>
<field name="reason_application"/>
@@ -34,7 +37,6 @@
</group>
<group>
<field name="date"/>
<field name="code"/>
<field name="type_remove_holiday"/>
<field name="is_issues"/>
<field name="related_issues_id" invisible="not is_issues"/>
yuthon_hr_attendance/views/yuthon_abnormal_approval_views.xml
+3 -1
View File
@@ -18,6 +18,9 @@
<field name="arch" type="xml">
<form string="值班调休审批">
<sheet>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group string="个人信息" col="2">
<group>
<field name="users_id"/>
@@ -32,7 +35,6 @@
<group string="审批事项">
<group>
<field name="name"/>
<field name="code"/>
<field name="reason_application"/>
<field name="documents_ids" widget="preview_many2many"/>
</group>
yuthon_hr_attendance/views/yuthon_adjustments_approval_views.xml
+3 -1
View File
@@ -18,6 +18,9 @@
<field name="arch" type="xml">
<form string="值班调休审批">
<sheet>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group string="个人信息" col="2">
<group>
<field name="users_id"/>
@@ -33,7 +36,6 @@
<group string="审批事项">
<group>
<field name="name"/>
<field name="code"/>
<field name="reason_application"/>
<field name="documents_ids" widget="preview_many2many"/>
</group>
yuthon_hr_attendance/views/yuthon_customer_approval_views.xml
+3
View File
@@ -16,6 +16,9 @@
<field name="arch" type="xml">
<form string="客服值班审批">
<sheet>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<div class="oe_title">
<label for="name"/>
<h1>
yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
+3 -1
View File
@@ -21,7 +21,9 @@
<header>
<button name="button_shift_approval" type="object" string="批准" class="oe_highlight"/>
</header>
<field name="code" readonly="1"/>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group string="审批事项">
<group>
<field name="name" placeholder="请输入标题"/>
yuthon_hr_attendance/views/yuthon_special_approval_views.xml
+3 -1
View File
@@ -21,10 +21,12 @@
<header>
<button name="button_special_approval" type="object" string="批准" class="oe_highlight"/>
</header>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group string="审批事项">
<group>
<field name="name" placeholder="请输入标题"/>
<field name="code" invisible="1"/>
<field name="reason_application"/>
<field name="documents_ids" widget="preview_many2many"/>
</group>
yuthon_hr_employee_approval/views/yuthon_appointment_approval_views.xml
+3 -1
View File
@@ -20,9 +20,11 @@
<field name="arch" type="xml">
<form>
<sheet>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group string="基础信息" col="3">
<group>
<field name="code"/>
<field name="department_id"/>
</group>
<group>
yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml
+3 -1
View File
@@ -21,6 +21,9 @@
<field name="arch" type="xml">
<form>
<sheet>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group col="4" string="员工信息">
<group>
<field name="users_id"/>
@@ -30,7 +33,6 @@
</group>
<group>
<field name="department_id"/>
<field name="code"/>
<field name="end_of_contract"/>
<field name="expected_departure_date"/>
</group>
yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
+3
View File
@@ -21,6 +21,9 @@
<button name="button_office_supply" type="object" class="oe_highlight" string="办公用品" invisible="not is_office"/>
</header>
<sheet>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<div class="col-12 text-center">
<h1>
<field name="name" required="1"/>
yuthon_hr_employee_approval/views/yuthon_prepare_approval_views.xml
+11 -10
View File
@@ -17,16 +17,17 @@
<field name="arch" type="xml">
<form>
<sheet>
<group>
<field name="users_id" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="yuthon_company" invisible="1"/>
</group>
<group>
<field name="code" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="is_issues"/>
</group>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group>
<field name="users_id" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="yuthon_company" invisible="1"/>
</group>
<group>
<field name="department_id" invisible="1"/>
</group>
<group string="审批事项">
<field name="name" required="1"/>
<field name="reason"/>
yuthon_hr_employee_approval/views/yuthon_reassignment_approval_views.xml
+3 -1
View File
@@ -22,6 +22,9 @@
<field name="arch" type="xml">
<form>
<sheet>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group string="员工信息" col="4">
<group>
<field name="users_id"/>
@@ -31,7 +34,6 @@
</group>
<group>
<field name="department_id"/>
<field name="code"/>
<field name="business_superior_id"/>
<field name="place_of_work"/>
</group>
yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml
+3
View File
@@ -24,6 +24,9 @@
<field name="arch" type="xml">
<form>
<sheet>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group string="员工信息" col="4">
<group>
<field name="users_id" required="1"/>
yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml
+3 -1
View File
@@ -20,9 +20,11 @@
<field name="arch" type="xml">
<form>
<sheet>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group string="基础信息" col="3">
<group>
<field name="code"/>
<field name="yuthon_company" invisible="1"/>
<field name="department_id"/>
</group>
yuthon_hr_employee_approval/views/yuthon_service_approval_views.xml
+18 -16
View File
@@ -20,23 +20,25 @@
<field name="arch" type="xml">
<form>
<sheet>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group col="3" string="个人信息">
<group>
<field name="code"/>
<field name="service_type"/>
<field name="reason_issuance"/>
</group>
<group>
<field name="users_id"/>
<field name="job_id"/>
<field name="is_issues"/>
<field name="related_issues_id" invisible="not is_issues"/>
</group>
<group>
<field name="department_id"/>
<field name="tenant_user_card"/>
<field name="onboarding_time"/>
</group>
<group>
<field name="service_type"/>
<field name="reason_issuance"/>
</group>
<group>
<field name="users_id"/>
<field name="job_id"/>
<field name="is_issues"/>
<field name="related_issues_id" invisible="not is_issues"/>
</group>
<group>
<field name="department_id"/>
<field name="tenant_user_card"/>
<field name="onboarding_time"/>
</group>
</group>
<group string="审批事项">
<field name="name" required="1"/>
yuthon_hr_employee_approval/views/yuthon_transfer_approval_views.xml
+3 -1
View File
@@ -21,6 +21,9 @@
<field name="arch" type="xml">
<form>
<sheet>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group col="4" string="员工信息">
<group>
<field name="users_id"/>
@@ -29,7 +32,6 @@
</group>
<group>
<field name="department_id"/>
<field name="code"/>
<field name="end_of_contract"/>
</group>
<group>
yuthon_issue/views/issue_approval_views.xml
+3
View File
@@ -22,6 +22,9 @@
<field name="arch" type="xml">
<form string="议题审批" create="False">
<sheet>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group col="4" string="个人信息">
<group>
<field name="employee_id"/>
yuthon_issue/views/issue_meeting_minutes_views.xml
+3 -1
View File
@@ -18,9 +18,11 @@
<field name="arch" type="xml">
<form string="会议纪要">
<sheet>
<group>
<field name="code" readonly="1" string="流水号:"/>
</group>
<group col="2">
<group>
<field name="code"/>
<field name="name"/>
<field name="meeting_id"/>
<field name="meeting_date"/>
yuthon_property_approval/models/property_early_quitting.py
+1 -1
View File
@@ -20,7 +20,7 @@ class PropertyEarlyQuitting(models.Model):
end_data = fields.Date(string="合同结束日期")
early_quitting_date = fields.Date(string="提前退租日期")
original_contract_id = fields.Many2one('ir.attachment', string="合同")
contract_id = fields.Many2one('yuthon.property.contract', string="合同")
contract_id = fields.Many2one('property.lease.contract', string="合同")
reason = fields.Char(string="退租原因")
def button_approval(self):
yuthon_property_approval/models/property_lease_extension.py
+2 -2
View File
@@ -15,9 +15,9 @@ class PropertyLeaseExtension(models.Model):
default=lambda self: self.env['ir.sequence'].next_by_code('property_lease_extension_code'))
property_documents_ids = fields.Many2many('ir.attachment', string="延租文件")
original_contract_id = fields.Many2one('ir.attachment', string="原合同")
lessee_id = fields.Many2one(related='address_id.lessee_id', string="承租方")
lessee_id = fields.Many2one(related='contract_id.lessee_id', string="承租方")
address_id = fields.Many2one('yuthon.property', string="物业地址")
contract_id = fields.Many2one('yuthon.property.contract', string="合同")
contract_id = fields.Many2one('property.lease.contract', string="合同")
end_date = fields.Date(string="原到期时间")
new_end_date = fields.Date(string="延期至")
reason_extension = fields.Char(string="延期原因")
yuthon_property_approval/views/property_early_quitting.xml
+2 -3
View File
@@ -27,18 +27,17 @@
<group>
<field name="code"/>
<field name="start_data"/>
<field name="property_documents_ids" widget="preview_many2many"/>
<field name="reason"/>
<field name="property_documents_ids" widget="preview_many2many"/>
</group>
<group>
<field name="lessee_id"/>
<field name="end_data"/>
<field name="contract_id"/>
<field name="contract_id" widget="preview_many2one"/>
</group>
<group>
<field name="address_id"/>
<field name="early_quitting_date"/>
<field name="contract_id" widget="preview_many2one"/>
</group>
</group>
</sheet>
yuthon_property_approval/views/property_lease_alter.xml
+2 -2
View File
@@ -4,7 +4,7 @@
<field name="name">property.lease.alter.tree</field>
<field name="model">property.lease.alter</field>
<field name="arch" type="xml">
<tree string="续租审批审批">
<tree string="续租审批">
<field name="name"/>
<field name="code"/>
</tree>
@@ -15,7 +15,7 @@
<field name="name">property.lease.alter.form</field>
<field name="model">property.lease.alter</field>
<field name="arch" type="xml">
<form string="续租审批审批">
<form string="续租审批">
<sheet>
<div class="oe_title">
<label for="name"/>
yuthon_property_approval/views/property_lease_extension.xml
+6 -6
View File
@@ -4,7 +4,7 @@
<field name="name">property.lease.extension.tree</field>
<field name="model">property.lease.extension</field>
<field name="arch" type="xml">
<tree string="延租审批">
<tree string="续租审批">
<field name="name"/>
<field name="code"/>
</tree>
@@ -15,7 +15,7 @@
<field name="name">property.lease.extension.form</field>
<field name="model">property.lease.extension</field>
<field name="arch" type="xml">
<form string="延租审批">
<form string="续租审批">
<sheet>
<div class="oe_title">
<label for="name"/>
@@ -26,13 +26,13 @@
<group col="3">
<group>
<field name="code"/>
<field name="property_documents_ids" widget="preview_many2many"/>
<field name="new_end_date"/>
<field name="original_contract_id" widget="preview_many2one"/>
</group>
<group>
<field name="original_contract_id" widget="preview_many2one"/>
<field name="lessee_id"/>
<field name="contract_id" invisible="1"/>
<field name="contract_id"/>
<field name="property_documents_ids" widget="preview_many2many"/>
</group>
<group>
<field name="address_id"/>
@@ -46,7 +46,7 @@
</record>
<record id="property_lease_extension_action" model="ir.actions.act_window">
<field name="name">延租审批</field>
<field name="name">续租审批</field>
<field name="res_model">property.lease.extension</field>
<field name="view_mode">tree,form</field>
</record>
yuthon_property_approval/views/property_menu_all.xml
+7 -15
View File
@@ -21,13 +21,6 @@
action="property_business_confirm_action"
sequence="21"/>
<menuitem
id="property_early_quitting_menu"
parent="yuthon_property.property_approval_menu"
name="提前退租审批"
action="property_early_quitting_action"
sequence="24"/>
<menuitem
id="property_inventory_table_menu"
parent="yuthon_property.property_approval_menu"
@@ -47,19 +40,18 @@
parent="yuthon_property.yuthon_property_estate_menu"
name="流程"
sequence="10"/>
<menuitem
id="property_lease_alter_menu"
parent="property_contract_process_menu"
name="续租审批审批"
action="property_lease_alter_action"
sequence="1"/>
<menuitem
id="property_lease_extension_menu"
parent="property_contract_process_menu"
name="延租审批"
name="续租审批"
action="property_lease_extension_action"
sequence="3"/>
<menuitem
id="property_early_quitting_menu"
parent="property_contract_process_menu"
name="提前退租审批"
action="property_early_quitting_action"
sequence="5"/>
<menuitem
id="property_lease_renewal_menu"
parent="property_contract_process_menu"