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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
pengyuthon
2026-01-19 11:48:14 +08:00
parent 15ed2b9ea3 8806b7d4a1
commit 490da05e8a
6 changed files with 21 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soong_workflow/models/soong_workflow_mixin.py
+1 -1
View File
@@ -894,7 +894,7 @@ class SoongWorkflowMixin(models.AbstractModel):
if button.has_icon:
btn_exec_action_el.set("icon", button.icon)
# 接下来是隐藏的配置
invisible = "not id or state != '{0}' ".format(str(node.node_name))
invisible = "state != '{0}' ".format(str(node.node_name))
if button.review_type == 'user_role':
# 构建角色条件
role_domain = []
soong_workflow/wizard/soong_workflow_record_delete_wizard.py
+3 -3
View File
@@ -89,9 +89,9 @@ class SoongWorkflowRecordDeleteWizard(models.TransientModel):
"state": "confirm",
"active": False
})
# 确保在写入前记录仍然存在
if target_record.exists():
target_record.write({'active': False})
# # # 确保在写入前记录仍然存在
# if target_record.exists():
# target_record.write({'is_active': False})
else:
workflow_record = self.env["soong.workflow.record"].sudo().search(
[("id", "=", record.id), ('reclaim_state', "=", True)], limit=1)
yuthon_hr_attendance/__manifest__.py
-1
View File
@@ -26,7 +26,6 @@
'report/go_approval_templates.xml',
'views/hr_attendance_views.xml',
'views/resource_calendar_leaves_views.xml',
'views/yuthon_meal_case_view.xml',
'views/inherit_hr_employee.xml',
'views/inherit_planning_role_views.xml',
'views/inherit_planning_slot_views.xml',
yuthon_hr_attendance/views/yuthon_meal_case_view.xml
-19
View File
@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record id="view_yuthon_meal_case_tree" model="ir.ui.view">
<field name="name">yuthon.meal.case.tree</field>
<field name="model">yuthon.meal.case</field>
<field name="arch" type="xml">
<tree string="误餐情况" editable="bottom">
<field name="employee_id"/>
<field name="number"/>
</tree>
</field>
</record>
<record id="view_yuthon_meal_case_action" model="ir.actions.act_window">
<field name="name">误餐情况</field>
<field name="res_model">yuthon.meal.case</field>
<field name="view_mode">tree</field>
</record>
</odoo>
yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
+1 -1
View File
@@ -558,7 +558,7 @@
<field name="res_model">yuthon.vacation.reports</field>
<field name="view_mode">tree</field>
<field name="domain">[('meal_fee', '!=', 0)]</field>
<field name="context">{'search_default_group_by_employee_id': 1, 'search_default_group_by_vacation_month': True}</field>
<field name="context">{'search_default_group_by_vacation_month': True}</field>
<field name="view_ids" eval="[(5, 0, 0),
(0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_hr_attendance.view_yuthon_vacation_meal_tree')}),]"/>
</record>
yuthon_trade/views/yuthon_business_approval_viwes.xml
+16 -11
View File
@@ -27,7 +27,7 @@
invisible="urgency_level != 'urgent'"/>
<widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
invisible="urgency_level != 'emergency'"/>
<group col="5">
<group col="3">
<group>
<field name="code" string="流水号" readonly="1"/>
</group>
@@ -49,19 +49,24 @@
<field name="name_title" readonly="1"/>
</h1>
</div>
<group string="审批事项">
<field name="is_back" invisible="1"/>
<field name="work_end" invisible="1"/>
<field name="name" string="事项标题"/>
<field name="users_id"/>
<field name="information_categories_ids" widget="many2many_tags" string="业务类型" options="{'no_create': True}"/>
<field name="reason" string="事项说明"/>
<group string="审批事项" col="2">
<group>
<field name="is_back" invisible="1"/>
<field name="work_end" invisible="1"/>
<field name="name" string="事项标题"/>
<field name="users_id"/>
<field name="information_categories_ids" widget="many2many_tags" string="业务类型" options="{'no_create': True}"/>
<!-- <field name="reason" string="事项说明"/>-->
<!-- <field name="document_ids" widget="preview_many2many" string="附件清单"/>-->
<field name="type_stamp_ids" widget="many2many_tags" options="{'no_create': True, 'no_open': True}" invisible="is_chapter == 'no' or not is_chapter"/>
<field name="scope_chapter_ids" widget="many2many_tags" options="{'no_create': True, 'no_open': True}" invisible="is_chapter == 'no' or not is_chapter"/>
<field name="department_id" invisible="1"/>
</group>
<group>
<field name="type_stamp_ids" widget="many2many_tags" options="{'no_create': True, 'no_open': True}" invisible="is_chapter == 'no' or not is_chapter"/>
<field name="scope_chapter_ids" widget="many2many_tags" options="{'no_create': True, 'no_open': True}" invisible="is_chapter == 'no' or not is_chapter"/>
<field name="department_id" invisible="1"/>
</group>
</group>
<group>
<field name="reason" string="事项说明"/>
<field name="document_ids" widget="preview_many2many" string="附件清单"/>
</group>
</sheet>