diff --git a/soong_workflow/models/soong_workflow_node.py b/soong_workflow/models/soong_workflow_node.py index af739e49e..787412515 100644 --- a/soong_workflow/models/soong_workflow_node.py +++ b/soong_workflow/models/soong_workflow_node.py @@ -326,7 +326,7 @@ class SoongWorkflowNodeButton(models.Model): ) icon = fields.Char(string="Icon", help="Enter icon name like: fa-print, it's recommended to use FontAwesome Icons.", ) - has_comment = fields.Boolean(string="意见/弹窗", default=False) + has_comment = fields.Boolean(string="意见/弹窗", default=True) btn_key = fields.Char(string="Button Key", default=_generate_key) btn_hide = fields.Boolean( string="Hide Button if Condition isn't fulfilled", diff --git a/yuthon_property_approval/report/contract_accounts_receivable_templates.xml b/yuthon_property_approval/report/contract_accounts_receivable_templates.xml index e00ee7ef0..e5d53d010 100644 --- a/yuthon_property_approval/report/contract_accounts_receivable_templates.xml +++ b/yuthon_property_approval/report/contract_accounts_receivable_templates.xml @@ -67,6 +67,7 @@ vertical-align: top; /* 或 middle,根据需要 */ line-height: 1; /* 减少额外高度 */ } + .summary-page { page-break-before: always; page-break-after: auto; }

付款通知单

@@ -147,6 +148,38 @@

广州市天河物业管理有限公司

年月日

+ + +
+

签收单

+ + + + + + + + + + + + + + + + + + + + + + + + + +
合同编号版本物业信息承租方月份签收人签收时间
+
+
diff --git a/yuthon_trade/models/yuthon_business_approval.py b/yuthon_trade/models/yuthon_business_approval.py index 3d3a945d9..347e61d1e 100644 --- a/yuthon_trade/models/yuthon_business_approval.py +++ b/yuthon_trade/models/yuthon_business_approval.py @@ -19,7 +19,7 @@ class YuthonBusinessApproval(models.Model): is_issues = fields.Boolean(string='是否上会') issues_result = fields.Html(string="会议结果") related_issues_id = fields.Many2one('issue.library', string="关联议题") - information_categories_ids = fields.Many2many('yuthon.information.categories', string='信息分类') + information_categories_ids = fields.Many2many('yuthon.information.categories', string='类型') reason = fields.Text(string="正文") document_ids = fields.Many2many('ir.attachment', string="附件") active = fields.Boolean('Active', default=True, tracking=True)