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

!12023 Merge branch 'master' into dev_zhou

Browse Source 
Merge pull request !12023 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2026-06-11 02:29:28 +00:00
committed by Gitee
parent 61f4a5fb65 aafe87061b
commit 038b697b23
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soong_workflow/wizard/soong_workflow_comment_wizard_view.xml
+10
View File
@@ -88,6 +88,11 @@
<field name="comment_note_id" class="mb-3" style="width: 100%;" options="{'no_create': True}"
domain="[('note_setting_id.users_role_ids', 'in', user_role_ids)]"/>
<field name="comment_note" placeholder="请输入意见内容..." style="width: 100%;"/>
<field name="allowed_issue_ids" invisible="1"/>
<field name="avoid_issue_ids" widget="many2many_tags"
invisible="not is_avoid" options="{'no_create': True}"
domain="[('id', 'in', allowed_issue_ids)]"/>
<field name="avoid_comment" invisible="not is_avoid" placeholder="请输入回避意见..."/>
</div>
<group>
<field name="document_ids" widget="preview_many2many"/>
@@ -137,6 +142,11 @@
<field name="trans_link_id" string="转交节点" invisible="node_btn_name == '退回'"
domain="[('id', 'not in', invalid_link_ids), ('workflow_record_id', '=', workflow_record_id)]"
options="{'no_open': True}" widget="radio" force_save="1"/>
<field name="is_avoid" invisible="res_model not in ['issue.party.approval', 'issue.boss.approval', 'issue.class.approval']"/>
<field name="allowed_issue_ids" invisible="1"/>
<field name="avoid_issue_ids" widget="many2many_tags"
invisible="not is_avoid" options="{'no_create': True}" domain="[('id', 'in', allowed_issue_ids)]"/>
<field name="avoid_comment" invisible="not is_avoid" placeholder="请输入回避意见..."/>
<field name="employee_trans_domain_ids" invisible="1"/>
<!-- 退回意见退回类型 -->
<div invisible="node_btn_name != '退回'" style="white-space: nowrap; color: #dc3545; font-weight: bold; font-size: 14px; padding: 2px 8px; border-left: 3px solid #dc3545; margin-bottom: 6px;">退回节点</div>
yuthon_property_approval/wizard/property_reconciliation_wizard.py
-2
View File
@@ -453,8 +453,6 @@ class PropertyReconciliationWizard(models.Model):
if not source_receivable and existing_record:
source_receivable = existing_record[:1].source_receivable_id or existing_record[:1]._resolve_source_receivable()
is_reconciliation = round(line.amount, 2) == round(line.rent, 2)
receivable_id = self.env['property.accounts.receivable']
if not existing_record and is_create:
receivable_id = self.env['property.accounts.receivable'].create({
'is_reconciliation': is_reconciliation,