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

Merge pull request #19375 from khushalti/develop

Browse Source 
fix: date validation, setting up default company, customer/supplier manadatory property on Blanket Order
This commit is contained in:
Deepesh Garg 2019-10-23 12:11:13 +05:30 committed by GitHub
commit 3f96306986
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/manufacturing/doctype/blanket_order/blanket_order.js
View File

@ -12,6 +12,7 @@ frappe.ui.form.on('Blanket Order', {
}, },
refresh: function(frm) { refresh: function(frm) {
erpnext.hide_company();
if (frm.doc.customer && frm.doc.docstatus === 1) { if (frm.doc.customer && frm.doc.docstatus === 1) {
frm.add_custom_button(__('View Orders'), function() { frm.add_custom_button(__('View Orders'), function() {
frappe.set_route('List', 'Sales Order', {blanket_order: frm.doc.name}); frappe.set_route('List', 'Sales Order', {blanket_order: frm.doc.name});
@ -51,11 +52,19 @@ frappe.ui.form.on('Blanket Order', {
set_tc_name_filter: function(frm) { set_tc_name_filter: function(frm) {
if (frm.doc.blanket_order_type === 'Selling') { if (frm.doc.blanket_order_type === 'Selling') {
frm.set_df_property("customer","reqd", 1);
frm.set_df_property("supplier","reqd", 0);
frm.set_value("supplier", "");
frm.set_query("tc_name", function() { frm.set_query("tc_name", function() {
return { filters: { selling: 1 } }; return { filters: { selling: 1 } };
}); });
} }
if (frm.doc.blanket_order_type === 'Purchasing') { if (frm.doc.blanket_order_type === 'Purchasing') {
frm.set_df_property("supplier","reqd", 1);
frm.set_df_property("customer","reqd", 0);
frm.set_value("customer", "");
frm.set_query("tc_name", function() { frm.set_query("tc_name", function() {
return { filters: { buying: 1 } }; return { filters: { buying: 1 } };
}); });

5
erpnext/manufacturing/doctype/blanket_order/blanket_order.json
View File

@ -88,7 +88,8 @@
"fieldname": "company", "fieldname": "company",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Company", "label": "Company",
"options": "Company" "options": "Company",
"reqd": 1
}, },
{ {
"fieldname": "section_break_12", "fieldname": "section_break_12",
@ -128,7 +129,7 @@
} }
], ],
"is_submittable": 1, "is_submittable": 1,
"modified": "2019-06-19 11:59:09.279607", "modified": "2019-10-16 13:38:32.302316",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Blanket Order", "name": "Blanket Order",

10
erpnext/manufacturing/doctype/blanket_order/blanket_order.py
View File

@ -4,13 +4,21 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from frappe.utils import flt from frappe import _
from frappe.utils import flt, getdate
from frappe.model.document import Document from frappe.model.document import Document
from frappe.model.mapper import get_mapped_doc from frappe.model.mapper import get_mapped_doc
from erpnext.stock.doctype.item.item import get_item_defaults from erpnext.stock.doctype.item.item import get_item_defaults
class BlanketOrder(Document): class BlanketOrder(Document):
def validate(self):
self.validate_dates()
def validate_dates(self):
if getdate(self.from_date) > getdate(self.to_date):
frappe.throw(_("From date cannot be greater than To date"))
def update_ordered_qty(self): def update_ordered_qty(self):
ref_doctype = "Sales Order" if self.blanket_order_type == "Selling" else "Purchase Order" ref_doctype = "Sales Order" if self.blanket_order_type == "Selling" else "Purchase Order"
item_ordered_qty = frappe._dict(frappe.db.sql(""" item_ordered_qty = frappe._dict(frappe.db.sql("""