diff --git a/erpnext/docs/assets/old_images/erpnext/material-request-workflow.jpg b/erpnext/docs/assets/old_images/erpnext/material-request-workflow.jpg
index 6846fa5baa..c462e209f1 100644
Binary files a/erpnext/docs/assets/old_images/erpnext/material-request-workflow.jpg and b/erpnext/docs/assets/old_images/erpnext/material-request-workflow.jpg differ
diff --git a/erpnext/docs/current/models/stock/material_request_item.html b/erpnext/docs/current/models/stock/material_request_item.html
index 2988065b2a..d1d8f6fbca 100644
--- a/erpnext/docs/current/models/stock/material_request_item.html
+++ b/erpnext/docs/current/models/stock/material_request_item.html
@@ -123,30 +123,16 @@
| 7 |
image |
- Attach |
-
+ Attach Image |
+
Image
|
|
-
- | 8 |
- image_view |
-
- Image |
-
- Image View
-
- |
-
- image
- |
-
-
- | 9 |
+ 8 |
quantity_and_warehouse |
Section Break |
@@ -158,7 +144,7 @@
- | 10 |
+ 9 |
qty |
Float |
@@ -170,7 +156,7 @@
- | 11 |
+ 10 |
uom |
Link |
@@ -191,7 +177,7 @@
- | 12 |
+ 11 |
warehouse |
Link |
@@ -212,7 +198,7 @@
- | 13 |
+ 12 |
col_break2 |
Column Break |
@@ -224,7 +210,7 @@
- | 14 |
+ 13 |
schedule_date |
Date |
@@ -236,7 +222,7 @@
- | 15 |
+ 14 |
more_info |
Section Break |
@@ -248,7 +234,7 @@
- | 16 |
+ 15 |
item_group |
Link |
@@ -269,7 +255,7 @@
- | 17 |
+ 16 |
brand |
Link |
@@ -290,7 +276,7 @@
- | 18 |
+ 17 |
lead_time_date |
Date |
@@ -302,7 +288,7 @@
- | 19 |
+ 18 |
sales_order |
Link |
@@ -323,7 +309,7 @@
- | 20 |
+ 19 |
col_break3 |
Column Break |
@@ -335,7 +321,7 @@
- | 21 |
+ 20 |
min_order_qty |
Float |
@@ -347,7 +333,7 @@
- | 22 |
+ 21 |
projected_qty |
Float |
@@ -359,7 +345,7 @@
- | 23 |
+ 22 |
ordered_qty |
Float |
@@ -371,7 +357,7 @@
- | 24 |
+ 23 |
page_break |
Check |
diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py
index 80ec589d46..c1a5281100 100644
--- a/erpnext/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py
@@ -355,6 +355,7 @@ def raise_production_orders(source_name):
prod_order.material_request = material_request.name
prod_order.material_request_item = d.name
prod_order.planned_start_date = material_request.transaction_date
+ prod_order.company = material_request.company
prod_order.save()
production_orders.append(prod_order.name)
else:
@@ -364,4 +365,5 @@ def raise_production_orders(source_name):
(p, p) for p in production_orders]
msgprint(_("Production Orders {0} created").format(comma_and(message)))
if errors:
- msgprint(_("Could not Raise Production Orders for {0}").format(comma_and(errors)))
\ No newline at end of file
+ msgprint(_("Could not Raise Production Orders for {0}").format(comma_and(errors)))
+ return production_orders
\ No newline at end of file
diff --git a/erpnext/stock/doctype/material_request/test_material_request.py b/erpnext/stock/doctype/material_request/test_material_request.py
index 37d985edb0..c675224ceb 100644
--- a/erpnext/stock/doctype/material_request/test_material_request.py
+++ b/erpnext/stock/doctype/material_request/test_material_request.py
@@ -7,6 +7,7 @@
from __future__ import unicode_literals
import frappe, unittest
from frappe.utils import flt
+from erpnext.stock.doctype.material_request.material_request import raise_production_orders
class TestMaterialRequest(unittest.TestCase):
def setUp(self):
@@ -436,6 +437,25 @@ class TestMaterialRequest(unittest.TestCase):
#testing bin requested qty after issuing stock against material request
self.assertEquals(_get_requested_qty(), existing_requested_qty)
+
+ def test_completed_qty_for__manufacture(self):
+ mr = frappe.copy_doc(test_records[1]).insert()
+ mr = frappe.get_doc("Material Request", mr.name)
+ mr.submit()
+ completed_qty = mr.items[0].ordered_qty
+
+ prod_order = raise_production_orders(mr.name)
+ po = frappe.get_doc("Production Order", prod_order[0])
+ po.wip_warehouse = "_Test Warehouse 1 - _TC"
+ po.submit()
+
+ mr = frappe.get_doc("Material Request", mr.name)
+ self.assertEquals(completed_qty + po.qty, mr.items[0].ordered_qty)
+
+ po.cancel()
+ mr = frappe.get_doc("Material Request", mr.name)
+ self.assertEquals(completed_qty, mr.items[0].ordered_qty)
+
test_dependencies = ["Currency Exchange"]
test_records = frappe.get_test_records('Material Request')
diff --git a/erpnext/stock/doctype/material_request/test_records.json b/erpnext/stock/doctype/material_request/test_records.json
index 152d1443a3..09d1912ed7 100644
--- a/erpnext/stock/doctype/material_request/test_records.json
+++ b/erpnext/stock/doctype/material_request/test_records.json
@@ -30,5 +30,26 @@
"material_request_type": "Purchase",
"naming_series": "_T-Material Request-",
"transaction_date": "2013-02-18"
+ },
+ {
+ "company": "_Test Company",
+ "doctype": "Material Request",
+ "fiscal_year": "_Test Fiscal Year 2013",
+ "items": [
+ {
+ "description": "_Test FG Item",
+ "doctype": "Material Request Item",
+ "item_code": "_Test FG Item",
+ "item_name": "_Test FG Item",
+ "parentfield": "items",
+ "qty": 5,
+ "schedule_date": "2013-02-18",
+ "uom": "_Test UOM 1",
+ "warehouse": "_Test Warehouse - _TC"
+ }
+ ],
+ "material_request_type": "Manufacture",
+ "naming_series": "_T-Material Request-",
+ "transaction_date": "2013-02-18"
}
]
\ No newline at end of file