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

[fixes] Drop Shipping - Purchase Order Cancellation - Sales Order Status

Browse Source
This commit is contained in:
Saurabh
2015-12-08 10:09:51 +05:30
parent cc24d28ddc
commit 01ca354d52
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/buying/doctype/purchase_order/purchase_order.py
View File

@@ -159,6 +159,8 @@ class PurchaseOrder(BuyingController):
def on_cancel(self): def on_cancel(self):
if self.has_drop_ship_item(): if self.has_drop_ship_item():
self.update_status_updater() self.update_status_updater()
self.reset_received_qty_for_drop_ship_items()
self.update_delivered_qty_in_sales_order()
pc_obj = frappe.get_doc('Purchase Common') pc_obj = frappe.get_doc('Purchase Common')
self.check_for_stopped_or_closed_status(pc_obj) self.check_for_stopped_or_closed_status(pc_obj)
@@ -234,6 +236,11 @@ class PurchaseOrder(BuyingController):
if item.delivered_by_supplier == 1: if item.delivered_by_supplier == 1:
item.received_qty = item.qty item.received_qty = item.qty
def reset_received_qty_for_drop_ship_items(self):
for item in self.items:
if item.delivered_by_supplier == 1:
frappe.db.set_value("Purchase Order Item", item.name, "received_qty", 0.0)
@frappe.whitelist() @frappe.whitelist()
def stop_or_unstop_purchase_orders(names, status): def stop_or_unstop_purchase_orders(names, status):
if not frappe.has_permission("Purchase Order", "write"): if not frappe.has_permission("Purchase Order", "write"):

6
erpnext/selling/doctype/sales_order/sales_order.py
View File

@@ -271,13 +271,13 @@ class SalesOrder(SellingController):
for item in self.items: for item in self.items:
if item.delivered_by_supplier: if item.delivered_by_supplier:
item_delivered_qty = frappe.db.sql("""select qty item_delivered_qty = frappe.db.sql("""select received_qty
from `tabPurchase Order Item` poi, `tabPurchase Order` po from `tabPurchase Order Item` poi, `tabPurchase Order` po
where poi.prevdoc_docname = %s where poi.prevdoc_detail_docname = %s
and poi.prevdoc_doctype = 'Sales Order' and poi.prevdoc_doctype = 'Sales Order'
and poi.item_code = %s and poi.item_code = %s
and poi.parent = po.name and poi.parent = po.name
and po.status = 'Delivered'""", (self.name, item.item_code)) and po.status = 'Delivered'""", (item.name, item.item_code))
item_delivered_qty = item_delivered_qty[0][0] if item_delivered_qty else 0 item_delivered_qty = item_delivered_qty[0][0] if item_delivered_qty else 0
item.db_set("delivered_qty", item_delivered_qty) item.db_set("delivered_qty", item_delivered_qty)