[cleanup] drop ship testing & cleanup

erpnext/selling/doctype/sales_order/sales_order.js

@@ -23,23 +23,25 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
 
 				$.each(cur_frm.doc.items, function(i, item){
 					if(item.delivered_by_supplier == 1 || item.supplier){
-						if(item.qty > item.ordered_qty)
+						if(item.qty > flt(item.ordered_qty))
 							is_delivered_by_supplier = true;
 					}
 					else{
-						if(item.qty > item.delivered_qty)
+						if(item.qty > flt(item.delivered_qty))
 							is_delivery_note = true;
 					}
 				})
 
-				// cur_frm.dashboard.add_progress(cint(doc.per_delivered) + __("% Delivered"),
-				// 	doc.per_delivered);
-				// cur_frm.dashboard.add_progress(cint(doc.per_billed) + __("% Billed"),
-				// 	doc.per_billed);
+				// material request
+				if(!doc.order_type || ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1
+					&& flt(doc.per_delivered, 2) < 100) {
+						cur_frm.add_custom_button(__('Material Request'), this.make_material_request);
+				}
 
-				// indent
-				if(!doc.order_type || ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1 && flt(doc.per_delivered, 2) < 100 && !is_delivered_by_supplier)
-					cur_frm.add_custom_button(__('Material Request'), this.make_material_request);
+				// make purchase order
+				if(flt(doc.per_delivered, 2) < 100 && is_delivered_by_supplier) {
+					cur_frm.add_custom_button(__('Purchase Order'), cur_frm.cscript.make_purchase_order);
+				}
 
 				if(flt(doc.per_billed)==0) {
 					cur_frm.add_custom_button(__('Payment'), cur_frm.cscript.make_bank_entry);
@@ -60,16 +62,15 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
 				}
 
 				// delivery note
-				if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1 && is_delivery_note)
+				if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1 && is_delivery_note) {
 					cur_frm.add_custom_button(__('Delivery'), this.make_delivery_note).addClass("btn-primary");
+				}
 
 				// sales invoice
 				if(flt(doc.per_billed, 2) < 100) {
 					cur_frm.add_custom_button(__('Invoice'), this.make_sales_invoice).addClass("btn-primary");
 				}
 
-				if(flt(doc.per_delivered, 2) < 100 && is_delivered_by_supplier)
-					cur_frm.add_custom_button(__('Make Purchase Order'), cur_frm.cscript.make_purchase_order).addClass("btn-primary");
 
 			} else {
 				// un-stop
@@ -178,7 +179,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
 							filters: {'parent': cur_frm.doc.name}
 						}
 					}, "reqd": 1 },
-				{"fieldtype": "Button", "label": __("Make Purchase Order"), "fieldname": "make_purchase_order"},
+				{"fieldtype": "Button", "label": __("Make Purchase Order"), "fieldname": "make_purchase_order", "cssClass": "btn-primary"},
 			]
 		});
 

erpnext/selling/doctype/sales_order/sales_order.py

@@ -220,20 +220,13 @@ class SalesOrder(SellingController):
 		if date_diff and date_diff[0][0]:
 			frappe.throw(_("{0} {1} has been modified. Please refresh.").format(self.doctype, self.name))
 
-	def stop_sales_order(self, status):
+	def update_status(self, status):
 		self.check_modified_date()
-		self.db_set('status', status)
+		self.set_status(update=True, status=status)
 		self.update_reserved_qty()
 		self.notify_update()
 		clear_doctype_notifications(self)
 
-	def unstop_sales_order(self):
-		self.check_modified_date()
-		self.db_set('status', 'Draft')
-		self.set_status(update=True)
-		self.update_reserved_qty()
-		clear_doctype_notifications(self)
-
 	def update_reserved_qty(self, so_item_rows=None):
 		"""update requested qty (before ordered_qty is updated)"""
 		item_wh_list = []
@@ -261,27 +254,38 @@ class SalesOrder(SellingController):
 
 	def before_update_after_submit(self):
 		self.validate_drop_ship()
-		self.validate_po()
+		self.validate_supplier_after_submit()
 
-	def validate_po(self):
+	def validate_supplier_after_submit(self):
+		"""Check that supplier is the same after submit if PO is already made"""
 		exc_list = []
 
 		for item in self.items:
