From 783331c64573cf56635bbe1cdb8e59c8f32db018 Mon Sep 17 00:00:00 2001 From: Himanshu Warekar Date: Wed, 6 Mar 2019 18:44:04 +0530 Subject: [PATCH 1/4] sales_order to work_order item desc fix --- erpnext/selling/doctype/sales_order/sales_order.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index b589cdeaa43..2345762233f 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -388,6 +388,7 @@ class SalesOrder(SellingController): items.append(dict( name= i.name, item_code= i.item_code, + description= i.description, bom = bom, warehouse = i.warehouse, pending_qty = pending_qty, @@ -398,6 +399,7 @@ class SalesOrder(SellingController): items.append(dict( name= i.name, item_code= i.item_code, + description= i.description, bom = '', warehouse = i.warehouse, pending_qty = pending_qty, @@ -901,7 +903,8 @@ def make_work_orders(items, sales_order, company, project=None): sales_order=sales_order, sales_order_item=i['sales_order_item'], project=project, - fg_warehouse=i['warehouse'] + fg_warehouse=i['warehouse'], + description=i['description'] )).insert() work_order.set_work_order_operations() work_order.save() From 4f1737c2dd248850f8d086736e170b44b66d1a2f Mon Sep 17 00:00:00 2001 From: Himanshu Warekar Date: Wed, 6 Mar 2019 22:19:15 +0530 Subject: [PATCH 2/4] fix sales order test for creating work order from sales order --- erpnext/selling/doctype/sales_order/test_sales_order.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index 0eb19e3417c..f270938ad3a 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -573,7 +573,8 @@ class TestSalesOrder(unittest.TestCase): "item_code": item.get("item_code"), "pending_qty": item.get("pending_qty"), "sales_order_item": item.get("sales_order_item"), - "bom": item.get("bom") + "bom": item.get("bom"), + "description": item.get("description") }) so_item_name[item.get("sales_order_item")]= item.get("pending_qty") make_work_orders(json.dumps({"items":po_items}), so.name, so.company) From 59699bf46e2288ef89208ed7a602016455754aef Mon Sep 17 00:00:00 2001 From: Himanshu Warekar Date: Wed, 6 Mar 2019 23:33:03 +0530 Subject: [PATCH 3/4] [debug] locally tests passed but travis failed --- erpnext/selling/doctype/sales_order/sales_order.py | 1 + erpnext/selling/doctype/sales_order/test_sales_order.py | 1 + 2 files changed, 2 insertions(+) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 2345762233f..a84fa1430bb 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -886,6 +886,7 @@ def get_supplier(doctype, txt, searchfield, start, page_len, filters): def make_work_orders(items, sales_order, company, project=None): '''Make Work Orders against the given Sales Order for the given `items`''' items = json.loads(items).get('items') + print(items) out = [] for i in items: diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index f270938ad3a..584b5b99c66 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -577,6 +577,7 @@ class TestSalesOrder(unittest.TestCase): "description": item.get("description") }) so_item_name[item.get("sales_order_item")]= item.get("pending_qty") + print(po_items) make_work_orders(json.dumps({"items":po_items}), so.name, so.company) # Check if Work Orders were raised From 7ab961f79881c4861dd2c7664aaceb165ebc3bc7 Mon Sep 17 00:00:00 2001 From: Himanshu Warekar Date: Wed, 6 Mar 2019 23:53:38 +0530 Subject: [PATCH 4/4] remove debug code --- erpnext/selling/doctype/sales_order/sales_order.py | 1 - erpnext/selling/doctype/sales_order/test_sales_order.py | 1 - 2 files changed, 2 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index a84fa1430bb..2345762233f 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -886,7 +886,6 @@ def get_supplier(doctype, txt, searchfield, start, page_len, filters): def make_work_orders(items, sales_order, company, project=None): '''Make Work Orders against the given Sales Order for the given `items`''' items = json.loads(items).get('items') - print(items) out = [] for i in items: diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index 584b5b99c66..f270938ad3a 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -577,7 +577,6 @@ class TestSalesOrder(unittest.TestCase): "description": item.get("description") }) so_item_name[item.get("sales_order_item")]= item.get("pending_qty") - print(po_items) make_work_orders(json.dumps({"items":po_items}), so.name, so.company) # Check if Work Orders were raised