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

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-10-01 11:02:40 +05:30
committed by GitHub
parent 1aed76f778
commit f0a37f545a
1 changed files with 0 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -838,53 +838,6 @@ frappe.ui.form.on("UOM Conversion Detail", {
}
}
});
<<<<<<< HEAD
=======
frappe.tour['Item'] = [
{
fieldname: "item_code",
title: "Item Code",
description: __("Enter an Item Code, the name will be auto-filled the same as Item Code on clicking inside the Item Name field.")
},
{
fieldname: "item_group",
title: "Item Group",
description: __("Select an Item Group.")
},
{
fieldname: "is_stock_item",
title: "Maintain Stock",
description: __("If you are maintaining stock of this Item in your Inventory, ERPNext will make a stock ledger entry for each transaction of this item.")
},
{
fieldname: "include_item_in_manufacturing",
title: "Include Item in Manufacturing",
description: __("This is for raw material Items that'll be used to create finished goods. If the Item is an additional service like 'washing' that'll be used in the BOM, keep this unchecked.")
},
{
fieldname: "opening_stock",
title: "Opening Stock",
description: __("Enter the opening stock units.")
},
{
fieldname: "valuation_rate",
title: "Valuation Rate",
description: __("There are two options to maintain valuation of stock. FIFO (first in - first out) and Moving Average. To understand this topic in detail please visit <a href='https://docs.erpnext.com/docs/v13/user/manual/en/stock/articles/item-valuation-fifo-and-moving-average' target='_blank'>Item Valuation, FIFO and Moving Average.</a>")
},
{
fieldname: "standard_rate",
title: "Standard Selling Rate",
description: __("When creating an Item, entering a value for this field will automatically create an Item Price at the backend.")
},
{
fieldname: "item_defaults",
title: "Item Defaults",
description: __("In this section, you can define Company-wide transaction-related defaults for this Item. Eg. Default Warehouse, Default Price List, Supplier, etc.")
}
];
function open_form(frm, doctype, child_doctype, parentfield) {
frappe.model.with_doctype(doctype, () => {
@@ -899,4 +852,3 @@ function open_form(frm, doctype, child_doctype, parentfield) {
frappe.ui.form.make_quick_entry(doctype, null, null, new_doc);
});
}
>>>>>>> 0439e41a44 (fix: Item details fetching on making transaction from item dashboard)