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

[fixes] remover per_ordered field and update delivered qty from perchase order via delivered by supplier -1

Browse Source
This commit is contained in:
Saurabh
2015-10-23 10:40:32 +05:30
parent b0ab93f779
commit 6d64fe378d
7 changed files with 67 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
erpnext/selling/doctype/sales_order/sales_order.json
View File

@@ -2038,29 +2038,6 @@
"unique": 0,
"width": "100px"
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "per_ordered",
"fieldtype": "Percent",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 1,
"in_list_view": 1,
"label": "% Ordered",
"no_copy": 1,
"permlevel": 0,
"precision": "",
"print_hide": 1,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0,
"width": "100px"
},
{
"allow_on_submit": 0,
"bold": 0,
@@ -2578,7 +2555,7 @@
"is_submittable": 1,
"issingle": 0,
"istable": 0,
"modified": "2015-10-21 19:02:58.591057",
"modified": "2015-10-22 16:32:34.339835",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",

8
erpnext/selling/doctype/sales_order/test_sales_order.py
View File

@@ -325,8 +325,8 @@ class TestSalesOrder(unittest.TestCase):
}
]
existing_ordered_qty, existing_reserved_qty = frappe.db.get_value("Bin", {"item_code": po_item.item_code,
"warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "reserved_qty"])
existing_ordered_qty, existing_reserved_qty = frappe.db.get_value("Bin",
{"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "reserved_qty"])
so = make_sales_order(item_list=so_items, do_not_submit=True)
so.submit()
@@ -344,8 +344,8 @@ class TestSalesOrder(unittest.TestCase):
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", {"item_code": po_item.item_code,
"warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "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(ordered_qty), (existing_ordered_qty + so_items[0]['qty']))
self.assertEquals(abs(reserved_qty), (existing_reserved_qty + so_items[0]['qty']))