From e2bb950012b0f7c22510fba566f87d25497300c7 Mon Sep 17 00:00:00 2001 From: Khushal Trivedi Date: Tue, 15 Oct 2019 15:03:13 +0530 Subject: [PATCH 1/9] [fix] - from date cannot be greater than to date on blanket order --- .../doctype/blanket_order/blanket_order.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.py b/erpnext/manufacturing/doctype/blanket_order/blanket_order.py index 822c7fcc1a..faed707d60 100644 --- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.py +++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.py @@ -4,13 +4,21 @@ from __future__ import unicode_literals 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.mapper import get_mapped_doc from erpnext.stock.doctype.item.item import get_item_defaults 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): ref_doctype = "Sales Order" if self.blanket_order_type == "Selling" else "Purchase Order" item_ordered_qty = frappe._dict(frappe.db.sql(""" From 01f8a4966ab0bb7b38a953613b90c0ab7f2381f9 Mon Sep 17 00:00:00 2001 From: Khushal Trivedi Date: Wed, 16 Oct 2019 11:40:27 +0530 Subject: [PATCH 2/9] [Fix] - making customer/supplier field manadatory on order type condition --- erpnext/manufacturing/doctype/blanket_order/blanket_order.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js index 0bbf689d4a..1e18678eb0 100644 --- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js @@ -51,11 +51,13 @@ frappe.ui.form.on('Blanket Order', { set_tc_name_filter: function(frm) { if (frm.doc.blanket_order_type === 'Selling') { + frm.set_df_property("customer","reqd", 1) frm.set_query("tc_name", function() { return { filters: { selling: 1 } }; }); } if (frm.doc.blanket_order_type === 'Purchasing') { + frm.set_df_property("customer","reqd", 1) frm.set_query("tc_name", function() { return { filters: { buying: 1 } }; }); From 1675181e49079c8a045c7dd9a874f3db98705e0a Mon Sep 17 00:00:00 2001 From: Khushal Trivedi Date: Wed, 16 Oct 2019 12:02:56 +0530 Subject: [PATCH 3/9] [Fix] - making customer/supplier field manadatory on order type condition on BO --- .../manufacturing/doctype/blanket_order/blanket_order.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js index 1e18678eb0..87ad3b5d9f 100644 --- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js @@ -52,12 +52,16 @@ frappe.ui.form.on('Blanket Order', { set_tc_name_filter: function(frm) { if (frm.doc.blanket_order_type === 'Selling') { frm.set_df_property("customer","reqd", 1) + frm.set_df_property("supplier","reqd", 0) + frm.set_query("tc_name", function() { return { filters: { selling: 1 } }; }); } if (frm.doc.blanket_order_type === 'Purchasing') { - frm.set_df_property("customer","reqd", 1) + frm.set_df_property("supplier","reqd", 1) + frm.set_df_property("customer","reqd", 0) + frm.set_query("tc_name", function() { return { filters: { buying: 1 } }; }); @@ -66,7 +70,7 @@ frappe.ui.form.on('Blanket Order', { blanket_order_type: function (frm) { frm.trigger('set_tc_name_filter'); - } + }, }); From 7084f07dab2f34889d952020785e5d10ceeb0b6c Mon Sep 17 00:00:00 2001 From: Khushal Trivedi Date: Wed, 16 Oct 2019 13:40:33 +0530 Subject: [PATCH 4/9] [Fix] - making customer/supplier field manadatory on order type condition on BO --- erpnext/manufacturing/doctype/blanket_order/blanket_order.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js index 87ad3b5d9f..8f0a5e0133 100644 --- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js @@ -70,7 +70,7 @@ frappe.ui.form.on('Blanket Order', { blanket_order_type: function (frm) { frm.trigger('set_tc_name_filter'); - }, + } }); From 5f4b6d267cb1caba153692405578beb558e006f5 Mon Sep 17 00:00:00 2001 From: Khushal Trivedi Date: Wed, 16 Oct 2019 13:40:58 +0530 Subject: [PATCH 5/9] [Fix] - making customer/supplier field manadatory on order type condition on BO --- erpnext/manufacturing/doctype/blanket_order/blanket_order.js | 3 +++ .../manufacturing/doctype/blanket_order/blanket_order.json | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js index 8f0a5e0133..b6ad27632e 100644 --- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js @@ -53,6 +53,7 @@ frappe.ui.form.on('Blanket Order', { 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() { return { filters: { selling: 1 } }; @@ -61,6 +62,8 @@ frappe.ui.form.on('Blanket Order', { 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() { return { filters: { buying: 1 } }; diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.json b/erpnext/manufacturing/doctype/blanket_order/blanket_order.json index 570d435c5f..260e0b8a73 100644 --- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.json +++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.json @@ -88,7 +88,8 @@ "fieldname": "company", "fieldtype": "Link", "label": "Company", - "options": "Company" + "options": "Company", + "reqd": 1 }, { "fieldname": "section_break_12", @@ -128,7 +129,7 @@ } ], "is_submittable": 1, - "modified": "2019-06-19 11:59:09.279607", + "modified": "2019-10-16 13:38:32.302316", "modified_by": "Administrator", "module": "Manufacturing", "name": "Blanket Order", From 8750caa8e36ce3ffa764663bdbef2950a6432689 Mon Sep 17 00:00:00 2001 From: Khushal Trivedi Date: Fri, 18 Oct 2019 17:01:16 +0530 Subject: [PATCH 6/9] [Fix] - if its not multi company set it by default on BO --- erpnext/manufacturing/doctype/blanket_order/blanket_order.js | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js index b6ad27632e..19ec2fc00a 100644 --- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js @@ -12,6 +12,7 @@ frappe.ui.form.on('Blanket Order', { }, refresh: function(frm) { + erpnext.hide_company(); if (frm.doc.customer && frm.doc.docstatus === 1) { frm.add_custom_button(__('View Orders'), function() { frappe.set_route('List', 'Sales Order', {blanket_order: frm.doc.name}); From cdebd400ec88879077f7aa36ce89932ce3cc4893 Mon Sep 17 00:00:00 2001 From: Khushal Trivedi Date: Mon, 21 Oct 2019 16:29:16 +0530 Subject: [PATCH 7/9] [Fix] - changed codacy changers suggested --- .../doctype/blanket_order/blanket_order.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js index 19ec2fc00a..420fb1099d 100644 --- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js @@ -52,18 +52,18 @@ frappe.ui.form.on('Blanket Order', { set_tc_name_filter: function(frm) { 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_df_property("customer","reqd", 1); + frm.set_df_property("supplier","reqd", 0); + frm.set_value("supplier", ""); frm.set_query("tc_name", function() { return { filters: { selling: 1 } }; }); } 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_df_property("supplier","reqd", 1); + frm.set_df_property("customer","reqd", 0); + frm.set_value("customer", ""); frm.set_query("tc_name", function() { From ad71307a5e0bc2558737978b8622f87810a18b3f Mon Sep 17 00:00:00 2001 From: Khushal Trivedi Date: Mon, 21 Oct 2019 17:46:35 +0530 Subject: [PATCH 8/9] fix: date validation, setting up default conpany, customer/supplier manadatory property on Blanket Order --- erpnext/manufacturing/doctype/blanket_order/blanket_order.js | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js index 420fb1099d..20336a1dfa 100644 --- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js @@ -65,7 +65,6 @@ frappe.ui.form.on('Blanket Order', { frm.set_df_property("customer","reqd", 0); frm.set_value("customer", ""); - frm.set_query("tc_name", function() { return { filters: { buying: 1 } }; }); From e22ca23b81984d85f73ce1044a63f95ab14e50d0 Mon Sep 17 00:00:00 2001 From: Khushal Trivedi Date: Mon, 21 Oct 2019 18:17:42 +0530 Subject: [PATCH 9/9] fix: fix: date validation, setting up default conpany, customer/supplier manadatory property on Blanket Order --- erpnext/manufacturing/doctype/blanket_order/blanket_order.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js index 20336a1dfa..1cd9446c8b 100644 --- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js @@ -61,7 +61,7 @@ frappe.ui.form.on('Blanket Order', { }); } if (frm.doc.blanket_order_type === 'Purchasing') { - frm.set_df_property("supplier","reqd", 1); + frm.set_df_property("supplier","reqd", 1); frm.set_df_property("customer","reqd", 0); frm.set_value("customer", "");