From 6b173f3a672a42fb0f3cda73d1c7665c50af2cec Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Mon, 9 Nov 2015 11:37:53 +0530 Subject: [PATCH 1/4] Allowed maintenance schedule to be imported via data import tool --- .../doctype/maintenance_schedule/maintenance_schedule.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.json b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.json index 419e64cece..b639f0f728 100644 --- a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.json +++ b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.json @@ -1,6 +1,6 @@ { "allow_copy": 0, - "allow_import": 0, + "allow_import": 1, "allow_rename": 0, "autoname": "MS.#####", "creation": "2013-01-10 16:34:30", @@ -87,7 +87,7 @@ "ignore_user_permissions": 0, "in_filter": 1, "in_list_view": 0, - "label": "Status", + "label": "Status", "no_copy": 1, "oldfieldname": "status", "oldfieldtype": "Select", @@ -543,7 +543,7 @@ "is_submittable": 1, "issingle": 0, "istable": 0, - "modified": "2015-10-02 07:38:56.092101", + "modified": "2015-11-09 01:06:37.685780", "modified_by": "Administrator", "module": "Support", "name": "Maintenance Schedule", From 4e72ef142189fe9f5973b5429d229ae56aaeaaed Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 9 Nov 2015 13:01:49 +0530 Subject: [PATCH 2/4] [fix] Allow both Purchase Order and Delivery from Sales Order, based on drop shipping checkbox --- .../doctype/sales_order/sales_order.js | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index 7fc127c3e1..5926b25db8 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -15,25 +15,31 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( refresh: function(doc, dt, dn) { this._super(); this.frm.dashboard.reset(); - var is_delivered_by_supplier = false; - var is_delivery_note = false; + var allow_purchase = false; + var allow_delivery = false; if(doc.docstatus==1) { if(doc.status != 'Stopped' && doc.status != 'Closed') { - $.each(cur_frm.doc.items, function(i, item){ - if(item.delivered_by_supplier == 1 || item.supplier){ + for (var i in cur_frm.doc.items) { + var item = cur_frm.doc.items[i]; + if(item.delivered_by_supplier === 1 || item.supplier){ if(item.qty > flt(item.ordered_qty) && item.qty > flt(item.delivered_qty)) { - is_delivered_by_supplier = true; + allow_purchase = true; } } - else{ + + if (item.delivered_by_supplier===0) { if(item.qty > flt(item.delivered_qty)) { - is_delivery_note = true; + allow_delivery = true; } } - }) + + if (allow_delivery && allow_purchase) { + break; + } + } // material request if(!doc.order_type || ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1 @@ -42,7 +48,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( } // make purchase order - if(flt(doc.per_delivered, 2) < 100 && is_delivered_by_supplier) { + if(flt(doc.per_delivered, 2) < 100 && allow_purchase) { cur_frm.add_custom_button(__('Purchase Order'), cur_frm.cscript.make_purchase_order); } @@ -65,7 +71,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( } // delivery note - if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1 && is_delivery_note) { + if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1 && allow_delivery) { cur_frm.add_custom_button(__('Delivery'), this.make_delivery_note).addClass("btn-primary"); } From 7f7700201575ad7cb8dff5a592fb76b390adc267 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 9 Nov 2015 13:16:24 +0530 Subject: [PATCH 3/4] Revert b28573ab03e7216a0c3512879afa87af8e902f4b --- .../doctype/maintenance_schedule/maintenance_schedule.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.json b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.json index b639f0f728..419e64cece 100644 --- a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.json +++ b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.json @@ -1,6 +1,6 @@ { "allow_copy": 0, - "allow_import": 1, + "allow_import": 0, "allow_rename": 0, "autoname": "MS.#####", "creation": "2013-01-10 16:34:30", @@ -87,7 +87,7 @@ "ignore_user_permissions": 0, "in_filter": 1, "in_list_view": 0, - "label": "Status", + "label": "Status", "no_copy": 1, "oldfieldname": "status", "oldfieldtype": "Select", @@ -543,7 +543,7 @@ "is_submittable": 1, "issingle": 0, "istable": 0, - "modified": "2015-11-09 01:06:37.685780", + "modified": "2015-10-02 07:38:56.092101", "modified_by": "Administrator", "module": "Support", "name": "Maintenance Schedule", From 7489d298130d90a16a252d2b2a27214b7e5b3c5d Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 9 Nov 2015 13:47:49 +0600 Subject: [PATCH 4/4] bumped to version 6.7.7 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index 1c50efc2e9..293d37387b 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '6.7.6' +__version__ = '6.7.7' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 7bf4201bfd..51d0b5c182 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -29,7 +29,7 @@ blogs. """ app_icon = "icon-th" app_color = "#e74c3c" -app_version = "6.7.6" +app_version = "6.7.7" source_link = "https://github.com/frappe/erpnext" error_report_email = "support@erpnext.com" diff --git a/setup.py b/setup.py index bc61dded37..c6f12a9706 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages -version = "6.7.6" +version = "6.7.7" with open("requirements.txt", "r") as f: install_requires = f.readlines()