-			supplier = frappe.db.get_value("Sales Order Item", {"parent": self.name, "item_code": item.item_code},
-				"supplier")
-			if item.ordered_qty > 0.0 and item.supplier != supplier:
-				exc_list.append("Row #{0}: Not allowed to change supplier as Purchase Order already exists".format(item.idx))
+			if item.supplier:
+				supplier = frappe.db.get_value("Sales Order Item", {"parent": self.name, "item_code": item.item_code},
+					"supplier")
+				if item.ordered_qty > 0.0 and item.supplier != supplier:
+					exc_list.append(_("Row #{0}: Not allowed to change Supplier as Purchase Order already exists").format(item.idx))
 
 		if exc_list:
 			frappe.throw('\n'.join(exc_list))
 
 	def update_delivery_status(self, po_name):
+		"""Update delivery status from Purchase Order for drop shipping"""
 		tot_qty, delivered_qty = 0.0, 0.0
 
 		for item in self.items:
 			if item.delivered_by_supplier:
-				delivered_qty = frappe.db.get_value("Purchase Order Item", {"parent": po_name, "item_code": item.item_code}, "qty")
-				frappe.db.set_value("Sales Order Item", item.name, "delivered_qty", delivered_qty)
+				delivered_qty = frappe.db.sql("""select qty
+					from `tabPurchase Order Item` poi, `tabPurchase Order` po
+					where poi.prevdoc_docname = %s
+						and poi.prevdoc_doctype = 'Sales Order'
+						and poi.item_code = %s
+						and poi.parent = po.name
+						and po.status = 'Delivered'""", (self.name, item.item_code))
+
+				delivered_qty = delivered_qty[0][0] if delivered_qty else 0
+				item.db_set("delivered_qty", delivered_qty)
 
 			delivered_qty += item.delivered_qty
 			tot_qty += item.qty
@@ -305,10 +309,10 @@ def stop_or_unstop_sales_orders(names, status):
 		if so.docstatus == 1:
 			if status in ("Stopped", "Closed"):
 				if so.status not in ("Stopped", "Cancelled", "Closed") and (so.per_delivered < 100 or so.per_billed < 100):
-					so.stop_sales_order(status)
+					so.update_status(status)
 			else:
 				if so.status in ("Stopped", "Closed"):
-					so.unstop_sales_order()
+					so.update_status('Draft')
 
 	frappe.local.message_log = []
 
