jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #2164: (feature/销售合同优化 -> develop)

Browse Source 
Merge Request: Merge branch 'feature/采购消息通知' into feature/销售合同优化

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2164
This commit is contained in:
禹翔辉
2025-06-05 09:19:28 +08:00
committed by Coding
parent 57acad4716 0204e0e24f
commit 001900bd65
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jikimo_workorder_exception/models/mrp_workorder.py
View File

@@ -9,7 +9,7 @@ class MrpWorkorder(models.Model):
exception_ids = fields.One2many('jikimo.workorder.exception', 'workorder_id', string='工单异常记录') exception_ids = fields.One2many('jikimo.workorder.exception', 'workorder_id', string='工单异常记录')
def write(self, values): def write(self, values):
if values.get('test_results') and self.exception_ids: if 'test_results' in values and self.exception_ids:
pending_exception = self.exception_ids.filtered( pending_exception = self.exception_ids.filtered(
lambda exc: exc.state == 'pending' and exc.exception_code == 'YC0005' lambda exc: exc.state == 'pending' and exc.exception_code == 'YC0005'
) )

3
sf_manufacturing/models/sale_order.py
View File

@@ -207,7 +207,8 @@ class SaleOrder(models.Model):
'name': contract_file_name, 'name': contract_file_name,
'attachment_id': attachment.id, 'attachment_id': attachment.id,
'folder_id': workspace, 'folder_id': workspace,
'res_model': 'sale.order' 'res_model': 'sale.order',
'res_id': self.id,
}) })
self.write({ self.write({