${d.warehouse}
${d.qty}
diff --git a/erpnext/stock/doctype/batch/batch.py b/erpnext/stock/doctype/batch/batch.py
index 3882e5b2424..1e1e6c8ee26 100644
--- a/erpnext/stock/doctype/batch/batch.py
+++ b/erpnext/stock/doctype/batch/batch.py
@@ -218,6 +218,7 @@ def get_batch_qty(
posting_time=None,
ignore_voucher_nos=None,
for_stock_levels=False,
+ consider_negative_batches=False,
):
"""Returns batch actual qty if warehouse is passed,
or returns dict of qty by warehouse if warehouse is None
@@ -243,6 +244,7 @@ def get_batch_qty(
"batch_no": batch_no,
"ignore_voucher_nos": ignore_voucher_nos,
"for_stock_levels": for_stock_levels,
+ "consider_negative_batches": consider_negative_batches,
}
)
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note_list.js b/erpnext/stock/doctype/delivery_note/delivery_note_list.js
index c6b98c4134c..dd09f6cfcf5 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note_list.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note_list.js
@@ -63,16 +63,20 @@ frappe.listview_settings["Delivery Note"] = {
}
};
- // doclist.page.add_actions_menu_item(__('Create Delivery Trip'), action, false);
+ if (frappe.model.can_create("Delivery Trip")) {
+ doclist.page.add_action_item(__("Create Delivery Trip"), action);
+ }
- doclist.page.add_action_item(__("Create Delivery Trip"), action);
+ if (frappe.model.can_create("Sales Invoice")) {
+ doclist.page.add_action_item(__("Sales Invoice"), () => {
+ erpnext.bulk_transaction_processing.create(doclist, "Delivery Note", "Sales Invoice");
+ });
+ }
- doclist.page.add_action_item(__("Sales Invoice"), () => {
- erpnext.bulk_transaction_processing.create(doclist, "Delivery Note", "Sales Invoice");
- });
-
- doclist.page.add_action_item(__("Packaging Slip From Delivery Note"), () => {
- erpnext.bulk_transaction_processing.create(doclist, "Delivery Note", "Packing Slip");
- });
+ if (frappe.model.can_create("Packing Slip")) {
+ doclist.page.add_action_item(__("Packaging Slip From Delivery Note"), () => {
+ erpnext.bulk_transaction_processing.create(doclist, "Delivery Note", "Packing Slip");
+ });
+ }
},
};
diff --git a/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json b/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
index 9c59c13ac07..898848ebf42 100644
--- a/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
+++ b/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
@@ -11,7 +11,8 @@
"description",
"col_break3",
"amount",
- "base_amount"
+ "base_amount",
+ "has_corrective_cost"
],
"fields": [
{
@@ -62,12 +63,19 @@
"label": "Amount (Company Currency)",
"options": "Company:company:default_currency",
"read_only": 1
+ },
+ {
+ "default": "0",
+ "fieldname": "has_corrective_cost",
+ "fieldtype": "Check",
+ "label": "Has Corrective Cost",
+ "read_only": 1
}
],
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2021-05-17 13:57:10.807980",
+ "modified": "2025-01-20 12:22:03.455762",
"modified_by": "Administrator",
"module": "Stock",
"name": "Landed Cost Taxes and Charges",
diff --git a/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.py b/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.py
index 8509cb71d85..a3f7f037d60 100644
--- a/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.py
+++ b/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.py
@@ -20,6 +20,7 @@ class LandedCostTaxesandCharges(Document):
description: DF.SmallText
exchange_rate: DF.Float
expense_account: DF.Link | None
+ has_corrective_cost: DF.Check
parent: DF.Data
parentfield: DF.Data
parenttype: DF.Data
diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js
index 21f0784df75..b35b3aa0f19 100644
--- a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js
+++ b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js
@@ -6,6 +6,10 @@ frappe.ui.form.on("Serial and Batch Bundle", {
frm.trigger("set_queries");
},
+ before_submit(frm) {
+ frappe.throw(__("User cannot submitted the Serial and Batch Bundle manually"));
+ },
+
refresh(frm) {
frm.trigger("toggle_fields");
frm.trigger("prepare_serial_batch_prompt");
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index df6a61d335b..635fd1a1fcf 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -507,18 +507,6 @@ frappe.ui.form.on("Stock Entry", {
});
},
- company: function (frm) {
- if (frm.doc.company) {
- var company_doc = frappe.get_doc(":Company", frm.doc.company);
- if (company_doc.default_letter_head) {
- frm.set_value("letter_head", company_doc.default_letter_head);
- }
- frm.trigger("toggle_display_account_head");
-
- erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
- }
- },
-
make_retention_stock_entry: function (frm) {
frappe.call({
method: "erpnext.stock.doctype.stock_entry.stock_entry.move_sample_to_retention_warehouse",
@@ -918,7 +906,12 @@ frappe.ui.form.on("Stock Entry Detail", {
var d = locals[cdt][cdn];
$.each(r.message, function (k, v) {
if (v) {
- frappe.model.set_value(cdt, cdn, k, v); // qty and it's subsequent fields weren't triggered
+ // set_value trigger barcode function and barcode set qty to 1 in stock_controller.js, to avoid this set value manually instead of set value.
+ if (k != "barcode") {
+ frappe.model.set_value(cdt, cdn, k, v); // qty and it's subsequent fields weren't triggered
+ } else {
+ d.barcode = v;
+ }
}
});
refresh_field("items");
@@ -1060,11 +1053,9 @@ erpnext.stock.StockEntry = class StockEntry extends erpnext.stock.StockControlle
onload_post_render() {
var me = this;
- this.set_default_account(function () {
- if (me.frm.doc.__islocal && me.frm.doc.company && !me.frm.doc.amended_from) {
- me.frm.trigger("company");
- }
- });
+ if (me.frm.doc.__islocal && me.frm.doc.company && !me.frm.doc.amended_from) {
+ me.company();
+ }
this.frm.get_field("items").grid.set_multiple_add("item_code", "qty");
}
@@ -1143,26 +1134,40 @@ erpnext.stock.StockEntry = class StockEntry extends erpnext.stock.StockControlle
this.clean_up();
}
- set_default_account(callback) {
+ company() {
+ if (this.frm.doc.company) {
+ var company_doc = frappe.get_doc(":Company", this.frm.doc.company);
+ if (company_doc.default_letter_head) {
+ this.frm.set_value("letter_head", company_doc.default_letter_head);
+ }
+ this.frm.trigger("toggle_display_account_head");
+
+ erpnext.accounts.dimensions.update_dimension(this.frm, this.frm.doctype);
+ if (this.frm.doc.company && erpnext.is_perpetual_inventory_enabled(this.frm.doc.company))
+ this.set_default_account("stock_adjustment_account", "expense_account");
+ this.set_default_account("cost_center", "cost_center");
+
+ this.frm.refresh_fields("items");
+ }
+ }
+
+ set_default_account(company_fieldname, fieldname) {
var me = this;
- if (this.frm.doc.company && erpnext.is_perpetual_inventory_enabled(this.frm.doc.company)) {
- return this.frm.call({
- method: "erpnext.accounts.utils.get_company_default",
- args: {
- fieldname: "stock_adjustment_account",
- company: this.frm.doc.company,
- },
- callback: function (r) {
- if (!r.exc) {
- $.each(me.frm.doc.items || [], function (i, d) {
- if (!d.expense_account) d.expense_account = r.message;
- });
- if (callback) callback();
- }
- },
- });
- }
+ return this.frm.call({
+ method: "erpnext.accounts.utils.get_company_default",
+ args: {
+ fieldname: company_fieldname,
+ company: this.frm.doc.company,
+ },
+ callback: function (r) {
+ if (!r.exc) {
+ $.each(me.frm.doc.items || [], function (i, d) {
+ d[fieldname] = r.message;
+ });
+ }
+ },
+ });
}
clean_up() {
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index c95de8b48a2..eec30f69f36 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -2868,17 +2868,6 @@ def get_operating_cost_per_unit(work_order=None, bom_no=None):
if bom.quantity:
operating_cost_per_unit = flt(bom.operating_cost) / flt(bom.quantity)
- if (
- work_order
- and work_order.produced_qty
- and cint(
- frappe.db.get_single_value(
- "Manufacturing Settings", "add_corrective_operation_cost_in_finished_good_valuation"
- )
- )
- ):
- operating_cost_per_unit += flt(work_order.corrective_operation_cost) / flt(work_order.produced_qty)
-
return operating_cost_per_unit
@@ -3244,12 +3233,13 @@ def create_serial_and_batch_bundle(parent_doc, row, child, type_of_transaction=N
}
)
+ precision = frappe.get_precision("Stock Entry Detail", "qty")
if row.serial_nos and row.batches_to_be_consume:
doc.has_serial_no = 1
doc.has_batch_no = 1
batchwise_serial_nos = get_batchwise_serial_nos(child.item_code, row)
for batch_no, qty in row.batches_to_be_consume.items():
- while qty > 0:
+ while flt(qty, precision) > 0:
qty -= 1
doc.append(
"entries",
@@ -3270,8 +3260,9 @@ def create_serial_and_batch_bundle(parent_doc, row, child, type_of_transaction=N
precision = frappe.get_precision("Serial and Batch Entry", "qty")
doc.has_batch_no = 1
for batch_no, qty in row.batches_to_be_consume.items():
- qty = flt(qty, precision)
- doc.append("entries", {"batch_no": batch_no, "warehouse": row.warehouse, "qty": qty * -1})
+ if flt(qty, precision) > 0:
+ qty = flt(qty, precision)
+ doc.append("entries", {"batch_no": batch_no, "warehouse": row.warehouse, "qty": qty * -1})
if not doc.entries:
return None
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
index 9e23270ca71..85c74480e7d 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
@@ -139,8 +139,8 @@ class StockReconciliation(StockController):
"voucher_type": self.doctype,
"voucher_no": self.name,
"voucher_detail_no": row.name,
- "qty": row.current_qty,
- "type_of_transaction": "Outward",
+ "qty": row.current_qty * -1,
+ "type_of_transaction": "Outward" if row.current_qty > 0 else "Inward",
"company": self.company,
"is_rejected": 0,
"serial_nos": get_serial_nos(row.current_serial_no)
@@ -1367,6 +1367,7 @@ def get_stock_balance_for(
posting_date=posting_date,
posting_time=posting_time,
for_stock_levels=True,
+ consider_negative_batches=True,
)
or 0
)
diff --git a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
index a3673063a48..48a27a25962 100644
--- a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
@@ -1330,6 +1330,84 @@ class TestStockReconciliation(FrappeTestCase, StockTestMixin):
self.assertEqual(stock_value_difference, 1500.00 * -1)
+ def test_stock_reco_for_negative_batch(self):
+ from erpnext.stock.doctype.batch.batch import get_batch_qty
+ from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
+
+ item_code = self.make_item(
+ "Test Item For Negative Batch",
+ {
+ "is_stock_item": 1,
+ "has_batch_no": 1,
+ "create_new_batch": 1,
+ "batch_number_series": "TEST-BATCH-NB-.###",
+ },
+ ).name
+
+ warehouse = "_Test Warehouse - _TC"
+
+ se = make_stock_entry(
+ posting_date="2024-11-01",
+ posting_time="11:00",
+ item_code=item_code,
+ target=warehouse,
+ qty=10,
+ basic_rate=100,
+ )
+
+ batch_no = get_batch_from_bundle(se.items[0].serial_and_batch_bundle)
+
+ se = make_stock_entry(
+ posting_date="2024-11-01",
+ posting_time="11:00",
+ item_code=item_code,
+ source=warehouse,
+ qty=10,
+ basic_rate=100,
+ use_serial_batch_fields=1,
+ batch_no=batch_no,
+ )
+
+ sles = frappe.get_all(
+ "Stock Ledger Entry",
+ filters={"voucher_no": se.name, "is_cancelled": 0},
+ )
+
+ # intentionally setting negative qty
+ doc = frappe.get_doc("Stock Ledger Entry", sles[0].name)
+ doc.db_set(
+ {
+ "actual_qty": -20,
+ "qty_after_transaction": -10,
+ }
+ )
+
+ sabb_doc = frappe.get_doc("Serial and Batch Bundle", doc.serial_and_batch_bundle)
+ for row in sabb_doc.entries:
+ row.db_set("qty", -20)
+
+ batch_qty = get_batch_qty(batch_no, warehouse, item_code, consider_negative_batches=True)
+ self.assertEqual(batch_qty, -10)
+
+ sr = create_stock_reconciliation(
+ posting_date="2024-11-02",
+ posting_time="11:00",
+ item_code=item_code,
+ warehouse=warehouse,
+ use_serial_batch_fields=1,
+ batch_no=batch_no,
+ qty=0,
+ rate=100,
+ do_not_submit=True,
+ )
+
+ self.assertEqual(sr.items[0].current_qty, -10)
+ sr.submit()
+ sr.reload()
+
+ self.assertTrue(sr.items[0].current_serial_and_batch_bundle)
+ self.assertFalse(sr.items[0].serial_and_batch_bundle)
+
def create_batch_item_with_batch(item_name, batch_id):
batch_item_doc = create_item(item_name, is_stock_item=1)
diff --git a/erpnext/stock/report/stock_balance/stock_balance.js b/erpnext/stock/report/stock_balance/stock_balance.js
index 1d86634fd95..0d68caa7e09 100644
--- a/erpnext/stock/report/stock_balance/stock_balance.js
+++ b/erpnext/stock/report/stock_balance/stock_balance.js
@@ -41,8 +41,14 @@ frappe.query_reports["Stock Balance"] = {
width: "80",
options: "Item",
get_query: function () {
+ let item_group = frappe.query_report.get_filter_value("item_group");
+
return {
query: "erpnext.controllers.queries.item_query",
+ filters: {
+ ...(item_group && { item_group }),
+ is_stock_item: 1,
+ },
};
},
},
diff --git a/erpnext/stock/serial_batch_bundle.py b/erpnext/stock/serial_batch_bundle.py
index 85adb0348d9..f4d862b583c 100644
--- a/erpnext/stock/serial_batch_bundle.py
+++ b/erpnext/stock/serial_batch_bundle.py
@@ -418,7 +418,13 @@ class SerialBatchBundle:
batches = frappe._dict({self.sle.batch_no: self.sle.actual_qty})
batches_qty = get_available_batches(
- frappe._dict({"item_code": self.item_code, "batch_no": list(batches.keys())})
+ frappe._dict(
+ {
+ "item_code": self.item_code,
+ "batch_no": list(batches.keys()),
+ "consider_negative_batches": 1,
+ }
+ )
)
for batch_no in batches:
diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py
index ee5893eb826..6369562a62d 100644
--- a/erpnext/stock/utils.py
+++ b/erpnext/stock/utils.py
@@ -58,7 +58,10 @@ def get_stock_value_from_bin(warehouse=None, item_code=None):
def get_stock_value_on(
- warehouses: list | str | None = None, posting_date: str | None = None, item_code: str | None = None
+ warehouses: list | str | None = None,
+ posting_date: str | None = None,
+ item_code: str | None = None,
+ company: str | None = None,
) -> float:
if not posting_date:
posting_date = nowdate()
@@ -84,6 +87,9 @@ def get_stock_value_on(
if item_code:
query = query.where(sle.item_code == item_code)
+ if company:
+ query = query.where(sle.company == company)
+
return query.run(as_list=True)[0][0]
diff --git a/erpnext/translations/bn.csv b/erpnext/translations/bn.csv
index 7bfbd07be36..f77199d085c 100644
--- a/erpnext/translations/bn.csv
+++ b/erpnext/translations/bn.csv
@@ -8743,3 +8743,12 @@ WhatsApp,হোয়াটসঅ্যাপ,
Make a call,ফোন করুন,
Approve,অনুমোদন করা,
Reject,প্রত্যাখ্যান,
+Signature,স্বাক্ষর,
+Signature is mandatory,স্বাক্ষর আবশ্যক,
+Signature is not mandatory,স্বাক্ষর আবশ্যক নয়,
+Authorised Signature,অনুমোদিত স্বাক্ষর,
+Billing Month,বিলিং মাস,
+Name of Client,ক্লায়েন্টের নাম,
+Client Name,ক্লায়েন্টের নাম,
+Client,ক্লায়েন্ট,
+BD,বিডি,
diff --git a/erpnext/utilities/bulk_transaction.py b/erpnext/utilities/bulk_transaction.py
index 7ba687941c9..51447e0591b 100644
--- a/erpnext/utilities/bulk_transaction.py
+++ b/erpnext/utilities/bulk_transaction.py
@@ -8,6 +8,9 @@ from frappe.utils import get_link_to_form, today
@frappe.whitelist()
def transaction_processing(data, from_doctype, to_doctype):
+ frappe.has_permission(from_doctype, "read", throw=True)
+ frappe.has_permission(to_doctype, "create", throw=True)
+
if isinstance(data, str):
deserialized_data = json.loads(data)
else:
diff --git a/erpnext/utilities/web_form/addresses/addresses.json b/erpnext/utilities/web_form/addresses/addresses.json
index 4e2d8e36c2c..38b73926985 100644
--- a/erpnext/utilities/web_form/addresses/addresses.json
+++ b/erpnext/utilities/web_form/addresses/addresses.json
@@ -84,6 +84,18 @@
"reqd": 0,
"show_in_filter": 0
},
+ {
+ "allow_read_on_all_link_options": 0,
+ "fieldname": "pincode",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "label": "Postal Code",
+ "max_length": 0,
+ "max_value": 0,
+ "read_only": 0,
+ "reqd": 0,
+ "show_in_filter": 0
+ },
{
"allow_read_on_all_link_options": 0,
"fieldname": "city",
@@ -108,18 +120,7 @@
"reqd": 0,
"show_in_filter": 0
},
- {
- "allow_read_on_all_link_options": 0,
- "fieldname": "pincode",
- "fieldtype": "Data",
- "hidden": 0,
- "label": "Postal Code",
- "max_length": 0,
- "max_value": 0,
- "read_only": 0,
- "reqd": 0,
- "show_in_filter": 0
- },
+
{
"allow_read_on_all_link_options": 1,
"fieldname": "country",