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

Merge branch 'develop'

Browse Source
This commit is contained in:
Nabin Hait 2017-07-08 13:55:41 +05:30
commit 35ecab6a52
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -2,7 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
__version__ = '8.3.4' __version__ = '8.3.5'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

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

@ -265,7 +265,7 @@ erpnext.production_order = {
erpnext.production_order.stop_production_order(frm, "Resumed"); erpnext.production_order.stop_production_order(frm, "Resumed");
}, __("Status")); }, __("Status"));
} }
if(!frm.doc.skip_transfer){ if(!frm.doc.skip_transfer){
if ((flt(doc.material_transferred_for_manufacturing) < flt(doc.qty)) if ((flt(doc.material_transferred_for_manufacturing) < flt(doc.qty))
&& frm.doc.status != 'Stopped') { && frm.doc.status != 'Stopped') {
@ -274,7 +274,7 @@ erpnext.production_order = {
erpnext.production_order.make_se(frm, 'Material Transfer for Manufacture'); erpnext.production_order.make_se(frm, 'Material Transfer for Manufacture');
}); });
start_btn.addClass('btn-primary'); start_btn.addClass('btn-primary');
} }
} }
if(!frm.doc.skip_transfer){ if(!frm.doc.skip_transfer){
@ -293,8 +293,9 @@ erpnext.production_order = {
} else { } else {
if ((flt(doc.produced_qty) < flt(doc.qty)) && frm.doc.status != 'Stopped') { if ((flt(doc.produced_qty) < flt(doc.qty)) && frm.doc.status != 'Stopped') {
frm.has_finish_btn = true; frm.has_finish_btn = true;
var finish_btn = frm.add_custom_button(__('Finish'), var finish_btn = frm.add_custom_button(__('Finish'), function() {
cur_frm.cscript['Update Finished Goods']); erpnext.production_order.make_se(frm, 'Manufacture');
});
finish_btn.addClass('btn-primary'); finish_btn.addClass('btn-primary');
} }
} }

4
erpnext/regional/india/utils.py
View File

@ -19,6 +19,6 @@ def validate_gstin_for_india(doc, method):
if doc.gst_state: if doc.gst_state:
doc.gst_state_number = state_numbers[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}") frappe.throw(_("First 2 digits of GSTIN should match with State number {0}")
.format(doc.gst_state_number)) .format(doc.gst_state_number))