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

!9077 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang

Browse Source 
Merge pull request !9077 from 李鹏宇/dev_wang
This commit is contained in:
李鹏宇
2026-02-28 07:28:33 +00:00
committed by Gitee
parent d774830e3f a51d7b3ece
commit 7a56e70fbf
7 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soong_workflow/views/soong_workflow_record.xml
+5 -4
View File
@@ -439,7 +439,7 @@
<field name="res_model">soong.workflow.record</field>
<field name="view_mode">tree,kanban,search</field>
<field name="context">{'header_search_default_approve_state': 1, 'header_search_default_to_do':1,
'check_employee': 1}
'check_employee': 1, 'default_order': 'display_end_time desc'}
</field>
<field name="domain">[('is_to_do', '=', True)]</field>
<field name="search_view_id" ref="soong_workflow_record_search1"/>
@@ -451,7 +451,7 @@
<field name="res_model">soong.workflow.record</field>
<field name="view_mode">tree,kanban,search</field>
<field name="context">{'header_search_default_approve_state': 1, 'header_search_default_to_do':1,
'check_employee': 1}
'check_employee': 1, 'default_order': 'display_end_time desc'}
</field>
<field name="domain">[('is_done', '=', True)]</field>
<field name="search_view_id" ref="soong_workflow_record_search1"/>
@@ -463,7 +463,7 @@
<field name="res_model">soong.workflow.record</field>
<field name="view_mode">tree,kanban,search</field>
<field name="domain">[('reclaim_state', '=', False), ('member_of_department', '=', True), ('is_company', '=', True),('approve_state','!=','start'),('approvals_group_id.name', '!=', '考勤')]</field>
<field name="context">{'search_default_my_department_shifts': True,}</field>
<field name="context">{'search_default_my_department_shifts': True, 'default_order': 'display_end_time desc'}</field>
<field name="search_view_id" ref="soong_workflow_record_search1"/>
<field name="view_id" ref="soong_workflow_record_department_tree"/>
</record>
@@ -475,6 +475,7 @@
<field name="domain">[('is_company', '=', True), ('reclaim_state', '=', False), '|', ('approvals_group_id.name', '=', '人力资源'),
('approvals_group_id.name', '=', '考勤'), ('approve_state', '!=', 'start')]
</field>
<field name="context">{'default_order': 'display_end_time desc'}</field>
<field name="search_view_id" ref="soong_workflow_record_search"/>
</record>
<record id="soong_workflow_other_record_action" model="ir.actions.act_window">
@@ -485,7 +486,7 @@
<field name="domain">[('is_company', '=', True), ('reclaim_state', '=', False), ('approvals_group_id.name', '!=', '人力资源'),
('approvals_group_id.name', '!=', '考勤')]
</field>
<field name="context">{'search_default_my_department_shifts': True,}</field>
<field name="context">{'search_default_my_department_shifts': True, 'default_order': 'display_end_time desc'}</field>
<field name="search_view_id" ref="soong_workflow_record_search1"/>
</record>
<record id="soong_workflow_record_action_admin" model="ir.actions.act_window">
yuthon_official/views/yuthon_file_processing_views.xml
+1
View File
@@ -108,6 +108,7 @@
<field name="res_model">yuthon.file.processing</field>
<field name="domain">[('is_display', '=', True)]</field>
<field name="view_mode">tree,form</field>
<field name="context">{'default_order': 'completion_time desc'}</field>
</record>
<record id="yuthon_file_processing_update" model="ir.actions.server">
<field name="name">触发逻辑</field>
yuthon_official/views/yuthon_official_incoming_normal_views.xml
+1
View File
@@ -108,5 +108,6 @@
<field name="res_model">yuthon.official.incoming.normal</field>
<field name="domain">[('is_company','=',True), ('is_void','=',False)]</field>
<field name="view_mode">tree,form</field>
<field name="context">{'default_order': 'display_end_time desc'}</field>
</record>
</odoo>
yuthon_official/views/yuthon_sub_enterprises_view.xml
+1
View File
@@ -79,6 +79,7 @@
<field name="domain">[('is_display','=', True)]</field>
<field name="res_model">yuthon.sub.enterprises</field>
<field name="view_mode">tree,form</field>
<field name="context">{'default_order': 'completion_time desc'}</field>
</record>
</odoo>
yuthon_property_approval/models/property_confirm.py
+4 -4
View File
@@ -16,9 +16,9 @@ class PropertyConfirm(models.Model):
lessee = fields.Char(string="承租方")
active = fields.Boolean('Active', default=True, tracking=True)
work_end = fields.Boolean(string="结束")
is_chapter = fields.Selection([('yes', '是'), ('no', '否')], string='是否用章', default='no')
property_name = fields.Char(string='物业信息')
approval_unit = fields.Char(string='发送单位')
type_stamp_ids = fields.Many2many('seals.type.setting', string='用章类型')
yuthon_property_approval/views/property_confirm_views.xml
+11 -1
View File
@@ -17,6 +17,14 @@
<field name="arch" type="xml">
<form string="成交确认" create="0">
<sheet>
<group col="5">
<group>
<field name="code" string="流水号"/>
</group>
<group>
<field name="is_chapter"/>
</group>
</group>
<div class="oe_title">
<label for="name"/>
<h1>
@@ -26,8 +34,10 @@
<group>
<group>
<field name="work_end" invisible="1"/>
<field name="code"/>
<field name="lessee"/>
<field name="property_name"/>
<field name="approval_unit"/>
<field name="type_stamp_ids" widget="many2many_tags" invisible="is_chapter != 'yes'"/>
</group>
</group>
</sheet>
yuthon_purchase/views/inherit_purchase_order_views.xml
+1
View File
@@ -180,5 +180,6 @@
<field name="name">Purchase Orders</field>
<field name="domain">[('is_company', '=', True)]</field>
<field name="res_model">purchase.order</field>
<field name="context">{'default_order': 'display_end_time desc'}</field>
</record>
</odoo>