@@ -545,11 +549,12 @@ def make_purchase_order_for_drop_shipment(source_name, for_supplier, target_doc=
 		"Sales Order": {
 			"doctype": "Purchase Order",
 			"field_map": {
+				"customer_address": "customer_address",
+				"contact_person": "customer_contact_person",
 				"address_display": "customer_address_display",
 				"contact_display": "customer_contact_display",
 				"contact_mobile": "customer_contact_mobile",
 				"contact_email": "customer_contact_email",
-				"contact_person": "customer_contact_person"
 			},
 			"field_no_map": [
 				"address_display",
@@ -614,4 +619,4 @@ def get_supplier(doctype, txt, searchfield, start, page_len, filters):
 @frappe.whitelist()
 def update_status(status, name):
 	so = frappe.get_doc("Sales Order", name)
-	so.stop_sales_order(status)
+	so.update_status(status)

erpnext/selling/doctype/sales_order/test_sales_order.py

@@ -7,8 +7,6 @@ import frappe.permissions
 import unittest
 from erpnext.selling.doctype.sales_order.sales_order \
 	import make_material_request, make_delivery_note, make_sales_invoice, WarehouseRequired
-from erpnext.accounts.doctype.journal_entry.test_journal_entry \
-	import make_journal_entry
 
 from frappe.tests.test_permissions import set_user_permission_doctypes
 
@@ -97,12 +95,12 @@ class TestSalesOrder(unittest.TestCase):
 
 		# stop so
 		so.load_from_db()
-		so.stop_sales_order("Stopped")
+		so.update_status("Stopped")
 		self.assertEqual(get_reserved_qty(), existing_reserved_qty)
 
 		# unstop so
 		so.load_from_db()
-		so.unstop_sales_order()
+		so.update_status('Draft')
 		self.assertEqual(get_reserved_qty(), existing_reserved_qty + 5)
 
 		dn.cancel()
@@ -147,14 +145,14 @@ class TestSalesOrder(unittest.TestCase):
 
 		# stop so
 		so.load_from_db()
-		so.stop_sales_order("Stopped")
+		so.update_status("Stopped")
 
 		self.assertEqual(get_reserved_qty("_Test Item"), existing_reserved_qty_item1)
 		self.assertEqual(get_reserved_qty("_Test Item Home Desktop 100"), existing_reserved_qty_item2)
 
 		# unstop so
 		so.load_from_db()
-		so.unstop_sales_order()
+		so.update_status('Draft')
 
 		self.assertEqual(get_reserved_qty("_Test Item"), existing_reserved_qty_item1 + 25)
 		self.assertEqual(get_reserved_qty("_Test Item Home Desktop 100"),
@@ -295,14 +293,14 @@ class TestSalesOrder(unittest.TestCase):
 			{"price_list": "_Test Price List", "item_code": "_Test Item for Auto Price List"}, "price_list_rate"), None)
 
 		frappe.db.set_value("Stock Settings", None, "auto_insert_price_list_rate_if_missing", 1)
-	
+
 	def test_drop_shipping(self):
-		from erpnext.selling.doctype.sales_order.sales_order import make_purchase_order_for_drop_shipment, make_delivery_note
+		from erpnext.selling.doctype.sales_order.sales_order import make_purchase_order_for_drop_shipment
 		from erpnext.stock.doctype.item.test_item import make_item
 		from erpnext.buying.doctype.purchase_order.purchase_order import delivered_by_supplier
 
 		po_item = make_item("_Test Item for Drop Shipping", {"is_stock_item": 1, "is_sales_item": 1,
-			"is_purchase_item": 1, "delivered_by_supplier": 1, 'default_supplier': '_Test Supplier', 
+			"is_purchase_item": 1, "delivered_by_supplier": 1, 'default_supplier': '_Test Supplier',
 		    "expense_account": "_Test Account Cost for Goods Sold - _TC",
 		    "cost_center": "_Test Cost Center - _TC"
 			})
@@ -328,90 +326,90 @@ class TestSalesOrder(unittest.TestCase):
 				"conversion_factor": 1.0
 			}
 		]
-		
+
 		#setuo existing qty from bin
