Merge pull request #4557 from nabinhait/po_fix

[fix] Update ordered qty in SO, if PO is made against SO
This commit is contained in:
Nabin Hait 2015-12-31 15:17:41 +05:30
commit f8de94b7c6

View File

@ -140,7 +140,7 @@ class PurchaseOrder(BuyingController):
clear_doctype_notifications(self) clear_doctype_notifications(self)
def on_submit(self): def on_submit(self):
if self.has_drop_ship_item(): if self.is_against_so():
self.update_status_updater() self.update_status_updater()
super(PurchaseOrder, self).on_submit() super(PurchaseOrder, self).on_submit()
@ -157,8 +157,10 @@ class PurchaseOrder(BuyingController):
purchase_controller.update_last_purchase_rate(self, is_submit = 1) purchase_controller.update_last_purchase_rate(self, is_submit = 1)
def on_cancel(self): def on_cancel(self):
if self.has_drop_ship_item(): if self.is_against_so():
self.update_status_updater() self.update_status_updater()
if self.has_drop_ship_item():
self.update_delivered_qty_in_sales_order() self.update_delivered_qty_in_sales_order()
pc_obj = frappe.get_doc('Purchase Common') pc_obj = frappe.get_doc('Purchase Common')
@ -222,13 +224,10 @@ class PurchaseOrder(BuyingController):
so.notify_update() so.notify_update()
def has_drop_ship_item(self): def has_drop_ship_item(self):
is_drop_ship = False return any([d.delivered_by_supplier for d in self.items])
for item in self.items: def is_against_so(self):
if item.delivered_by_supplier == 1: return any([d.prevdoc_doctype for d in self.items if d.prevdoc_doctype=="Sales Order"])
is_drop_ship = True
return is_drop_ship
def set_received_qty_for_drop_ship_items(self): def set_received_qty_for_drop_ship_items(self):
for item in self.items: for item in self.items: