Merge branch 'feature/commercially_launched' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched

This commit is contained in:
胡尧
2025-03-24 09:00:22 +08:00
3 changed files with 28 additions and 23 deletions

View File

@@ -489,7 +489,7 @@ class SFSaleOrderCancelLine(models.TransientModel):
'product_name': f'[{purchase_request_line.product_id.default_code}] {purchase_request_line.product_id.name}',
'quantity': purchase_request_line.product_qty,
'doc_state': purchase_request_map_dict.get(purchase_request_line.request_state, purchase_request_line.request_state),
'cancel_reason': '已有异动' if purchase_request_line.request_state not in ['draft', 'cancel'] else ''
'cancel_reason': '已有异动' if purchase_request_line.request_state not in ['draft', 'cancel', 'approved'] else ''
}
lines.append(self.create(vals))