Accept Merge Request #2172: (feature/6694 -> develop)
Merge Request: 修复二次弹窗不能刷新页面的问题,但是js方法还需要修改 Created By: @胡尧 Accepted By: @胡尧 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2172
This commit is contained in:
@@ -339,7 +339,7 @@ class QualityCheck(models.Model):
|
||||
|
||||
# 4. 获取报告动作并生成PDF(此时二维码将包含正确的文档ID)
|
||||
report_action = self.env.ref('sf_quality.action_report_quality_inspection')
|
||||
pdf_content, _ = report_action._render_qweb_pdf(
|
||||
pdf_content, v = report_action._render_qweb_pdf(
|
||||
report_ref=report_action.report_name,
|
||||
res_ids=self.ids
|
||||
)
|
||||
|
||||
@@ -273,7 +273,7 @@ class QualityCheck(models.Model):
|
||||
'message': f"拣货调拨单号{self.picking_id.name}需求数量为{picking_qty},当前质量检查单产品数量为{self.total_qty},数量不一致,是否确认继续?",
|
||||
'next_model': self._name,
|
||||
'next_method': 'preview_do_publish_confirm',
|
||||
'context': self.env.context
|
||||
'context': self.env.context,
|
||||
}
|
||||
}
|
||||
else:
|
||||
@@ -298,5 +298,6 @@ class QualityCheck(models.Model):
|
||||
'default_item_count': len(self.measure_line_ids),
|
||||
'default_old_report_name': self.old_report_name,
|
||||
'default_publish_status': self.publish_status,
|
||||
'is_web_request': True
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user