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

Cleanup of PO schedule date pull requests

Browse Source
This commit is contained in:
Nabin Hait
2017-10-05 19:51:10 +05:30
parent 455c3ebb27 38647ed832
commit 5a834209d0
18 changed files with 156 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/stock/doctype/material_request/material_request.js
View File

@@ -53,7 +53,7 @@ frappe.ui.form.on("Material Request Item", {
set_schedule_date(frm);
}
}
}
}
});
erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.extend({

30
erpnext/stock/doctype/material_request/material_request.py
View File

@@ -7,7 +7,7 @@
from __future__ import unicode_literals
import frappe
from frappe.utils import cstr, flt, getdate, new_line_sep
from frappe.utils import cstr, flt, getdate, new_line_sep, nowdate, add_days
from frappe import msgprint, _
from frappe.model.mapper import get_mapped_doc
from erpnext.stock.stock_balance import update_bin_qty, get_indented_qty
@@ -53,20 +53,6 @@ class MaterialRequest(BuyingController):
if actual_so_qty and (flt(so_items[so_no][item]) + already_indented > actual_so_qty):
frappe.throw(_("Material Request of maximum {0} can be made for Item {1} against Sales Order {2}").format(actual_so_qty - already_indented, item, so_no))
def validate_schedule_date(self):
if not self.schedule_date:
self.schedule_date = max([d.schedule_date for d in self.get("items")])
if self.schedule_date:
for d in self.get('items'):
if not d.schedule_date:
d.schedule_date = self.schedule_date
if d.schedule_date and getdate(d.schedule_date) < getdate(self.transaction_date):
frappe.throw(_("Expected Date cannot be before Material Request Date"))
else:
frappe.throw(_("Please enter Schedule Date"))
# Validate
# ---------------------
def validate(self):
@@ -296,7 +282,7 @@ def make_purchase_order_based_on_supplier(source_name, target_doc=None):
def postprocess(source, target_doc):
target_doc.supplier = source_name
target_doc.schedule_date = add_days(nowdate(), 1)
target_doc.set("items", [d for d in target_doc.get("items")
if d.get("item_code") in supplier_items and d.get("qty") > 0])
@@ -329,12 +315,12 @@ def get_material_requests_based_on_supplier(supplier):
material_requests = frappe.db.sql_list("""select distinct mr.name
from `tabMaterial Request` mr, `tabMaterial Request Item` mr_item
where mr.name = mr_item.parent
and mr_item.item_code in (%s)
and mr.material_request_type = 'Purchase'
and mr.per_ordered < 99.99
and mr.docstatus = 1
and mr.status != 'Stopped'
order by mr_item.item_code ASC""" % ', '.join(['%s']*len(supplier_items)),
and mr_item.item_code in (%s)
and mr.material_request_type = 'Purchase'
and mr.per_ordered < 99.99
and mr.docstatus = 1
and mr.status != 'Stopped'
order by mr_item.item_code ASC""" % ', '.join(['%s']*len(supplier_items)),
tuple(supplier_items))
else:
material_requests = []

1
erpnext/stock/doctype/material_request/test_material_request.py
View File

@@ -206,6 +206,7 @@ class TestMaterialRequest(unittest.TestCase):
po_doc = make_purchase_order(mr.name)
po_doc.supplier = "_Test Supplier"
po_doc.transaction_date = "2013-07-07"
po_doc.schedule_date = "2013-07-09"
po_doc.get("items")[0].qty = 27.0
po_doc.get("items")[1].qty = 1.5
po_doc.get("items")[0].schedule_date = "2013-07-09"