nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-19 01:25:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: conflicts

Browse Source
This commit is contained in:
Sagar Sharma
2023-02-27 17:32:05 +05:30
committed by GitHub
parent b1ecca3a16
commit a71a336e59
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
erpnext/stock/doctype/material_request/material_request.py
View File

@@ -724,18 +724,3 @@ def create_pick_list(source_name, target_doc=None):
doc.set_item_locations()
return doc
<<<<<<< HEAD
=======
@frappe.whitelist()
def make_in_transit_stock_entry(source_name, in_transit_warehouse):
ste_doc = make_stock_entry(source_name)
ste_doc.add_to_transit = 1
ste_doc.to_warehouse = in_transit_warehouse
for row in ste_doc.items:
row.t_warehouse = in_transit_warehouse
return ste_doc
>>>>>>> c09a61f360 (fix: set `from_warehouse` and `to_warehouse` while mapping SE)