nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 19:59:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13837 from shreyashah115/serial-batch-linking

Browse Source 
Serial No. and Batch No. linking
This commit is contained in:
Prateeksha Singh
2018-05-02 15:11:19 +05:30
committed by GitHub
parent e85a43c1c6 0456ced796
commit a7c6ff8f3e
9 changed files with 293 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/public/js/controllers/transaction.js
View File

@@ -296,7 +296,6 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
var me = this;
var item = frappe.get_doc(cdt, cdn);
var update_stock = 0, show_batch_dialog = 0;
if(['Sales Invoice'].includes(this.frm.doc.doctype)) {
update_stock = cint(me.frm.doc.update_stock);
show_batch_dialog = update_stock;
@@ -305,7 +304,6 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
this.frm.doc.doctype === 'Delivery Note') {
show_batch_dialog = 1;
}
// clear barcode if setting item (else barcode will take priority)
if(!from_barcode) {
item.barcode = null;

2
erpnext/public/js/utils.js
View File

@@ -69,7 +69,7 @@ $.extend(erpnext, {
"get_query": function () {
return {
filters: {
item_code:grid_row.doc.item_code ,
item_code:grid_row.doc.item_code,
warehouse:cur_frm.doc.is_return ? null : grid_row.doc.warehouse
}
}