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-04-06 14:57:06 +08:00
parent 2acb9d4a49
commit e7c71ee765
84 changed files with 316 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files
room/views/room_booking_views.xml
+1 -1
View File
@@ -152,7 +152,7 @@
<field name="room_id" string="会议地点"/>
</group>
<group>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="meeting_type_id" required="1"/>
</group>
</group>
room/views/room_room_views.xml
+2 -2
View File
@@ -70,7 +70,7 @@
<tree>
<field name="name"/>
<field name="office_address"/>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="is_available" string="Is Currently Available"/>
<field name="next_booking_start"/>
</tree>
@@ -117,7 +117,7 @@
<field name="meeting_type_template"/>
<field name="meet_document_id"/>
<field name="office_address"/>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="short_code" invisible="1"/>
</group>
<!-- <group>-->
soong_workflow/views/soong_user_role_views.xml
+3 -3
View File
@@ -29,7 +29,7 @@
<tree>
<field name="number" required="1"/>
<field name="name" required="1"/>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="user_type"/>
<field name="personnel_ids" widget="many2many_tags" force_save="1"/>
<field name="number_people"/>
@@ -58,7 +58,7 @@
<group>
<field name="number"/>
<field name="user_type"/>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="create_time"/>
<field name="end_time"/>
</group>
@@ -79,7 +79,7 @@
<field name="arch" type="xml">
<search>
<field name="name"/>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<searchpanel>
<field name="department_id" enable_counters="1"/>
</searchpanel>
soong_workflow/views/soong_workflow_inspector_views.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<tree>
<field name="name"/>
<field name="code"/>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="start_data"/>
<field name="end_data"/>
</tree>
yuthon_holiday/views/hr_leave_batch.xml
+2 -2
View File
@@ -8,7 +8,7 @@
<tree string="请假审批">
<field name="employee_id" column_invisible="1"/>
<field name="name"/>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
</tree>
</field>
</record>
@@ -47,7 +47,7 @@
</div>
<group>
<group>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="employee_id" invisible="1" force_save="1"/>
<field name="text"/>
<field name="work_end" invisible="1"/>
yuthon_holiday/views/yuthon_fixes_approval_views.xml
+2 -2
View File
@@ -6,8 +6,8 @@
<field name="arch" type="xml">
<tree string="假期修正审批">
<field name="name"/>
<field name="users_id"/>
<field name="department_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="department_id" widget="ztree_select"/>
</tree>
</field>
</record>
yuthon_hr_attendance/views/card_approval.xml
+2 -2
View File
@@ -6,7 +6,7 @@
<field name="arch" type="xml">
<tree>
<field name="name"/>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="attendance_id"/>
<field name="replacement_time"/>
</tree>
@@ -45,7 +45,7 @@
<field name="name"/>
<field name="work_end" invisible="1"/>
<field name="reason_application"/>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="employee_id" invisible="1"/>
<field name="shift_id" invisible="shift_name"/>
<field name="shift_name" invisible="shift_id"/>
yuthon_hr_attendance/views/duty_approval.xml
+2 -2
View File
@@ -6,7 +6,7 @@
<tree>
<field name="name"/>
<field name="department_id" optional="hide"/>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
</tree>
</field>
</record>
@@ -49,7 +49,7 @@
</div>
<group col="2">
<group>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="validity"/>
<field name="work_end" invisible="1"/>
<field name="issues_result" invisible="is_issues == False"/>
yuthon_hr_attendance/views/go_approval.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<field name="arch" type="xml">
<tree>
<field name="name"/>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
</tree>
</field>
</record>
yuthon_hr_attendance/views/hr_attendance_detail_wechat_views.xml
+3 -3
View File
@@ -34,8 +34,8 @@
<header>
<button name="get_hr_attendance_time" type="object" string="手动计算" display="always"/>
</header>
<field name="employee_id"/>
<field name="department_id"/>
<field name="employee_id" widget="ztree_select"/>
<field name="department_id" widget="ztree_select"/>
<field name="groupname"/>
<field name="checkin_type"/>
<field name="checkin_time"/>
@@ -50,7 +50,7 @@
<form string="hr attendance detail">
<sheet>
<group>
<field name="employee_id"/>
<field name="employee_id" widget="ztree_select"/>
<field name="department_id"/>
<field name="groupname"/>
<field name="checkin_type"/>
yuthon_hr_attendance/views/hr_attendance_month_views.xml
+4 -4
View File
@@ -63,8 +63,8 @@
<button class="oe_stat_button" name="update_attendance_month" string="更新考勤明细" type="object"
icon="fa-bars"/>
</header>
<field name="employee_id"/>
<field name="department_id" optional="hide"/>
<field name="employee_id" widget="ztree_select"/>
<field name="department_id" optional="hide" widget="ztree_select"/>
<field name="current_year"/>
<field name="current_month"/>
<field name="entry_date"/>
@@ -203,8 +203,8 @@
<sheet>
<group>
<group>
<field name="employee_id"/>
<field name="department_id"/>
<field name="employee_id" widget="ztree_select"/>
<field name="department_id" widget="ztree_select"/>
<field name="current_year"/>
<field name="current_month"/>
<field name="required_attendance_days"/>
yuthon_hr_attendance/views/hr_attendance_views.xml
+2 -2
View File
@@ -28,7 +28,7 @@
<button name="button_card_approval" type="object" string="补卡" class="oe_highlight" invisible="not (is_abnormal or is_early_card or is_late_card or absenteeism_card or is_no_card)"/>
<button name="button_duty_approval" type="object" string="外出" class="oe_highlight" invisible="not (is_abnormal or is_early_card or is_late_card or absenteeism_card or is_no_card)"/>
<button name="button_correct_approval" type="object" string="修正" class="oe_highlight" groups="yuthon_hr_attendance.group_he_attendance_planning_manager" invisible="is_approval"/>
<button name="button_source" type="object" string="来源" class="oe_highlight"/>
<button name="button_source" type="object" string="详情" class="oe_highlight"/>
</tree>
</field>
</record>
@@ -54,7 +54,7 @@
<field name="model">hr.attendance</field>
<field name="arch" type="xml">
<search>
<field name="employee_id"/>
<field name="employee_id" widget="ztree_select"/>
</search>
</field>
</record>
yuthon_hr_attendance/views/inherit_planning_slot_template_views.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<field name="planning_name" string="名称"/>
</xpath>
<xpath expr="//field[@name='role_id']" position="after">
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="end_time2" widget="float_time"/>
<field name="day2"/>
<field name="color" widget="color_picker" optional="show"/>
yuthon_hr_attendance/views/overtime_approval.xml
+2 -2
View File
@@ -6,7 +6,7 @@
<field name="arch" type="xml">
<tree>
<field name="name"/>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="department_id" optional="hide"/>
</tree>
</field>
@@ -52,7 +52,7 @@
</h1>
</div>
<group string="审批事项">
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="work_end" invisible="1"/>
<field name="reason_application"/>
<field name="issues_result" invisible="is_issues == False"/>
yuthon_hr_attendance/views/remove_holiday_approval.xml
+2 -2
View File
@@ -7,7 +7,7 @@
<field name="arch" type="xml">
<tree>
<field name="name"/>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="department_id"/>
<field name="date"/>
<field name="statu"/>
@@ -54,7 +54,7 @@
</group>
<group string="审批人信息">
<group>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="department_id"/>
<field name="date_start"/>
<field name="date_end"/>
yuthon_hr_attendance/views/yuthon_abnormal_approval_views.xml
+2 -2
View File
@@ -6,7 +6,7 @@
<field name="arch" type="xml">
<tree string="值班补卡审批">
<field name="name"/>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="department_id"/>
</tree>
</field>
@@ -53,7 +53,7 @@
</group>
<group string="个人信息">
<group>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="department_id"/>
</group>
</group>
yuthon_hr_attendance/views/yuthon_adjustments_approval_views.xml
+3 -3
View File
@@ -6,8 +6,8 @@
<field name="arch" type="xml">
<tree string="值班调休审批">
<field name="name"/>
<field name="users_id"/>
<field name="department_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="department_id" widget="ztree_select"/>
</tree>
</field>
</record>
@@ -53,7 +53,7 @@
</group>
<group col="2">
<group>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
</group>
<group>
<field name="replacement_data"/>
yuthon_hr_attendance/views/yuthon_customer_approval_views.xml
+2 -2
View File
@@ -6,7 +6,7 @@
<field name="arch" type="xml">
<tree string="客服值班审批">
<field name="name"/>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
</tree>
</field>
</record>
@@ -50,7 +50,7 @@
</group>
<group string="个人信息" col="2">
<group>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="employee_id" invisible="1"/>
</group>
<group>
yuthon_hr_attendance/views/yuthon_run_planning_views.xml
+1 -1
View File
@@ -32,7 +32,7 @@
<tree editable="bottom">
<field name="engineering_planning_id" column_invisible="1"/>
<field name="sequence" />
<field name="employee_id"/>
<field name="employee_id" widget="ztree_select"/>
</tree>
</field>
</group>
yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<field name="arch" type="xml">
<tree string="值班换班审批">
<field name="name"/>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="department_id" optional="hide"/>
</tree>
</field>
yuthon_hr_attendance/views/yuthon_shift_planning_views.xml
+1 -1
View File
@@ -31,7 +31,7 @@
<field name="planning_a_ids" string=" ">
<tree editable="bottom">
<field name="sequence" widget="handle" />
<field name="employee_id"/>
<field name="employee_id" widget="ztree_select"/>
<field name="regular_holidays"/>
</tree>
</field>
yuthon_hr_attendance/views/yuthon_special_approval_views.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<field name="arch" type="xml">
<tree string="特殊加班">
<field name="name"/>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="department_id" optional="hide"/>
</tree>
</field>
yuthon_hr_employee/views/inherit_hr_applicant_views.xml
+2 -2
View File
@@ -26,7 +26,7 @@
</group>
<group>
<field name="colleges"/>
<field name="department_id" string="部门"/>
<field name="department_id" string="部门" widget="ztree_select"/>
<field name="company_id" required="1"/>
<field name="tage_ids" widget="many2many_tags"/>
</group>
@@ -79,7 +79,7 @@
<attribute name="string">岗位</attribute>
</xpath>
<xpath expr="//field[@name='name']" position="after">
<field name="department_id" string="部门"/>
<field name="department_id" string="部门" widget="ztree_select"/>
<field name="is_interview_status" string="状态"/>
</xpath>
<xpath expr="//field[@name='create_date']" position="attributes">
yuthon_hr_employee/views/yuthon_job_postings_views.xml
+1 -1
View File
@@ -22,7 +22,7 @@
</div>
<group col="4">
<group>
<field name="user_id" required="1" string="申报员"/>
<field name="user_id" required="1" string="申报员" widget="ztree_select"/>
<field name="recruit_start_date"/>
</group>
<group>
yuthon_hr_employee/views/yuthon_medical_manage_views.xml
+3 -3
View File
@@ -8,7 +8,7 @@
<header>
<button name="property_reimbursement_form" string="提交体检费报销审批" type="object" class="oe_highlight"/>
</header>
<field name="employee_id"/>
<field name="employee_id" widget="ztree_select"/>
<field name="company_id" required="1" optional="show"/>
<field name="this_year_usage"/>
<field name="this_year_quota"/>
@@ -32,9 +32,9 @@
<form string="体检费管理" create="0">
<sheet>
<div class="oe_title">
<label for="employee_id"/>
<label for="employee_id" widget="ztree_select"/>
<h1>
<field name="employee_id"/>
<field name="employee_id" widget="ztree_select"/>
</h1>
</div>
<group>
yuthon_hr_employee/views/yuthon_medical_rule_views.xml
+1 -1
View File
@@ -12,7 +12,7 @@
<field name="cap"/>
<field name="allowance_unmarried_women"/>
<field name="allowance_married_women"/>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="extension_years"/>
<field name="company_id" required="1" optional="show"/>
<field name="start_date"/>
yuthon_hr_employee/wizard/hr_employee_time_wizard_views.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<form string="考勤时间表">
<sheet>
<group>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="employee_ids" widget="many2many_tags"/>
<field name="attendance_id"/>
</group>
yuthon_hr_employee_approval/views/yuthon_interview_approval_views.xml
+1 -1
View File
@@ -51,7 +51,7 @@
<field name="name"/>
<field name="job_id"/>
<field name="departments_id"/>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="work_end" invisible="1"/>
<field name="is_issues" invisible="is_issues == False"/>
<field name="department_id" invisible="1"/>
yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml
+1 -1
View File
@@ -48,7 +48,7 @@
<group string="审批信息">
<field name="name" required="1"/>
<field name="work_end" invisible="1"/>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="reason"/>
<field name="issues_result" invisible="is_issues == False"/>
</group>
yuthon_inspection/views/yuthon_inspection_items_views.xml
+2 -2
View File
@@ -11,7 +11,7 @@
<field name="items_check"/>
<field name="items_line"/>
<field name="items_outcome"/>
<field name="user_id"/>
<field name="user_id" widget="ztree_select"/>
<field name="items_time"/>
</tree>
</field>
@@ -31,7 +31,7 @@
</group>
<group>
<field name="items_outcome"/>
<field name="user_id"/>
<field name="user_id" widget="ztree_select"/>
<field name="items_time"/>
</group>
</group>
yuthon_inspection/views/yuthon_inspection_route_views.xml
+2 -2
View File
@@ -10,7 +10,7 @@
<field name="route_type"/>
<field name="sequence"/>
<field name="route_number"/>
<field name="user_id"/>
<field name="user_id" widget="ztree_select"/>
<field name="items_time"/>
</tree>
</field>
@@ -29,7 +29,7 @@
</group>
<group>
<field name="route_number"/>
<field name="user_id"/>
<field name="user_id" widget="ztree_select"/>
<field name="items_time"/>
</group>
</group>
yuthon_inspection/views/yuthon_inspection_scores_views.xml
+2 -2
View File
@@ -9,7 +9,7 @@
<field name="scores_code"/>
<field name="scores_location"/>
<field name="scores_job"/>
<field name="user_id"/>
<field name="user_id" widget="ztree_select"/>
<field name="scores_time"/>
<field name="scores_sign"/>
<field name="scores_photo"/>
@@ -30,7 +30,7 @@
</group>
<group>
<field name="user_id"/>
<field name="user_id" widget="ztree_select"/>
<field name="scores_time"/>
<field name="scores_sign"/>
<field name="scores_photo"/>
yuthon_inspection/views/yuthon_inspection_views.xml
+2 -2
View File
@@ -9,7 +9,7 @@
<field name="name"/>
<field name="state"/>
<field name="inspection_code"/>
<field name="user_id"/>
<field name="user_id" widget="ztree_select"/>
<field name="user_phone"/>
<field name="start_plan_time"/>
<field name="end_plan_time"/>
@@ -29,7 +29,7 @@
<field name="inspection_code"/>
</group>
<group>
<field name="user_id"/>
<field name="user_id" widget="ztree_select"/>
<field name="user_phone"/>
<field name="start_plan_time"/>
<field name="end_plan_time"/>
yuthon_issue/views/issue_approval_decision_views.xml
+1 -1
View File
@@ -47,7 +47,7 @@
<group>
<field name="board_meet"/>
<field name="start_date"/>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
</group>
<group>
<field name="district_bureau"/>
yuthon_issue/views/issue_approval_views.xml
+4 -4
View File
@@ -8,7 +8,7 @@
<field name="issue_data" column_invisible="1"/>
<field name="decision_data" column_invisible="1"/>
<field name="name"/>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="issue_display" widget="json_template"/>
<field name="decision_display" widget="json_template"/>
</tree>
@@ -49,14 +49,14 @@
</group>
<group col="4" string="个人信息">
<group>
<field name="employee_id"/>
<field name="employee_id" widget="ztree_select"/>
<field name="is_attend"/>
</group>
<group>
<field name="job_id"/>
</group>
<group>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
</group>
</group>
<group>
@@ -72,7 +72,7 @@
<tree editable="bottom">
<field name="issue_approval_id" column_invisible="1"/>
<field name="issue_library_id"/>
<field name="employee_id"/>
<field name="employee_id" widget="ztree_select"/>
<field name="approval_decision_sequence"/>
<field name="is_party"/>
<field name="is_class"/>
yuthon_lessee_service/views/yuthon_lessee_notice.xml
+2 -2
View File
@@ -5,7 +5,7 @@
<field name="model">yuthon.lessee.notice</field>
<field name="arch" type="xml">
<tree string="公告管理">
<field name="user_id" string="发布人"/>
<field name="user_id" string="发布人" widget="ztree_select"/>
<field name="notice_type_id" string="类型"/>
<field name="name"/>
<field name="department_id" column_invisible="1"/>
@@ -43,7 +43,7 @@
<field name="create_date"/>
</group>
<group>
<field name="user_id" required="1"/>
<field name="user_id" required="1" widget="ztree_select"/>
<field name="is_notice_roger"/>
</group>
</group>
yuthon_maintain/views/property_report_repair.xml
+2 -2
View File
@@ -44,13 +44,13 @@
</div>
<group string="基本信息" col="3">
<group>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
</group>
<group>
<field name="repairer_date"/>
</group>
<group>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
</group>
</group>
<group string="设备信息">
yuthon_maintain/views/yuthon_maintain_desktop_views.xml
+2 -2
View File
@@ -8,7 +8,7 @@
<field name="desktop_id"/>
<field name="account"/>
<field name="purchase_date"/>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
</tree>
</field>
</record>
@@ -39,7 +39,7 @@
<field name="password"/>
<field name="desktop_type"/>
<field name="purchase_date"/>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
</group>
</group>
<group>
yuthon_notice/views/yuthon_confirm_users_views.xml
+1 -1
View File
@@ -9,7 +9,7 @@
<header>
<button class="oe_stat_button" name="reminders_notice" string="批量催办" type="object" icon="fa-bars"/>
</header>
<field name="employee_id"/>
<field name="employee_id" widget="ztree_select"/>
<field name="notice_id"/>
<field name="notice_code"/>
<field name="state"/>
yuthon_notice/views/yuthon_notice_views.xml
+4 -4
View File
@@ -9,7 +9,7 @@
decoration-muted="notice_state == 'stop'">
<field name="name" required="1"/>
<field name="notice_type_id" string="类型"/>
<field name="users_id" string="发布人"/>
<field name="users_id" string="发布人" widget="ztree_select"/>
<field name="department_id" column_invisible="1"/>
<field name="users_ids" column_invisible="1"/>
<field name="create_date"/>
@@ -57,7 +57,7 @@
<field name="notice_type_id" required="1"/>
</group>
<group>
<field name="users_id" required="1"/>
<field name="users_id" required="1" widget="ztree_select"/>
</group>
<group>
<field name="work_end" invisible="1"/>
@@ -108,7 +108,7 @@
js_class="custom_notice_tree_button">
<field name="name"/>
<field name="notice_type_id" string="类型"/>
<field name="users_id" string="发布人"/>
<field name="users_id" string="发布人" widget="ztree_select"/>
<field name="is_notice_roger"/>
<field name="department_id" column_invisible="1"/>
<field name="users_ids" column_invisible="1"/>
@@ -129,7 +129,7 @@
<field name="notice_type_id" required="1" string="发布类型"/>
</group>
<group>
<field name="users_id" required="1"/>
<field name="users_id" required="1" widget="ztree_select"/>
</group>
<group>
<field name="read_number"/>
yuthon_official/views/yuthon_official_incoming_labor_views.xml
+2 -2
View File
@@ -6,7 +6,7 @@
<field name="arch" type="xml">
<tree>
<field name="name"/>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="date"/>
<field name="statu"/>
</tree>
@@ -62,7 +62,7 @@
<field name="remarks"/>
</group>
<group>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="main_flats"/>
<field name="copy_flats"/>
<field name="servings_number"/>
yuthon_official/views/yuthon_official_incoming_normal_views.xml
+3 -3
View File
@@ -6,7 +6,7 @@
<field name="arch" type="xml">
<tree>
<field name="name"/>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="time_date"/>
</tree>
</field>
@@ -58,8 +58,8 @@
<field name="remarks"/>
</group>
<group>
<field name="users_id"/>
<field name="department_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="department_id" widget="ztree_select"/>
<field name="main_flats"/>
<field name="servings_number"/>
<field name="is_supervising"/>
yuthon_official/views/yuthon_official_incoming_party_views.xml
+2 -2
View File
@@ -6,7 +6,7 @@
<field name="arch" type="xml">
<tree>
<field name="name"/>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="date"/>
<field name="statu"/>
</tree>
@@ -56,7 +56,7 @@
</group>
<group>
<field name="date"/>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="main_flats"/>
<field name="copy_flats"/>
<field name="servings_number"/>
yuthon_official/views/yuthon_official_labor_views.xml
+2 -2
View File
@@ -6,7 +6,7 @@
<field name="arch" type="xml">
<tree>
<field name="name"/>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="date"/>
<field name="statu"/>
</tree>
@@ -49,7 +49,7 @@
<field name="official_documents_ids" widget="preview_many2many"/>
</group>
<group>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="main_flats"/>
<field name="copy_flats"/>
<field name="servings_number"/>
yuthon_official/views/yuthon_official_party_views.xml
+2 -2
View File
@@ -6,7 +6,7 @@
<field name="arch" type="xml">
<tree>
<field name="name"/>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="date"/>
<field name="statu"/>
</tree>
@@ -57,7 +57,7 @@
<field name="date"/>
</group>
<group>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="main_flats"/>
<field name="copy_flats"/>
<field name="servings_number"/>
yuthon_official/views/yuthon_official_views.xml
+2 -2
View File
@@ -6,7 +6,7 @@
<field name="arch" type="xml">
<tree>
<field name="name"/>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="official_partner_id"/>
<field name="date"/>
</tree>
@@ -66,7 +66,7 @@
<field name="official_documents_ids" widget="many2many_tags"/>
</group>
<group>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="come_file_id"/>
<field name="incoming_file_id"/>
<field name="main_flats"/>
yuthon_performance/views/yuthon_duty_management.xml
+2 -2
View File
@@ -5,7 +5,7 @@
<field name="model">yuthon.duty.management</field>
<field name="arch" type="xml">
<tree string="责任书">
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="name"/>
<field name="start_index_time"/>
<field name="end_index_time"/>
@@ -28,7 +28,7 @@
<group>
<group>
<field name="work_end" invisible="1"/>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="total_weights"/>
</group>
<group>
yuthon_performance/views/yuthon_employee_appraisal.xml
+1 -1
View File
@@ -38,7 +38,7 @@
<group col="2" string="被考核者的基本信息">
<group>
<field name="be_examiners"/>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
</group>
<group>
<field name="assessment_cycle"/>
yuthon_performance/views/yuthon_employee_approval.xml
+4 -4
View File
@@ -7,8 +7,8 @@
<field name="arch" type="xml">
<tree>
<field name="name"/>
<field name="users_id"/>
<field name="department_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="department_id" widget="ztree_select"/>
<field name="creation_time"/>
</tree>
</field>
@@ -22,14 +22,14 @@
<sheet>
<group col="3">
<group>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="code"/>
<field name="creation_time"/>
</group>
<group>
<field name="work_end" invisible="1"/>
<field name="job_id"/>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
</group>
<group/>
</group>
yuthon_performance/views/yuthon_employee_performance.xml
+2 -2
View File
@@ -7,7 +7,7 @@
<tree string="责任书"
decoration-danger="index_statu == 'void'"
decoration-success="index_statu == 'work'">
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="name"/>
<field name="start_index_time"/>
<field name="end_index_time"/>
@@ -29,7 +29,7 @@
</div>
<group>
<group>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="index_statu"/>
<field name="examiners"/>
</group>
yuthon_performance/views/yuthon_grading_tasks.xml
+2 -2
View File
@@ -7,7 +7,7 @@
<field name="arch" type="xml">
<tree>
<field name="name"/>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="index_time"/>
</tree>
</field>
@@ -25,7 +25,7 @@
</div>
<group col="2">
<group>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
</group>
<group>
<field name="index_time"/>
yuthon_performance/views/yuthon_kpi_tasks.xml
+2 -2
View File
@@ -7,7 +7,7 @@
<field name="arch" type="xml">
<tree>
<field name="name"/>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="index_time"/>
</tree>
</field>
@@ -25,7 +25,7 @@
</div>
<group col="2">
<group>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
</group>
<group>
<field name="index_time"/>
yuthon_performance/views/yuthon_tissue_duty_approval.xml
+4 -4
View File
@@ -7,8 +7,8 @@
<field name="arch" type="xml">
<tree>
<field name="name"/>
<field name="users_id"/>
<field name="department_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="department_id" widget="ztree_select"/>
<field name="creation_time"/>
</tree>
</field>
@@ -22,14 +22,14 @@
<sheet>
<group col="3">
<group>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="code"/>
<field name="creation_time"/>
</group>
<group>
<field name="work_end" invisible="1"/>
<field name="job_id"/>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
</group>
<group>
<field name="is_kpi"/>
yuthon_property/__manifest__.py
+3 -1
View File
@@ -56,8 +56,8 @@
'views/property_accounts_receivable_views.xml',
'wizard/yuthon_property_wizard_views.xml',
'wizard/property_meter_wizard_views.xml',
'wizard/rental_scheme_wizard_views.xml',
'wizard/property_tenant_wizard_views.xml',
'wizard/evaluation_plan_wizard_views.xml',
'wizard/property_water_wizard_views.xml',
'wizard/property_statements_wizard_views.xml',
'views/menuitem.xml',
@@ -68,9 +68,11 @@
'yuthon_property/static/src/js/rent_create_button.js',
'yuthon_property/static/src/js/bank_create_button.js',
'yuthon_property/static/src/js/statements_create_button.js',
'yuthon_property/static/src/js/evaluation_create_button.js',
'yuthon_property/static/src/xml/rent_create_button.xml',
'yuthon_property/static/src/xml/bank_create_button.xml',
'yuthon_property/static/src/xml/statements_create_button.xml',
'yuthon_property/static/src/xml/evaluation_create_button.xml',
],
},
'demo': [],
yuthon_property/models/property_evaluation_plan.py
+14 -22
View File
@@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
from odoo import models, fields, api
from odoo.exceptions import UserError, ValidationError
@@ -20,6 +21,7 @@ class PropertyEvaluationPlan(models.Model):
default='6')
annual_increase_percentage = fields.Float(string='每年递增(%)', igits=(6, 2))
remake = fields.Text(string='备注')
state = fields.Selection([('to', '待审批'), ('done', '已审批')], string="状态", default='to')
def put_assessment_approval(self):
property_evaluation_ids = self.env["property.evaluation.plan"].browse(
@@ -27,9 +29,12 @@ class PropertyEvaluationPlan(models.Model):
form_id = self.env.ref('yuthon_property_approval.property_evaluate_application_form').id
property_list = []
for i in property_evaluation_ids:
if i.state == 'done':
raise UserError('该方案不可提交')
property_list.append([0, 0, {
'property_evaluation_id': i.id,
}])
i.write({'state': 'done'})
return {
'name': '提交物业评估',
'view_mode': 'form',
@@ -38,28 +43,15 @@ class PropertyEvaluationPlan(models.Model):
'views': [(form_id, 'form')],
"context": {
'default_property_ids': property_list,
'default_is_property': True,
}
}
def rental_scheme_wizard(self):
property_evaluation_ids = self.env["property.evaluation.plan"].browse(
self._context.get('active_ids', self._context.get('active_id')))
evaluation = []
name_list = []
for i in property_evaluation_ids:
name = i.name
name_list.append(name)
evaluation.append(i.id)
name = ','.join(name_list)
def button_source(self):
domain = [('id', 'in', self.property_ids.ids)]
return {
'name': '整租方案弹窗',
'type': 'ir.actions.act_window',
'view_mode': 'form',
'res_model': 'rental.scheme.wizard',
'target': 'new',
'context': {
'default_name': name,
'default_property_ids': evaluation
}
}
"name": "物业",
"type": "ir.actions.act_window",
"view_mode": "tree",
"res_model": "yuthon.property",
"domain": domain,
"target": "new",
}
yuthon_property/models/yuthon_property.py
+35 -3
View File
@@ -1,5 +1,6 @@
from odoo import models, fields, api
from odoo.exceptions import UserError, ValidationError
from pypinyin import pinyin,lazy_pinyin
class YuthonProperty(models.Model):
@@ -7,6 +8,7 @@ class YuthonProperty(models.Model):
_description = '物业管理'
_inherit = ['mail.thread.main.attachment', 'mail.activity.mixin']
_rec_name = 'name'
_order = 'first_letter'
name = fields.Char(string="资产名称")
users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
@@ -80,6 +82,22 @@ class YuthonProperty(models.Model):
property_merge_approval_id = fields.Many2one('yuthon.property', string='关联物业信息')
reference_ids = fields.One2many('yuthon.reference.conditions', 'yuthon_property_id', string='关联出租参考条件明细行')
first_letter = fields.Char(string="首字母", compute='_compute_first_letter', store=True)
@api.depends('name')
def _compute_first_letter(self):
for record in self:
name = record.name
if name:
first_char = name[0]
pinyin_list = lazy_pinyin(first_char)
if pinyin_list:
record.first_letter = pinyin_list[0][0].upper()
else:
record.first_letter = ''
else:
record.first_letter = ''
@api.onchange('title_information_ids')
def _onchange_title_information_ids(self):
for rec in self:
@@ -223,11 +241,19 @@ class YuthonProperty(models.Model):
'remake': record.remark,
})
record.write({'state': 'ing'})
return {
"name": "物业评估方案",
'type': 'ir.actions.act_window',
'res_model': 'property.evaluation.plan',
"view_mode": "tree",
}
def all_assessment_approval(self):
property_ids = self.env["yuthon.property"].browse(
self._context.get('active_ids', self._context.get('active_id')))
for record in property_ids:
property_ids = self.env["yuthon.property"].browse(
self._context.get('active_ids', self._context.get('active_id')))
for record in property_ids:
if record.state == 'ing':
raise UserError(f'{record.name}该物业已在评估，请勿重复提交')
self.env['property.evaluation.plan'].create({
'name': record.name,
'property_ids': [(6, 0, [record.id])],
@@ -242,6 +268,12 @@ class YuthonProperty(models.Model):
'remake': record.remark,
})
record.write({'state': 'ing'})
return {
"name": "物业评估方案",
'type': 'ir.actions.act_window',
'res_model': 'property.evaluation.plan',
"view_mode": "tree",
}
# 拆分
def put_split_approval(self):
yuthon_property/security/ir.model.access.csv
+2 -2
View File
@@ -85,5 +85,5 @@ access_major_event_setting,major_event_setting,model_major_event_setting,base.gr
access_yuthon_major_event_line,yuthon_major_event_line,model_yuthon_major_event_line,base.group_user,1,1,1,1
access_property_floor_setting,property_floor_setting,model_property_floor_setting,base.group_user,1,1,1,1
access_property_evaluation_plan,property_evaluation_plan,model_property_evaluation_plan,base.group_user,1,1,1,1
access_rental_scheme_wizard,rental_scheme_wizard,model_rental_scheme_wizard,base.group_user,1,1,1,1
access_evaluation_company,evaluation_company,model_evaluation_company,base.group_user,1,1,1,1
access_evaluation_company,evaluation_company,model_evaluation_company,base.group_user,1,1,1,1
access_evaluation_plan_wizard,evaluation_plan_wizard,model_evaluation_plan_wizard,base.group_user,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
85 access_yuthon_major_event_line yuthon_major_event_line model_yuthon_major_event_line base.group_user 1 1 1 1
86 access_property_floor_setting property_floor_setting model_property_floor_setting base.group_user 1 1 1 1
87 access_property_evaluation_plan property_evaluation_plan model_property_evaluation_plan base.group_user 1 1 1 1
88 access_rental_scheme_wizard access_evaluation_company rental_scheme_wizard evaluation_company model_rental_scheme_wizard model_evaluation_company base.group_user 1 1 1 1
89 access_evaluation_company access_evaluation_plan_wizard evaluation_company evaluation_plan_wizard model_evaluation_company model_evaluation_plan_wizard base.group_user 1 1 1 1
yuthon_property/static/src/js/evaluation_create_button.js
+29
View File
@@ -0,0 +1,29 @@
/** @odoo-module */
import { ListController } from "@web/views/list/list_controller";
import { registry } from '@web/core/registry';
import { listView } from '@web/views/list/list_view';
export class CustomEvaluationController extends ListController {
setup() {
super.setup();
}
openEvaluationWizard() {
this.actionService.doAction({
type: 'ir.actions.act_window',
res_model: 'evaluation.plan.wizard',
name: '评估方案',
view_mode: 'form',
view_type: 'form',
views: [[false, 'form']],
target: 'new', // 以弹窗形式打开
context: {},
});
}
}
registry.category("views").add("custom_evaluation_button", {
...listView,
Controller: CustomEvaluationController,
buttonTemplate: "evaluation_module.ListView.Buttons",
});
yuthon_property/static/src/xml/evaluation_create_button.xml
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<templates>
<t t-name="evaluation_module.ListView.Buttons" t-inherit="web.ListView.Buttons">
<xpath expr="//div[hasclass('o_list_buttons')]" position="after">
<button type="button" class="btn btn-primary" style="margin-left: 10px;" t-on-click="openEvaluationWizard">
新建
</button>
</xpath>
</t>
</templates>
yuthon_property/views/property_electric_reading_views.xml
+1 -1
View File
@@ -9,7 +9,7 @@
<field name="position" optional="hide"/>
<field name="property_id"/>
<field name="lessee_id"/>
<field name="users_id" optional="hide"/>
<field name="users_id" optional="hide" widget="ztree_select"/>
<field name="state" optional="hide"/>
<field name="payment_account" optional="hide"/>
<field name="billing_period" optional="hide"/>
yuthon_property/views/property_evaluation_plan_view.xml
+4 -3
View File
@@ -4,13 +4,12 @@
<field name="name">property.evaluation.plan.tree</field>
<field name="model">property.evaluation.plan</field>
<field name="arch" type="xml">
<tree string="物业评估方案" editable="bottom">
<tree string="物业评估方案" editable="bottom" create="false" js_class="custom_evaluation_button">
<header>
<button name="put_assessment_approval" type="object" string="提交评估申请" class="btn btn-primary"/>
<button name="rental_scheme_wizard" type="object" string="整租方案" class="btn btn-primary"/>
</header>
<field name="name"/>
<field name="property_ids" widget="many2many_tags"/>
<field name="property_ids" widget="many2many_tags" optional="hide"/>
<field name="evaluation_area"/>
<field name="assessment_category"/>
<field name="owner_id"/>
@@ -21,6 +20,8 @@
<field name="rent_id"/>
<field name="annual_increase_percentage"/>
<field name="remake"/>
<field name="state"/>
<button name="button_source" type="object" string="详情" class="btn btn-primary"/>
</tree>
</field>
</record>
yuthon_property/views/property_water_reading_views.xml
+1 -1
View File
@@ -9,7 +9,7 @@
<field name="position" optional="hide"/>
<field name="property_id"/>
<field name="lessee_id"/>
<field name="users_id" optional="hide"/>
<field name="users_id" optional="hide" widget="ztree_select"/>
<field name="state" optional="hide"/>
<field name="payment_account" optional="hide"/>
<field name="billing_period" optional="hide"/>
yuthon_property/views/yuthon_property_views.xml
+2 -7
View File
@@ -9,6 +9,7 @@
<button name="put_merge_approval" string="合并" type="object" class="btn btn-primary"/>
<button name="put_property_handover" string="物业移交" type="object" class="btn btn-primary"/>
<button name="put_declare_approval" type="object" string="提交出租申报" class="btn btn-primary"/>
<button name="all_assessment_approval" string="评估推送" type="object" class="btn btn-primary"/>
</header>
<field name="name" required="1"/>
<field name="title_deed"/>
@@ -16,6 +17,7 @@
<field name="rent_area" digits="[16, 4]"/>
<field name="equity_area" digits="[16, 4]"/>
<field name="state"/>
<field name="first_letter" column_invisible="1"/>
<button name="put_assessment_approval" type="object" string="评估推送" class="btn btn-primary" invisible="state == 'ing'"/>
<button name="put_split_approval" type="object" string="拆分" class="btn btn-primary" invisible="state != 'done'"/>
<button name="put_offline_approval" type="object" string="提交线下审批" class="btn btn-primary" invisible="state != 'done'"/>
@@ -367,11 +369,4 @@
<field name="state">code</field>
<field name="code">action = model.trigger_company_id()</field>
</record>
<record id="all_data_update_assessment_approval" model="ir.actions.server">
<field name="name">批量评估推送</field>
<field name="model_id" ref="yuthon_property.model_yuthon_property"/>
<field name="binding_model_id" ref="yuthon_property.model_yuthon_property"/>
<field name="state">code</field>
<field name="code">action = model.all_assessment_approval()</field>
</record>
</odoo>
yuthon_property/wizard/__init__.py
+1 -1
View File
@@ -3,4 +3,4 @@ from . import property_meter_wizard
from . import property_tenant_wizard
from . import property_water_wizard
from . import property_statements_wizard
from . import rental_scheme_wizard
from . import evaluation_plan_wizard
yuthon_property/wizard/evaluation_plan_wizard.py
+32
View File
@@ -0,0 +1,32 @@
from odoo import models, fields, api
from odoo.exceptions import UserError, ValidationError
class EvaluationPlanWizard(models.Model):
_name = 'evaluation.plan.wizard'
_description = '评估方案弹窗'
property_ids = fields.Many2many('yuthon.property', string='物业')
def confirm(self):
evaluation_area = 0
name_list = []
first_id = self.property_ids[0]
for i in self.property_ids:
name = i.name
name_list.append(name)
evaluation_area += i.evaluation_area
name = ','.join(name_list)
self.env['property.evaluation.plan'].create({
'name': name,
'assessment_category': 'rent_money',
'evaluation_area': evaluation_area,
'owner_id': first_id.title_information_ids[0].owner_id.id if first_id.title_information_ids else None,
'registered_id': first_id.title_information_ids[0].registered_id.id if first_id.title_information_ids else None,
'rent_id': first_id.reference_ids[0].rent_id.id if first_id.reference_ids else None,
'start_lease_period': first_id.reference_ids[0].start_lease_period if first_id.reference_ids else None,
'end_lease_period': first_id.reference_ids[0].end_lease_period if first_id.reference_ids else None,
'annual_increase_percentage': first_id.reference_ids[0].annual_increase_percentage if first_id.reference_ids else None,
'remake': first_id.remark,
'property_ids': self.property_ids.ids
})
yuthon_property/wizard/rental_scheme_wizard_views.xml → yuthon_property/wizard/evaluation_plan_wizard_views.xml
+5 -6
View File
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="rental_scheme_wizard_form" model="ir.ui.view">
<field name="name">整租方案弹窗</field>
<field name="model">rental.scheme.wizard</field>
<record id="view_evaluation_plan_wizard_form" model="ir.ui.view">
<field name="name">evaluation.plan.wizard.form</field>
<field name="model">evaluation.plan.wizard</field>
<field name="arch" type="xml">
<form string="整租方案弹窗">
<form>
<sheet>
<group>
<field name="name"/>
<field name="property_ids" widget="many2many_tags" invisible="1"/>
<field name="property_ids" widget="many2many_tags" domain="[('state', '=', 'to')]"/>
</group>
</sheet>
<footer>
yuthon_property/wizard/rental_scheme_wizard.py
-35
View File
@@ -1,35 +0,0 @@
from odoo import models, fields, api, _, SUPERUSER_ID
from odoo.exceptions import UserError, ValidationError
from dateutil.relativedelta import relativedelta
from datetime import datetime, time, timedelta
class RentalSchemeWizard(models.Model):
_name = 'rental.scheme.wizard'
_description = '整租方案弹窗'
name = fields.Char(string='方案名称')
property_ids = fields.Many2many('property.evaluation.plan', string='关联物业备案申请')
def confirm(self):
evaluation_area = 0
all_property_ids = []
first_id = self.property_ids[0]
for record in self.property_ids:
evaluation_area += record.evaluation_area
all_property_ids += record.property_ids.ids
unique_property_ids = list(set(all_property_ids))
self.env['property.evaluation.plan'].create({
'name': self.name,
'evaluation_area': evaluation_area,
'assessment_category': first_id.assessment_category,
'owner_id': first_id.owner_id.id if first_id.owner_id else False,
'registered_id': first_id.registered_id.id if first_id.registered_id else False,
'registered_id2': first_id.registered_id2.id if first_id.registered_id2 else False,
'rent_id': first_id.rent_id.id if first_id.rent_id else False,
'start_lease_period': first_id.start_lease_period,
'end_lease_period': first_id.end_lease_period,
'annual_increase_percentage': first_id.annual_increase_percentage,
'is_pust': first_id.is_pust,
'remake': first_id.remake,
'property_ids': [(6, 0, unique_property_ids)]
})
yuthon_property_approval/models/property_evaluate_application.py
+13 -74
View File
@@ -20,13 +20,10 @@ class PropertyEvaluateApplication(models.Model):
related_issues_id = fields.Many2one('issue.library', string="关联议题")
is_experts = fields.Boolean(string="是否需要专家评审")
notice_documents_ids = fields.Many2many('ir.attachment', string='议题附件')
evaluate_application_ids = fields.One2many('evaluate.application.line', 'property_message_id', string='楼盘信息明细行')
property_ids = fields.One2many('yuthon.property.line', 'property_message_id' ,string='物业信息明细行')
urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度',
default='normal')
active = fields.Boolean('Active', default=True, tracking=True)
is_premises = fields.Boolean(string="楼盘选择")
is_property = fields.Boolean(string='物业选择')
evaluation_company_id = fields.Many2one('evaluation.company', string='公司')
quote = fields.Float(string='报价')
service_money = fields.Float(string='评估服务费总额')
@@ -79,46 +76,13 @@ class PropertyEvaluateApplication(models.Model):
})
class EvaluateApplicationLine(models.Model):
_name = 'evaluate.application.line'
_description = '楼盘信息明细行'
property_message_id = fields.Many2one('property.evaluate.application', string='关联评估申请')
premises_id = fields.Many2one('yuthon.premises.setting', string="楼盘")
owner_id = fields.Many2one('yuthon.owner.message', string="权属人")
assessment_category = fields.Selection([('rent_money', '租金'), ('value', '价值')], string="评估类别")
registered_id = fields.Many2one('yuthon.purpose.evidence', string='证载用途')
registered_id2 = fields.Many2one('yuthon.purpose.evidence', string='设定用途')
purpose_id = fields.Many2one('yuthon.resource.purpose', string="管理类型")
rent_id = fields.Many2one('rent.free.setting', string="办法")
start_lease_period = fields.Selection(selection=[(str(i), str(i)) for i in range(1, 7)], string='租期开始', default='1')
end_lease_period = fields.Selection(selection=[(str(i), str(i)) for i in range(1, 7)], string='租期结束', default='6')
annual_increase_percentage = fields.Float(string='每年递增(%)', igits=(6, 2))
rental_conditions = fields.Text(string='出租条件')
evaluation_area = fields.Float(string='评估面积（m²）')
remarks = fields.Text(string='备注')
property_floor_id = fields.Many2one('property.floor.setting', string="楼层")
def application_detail(self):
domain = [('state', '=', 'to')]
domain.append(('premises_id', '=', self.premises_id.id))
if self.property_floor_id:
domain.append(('property_floor_id', '=', self.property_floor_id.id))
return {
"name": _("物业"),
"type": "ir.actions.act_window",
"view_mode": "tree",
"res_model": "yuthon.property",
"target": "new", # 使动作以弹窗形式打开
"domain": domain,
}
class YuhtonPropertyLine(models.Model):
_name = 'yuthon.property.line'
_description = '物业信息评估明细'
property_message_id = fields.Many2one('property.evaluate.application', string='关联评估申请')
property_evaluation_id = fields.Many2one('property.evaluation.plan', string="关联物业评估方案")
property_ids = fields.Many2many(related='property_evaluation_id.property_ids', string="物业信息")
owner_id = fields.Many2one('yuthon.owner.message', related='property_evaluation_id.owner_id', string="权属人")
assessment_category = fields.Selection(related='property_evaluation_id.assessment_category', string="评估类别")
start_lease_period = fields.Selection(related='property_evaluation_id.start_lease_period', string='租期开始')
@@ -131,41 +95,16 @@ class YuhtonPropertyLine(models.Model):
rent_id = fields.Many2one('rent.free.setting', string="办法")
remarks = fields.Text(related='property_evaluation_id.remake', string='备注')
def set_property_state_to_ing(self):
domain = [('state', '=', 'to')]
domain.append(('premises_id', '=', self.premises_id.id))
if self.property_floor_id:
domain.append(('property_floor_id', '=', self.property_floor_id.id))
property_ids = self.env['yuthon.property'].search(domain)
for property in property_ids:
property.write({'state': 'ing'})
def application_detail(self):
return {
"name": "物业",
"type": "ir.actions.act_window",
"view_mode": "tree",
"res_model": "yuthon.property",
"target": "new",
"domain": [('id', 'in', self.property_ids.ids)],
}
# @api.depends('property_id.title_information_ids')
# def _compute_registered_id(self):
# for record in self:
# record.registered_id = record.property_id.title_information_ids[0].registered_id if record.property_id.title_information_ids else None
#
# @api.depends('property_id.title_information_ids')
# def _compute_owner_id(self):
# for record in self:
# record.owner_id = record.property_id.title_information_ids[0].owner_id if record.property_id.title_information_ids else None
#
# @api.depends('property_id.reference_ids')
# def _compute_rent_id(self):
# for record in self:
# record.rent_id = record.property_id.reference_ids[0].rent_id if record.property_id.reference_ids else None
#
# @api.depends('property_id.reference_ids')
# def _compute_start_lease_period(self):
# for record in self:
# record.start_lease_period = record.property_id.reference_ids[0].start_lease_period if record.property_id.reference_ids else None
#
# @api.depends('property_id.reference_ids')
# def _compute_end_lease_period(self):
# for record in self:
# record.end_lease_period = record.property_id.reference_ids[0].end_lease_period if record.property_id.reference_ids else None
#
# @api.depends('property_id.reference_ids')
# def _compute_annual_increase_percentage(self):
# for record in self:
# record.annual_increase_percentage = record.property_id.reference_ids[0].annual_increase_percentage if record.property_id.reference_ids else None
class EvaluateApplicationLine(models.Model):
_name = 'evaluate.application.line'
yuthon_property_approval/models/property_lease_contract.py
+14
View File
@@ -1167,12 +1167,20 @@ class PropertyLeaseContract(models.Model):
'assessment_category': 'rent_money',
})
record.write({'state': 'ing'})
return {
"name": "物业评估方案",
'type': 'ir.actions.act_window',
'res_model': 'property.evaluation.plan',
"view_mode": "tree",
}
def all_put_evaluation_plan(self):
contract_ids = self.env["property.lease.contract"].browse(self._context.get('active_ids', self._context.get('active_id')))
for record in contract_ids:
property_ids = []
property_id = record.lease_ids[0].address_id
if record.state == 'done':
raise UserError(f'{record.name}该物业已评估，请勿重复评估')
for lease_id in record.lease_ids:
property_ids.append(lease_id.address_id.id)
self.env['property.evaluation.plan'].create({
@@ -1189,6 +1197,12 @@ class PropertyLeaseContract(models.Model):
'assessment_category': 'rent_money',
})
record.write({'state': 'ing'})
return {
"name": "物业评估方案",
'type': 'ir.actions.act_window',
'res_model': 'property.evaluation.plan',
"view_mode": "tree",
}
class PropertyLeaseContractLine(models.Model):
_name = 'property.lease.contract.line'
yuthon_property_approval/security/ir.model.access.csv
-1
View File
@@ -42,7 +42,6 @@ access_property_approval,property_approval,model_property_approval,base.group_us
access_property_approval_line,property_approval_line,model_property_approval_line,base.group_user,1,1,1,1
access_property_handover,property_handover,model_property_handover,base.group_user,1,1,1,1
access_property_handover_line,property_handover_line,model_property_handover_line,base.group_user,1,1,1,1
access_evaluate_application_line,evaluate_application_line,model_evaluate_application_line,base.group_user,1,1,1,1
access_property_rental_form,property_rental_form,model_property_rental_form,base.group_user,1,1,1,1
access_property_offline_registration,property_offline_registration,model_property_offline_registration,base.group_user,1,1,1,1
access_quote_message_line,quote_message_line,model_quote_message_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
42 access_property_approval_line property_approval_line model_property_approval_line base.group_user 1 1 1 1
43 access_property_handover property_handover model_property_handover base.group_user 1 1 1 1
44 access_property_handover_line property_handover_line model_property_handover_line base.group_user 1 1 1 1
access_evaluate_application_line evaluate_application_line model_evaluate_application_line base.group_user 1 1 1 1
45 access_property_rental_form property_rental_form model_property_rental_form base.group_user 1 1 1 1
46 access_property_offline_registration property_offline_registration model_property_offline_registration base.group_user 1 1 1 1
47 access_quote_message_line quote_message_line model_quote_message_line base.group_user 1 1 1 1
yuthon_property_approval/views/perperty_claim_approval_views.xml
+2 -2
View File
@@ -6,7 +6,7 @@
<field name="arch" type="xml">
<tree string="业务报销审批">
<field name="name"/>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="total_received"/>
</tree>
</field>
@@ -40,7 +40,7 @@
<group string="审批事项">
<field name="work_end" invisible="1"/>
<field name="name"/>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="department_id"/>
<field name="reason"/>
<field name="total_received"/>
yuthon_property_approval/views/property_borrowing_approval_views.xml
+2 -2
View File
@@ -6,7 +6,7 @@
<field name="arch" type="xml">
<tree string="借支审批">
<field name="name"/>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="total_received"/>
<field name="trade_date"/>
</tree>
@@ -41,7 +41,7 @@
<group string="审批事项">
<field name="work_end" invisible="1"/>
<field name="name"/>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="department_id"/>
<field name="reason"/>
<field name="total_received"/>
yuthon_property_approval/views/property_eligibility.xml
+1 -1
View File
@@ -49,7 +49,7 @@
<field name="notice_documents_ids" widget="preview_many2many"/>
</group>
<group string="个人信息">
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="department_id"/>
<field name="sincerity_gold"/>
</group>
yuthon_property_approval/views/property_evaluate_application_views.xml
+18 -46
View File
@@ -55,54 +55,26 @@
<field name="pay_way"/>
<field name="is_experts"/>
</group>
<group col="2">
<group>
<field name="is_premises"/>
</group>
<group>
<field name="is_property"/>
</group>
</group>
<notebook>
<page string="待评估物业出租方案明细表">
<group invisible="not is_premises">
<field name="evaluate_application_ids" string=" ">
<tree editable="bottom">
<field name="property_message_id" column_invisible="1"/>
<field name="premises_id" required="1" class="list_width"/>
<field name="property_floor_id" domain="[('premises_ids', 'in', premises_id)]" class="list_width"/>
<field name="evaluation_area" string="评估面积m²"/>
<field name="assessment_category" string="评估类别"/>
<field name="owner_id"/>
<field name="registered_id"/>
<field name="registered_id2"/>
<field name="start_lease_period"/>
<field name="end_lease_period"/>
<field name="annual_increase_percentage"/>
<field name="rent_id" string="办法"/>
<field name="remarks" string="备注"/>
<button name="application_detail" string="详情" type="object" class="btn-primary"/>
</tree>
</field>
</group>
<group invisible="not is_property">
<field name="property_ids" string=" ">
<tree editable="bottom">
<field name="property_message_id" column_invisible="1"/>
<field name="property_evaluation_id" class="list_width"/>
<field name="evaluation_area"/>
<field name="assessment_category"/>
<field name="owner_id"/>
<field name="registered_id"/>
<field name="registered_id2"/>
<field name="start_lease_period"/>
<field name="end_lease_period"/>
<field name="annual_increase_percentage"/>
<field name="rent_id" string="办法"/>
<field name="remarks" string="备注"/>
</tree>
</field>
</group>
<field name="property_ids">
<tree editable="bottom">
<field name="property_message_id" column_invisible="1"/>
<field name="property_evaluation_id" class="list_width" string="物业"/>
<field name="property_ids" widget="many2many_tags" optional="hide"/>
<field name="evaluation_area"/>
<field name="assessment_category"/>
<field name="owner_id"/>
<field name="registered_id"/>
<field name="registered_id2"/>
<field name="start_lease_period"/>
<field name="end_lease_period"/>
<field name="annual_increase_percentage"/>
<field name="rent_id" string="办法"/>
<field name="remarks" string="备注"/>
<button name="application_detail" string="详情" type="object" class="btn-primary"/>
</tree>
</field>
</page>
</notebook>
</sheet>
yuthon_property_approval/views/property_intention_views.xml
+2 -2
View File
@@ -7,7 +7,7 @@
<tree>
<field name="name"/>
<field name="code"/>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
</tree>
</field>
</record>
@@ -50,7 +50,7 @@
<field name="notice_documents_ids" widget="preview_many2many"/>
</group>
<group string="个人信息">
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="department_id"/>
</group>
<notebook>
yuthon_property_approval/views/property_lease_contract.xml
+3 -7
View File
@@ -329,6 +329,9 @@
<field name="model">property.lease.contract</field>
<field name="arch" type="xml">
<tree string="租赁合同审批">
<header>
<button name="all_put_evaluation_plan" string="评估推送" type="object" class="btn btn-primary"/>
</header>
<field name="name"/>
<field name="contract_code" decoration-danger = "is_equal"/>
<field name="lessee_id"/>
@@ -765,11 +768,4 @@
<field name="state">code</field>
<field name="code">action = model.action_update_contract()</field>
</record>
<record id="all_data_action_evaluation_plan" model="ir.actions.server">
<field name="name">批量评估推送</field>
<field name="model_id" ref="yuthon_property_approval.model_property_lease_contract"/>
<field name="binding_model_id" ref="yuthon_property_approval.model_property_lease_contract"/>
<field name="state">code</field>
<field name="code">action = model.all_put_evaluation_plan()</field>
</record>
</odoo>
yuthon_property_approval/views/property_transfer_views.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<field name="arch" type="xml">
<tree string="物业移交">
<field name="name"/>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="start_date"/>
<field name="end_date"/>
</tree>
yuthon_salary/views/inherit_hr_payslip_views.xml
+2 -2
View File
@@ -171,7 +171,7 @@
<field name="model">hr.payslip</field>
<field name="arch" type="xml">
<tree string="薪资计算" default_order="employee_id" js_class="custom_salary_button" editable="bottom">
<field name="employee_id" string="姓名"/>
<field name="employee_id" string="姓名" widget="ztree_select"/>
<field name="total_before_tax" decoration-danger="1" decoration-bf="1"/>
<field name="company_id" optional="hide" required="1"/>
<field name="base_salary"/>
@@ -211,7 +211,7 @@
<field name="model">hr.payslip</field>
<field name="arch" type="xml">
<tree string="个税计算" default_order="employee_id" js_class="custom_salary_payslip_button">
<field name="employee_id" string="姓名"/>
<field name="employee_id" string="姓名" widget="ztree_select"/>
<field name="tax_payable" decoration-danger="1" decoration-bf="1"/>
<field name="struct_id" string="职级"/>
<field name="post_salary"/>
yuthon_salary/views/yuthon_payroll_project_views.xml
+2 -2
View File
@@ -10,7 +10,7 @@
<field name="company_id" required="1" optional="hide"/>
<field name="before_tax"/>
<field name="attributes"/>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="conditional_formulas"/>
<field name="payroll_type_ids" widget="many2many_tags" domain="[('company_id', '=' ,company_id)]"/>
<field name="payroll_structure_ids" widget="many2many_tags" column_invisible="1"/>
@@ -40,7 +40,7 @@
<field name="name"/>
<field name="company_id" required="1" optional="hide"/>
<field name="attributes"/>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="is_before_tax"/>
<field name="start_date"/>
<field name="end_date"/>
yuthon_sps_approval/views/yuthon_office_supplies_views.xml
+4 -4
View File
@@ -6,8 +6,8 @@
<field name="arch" type="xml">
<tree string="办公用品申请">
<field name="name"/>
<field name="users_id"/>
<field name="department_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="department_id" widget="ztree_select"/>
<field name="date"/>
</tree>
</field>
@@ -29,12 +29,12 @@
</group>
<group string="申请人信息" col="3">
<group>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="is_issues"/>
<field name="related_issues_id" invisible="not is_issues"/>
</group>
<group>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
<field name="office_supplies_id"/>
</group>
</group>
yuthon_trade/views/yuthon_care_condolences_views.xml
+1 -1
View File
@@ -23,7 +23,7 @@
<group string="审批事项">
<field name="work_end" invisible="1"/>
<field name="name"/>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="reason"/>
</group>
<group string="个人信息">
yuthon_trade/views/yuthon_message_approval_views.xml
+3 -3
View File
@@ -6,7 +6,7 @@
<field name="arch" type="xml">
<tree string="信息发布审批">
<field name="name"/>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="publish_ids" widget="many2many_tags"/>
</tree>
</field>
@@ -46,8 +46,8 @@
</group>
</group>
<group string="基础信息">
<field name="users_id"/>
<field name="department_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="department_id" widget="ztree_select"/>
<field name="phone"/>
</group>
<group string="发布设置">
yuthon_trade/views/yuthon_trade_activities.xml
+2 -2
View File
@@ -21,14 +21,14 @@
</group>
<group col="3">
<group>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="host_id"/>
</group>
<group>
<field name="joint_office_ids" widget="many2many_tags"/>
</group>
<group>
<field name="department_id"/>
<field name="department_id" widget="ztree_select"/>
</group>
</group>
<group>
yuthon_trade/views/yuthon_trade_premium.xml
+2 -2
View File
@@ -39,14 +39,14 @@
<group string="审批事项">
<group>
<field name="name"/>
<field name="users_id"/>
<field name="users_id" widget="ztree_select"/>
<field name="department_id" invisbiel="1"/>
<field name="documents_ids" widget="preview_many2many"/>
</group>
</group>
<group>
<field name="insurance_id"/>
<field name="employee_id"/>
<field name="employee_id" widget="ztree_select"/>
<field name="fee"/>
<field name="trade_date"/>
</group>