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

!12887 Merge branch 'master' into dev_zhou

Browse Source 
Merge pull request !12887 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2026-09-20 13:22:11 +00:00
committed by Gitee
parent 60d8c96feb d578b481f3
commit 98879f9fa5
2 changed files with 14 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_work_brand/views/hr_menus.xml
+8 -5
View File
@@ -927,11 +927,14 @@
name="物业财务管理"
parent="finance_root_board"
sequence="50"/>
<menuitem id="yuthon_accounts_receivable_menu"
sequence="1"
name="应收账单"
parent="yuthon_financial_management_menu"
action="yuthon_property_approval.action_receivable_unpaid_server"/>
<!-- 应收账单：纯目录菜单（动作已拆到子菜单：汇总 + 各应收类型，见 receivable_type_menus.xml） -->
<record id="yuthon_accounts_receivable_menu" model="ir.ui.menu">
<field name="name">应收账单</field>
<field name="parent_id" ref="yuthon_financial_management_menu"/>
<field name="sequence">1</field>
<!-- 显式清空原绑定的汇总动作，父菜单只做目录 -->
<field name="action" eval="False"/>
</record>
<!-- <menuitem-->
<!-- id="contract_accounts_receivable_menu"-->
<!-- parent="yuthon_financial_management_menu"-->
yuthon_work_brand/views/receivable_type_menus.xml
+6 -55
View File
@@ -89,61 +89,12 @@
</field>
</record>
<!--
应收类型子菜单专用的列表视图（供下面 7 个「独立类型」菜单使用）
作用：完整复制应收账单原列表视图 yuthon_property.view_property_accounts_receivable_tree，
仅把「应收类型」列 management_type_id 设为 column_invisible="1"（隐藏该列）
原因：这些菜单本身已按应收类型过滤，列表再显示「应收类型」列是多余的；
参考本视图原有的 multiplier / is_invalid / is_red 等列，本项目隐藏列就用 column_invisible="1"
说明：做成独立的新视图（不继承），只被这 7 个菜单引用；
「其它」菜单要按应收类型分组、必须显示该列，所以仍用原视图
-->
<record id="view_receivable_type_tree_no_type" model="ir.ui.view">
<!-- 视图外部标识名 -->
<field name="name">property.accounts.receivable.tree.receivable.type</field>
<!-- 所属模型：应收账单 -->
<field name="model">property.accounts.receivable</field>
<field name="arch" type="xml">
<!-- 与原视图完全一致，仅 management_type_id 增加 column_invisible="1" -->
<tree editable="bottom" string="应收账单" decoration-success="is_reconciliation == True" default_order="due_date desc" limit="15" delete="false"
decoration-muted="is_invalid">
<field name="acc_type" string=" "/>
<field name="deposit_state"/>
<!-- 应收类型列：类型专属菜单已按该字段过滤，这里隐藏该列 -->
<field name="management_type_id" readonly="0" column_invisible="1"/>
<field name="due_date" readonly="0" width="300px" required="1"/>
<field name="due_date_end" readonly="0"/>
<field name="payout_date" readonly="0"/>
<field name="original_amount" readonly="0"/>
<field name="discount_amount" readonly="0"/>
<field name="delivered1" readonly="0"/>
<field name="submitted" options='{"fg_color": "red: submitted != false;" }'/>
<field name="number_of_payments"/>
<field name="remark"/>
<field name="multiplier" column_invisible="1"/>
<field name="is_push" optional="hide" readonly="0"/>
<field name="reconciliation_time" optional="hide" readonly="0"/>
<field name="create_time" readonly="0"/>
<field name="last_update_time" optional="hide" readonly="0"/>
<field name="is_invalid" column_invisible="1"/>
<field name="void_date" column_invisible="1"/>
<field name="is_red" column_invisible="1"/>
<field name="is_reconciliation" optional="hide"/>
<field name="difference_amount" readonly="0"/>
<field name="receivable_log" column_invisible="1"/>
<field name="is_suspend" optional="hide"/>
<field name="is_write" column_invisible="1"/>
<field name="bank_id" column_invisible="1"/>
<field name="is_batch" column_invisible="1"/>
<field name="print_number"/>
<field name="print_date"/>
<field name="discount_date"/>
<field name="has_date"/>
<field name="is_liquidated_damages"/>
<button name="receivable_log_wizard" string="日志" type="object" class="btn btn-blue"/>
</tree>
</field>
</record>
<!-- ========== 0. 汇总（按合同汇总各应收类型未收金额，排在各类型子菜单最上面） ========== -->
<menuitem id="menu_receivable_summary"
name="汇总"
parent="yuthon_accounts_receivable_menu"
action="yuthon_property_approval.action_receivable_unpaid_server"
sequence="0"/>
<!-- ========== 1. 租金 ========== -->
<record id="action_receivable_type_rent" model="ir.actions.act_window">