test case fixed
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index 0f17e52..f6d9529 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -338,12 +338,12 @@
args["condition"] = " and posting_date<='%s'" % args.month_end_date \
if args.get("month_end_date") else ""
- return frappe.db.sql("""
+ return flt(frappe.db.sql("""
select sum(ifnull(debit, 0)) - sum(ifnull(credit, 0))
from `tabGL Entry`
where account='%(account)s' and cost_center='%(cost_center)s'
and fiscal_year='%(fiscal_year)s' and company='%(company)s' %(condition)s
- """ % (args))[0][0]
+ """ % (args))[0][0])
def get_currency_precision(currency=None):
if not currency:
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.py b/erpnext/manufacturing/doctype/production_order/production_order.py
index d0ad06e..673b966 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.py
+++ b/erpnext/manufacturing/doctype/production_order/production_order.py
@@ -124,7 +124,7 @@
def update_production_order_qty(self):
"""Update **Manufactured Qty** and **Material Transferred for Qty** in Production Order
based on Stock Entry"""
- print "call"
+
for purpose, fieldname in (("Manufacture", "produced_qty"),
("Material Transfer for Manufacture", "material_transferred_for_manufacturing")):
qty = flt(frappe.db.sql("""select sum(fg_completed_qty)
diff --git a/erpnext/manufacturing/doctype/production_order/test_production_order.py b/erpnext/manufacturing/doctype/production_order/test_production_order.py
index 37df081..625be51 100644
--- a/erpnext/manufacturing/doctype/production_order/test_production_order.py
+++ b/erpnext/manufacturing/doctype/production_order/test_production_order.py
@@ -75,7 +75,7 @@
prod_order = frappe.get_doc({
"doctype": "Production Order",
"production_item": "_Test FG Item 2",
- "bom_no": "BOM/_Test FG Item 2/002",
+ "bom_no": "BOM/_Test FG Item 2/001",
"qty": 1,
"wip_warehouse": "_Test Warehouse - _TC",
"fg_warehouse": "_Test Warehouse 1 - _TC",
diff --git a/erpnext/projects/doctype/time_log/test_time_log.py b/erpnext/projects/doctype/time_log/test_time_log.py
index c21d811..1920bf5 100644
--- a/erpnext/projects/doctype/time_log/test_time_log.py
+++ b/erpnext/projects/doctype/time_log/test_time_log.py
@@ -89,7 +89,7 @@
return frappe.get_doc({
"doctype":"Production Order",
"production_item": "_Test FG Item 2",
- "bom_no": "BOM/_Test FG Item 2/002",
+ "bom_no": "BOM/_Test FG Item 2/001",
"qty": 1,
"wip_warehouse": "_Test Warehouse - _TC",
"fg_warehouse": "_Test Warehouse 1 - _TC",
diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
index a5e82b9..388ae63 100644
--- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
@@ -82,18 +82,17 @@
else:
template = item
- warehouse = "_Test Warehouse - _TC"
-
# stock entry reqd for auto-reorder
- make_stock_entry(item_code=item_code, target="_Test Warehouse - _TC", qty=1, incoming_rate=1)
+ create_stock_reconciliation(item_code=item_code, warehouse="_Test Warehouse - _TC",
+ qty=10, rate=100)
frappe.db.set_value("Stock Settings", None, "auto_indent", 1)
projected_qty = frappe.db.get_value("Bin", {"item_code": item_code,
- "warehouse": warehouse}, "projected_qty") or 0
+ "warehouse": "_Test Warehouse - _TC"}, "projected_qty") or 0
# update re-level qty so that it is more than projected_qty
if projected_qty > template.reorder_levels[0].warehouse_reorder_level:
- template.reorder_levels[0].warehouse_reorder_level = projected_qty
+ template.reorder_levels[0].warehouse_reorder_level += projected_qty
template.save()
from erpnext.stock.reorder_item import reorder_item