schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Unable to create item variant based on manufacturer (#17651)

Browse Source 
* fix: Unable to create item variant against manufacturer

* fix: Spacing fixes

* fix: Spacing fixes in item.js
This commit is contained in:
Deepesh Garg
2019-05-17 15:39:59 +05:30
committed by Nabin Hait
parent b4b0e4424d
commit 6b378e1669
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
erpnext/stock/doctype/item/item.js
View File

@@ -365,10 +365,18 @@ $.extend(erpnext.item, {
show_modal_for_manufacturers: function(frm) { show_modal_for_manufacturers: function(frm) {
var dialog = new frappe.ui.Dialog({ var dialog = new frappe.ui.Dialog({
fields: [ fields: [
{fieldtype:'Link', options:'Manufacturer', {
reqd:1, label:'Manufacturer'}, fieldtype: 'Link',
{fieldtype:'Data', label:'Manufacturer Part Number', fieldname: 'manufacturer',
fieldname: 'manufacturer_part_no'}, options: 'Manufacturer',
label: 'Manufacturer',
reqd: 1,
},
{
fieldtype: 'Data',
label: 'Manufacturer Part Number',
fieldname: 'manufacturer_part_no'
},
] ]
}); });
@@ -379,7 +387,7 @@ $.extend(erpnext.item, {
// call the server to make the variant // call the server to make the variant
data.template = frm.doc.name; data.template = frm.doc.name;
frappe.call({ frappe.call({
method:"erpnext.controllers.item_variant.get_variant", method: "erpnext.controllers.item_variant.get_variant",
args: data, args: data,
callback: function(r) { callback: function(r) {
var doclist = frappe.model.sync(r.message); var doclist = frappe.model.sync(r.message);
@@ -454,7 +462,7 @@ $.extend(erpnext.item, {
me.multiple_variant_dialog.hide(); me.multiple_variant_dialog.hide();
frappe.call({ frappe.call({
method:"erpnext.controllers.item_variant.enqueue_multiple_variant_creation", method: "erpnext.controllers.item_variant.enqueue_multiple_variant_creation",
args: { args: {
"item": frm.doc.name, "item": frm.doc.name,
"args": selected_attributes "args": selected_attributes
@@ -504,9 +512,9 @@ $.extend(erpnext.item, {
let p = new Promise(resolve => { let p = new Promise(resolve => {
if(!d.numeric_values) { if(!d.numeric_values) {
frappe.call({ frappe.call({
method:"frappe.client.get_list", method: "frappe.client.get_list",
args:{ args: {
doctype:"Item Attribute Value", doctype: "Item Attribute Value",
filters: [ filters: [
["parent","=", d.attribute] ["parent","=", d.attribute]
], ],
@@ -524,9 +532,9 @@ $.extend(erpnext.item, {
}); });
} else { } else {
frappe.call({ frappe.call({
method:"frappe.client.get", method: "frappe.client.get",
args:{ args: {
doctype:"Item Attribute", doctype: "Item Attribute",
name: d.attribute name: d.attribute
} }
}).then((r) => { }).then((r) => {
@@ -589,7 +597,7 @@ $.extend(erpnext.item, {
var args = d.get_values(); var args = d.get_values();
if(!args) return; if(!args) return;
frappe.call({ frappe.call({
method:"erpnext.controllers.item_variant.get_variant", method: "erpnext.controllers.item_variant.get_variant",
args: { args: {
"template": frm.doc.name, "template": frm.doc.name,
"args": d.get_values() "args": d.get_values()
@@ -611,7 +619,7 @@ $.extend(erpnext.item, {
} else { } else {
d.hide(); d.hide();
frappe.call({ frappe.call({
method:"erpnext.controllers.item_variant.create_variant", method: "erpnext.controllers.item_variant.create_variant",
args: { args: {
"item": frm.doc.name, "item": frm.doc.name,
"args": d.get_values() "args": d.get_values()
@@ -649,8 +657,8 @@ $.extend(erpnext.item, {
.on('input', function(e) { .on('input', function(e) {
var term = e.target.value; var term = e.target.value;
frappe.call({ frappe.call({
method:"erpnext.stock.doctype.item.item.get_item_attribute", method: "erpnext.stock.doctype.item.item.get_item_attribute",
args:{ args: {
parent: i, parent: i,
attribute_value: term attribute_value: term
}, },
@@ -712,7 +720,7 @@ frappe.ui.form.on("UOM Conversion Detail", {
var row = locals[cdt][cdn]; var row = locals[cdt][cdn];
if (row.uom) { if (row.uom) {
frappe.call({ frappe.call({
method:"erpnext.stock.doctype.item.item.get_uom_conv_factor", method: "erpnext.stock.doctype.item.item.get_uom_conv_factor",
args: { args: {
"uom": row.uom, "uom": row.uom,
"stock_uom": frm.doc.stock_uom "stock_uom": frm.doc.stock_uom