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

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

Browse Source
This commit is contained in:
mgw
2025-03-21 18:18:29 +08:00
parent 3bb909c2ee 4ba3a56794
commit e861897527
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jikimo_purchase_request/views/purchase_request_view.xml
View File

@@ -55,6 +55,7 @@
<field name="inherit_id" ref="purchase_request.purchase_request_line_search" />
<field name="arch" type="xml">
<xpath expr="//field[@name='product_id']" position="after">
<field name="supply_method"/>
<field name="related_product"/>
<field name="part_number"/>
<field name="part_name"/>

2
sf_manufacturing/wizard/sale_order_cancel.py
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))