Merge branch 'develop'
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 7a36695..a8a8055 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@
from __future__ import unicode_literals
import frappe
-__version__ = '8.3.4'
+__version__ = '8.3.5'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.js b/erpnext/manufacturing/doctype/production_order/production_order.js
index a988112..f6d9eaf 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.js
+++ b/erpnext/manufacturing/doctype/production_order/production_order.js
@@ -265,7 +265,7 @@
erpnext.production_order.stop_production_order(frm, "Resumed");
}, __("Status"));
}
-
+
if(!frm.doc.skip_transfer){
if ((flt(doc.material_transferred_for_manufacturing) < flt(doc.qty))
&& frm.doc.status != 'Stopped') {
@@ -274,7 +274,7 @@
erpnext.production_order.make_se(frm, 'Material Transfer for Manufacture');
});
start_btn.addClass('btn-primary');
- }
+ }
}
if(!frm.doc.skip_transfer){
@@ -293,8 +293,9 @@
} else {
if ((flt(doc.produced_qty) < flt(doc.qty)) && frm.doc.status != 'Stopped') {
frm.has_finish_btn = true;
- var finish_btn = frm.add_custom_button(__('Finish'),
- cur_frm.cscript['Update Finished Goods']);
+ var finish_btn = frm.add_custom_button(__('Finish'), function() {
+ erpnext.production_order.make_se(frm, 'Manufacture');
+ });
finish_btn.addClass('btn-primary');
}
}
diff --git a/erpnext/regional/india/utils.py b/erpnext/regional/india/utils.py
index 62de7a9..84e5f3e 100644
--- a/erpnext/regional/india/utils.py
+++ b/erpnext/regional/india/utils.py
@@ -19,6 +19,6 @@
if doc.gst_state:
doc.gst_state_number = state_numbers[doc.gst_state]
- if doc.gst_state_number != doc.gstin[:2]:
+ if doc.gstin != "NA" and doc.gst_state_number != doc.gstin[:2]:
frappe.throw(_("First 2 digits of GSTIN should match with State number {0}")
- .format(doc.gst_state_number))
\ No newline at end of file
+ .format(doc.gst_state_number))