Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #39725 from s-aga-r/FIX-9411

Browse Source 
fix: Blanket Order Ordered Quantity
This commit is contained in:
s-aga-r 2024-02-05 16:07:50 +05:30 committed by GitHub
commit 3b671d5875
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -457,6 +457,7 @@ class PurchaseOrder(BuyingController):
self.update_ordered_qty() self.update_ordered_qty()
self.update_reserved_qty_for_subcontract() self.update_reserved_qty_for_subcontract()
self.update_subcontracting_order_status() self.update_subcontracting_order_status()
self.update_blanket_order()
self.notify_update() self.notify_update()
clear_doctype_notifications(self) clear_doctype_notifications(self)

25
erpnext/buying/doctype/purchase_order/test_purchase_order.py
View File

@ -822,6 +822,30 @@ class TestPurchaseOrder(FrappeTestCase):
# To test if the PO does NOT have a Blanket Order # To test if the PO does NOT have a Blanket Order
self.assertEqual(po_doc.items[0].blanket_order, None) self.assertEqual(po_doc.items[0].blanket_order, None)
def test_blanket_order_on_po_close_and_open(self):
# Step - 1: Create Blanket Order
bo = make_blanket_order(blanket_order_type="Purchasing", quantity=10, rate=10)
# Step - 2: Create Purchase Order
po = create_purchase_order(
item_code="_Test Item", qty=5, against_blanket_order=1, against_blanket=bo.name
)
bo.load_from_db()
self.assertEqual(bo.items[0].ordered_qty, 5)
# Step - 3: Close Purchase Order
po.update_status("Closed")
bo.load_from_db()
self.assertEqual(bo.items[0].ordered_qty, 0)
# Step - 4: Re-Open Purchase Order
po.update_status("Re-open")
bo.load_from_db()
self.assertEqual(bo.items[0].ordered_qty, 5)
def test_payment_terms_are_fetched_when_creating_purchase_invoice(self): def test_payment_terms_are_fetched_when_creating_purchase_invoice(self):
from erpnext.accounts.doctype.payment_entry.test_payment_entry import ( from erpnext.accounts.doctype.payment_entry.test_payment_entry import (
create_payment_terms_template, create_payment_terms_template,
@ -1148,6 +1172,7 @@ def create_purchase_order(**args):
"schedule_date": add_days(nowdate(), 1), "schedule_date": add_days(nowdate(), 1),
"include_exploded_items": args.get("include_exploded_items", 1), "include_exploded_items": args.get("include_exploded_items", 1),
"against_blanket_order": args.against_blanket_order, "against_blanket_order": args.against_blanket_order,
"against_blanket": args.against_blanket,
"material_request": args.material_request, "material_request": args.material_request,
"material_request_item": args.material_request_item, "material_request_item": args.material_request_item,
}, },

4
erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
View File

@ -545,7 +545,6 @@
"fieldname": "blanket_order", "fieldname": "blanket_order",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Blanket Order", "label": "Blanket Order",
"no_copy": 1,
"options": "Blanket Order" "options": "Blanket Order"
}, },
{ {
@ -553,7 +552,6 @@
"fieldname": "blanket_order_rate", "fieldname": "blanket_order_rate",
"fieldtype": "Currency", "fieldtype": "Currency",
"label": "Blanket Order Rate", "label": "Blanket Order Rate",
"no_copy": 1,
"print_hide": 1, "print_hide": 1,
"read_only": 1 "read_only": 1
}, },
@ -917,7 +915,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2023-11-24 13:24:41.298416", "modified": "2024-02-05 11:23:24.859435",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Purchase Order Item", "name": "Purchase Order Item",