-		bin = frappe.get_all("Bin", filters={"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"}, 
+		bin = frappe.get_all("Bin", filters={"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"},
 			fields=["ordered_qty", "reserved_qty"])
-			
+
 		existing_ordered_qty = bin[0].ordered_qty if bin else 0.0
 		existing_reserved_qty = bin[0].reserved_qty if bin else 0.0
-		
-		bin = frappe.get_all("Bin", filters={"item_code": dn_item.item_code, "warehouse": "_Test Warehouse - _TC"}, 
+
+		bin = frappe.get_all("Bin", filters={"item_code": dn_item.item_code, "warehouse": "_Test Warehouse - _TC"},
 			fields=["reserved_qty"])
-		
+
 		existing_reserved_qty_for_dn_item = bin[0].reserved_qty if bin else 0.0
-		
+
 		#create so, po and partial dn
 		so = make_sales_order(item_list=so_items, do_not_submit=True)
 		so.submit()
-		
+
 		po = make_purchase_order_for_drop_shipment(so.name, '_Test Supplier')
 		po.submit()
-		
+
 		dn = create_dn_against_so(so.name, delivered_qty=1)
-		
+
 		self.assertEquals(so.customer, po.customer)
 		self.assertEquals(po.items[0].prevdoc_doctype, "Sales Order")
 		self.assertEquals(po.items[0].prevdoc_docname, so.name)
 		self.assertEquals(po.items[0].item_code, po_item.item_code)
 		self.assertEquals(dn.items[0].item_code, dn_item.item_code)
-		
-		#test ordered_qty and reserved_qty		
-		ordered_qty, reserved_qty = frappe.db.get_value("Bin", 
+
+		#test ordered_qty and reserved_qty
+		ordered_qty, reserved_qty = frappe.db.get_value("Bin",
 			{"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "reserved_qty"])
-		
-		self.assertEquals(abs(flt(ordered_qty)), existing_ordered_qty + so_items[0]['qty'])			
+
+		self.assertEquals(abs(flt(ordered_qty)), existing_ordered_qty + so_items[0]['qty'])
 		self.assertEquals(abs(flt(reserved_qty)), existing_reserved_qty)
-		
-		reserved_qty = frappe.db.get_value("Bin", 
+
+		reserved_qty = frappe.db.get_value("Bin",
 					{"item_code": dn_item.item_code, "warehouse": "_Test Warehouse - _TC"}, "reserved_qty")
-		
+
 		self.assertEquals(abs(flt(reserved_qty)), existing_reserved_qty_for_dn_item + 1)
-		
+
 		#test po_item length
 		self.assertEquals(len(po.items), 1)
-		
+
 		#test per_delivered status
 		delivered_by_supplier(po.name)
 		self.assertEquals(flt(frappe.db.get_value("Sales Order", so.name, "per_delivered"), 2), 75.00)
-		
+
 		#test reserved qty after complete delivery
 		dn = create_dn_against_so(so.name, delivered_qty=1)
-		reserved_qty = frappe.db.get_value("Bin", 
+		reserved_qty = frappe.db.get_value("Bin",
 			{"item_code": dn_item.item_code, "warehouse": "_Test Warehouse - _TC"}, "reserved_qty")
-		
+
 		self.assertEquals(abs(flt(reserved_qty)), existing_reserved_qty_for_dn_item)
-		
+
 		#test after closing so
 		so.db_set('status', "Closed")
 		so.update_reserved_qty()
-		
-		ordered_qty, reserved_qty = frappe.db.get_value("Bin", 
+
+		ordered_qty, reserved_qty = frappe.db.get_value("Bin",
 			{"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "reserved_qty"])
-		
-		self.assertEquals(abs(flt(ordered_qty)), existing_ordered_qty)			
+
+		self.assertEquals(abs(flt(ordered_qty)), existing_ordered_qty)
 		self.assertEquals(abs(flt(reserved_qty)), existing_reserved_qty)
-		
-		reserved_qty = frappe.db.get_value("Bin", 
+
+		reserved_qty = frappe.db.get_value("Bin",
 			{"item_code": dn_item.item_code, "warehouse": "_Test Warehouse - _TC"}, "reserved_qty")
-		
+
 		self.assertEquals(abs(flt(reserved_qty)), existing_reserved_qty)
-		
+
 	def test_reserved_qty_for_closing_so(self):
-		bin = frappe.get_all("Bin", filters={"item_code": "_Test Item", "warehouse": "_Test Warehouse - _TC"}, 
-			fields=["reserved_qty"])	
-		
+		bin = frappe.get_all("Bin", filters={"item_code": "_Test Item", "warehouse": "_Test Warehouse - _TC"},
+			fields=["reserved_qty"])
+
 		existing_reserved_qty = bin[0].reserved_qty if bin else 0.0
-			
+
 		so = make_sales_order(item_code="_Test Item", qty=1)
-		
+
 		self.assertEquals(get_reserved_qty(item_code="_Test Item", warehouse="_Test Warehouse - _TC"), existing_reserved_qty+1)
-		
-		so.stop_sales_order("Closed")
-		
+
+		so.update_status("Closed")
+
 		self.assertEquals(get_reserved_qty(item_code="_Test Item", warehouse="_Test Warehouse - _TC"), existing_reserved_qty)
-		
-		
+
+
 def make_sales_order(**args):
 	so = frappe.new_doc("Sales Order")
 	args = frappe._dict(args)
@@ -427,11 +425,11 @@ def make_sales_order(**args):
 
 	if "warehouse" not in args:
 		args.warehouse = "_Test Warehouse - _TC"
-		
+
 	if args.item_list:
 		for item in args.item_list:
 			so.append("items", item)
-		
+
 	else:
 		so.append("items", {
 			"item_code": args.item or args.item_code or "_Test Item",
@@ -440,7 +438,7 @@ def make_sales_order(**args):
 			"rate": args.rate or 100,
 			"conversion_factor": 1.0,
 		})
-		
+
 	if not args.do_not_save:
 		so.insert()
 		if not args.do_not_submit: