nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24643 from CaseSolvedUK/sinvfix-v13

Browse Source 
fix: Don't throw exception on invoice lines when there is no item_code
This commit is contained in:
Marica
2021-03-11 10:47:24 +05:30
committed by GitHub
parent 6f0fabc54e a780306ec7
commit 63eb6bdb3c
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1885,7 +1885,6 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
frappe.throw(__("Please enter Item Code to get batch no")); frappe.throw(__("Please enter Item Code to get batch no"));
} else if (doc.doctype == "Purchase Receipt" || } else if (doc.doctype == "Purchase Receipt" ||
(doc.doctype == "Purchase Invoice" && doc.update_stock)) { (doc.doctype == "Purchase Invoice" && doc.update_stock)) {
return { return {
filters: {'item': item.item_code} filters: {'item': item.item_code}
} }
@@ -1911,9 +1910,8 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
set_query_for_item_tax_template: function(doc, cdt, cdn) { set_query_for_item_tax_template: function(doc, cdt, cdn) {
var item = frappe.get_doc(cdt, cdn); var item = frappe.get_doc(cdt, cdn);
if(!item.item_code) { if(!item.item_code) {
frappe.throw(__("Please enter Item Code to get item taxes")); return doc.company ? {filters: {company: doc.company}} : {};
} else { } else {
let filters = { let filters = {
'item_code': item.item_code, 'item_code': item.item_code,
'valid_from': ["<=", doc.transaction_date || doc.bill_date || doc.posting_date], 'valid_from': ["<=", doc.transaction_date || doc.bill_date || doc.posting_date],