Merge pull request #38082 from ruthra-kumar/fix_fy_exception
refactor: use 'boolean' parameter while fetching FY year
diff --git a/erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json b/erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
index cb0ed3d..5a281aa 100644
--- a/erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
+++ b/erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
@@ -186,6 +186,7 @@
"label": "Image"
},
{
+ "fetch_from": "item_code.image",
"fieldname": "image",
"fieldtype": "Attach",
"hidden": 1,
@@ -833,7 +834,7 @@
],
"istable": 1,
"links": [],
- "modified": "2023-03-12 13:36:40.160468",
+ "modified": "2023-11-14 18:33:22.585715",
"modified_by": "Administrator",
"module": "Accounts",
"name": "POS Invoice Item",
diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
index 424e942..bcedb7c 100644
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -158,6 +158,7 @@
"width": "300px"
},
{
+ "fetch_from": "item_code.image",
"fieldname": "image",
"fieldtype": "Attach",
"hidden": 1,
@@ -915,7 +916,7 @@
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2023-10-03 21:01:01.824892",
+ "modified": "2023-11-14 18:33:48.547297",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice Item",
diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
index 5d2764b..a403b14 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -167,6 +167,7 @@
"print_hide": 1
},
{
+ "fetch_from": "item_code.image",
"fieldname": "image",
"fieldtype": "Attach",
"hidden": 1,
@@ -901,7 +902,7 @@
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2023-07-26 12:53:22.404057",
+ "modified": "2023-11-14 18:34:10.479329",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice Item",
@@ -911,4 +912,4 @@
"sort_field": "modified",
"sort_order": "DESC",
"states": []
-}
+}
\ No newline at end of file
diff --git a/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js b/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js
index 9e575e6..0f206b1 100644
--- a/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js
+++ b/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js
@@ -110,6 +110,11 @@
"fieldname":"based_on_payment_terms",
"label": __("Based On Payment Terms"),
"fieldtype": "Check",
+ },
+ {
+ "fieldname": "for_revaluation_journals",
+ "label": __("Revaluation Journals"),
+ "fieldtype": "Check",
}
],
diff --git a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js
index 5ad10c7..2f6d258 100644
--- a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js
+++ b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js
@@ -139,6 +139,11 @@
"label": __("Show GL Balance"),
"fieldtype": "Check",
},
+ {
+ "fieldname": "for_revaluation_journals",
+ "label": __("Revaluation Journals"),
+ "fieldtype": "Check",
+ }
],
onload: function(report) {
diff --git a/erpnext/assets/doctype/asset/asset.json b/erpnext/assets/doctype/asset/asset.json
index 40f51ab..d6b9c46 100644
--- a/erpnext/assets/doctype/asset/asset.json
+++ b/erpnext/assets/doctype/asset/asset.json
@@ -481,11 +481,10 @@
"read_only": 1
},
{
- "depends_on": "eval.doc.asset_quantity",
"fieldname": "asset_quantity",
"fieldtype": "Int",
"label": "Asset Quantity",
- "read_only": 1
+ "read_only_depends_on": "eval:!doc.is_existing_asset && !doc.is_composite_asset"
},
{
"fieldname": "depr_entry_posting_status",
@@ -572,7 +571,7 @@
"link_fieldname": "target_asset"
}
],
- "modified": "2023-10-27 17:03:46.629617",
+ "modified": "2023-11-15 17:40:17.315203",
"modified_by": "Administrator",
"module": "Assets",
"name": "Asset",
diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
index 2b6ffb7..2d706f4 100644
--- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
+++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@@ -189,6 +189,7 @@
"fieldtype": "Column Break"
},
{
+ "fetch_from": "item_code.image",
"fieldname": "image",
"fieldtype": "Attach",
"hidden": 1,
@@ -916,7 +917,7 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2023-11-06 11:00:53.596417",
+ "modified": "2023-11-14 18:34:27.267382",
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order Item",
diff --git a/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json b/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json
index 82fcfa2..6cdd2ba 100644
--- a/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json
+++ b/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json
@@ -87,6 +87,7 @@
"width": "300px"
},
{
+ "fetch_from": "item_code.image",
"fieldname": "image",
"fieldtype": "Attach",
"hidden": 1,
@@ -260,13 +261,15 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2020-09-24 17:26:46.276934",
+ "modified": "2023-11-14 18:34:48.327224",
"modified_by": "Administrator",
"module": "Buying",
"name": "Request for Quotation Item",
+ "naming_rule": "Random",
"owner": "Administrator",
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC",
+ "states": [],
"track_changes": 1
-}
+}
\ No newline at end of file
diff --git a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
index 8d491fb..4bbcacf 100644
--- a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
+++ b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
@@ -133,6 +133,7 @@
"fieldtype": "Column Break"
},
{
+ "fetch_from": "item_code.image",
"fieldname": "image",
"fieldtype": "Attach",
"hidden": 1,
@@ -559,13 +560,15 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2020-10-19 12:36:26.913211",
+ "modified": "2023-11-14 18:35:03.435817",
"modified_by": "Administrator",
"module": "Buying",
"name": "Supplier Quotation Item",
+ "naming_rule": "Random",
"owner": "Administrator",
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC",
+ "states": [],
"track_changes": 1
-}
+}
\ No newline at end of file
diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index ece08d8..a470b47 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -365,7 +365,7 @@
{
"item_code": d.item_code,
"warehouse": d.get("from_warehouse"),
- "posting_date": self.get("posting_date") or self.get("transation_date"),
+ "posting_date": self.get("posting_date") or self.get("transaction_date"),
"posting_time": posting_time,
"qty": -1 * flt(d.get("stock_qty")),
"serial_and_batch_bundle": d.get("serial_and_batch_bundle"),
diff --git a/erpnext/controllers/subcontracting_controller.py b/erpnext/controllers/subcontracting_controller.py
index 5fa66b1..3d55a08 100644
--- a/erpnext/controllers/subcontracting_controller.py
+++ b/erpnext/controllers/subcontracting_controller.py
@@ -626,6 +626,18 @@
(row.item_code, row.get(self.subcontract_data.order_field))
] -= row.qty
+ def __set_rate_for_serial_and_batch_bundle(self):
+ if self.doctype != "Subcontracting Receipt":
+ return
+
+ for row in self.get(self.raw_material_table):
+ if not row.get("serial_and_batch_bundle"):
+ continue
+
+ row.rate = frappe.get_cached_value(
+ "Serial and Batch Bundle", row.serial_and_batch_bundle, "avg_rate"
+ )
+
def __modify_serial_and_batch_bundle(self):
if self.is_new():
return
@@ -681,6 +693,7 @@
self.__remove_changed_rows()
self.__set_supplied_items()
self.__modify_serial_and_batch_bundle()
+ self.__set_rate_for_serial_and_batch_bundle()
def __validate_batch_no(self, row, key):
if row.get("batch_no") and row.get("batch_no") not in self.__transferred_items.get(key).get(
diff --git a/erpnext/crm/doctype/opportunity_item/opportunity_item.json b/erpnext/crm/doctype/opportunity_item/opportunity_item.json
index 1b4973c..732f80d 100644
--- a/erpnext/crm/doctype/opportunity_item/opportunity_item.json
+++ b/erpnext/crm/doctype/opportunity_item/opportunity_item.json
@@ -103,6 +103,7 @@
"fieldtype": "Column Break"
},
{
+ "fetch_from": "item_code.image",
"fieldname": "image",
"fieldtype": "Attach",
"hidden": 1,
@@ -165,7 +166,7 @@
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2021-07-30 16:39:09.775720",
+ "modified": "2023-11-14 18:35:30.887278",
"modified_by": "Administrator",
"module": "CRM",
"name": "Opportunity Item",
@@ -173,5 +174,6 @@
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC",
+ "states": [],
"track_changes": 1
}
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json b/erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
index 9b1db63..c75ac32 100644
--- a/erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
+++ b/erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
@@ -85,6 +85,7 @@
"fieldtype": "Column Break"
},
{
+ "fetch_from": "item_code.image",
"fieldname": "image",
"fieldtype": "Attach",
"hidden": 1,
@@ -169,7 +170,7 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2022-05-27 13:42:23.305455",
+ "modified": "2023-11-14 18:35:40.856895",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "BOM Explosion Item",
diff --git a/erpnext/manufacturing/doctype/bom_item/bom_item.json b/erpnext/manufacturing/doctype/bom_item/bom_item.json
index c526611..cb58af1 100644
--- a/erpnext/manufacturing/doctype/bom_item/bom_item.json
+++ b/erpnext/manufacturing/doctype/bom_item/bom_item.json
@@ -111,6 +111,7 @@
"fieldtype": "Column Break"
},
{
+ "fetch_from": "item_code.image",
"fieldname": "image",
"fieldtype": "Attach",
"hidden": 1,
@@ -289,7 +290,7 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2022-07-28 10:20:51.559010",
+ "modified": "2023-11-14 18:35:51.378513",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "BOM Item",
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.js b/erpnext/manufacturing/doctype/production_plan/production_plan.js
index 72438dd..dd102b0 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.js
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.js
@@ -89,10 +89,6 @@
frm.trigger("show_progress");
if (frm.doc.status !== "Completed") {
- frm.add_custom_button(__("Work Order Tree"), ()=> {
- frappe.set_route('Tree', 'Work Order', {production_plan: frm.doc.name});
- }, __('View'));
-
frm.add_custom_button(__("Production Plan Summary"), ()=> {
frappe.set_route('query-report', 'Production Plan Summary', {production_plan: frm.doc.name});
}, __('View'));
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py
index 6b12a29..6efb762 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py
@@ -828,8 +828,6 @@
# Combine subassembly items
sub_assembly_items_store = self.combine_subassembly_items(sub_assembly_items_store)
- sub_assembly_items_store.sort(key=lambda d: d.bom_level, reverse=True) # sort by bom level
-
for idx, row in enumerate(sub_assembly_items_store):
row.idx = idx + 1
self.append("sub_assembly_items", row)
diff --git a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
index e9c6ee3..dd32c34 100644
--- a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
@@ -664,49 +664,6 @@
frappe.db.rollback()
- def test_subassmebly_sorting(self):
- "Test subassembly sorting in case of multiple items with nested BOMs."
- from erpnext.manufacturing.doctype.bom.test_bom import create_nested_bom
-
- prefix = "_TestLevel_"
- boms = {
- "Assembly": {
- "SubAssembly1": {
- "ChildPart1": {},
- "ChildPart2": {},
- },
- "ChildPart6": {},
- "SubAssembly4": {"SubSubAssy2": {"ChildPart7": {}}},
- },
- "MegaDeepAssy": {
- "SecretSubassy": {
- "SecretPart": {"VerySecret": {"SuperSecret": {"Classified": {}}}},
- },
- # ^ assert that this is
- # first item in subassy table
- },
- }
- create_nested_bom(boms, prefix=prefix)
-
- items = [prefix + item_code for item_code in boms.keys()]
- plan = create_production_plan(item_code=items[0], do_not_save=True)
- plan.append(
- "po_items",
- {
- "use_multi_level_bom": 1,
- "item_code": items[1],
- "bom_no": frappe.db.get_value("Item", items[1], "default_bom"),
- "planned_qty": 1,
- "planned_start_date": now_datetime(),
- },
- )
- plan.get_sub_assembly_items()
-
- bom_level_order = [d.bom_level for d in plan.sub_assembly_items]
- self.assertEqual(bom_level_order, sorted(bom_level_order, reverse=True))
- # lowest most level of subassembly should be first
- self.assertIn("SuperSecret", plan.sub_assembly_items[0].production_item)
-
def test_multiple_work_order_for_production_plan_item(self):
"Test producing Prod Plan (making WO) in parts."
diff --git a/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.js b/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.js
index 521543a..afe4a6e 100644
--- a/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.js
+++ b/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.js
@@ -22,9 +22,9 @@
"formatter": function(value, row, column, data, default_formatter) {
value = default_formatter(value, row, column, data);
- if (column.fieldname == "document_name") {
+ if (column.fieldname == "item_code") {
var color = data.pending_qty > 0 ? 'red': 'green';
- value = `<a style='color:${color}' href="#Form/${data['document_type']}/${data['document_name']}" data-doctype="${data['document_type']}">${data['document_name']}</a>`;
+ value = `<a style='color:${color}' href="/app/item/${data['item_code']}" data-doctype="Item">${data['item_code']}</a>`;
}
return value;
diff --git a/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py b/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py
index 2c8f82f..076690f 100644
--- a/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py
+++ b/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py
@@ -44,6 +44,7 @@
{
"indent": 0,
"item_code": row.item_code,
+ "sales_order": row.get("sales_order"),
"item_name": frappe.get_cached_value("Item", row.item_code, "item_name"),
"qty": row.planned_qty,
"document_type": "Work Order",
@@ -80,7 +81,7 @@
data.append(
{
- "indent": 1,
+ "indent": 1 + item.indent,
"item_code": item.production_item,
"item_name": item.item_name,
"qty": item.qty,
@@ -98,7 +99,7 @@
for row in frappe.get_all(
"Work Order",
filters={"production_plan": filters.get("production_plan")},
- fields=["name", "produced_qty", "production_plan", "production_item"],
+ fields=["name", "produced_qty", "production_plan", "production_item", "sales_order"],
):
order_details.setdefault((row.name, row.production_item), row)
@@ -118,10 +119,17 @@
"label": _("Finished Good"),
"fieldtype": "Link",
"fieldname": "item_code",
- "width": 300,
+ "width": 240,
"options": "Item",
},
- {"label": _("Item Name"), "fieldtype": "data", "fieldname": "item_name", "width": 100},
+ {"label": _("Item Name"), "fieldtype": "data", "fieldname": "item_name", "width": 150},
+ {
+ "label": _("Sales Order"),
+ "options": "Sales Order",
+ "fieldtype": "Link",
+ "fieldname": "sales_order",
+ "width": 100,
+ },
{
"label": _("Document Type"),
"fieldtype": "Link",
@@ -133,10 +141,16 @@
"label": _("Document Name"),
"fieldtype": "Dynamic Link",
"fieldname": "document_name",
- "width": 150,
+ "options": "document_type",
+ "width": 180,
},
{"label": _("BOM Level"), "fieldtype": "Int", "fieldname": "bom_level", "width": 100},
{"label": _("Order Qty"), "fieldtype": "Float", "fieldname": "qty", "width": 120},
- {"label": _("Received Qty"), "fieldtype": "Float", "fieldname": "produced_qty", "width": 160},
+ {
+ "label": _("Produced / Received Qty"),
+ "fieldtype": "Float",
+ "fieldname": "produced_qty",
+ "width": 200,
+ },
{"label": _("Pending Qty"), "fieldtype": "Float", "fieldname": "pending_qty", "width": 110},
]
diff --git a/erpnext/selling/doctype/customer/customer.js b/erpnext/selling/doctype/customer/customer.js
index 42932ad..ddc7e2a 100644
--- a/erpnext/selling/doctype/customer/customer.js
+++ b/erpnext/selling/doctype/customer/customer.js
@@ -3,17 +3,32 @@
frappe.ui.form.on("Customer", {
setup: function(frm) {
-
+ frm.custom_make_buttons = {
+ "Opportunity": "Opportunity",
+ "Quotation": "Quotation",
+ "Sales Order": "Sales Order",
+ "Pricing Rule": "Pricing Rule",
+ };
frm.make_methods = {
- 'Quotation': () => frappe.model.open_mapped_doc({
- method: "erpnext.selling.doctype.customer.customer.make_quotation",
- frm: cur_frm
- }),
- 'Opportunity': () => frappe.model.open_mapped_doc({
- method: "erpnext.selling.doctype.customer.customer.make_opportunity",
- frm: cur_frm
- })
- }
+ "Quotation": () =>
+ frappe.model.open_mapped_doc({
+ method: "erpnext.selling.doctype.customer.customer.make_quotation",
+ frm: frm,
+ }),
+ "Sales Order": () =>
+ frappe.model.with_doctype("Sales Order", function () {
+ var so = frappe.model.get_new_doc("Sales Order");
+ so.customer = frm.doc.name; // Set the current customer as the SO customer
+ frappe.set_route("Form", "Sales Order", so.name);
+ }),
+ "Opportunity": () =>
+ frappe.model.open_mapped_doc({
+ method: "erpnext.selling.doctype.customer.customer.make_opportunity",
+ frm: frm,
+ }),
+ "Pricing Rule": () =>
+ erpnext.utils.make_pricing_rule(frm.doc.doctype, frm.doc.name),
+ };
frm.add_fetch('lead_name', 'company_name', 'customer_name');
frm.add_fetch('default_sales_partner','commission_rate','default_commission_rate');
@@ -146,9 +161,9 @@
{party_type: 'Customer', party: frm.doc.name, party_name: frm.doc.customer_name});
}, __('View'));
- frm.add_custom_button(__('Pricing Rule'), function () {
- erpnext.utils.make_pricing_rule(frm.doc.doctype, frm.doc.name);
- }, __('Create'));
+ for (const doctype in frm.make_methods) {
+ frm.add_custom_button(__(doctype), frm.make_methods[doctype], __("Create"));
+ }
frm.add_custom_button(__('Get Customer Group Details'), function () {
frm.trigger("get_customer_group_details");
diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.json b/erpnext/selling/doctype/quotation_item/quotation_item.json
index 5016f1f..0e25313 100644
--- a/erpnext/selling/doctype/quotation_item/quotation_item.json
+++ b/erpnext/selling/doctype/quotation_item/quotation_item.json
@@ -135,6 +135,7 @@
"width": "300px"
},
{
+ "fetch_from": "item_code.image",
"fieldname": "image",
"fieldtype": "Attach",
"hidden": 1,
@@ -666,7 +667,7 @@
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2023-09-26 13:42:11.410294",
+ "modified": "2023-11-14 18:24:24.619832",
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation Item",
@@ -676,4 +677,4 @@
"sort_order": "DESC",
"states": [],
"track_changes": 1
-}
+}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
index f82047f..b4f7300 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -68,7 +68,6 @@
"total_weight",
"column_break_21",
"weight_uom",
- "accounting_dimensions_section",
"warehouse_and_reference",
"warehouse",
"target_warehouse",
@@ -177,6 +176,7 @@
"print_hide": 1
},
{
+ "fetch_from": "item_code.image",
"fieldname": "image",
"fieldtype": "Attach",
"hidden": 1,
@@ -890,18 +890,12 @@
"label": "Production Plan Qty",
"no_copy": 1,
"read_only": 1
- },
- {
- "collapsible": 1,
- "fieldname": "accounting_dimensions_section",
- "fieldtype": "Section Break",
- "label": "Accounting Dimensions"
}
],
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2023-10-17 18:18:26.475259",
+ "modified": "2023-11-14 18:37:12.787893",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order Item",
diff --git a/erpnext/selling/page/point_of_sale/pos_controller.js b/erpnext/selling/page/point_of_sale/pos_controller.js
index 9bba4eb..feecd9c 100644
--- a/erpnext/selling/page/point_of_sale/pos_controller.js
+++ b/erpnext/selling/page/point_of_sale/pos_controller.js
@@ -609,11 +609,12 @@
// if item is clicked twice from item selector
// then "item_code, batch_no, uom, rate" will help in getting the exact item
// to increase the qty by one
- const has_batch_no = batch_no;
+ const has_batch_no = (batch_no !== 'null' && batch_no !== null);
item_row = this.frm.doc.items.find(
i => i.item_code === item_code
&& (!has_batch_no || (has_batch_no && i.batch_no === batch_no))
&& (i.uom === uom)
+ && (i.rate === flt(rate))
);
}
diff --git a/erpnext/setup/doctype/employee/employee.js b/erpnext/setup/doctype/employee/employee.js
index 39a215f..efc3fd1 100755
--- a/erpnext/setup/doctype/employee/employee.js
+++ b/erpnext/setup/doctype/employee/employee.js
@@ -81,8 +81,10 @@
employee: frm.doc.name,
email: frm.doc.prefered_email
},
+ freeze: true,
+ freeze_message: __("Creating User..."),
callback: function (r) {
- frm.set_value("user_id", r.message);
+ frm.reload_doc();
}
});
}
diff --git a/erpnext/setup/doctype/employee/employee.py b/erpnext/setup/doctype/employee/employee.py
index 78fb4df..6f9176c 100755
--- a/erpnext/setup/doctype/employee/employee.py
+++ b/erpnext/setup/doctype/employee/employee.py
@@ -48,6 +48,9 @@
else:
existing_user_id = frappe.db.get_value("Employee", self.name, "user_id")
if existing_user_id:
+ user = frappe.get_doc("User", existing_user_id)
+ validate_employee_role(user, ignore_emp_check=True)
+ user.save(ignore_permissions=True)
remove_user_permission("Employee", self.name, existing_user_id)
def after_rename(self, old, new, merge):
@@ -230,12 +233,26 @@
frappe.cache().hdel("employees_with_number", prev_number)
-def validate_employee_role(doc, method):
+def validate_employee_role(doc, method=None, ignore_emp_check=False):
# called via User hook
- if "Employee" in [d.role for d in doc.get("roles")]:
- if not frappe.db.get_value("Employee", {"user_id": doc.name}):
- frappe.msgprint(_("Please set User ID field in an Employee record to set Employee Role"))
- doc.get("roles").remove(doc.get("roles", {"role": "Employee"})[0])
+ if not ignore_emp_check:
+ if frappe.db.get_value("Employee", {"user_id": doc.name}):
+ return
+
+ user_roles = [d.role for d in doc.get("roles")]
+ if "Employee" in user_roles:
+ frappe.msgprint(
+ _("User {0}: Removed Employee role as there is no mapped employee.").format(doc.name)
+ )
+ doc.get("roles").remove(doc.get("roles", {"role": "Employee"})[0])
+
+ if "Employee Self Service" in user_roles:
+ frappe.msgprint(
+ _("User {0}: Removed Employee Self Service role as there is no mapped employee.").format(
+ doc.name
+ )
+ )
+ doc.get("roles").remove(doc.get("roles", {"role": "Employee Self Service"})[0])
def update_user_permissions(doc, method):
@@ -347,6 +364,8 @@
}
)
user.insert()
+ emp.user_id = user.name
+ emp.save()
return user.name
diff --git a/erpnext/setup/doctype/employee/test_employee.py b/erpnext/setup/doctype/employee/test_employee.py
index 5a693c5..9b70683 100644
--- a/erpnext/setup/doctype/employee/test_employee.py
+++ b/erpnext/setup/doctype/employee/test_employee.py
@@ -25,6 +25,15 @@
employee1_doc.status = "Left"
self.assertRaises(InactiveEmployeeStatusError, employee1_doc.save)
+ def test_user_has_employee(self):
+ employee = make_employee("test_emp_user_creation@company.com")
+ employee_doc = frappe.get_doc("Employee", employee)
+ user = employee_doc.user_id
+ self.assertTrue("Employee" in frappe.get_roles(user))
+ employee_doc.user_id = ""
+ employee_doc.save()
+ self.assertTrue("Employee" not in frappe.get_roles(user))
+
def tearDown(self):
frappe.db.rollback()
diff --git a/erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py b/erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py
index 481a3a5..d266285 100644
--- a/erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py
+++ b/erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py
@@ -108,7 +108,16 @@
if no_of_docs > 0:
self.delete_version_log(docfield["parent"], docfield["fieldname"])
- self.delete_communications(docfield["parent"], docfield["fieldname"])
+
+ reference_docs = frappe.get_all(
+ docfield["parent"], filters={docfield["fieldname"]: self.company}
+ )
+ reference_doc_names = [r.name for r in reference_docs]
+
+ self.delete_communications(docfield["parent"], reference_doc_names)
+ self.delete_comments(docfield["parent"], reference_doc_names)
+ self.unlink_attachments(docfield["parent"], reference_doc_names)
+
self.populate_doctypes_table(tables, docfield["parent"], no_of_docs)
self.delete_child_tables(docfield["parent"], docfield["fieldname"])
@@ -197,19 +206,49 @@
(versions.ref_doctype == doctype) & (versions.docname.isin(batch))
).run()
- def delete_communications(self, doctype, company_fieldname):
- reference_docs = frappe.get_all(doctype, filters={company_fieldname: self.company})
- reference_doc_names = [r.name for r in reference_docs]
-
+ def delete_communications(self, doctype, reference_doc_names):
communications = frappe.get_all(
"Communication",
filters={"reference_doctype": doctype, "reference_name": ["in", reference_doc_names]},
)
communication_names = [c.name for c in communications]
+ if not communication_names:
+ return
+
for batch in create_batch(communication_names, self.batch_size):
frappe.delete_doc("Communication", batch, ignore_permissions=True)
+ def delete_comments(self, doctype, reference_doc_names):
+ comments = frappe.get_all(
+ "Comment",
+ filters={"reference_doctype": doctype, "reference_name": ["in", reference_doc_names]},
+ )
+ comment_names = [c.name for c in comments]
+
+ if not comment_names:
+ return
+
+ for batch in create_batch(comment_names, self.batch_size):
+ frappe.delete_doc("Comment", batch, ignore_permissions=True)
+
+ def unlink_attachments(self, doctype, reference_doc_names):
+ files = frappe.get_all(
+ "File",
+ filters={"attached_to_doctype": doctype, "attached_to_name": ["in", reference_doc_names]},
+ )
+ file_names = [c.name for c in files]
+
+ if not file_names:
+ return
+
+ file = qb.DocType("File")
+
+ for batch in create_batch(file_names, self.batch_size):
+ qb.update(file).set(file.attached_to_doctype, None).set(file.attached_to_name, None).where(
+ file.name.isin(batch)
+ ).run()
+
@frappe.whitelist()
def get_doctypes_to_be_ignored():
diff --git a/erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.json b/erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.json
index 225da6d..0c4757f 100644
--- a/erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.json
+++ b/erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.json
@@ -104,15 +104,6 @@
"read_only": 1
},
{
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "label": "Amended From",
- "no_copy": 1,
- "options": "Closing Stock Balance",
- "print_hide": 1,
- "read_only": 1
- },
- {
"fieldname": "include_uom",
"fieldtype": "Link",
"label": "Include UOM",
@@ -145,4 +136,4 @@
"sort_field": "modified",
"sort_order": "DESC",
"states": []
-}
\ No newline at end of file
+}
diff --git a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
index 6148950..a44b9ac 100644
--- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
+++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -168,6 +168,7 @@
"width": "300px"
},
{
+ "fetch_from": "item_code.image",
"fieldname": "image",
"fieldtype": "Attach",
"hidden": 1,
@@ -893,7 +894,7 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2023-10-16 16:18:18.013379",
+ "modified": "2023-11-14 18:37:38.638144",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note Item",
diff --git a/erpnext/stock/doctype/material_request_item/material_request_item.json b/erpnext/stock/doctype/material_request_item/material_request_item.json
index 9912be1..5dc07c9 100644
--- a/erpnext/stock/doctype/material_request_item/material_request_item.json
+++ b/erpnext/stock/doctype/material_request_item/material_request_item.json
@@ -110,6 +110,7 @@
"width": "250px"
},
{
+ "fetch_from": "item_code.image",
"fieldname": "image",
"fieldtype": "Attach Image",
"label": "Image",
@@ -478,7 +479,7 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2023-10-27 15:53:41.444236",
+ "modified": "2023-11-14 18:37:59.599115",
"modified_by": "Administrator",
"module": "Stock",
"name": "Material Request Item",
diff --git a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
index 718f007..ce2e5d7 100644
--- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -192,6 +192,7 @@
"width": "300px"
},
{
+ "fetch_from": "item_code.image",
"fieldname": "image",
"fieldtype": "Attach",
"hidden": 1,
@@ -1090,7 +1091,7 @@
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2023-10-30 17:32:24.560337",
+ "modified": "2023-11-14 18:38:15.251994",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt Item",
diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
index f2bbf2b..0a4cae7 100644
--- a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
+++ b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
@@ -1604,6 +1604,9 @@
)
for key, val in kwargs.items():
+ if not val:
+ continue
+
if key in ["get_subcontracted_item"]:
continue
diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
index dcbd9b2..be37994 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -12,6 +12,7 @@
"posting_date",
"posting_time",
"is_adjustment_entry",
+ "auto_created_serial_and_batch_bundle",
"column_break_6",
"voucher_type",
"voucher_no",
@@ -340,6 +341,13 @@
"fieldname": "is_adjustment_entry",
"fieldtype": "Check",
"label": "Is Adjustment Entry"
+ },
+ {
+ "default": "0",
+ "depends_on": "serial_and_batch_bundle",
+ "fieldname": "auto_created_serial_and_batch_bundle",
+ "fieldtype": "Check",
+ "label": "Auto Created Serial and Batch Bundle"
}
],
"hide_toolbar": 1,
@@ -348,7 +356,7 @@
"in_create": 1,
"index_web_pages_for_search": 1,
"links": [],
- "modified": "2023-10-23 18:07:42.063615",
+ "modified": "2023-11-14 16:47:39.791967",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Ledger Entry",
diff --git a/erpnext/stock/serial_batch_bundle.py b/erpnext/stock/serial_batch_bundle.py
index 5998274..da98455 100644
--- a/erpnext/stock/serial_batch_bundle.py
+++ b/erpnext/stock/serial_batch_bundle.py
@@ -129,7 +129,9 @@
frappe.throw(_(error_msg))
def set_serial_and_batch_bundle(self, sn_doc):
- self.sle.db_set("serial_and_batch_bundle", sn_doc.name)
+ self.sle.db_set(
+ {"serial_and_batch_bundle": sn_doc.name, "auto_created_serial_and_batch_bundle": 1}
+ )
if sn_doc.is_rejected:
frappe.db.set_value(
@@ -143,6 +145,12 @@
@property
def child_doctype(self):
child_doctype = self.sle.voucher_type + " Item"
+
+ if (
+ self.sle.voucher_type == "Subcontracting Receipt" and self.sle.dependant_sle_voucher_detail_no
+ ):
+ child_doctype = "Subcontracting Receipt Supplied Item"
+
if self.sle.voucher_type == "Stock Entry":
child_doctype = "Stock Entry Detail"
diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py
index 6390894..9142a27 100644
--- a/erpnext/stock/stock_ledger.py
+++ b/erpnext/stock/stock_ledger.py
@@ -766,7 +766,9 @@
sle.doctype = "Stock Ledger Entry"
frappe.get_doc(sle).db_update()
- if not self.args.get("sle_id"):
+ if not self.args.get("sle_id") or (
+ sle.serial_and_batch_bundle and sle.auto_created_serial_and_batch_bundle
+ ):
self.update_outgoing_rate_on_transaction(sle)
def reset_actual_qty_for_stock_reco(self, sle):
diff --git a/erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json b/erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
index d77e774..46c229b 100644
--- a/erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
+++ b/erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
@@ -112,6 +112,7 @@
"fieldtype": "Column Break"
},
{
+ "fetch_from": "item_code.image",
"fieldname": "image",
"fieldtype": "Attach",
"hidden": 1,
@@ -337,7 +338,7 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2023-01-20 23:25:45.363281",
+ "modified": "2023-11-14 18:38:37.640677",
"modified_by": "Administrator",
"module": "Subcontracting",
"name": "Subcontracting Order Item",
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js
index 19a1c93..36001eb 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js
@@ -13,6 +13,16 @@
frm.trigger('set_queries');
},
+ on_submit(frm) {
+ frm.events.refresh_serial_batch_bundle_field(frm);
+ },
+
+ refresh_serial_batch_bundle_field(frm) {
+ frappe.route_hooks.after_submit = (frm_obj) => {
+ frm_obj.reload_doc();
+ }
+ },
+
refresh: (frm) => {
if (frm.doc.docstatus > 0) {
frm.add_custom_button(__('Stock Ledger'), () => {
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
index 7e06444..8d705aa 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
@@ -148,6 +148,8 @@
if (
frappe.db.get_single_value("Buying Settings", "backflush_raw_materials_of_subcontract_based_on")
== "BOM"
+ and self.supplied_items
+ and not any(item.serial_and_batch_bundle for item in self.supplied_items)
):
self.supplied_items = []
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py b/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
index 1828f696..6191a8c 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
@@ -6,7 +6,7 @@
import frappe
from frappe.tests.utils import FrappeTestCase
-from frappe.utils import add_days, cint, cstr, flt, today
+from frappe.utils import add_days, cint, cstr, flt, nowtime, today
import erpnext
from erpnext.accounts.doctype.account.test_account import get_inventory_account
@@ -26,6 +26,10 @@
from erpnext.manufacturing.doctype.production_plan.test_production_plan import make_bom
from erpnext.stock.doctype.item.test_item import make_item
from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import get_gl_entries
+from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
+ get_batch_from_bundle,
+ make_serial_batch_bundle,
+)
from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import (
create_stock_reconciliation,
@@ -507,6 +511,162 @@
self.assertNotEqual(scr.supplied_items[0].rate, prev_cost)
self.assertEqual(scr.supplied_items[0].rate, sr.items[0].valuation_rate)
+ def test_subcontracting_receipt_for_batch_raw_materials_without_material_transfer(self):
+ set_backflush_based_on("BOM")
+
+ fg_item = make_item(properties={"is_stock_item": 1, "is_sub_contracted_item": 1}).name
+ rm_item1 = make_item(
+ properties={
+ "is_stock_item": 1,
+ "has_batch_no": 1,
+ "create_new_batch": 1,
+ "batch_number_series": "BNGS-.####",
+ }
+ ).name
+
+ bom = make_bom(item=fg_item, raw_materials=[rm_item1])
+
+ rm_batch_no = None
+ for row in bom.items:
+ se = make_stock_entry(
+ item_code=row.item_code,
+ qty=1,
+ target="_Test Warehouse 1 - _TC",
+ rate=300,
+ )
+
+ se.reload()
+ rm_batch_no = get_batch_from_bundle(se.items[0].serial_and_batch_bundle)
+
+ service_items = [
+ {
+ "warehouse": "_Test Warehouse - _TC",
+ "item_code": "Subcontracted Service Item 1",
+ "qty": 1,
+ "rate": 100,
+ "fg_item": fg_item,
+ "fg_item_qty": 1,
+ },
+ ]
+ sco = get_subcontracting_order(service_items=service_items)
+ scr = make_subcontracting_receipt(sco.name)
+ scr.save()
+ scr.reload()
+
+ bundle_doc = make_serial_batch_bundle(
+ {
+ "item_code": scr.supplied_items[0].rm_item_code,
+ "warehouse": "_Test Warehouse 1 - _TC",
+ "voucher_type": "Subcontracting Receipt",
+ "posting_date": today(),
+ "posting_time": nowtime(),
+ "qty": -1,
+ "batches": frappe._dict({rm_batch_no: 1}),
+ "type_of_transaction": "Outward",
+ "do_not_submit": True,
+ }
+ )
+
+ scr.supplied_items[0].serial_and_batch_bundle = bundle_doc.name
+ scr.submit()
+ scr.reload()
+
+ batch_no = get_batch_from_bundle(scr.supplied_items[0].serial_and_batch_bundle)
+ self.assertEqual(batch_no, rm_batch_no)
+ self.assertEqual(scr.items[0].rm_cost_per_qty, 300)
+ self.assertEqual(scr.items[0].service_cost_per_qty, 100)
+
+ def test_subcontracting_receipt_valuation_with_auto_created_serial_batch_bundle(self):
+ set_backflush_based_on("BOM")
+
+ fg_item = make_item(properties={"is_stock_item": 1, "is_sub_contracted_item": 1}).name
+ rm_item1 = make_item(
+ properties={
+ "is_stock_item": 1,
+ "has_batch_no": 1,
+ "create_new_batch": 1,
+ "batch_number_series": "BNGS-.####",
+ }
+ ).name
+
+ rm_item2 = make_item(
+ properties={
+ "is_stock_item": 1,
+ "has_batch_no": 1,
+ "has_serial_no": 1,
+ "create_new_batch": 1,
+ "batch_number_series": "BNGS-.####",
+ "serial_no_series": "BNSS-.####",
+ }
+ ).name
+
+ rm_item3 = make_item(
+ properties={
+ "is_stock_item": 1,
+ "has_serial_no": 1,
+ "serial_no_series": "BSSSS-.####",
+ }
+ ).name
+
+ bom = make_bom(item=fg_item, raw_materials=[rm_item1, rm_item2, rm_item3])
+
+ rm_batch_no = None
+ for row in bom.items:
+ make_stock_entry(
+ item_code=row.item_code,
+ qty=1,
+ target="_Test Warehouse 1 - _TC",
+ rate=300,
+ )
+
+ make_stock_entry(
+ item_code=row.item_code,
+ qty=1,
+ target="_Test Warehouse 1 - _TC",
+ rate=400,
+ )
+
+ service_items = [
+ {
+ "warehouse": "_Test Warehouse - _TC",
+ "item_code": "Subcontracted Service Item 1",
+ "qty": 1,
+ "rate": 100,
+ "fg_item": fg_item,
+ "fg_item_qty": 1,
+ },
+ ]
+ sco = get_subcontracting_order(service_items=service_items)
+
+ frappe.db.set_single_value(
+ "Stock Settings", "auto_create_serial_and_batch_bundle_for_outward", 1
+ )
+ scr = make_subcontracting_receipt(sco.name)
+ scr.save()
+ for row in scr.supplied_items:
+ self.assertNotEqual(row.rate, 300.00)
+ self.assertFalse(row.serial_and_batch_bundle)
+
+ scr.submit()
+ scr.reload()
+
+ for row in scr.supplied_items:
+ self.assertEqual(row.rate, 300.00)
+ self.assertTrue(row.serial_and_batch_bundle)
+ auto_created_serial_batch = frappe.db.get_value(
+ "Stock Ledger Entry",
+ {"voucher_no": scr.name, "voucher_detail_no": row.name},
+ "auto_created_serial_and_batch_bundle",
+ )
+
+ self.assertTrue(auto_created_serial_batch)
+
+ self.assertEqual(scr.items[0].rm_cost_per_qty, 900)
+ self.assertEqual(scr.items[0].service_cost_per_qty, 100)
+ frappe.db.set_single_value(
+ "Stock Settings", "auto_create_serial_and_batch_bundle_for_outward", 0
+ )
+
def test_subcontracting_receipt_raw_material_rate(self):
# Step - 1: Set Backflush Based On as "BOM"
set_backflush_based_on("BOM")
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json b/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
index 38432be..26a29dd 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@@ -109,6 +109,7 @@
"width": "300px"
},
{
+ "fetch_from": "item_code.image",
"fieldname": "image",
"fieldtype": "Attach",
"hidden": 1,
@@ -521,7 +522,7 @@
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2023-09-03 17:04:21.214316",
+ "modified": "2023-11-14 18:38:26.459669",
"modified_by": "Administrator",
"module": "Subcontracting",
"name": "Subcontracting Receipt Item",