Merge pull request #40113 from ruthra-kumar/patch_for_dimension_creation_in_reconciliation_tool
refactor: patch to setup dimensions in Reconciliation tool
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index abc0694..3a930e0 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -270,7 +270,7 @@
super(SalesInvoice, self).validate()
self.validate_auto_set_posting_time()
- if not self.is_pos:
+ if not (self.is_pos or self.is_debit_note):
self.so_dn_required()
self.set_tax_withholding()
@@ -1478,9 +1478,7 @@
"credit_in_account_currency": payment_mode.base_amount
if self.party_account_currency == self.company_currency
else payment_mode.amount,
- "against_voucher": self.return_against
- if cint(self.is_return) and self.return_against
- else self.name,
+ "against_voucher": self.name,
"against_voucher_type": self.doctype,
"cost_center": self.cost_center,
},
diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index 8c3aede..c6a8362 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -1105,6 +1105,44 @@
self.assertEqual(pos.grand_total, 100.0)
self.assertEqual(pos.write_off_amount, 10)
+ def test_ledger_entries_of_return_pos_invoice(self):
+ make_pos_profile()
+
+ pos = create_sales_invoice(do_not_save=True)
+ pos.is_pos = 1
+ pos.append("payments", {"mode_of_payment": "Cash", "account": "Cash - _TC", "amount": 100})
+ pos.save().submit()
+ self.assertEqual(pos.outstanding_amount, 0.0)
+ self.assertEqual(pos.status, "Paid")
+
+ from erpnext.accounts.doctype.sales_invoice.sales_invoice import make_sales_return
+
+ pos_return = make_sales_return(pos.name)
+ pos_return.save().submit()
+ pos_return.reload()
+ pos.reload()
+ self.assertEqual(pos_return.is_return, 1)
+ self.assertEqual(pos_return.return_against, pos.name)
+ self.assertEqual(pos_return.outstanding_amount, 0.0)
+ self.assertEqual(pos_return.status, "Return")
+ self.assertEqual(pos.outstanding_amount, 0.0)
+ self.assertEqual(pos.status, "Credit Note Issued")
+
+ expected = (
+ ("Cash - _TC", 0.0, 100.0, pos_return.name, None),
+ ("Debtors - _TC", 0.0, 100.0, pos_return.name, pos_return.name),
+ ("Debtors - _TC", 100.0, 0.0, pos_return.name, pos_return.name),
+ ("Sales - _TC", 100.0, 0.0, pos_return.name, None),
+ )
+ res = frappe.db.get_all(
+ "GL Entry",
+ filters={"voucher_no": pos_return.name, "is_cancelled": 0},
+ fields=["account", "debit", "credit", "voucher_no", "against_voucher"],
+ order_by="account, debit, credit",
+ as_list=1,
+ )
+ self.assertEqual(expected, res)
+
def test_pos_with_no_gl_entry_for_change_amount(self):
frappe.db.set_single_value("Accounts Settings", "post_change_gl_entries", 0)
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index fc9034b..d8ae2a4 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -9,7 +9,7 @@
from frappe.contacts.doctype.address.address import get_company_address, get_default_address
from frappe.core.doctype.user_permission.user_permission import get_permitted_documents
from frappe.model.utils import get_fetch_values
-from frappe.query_builder.functions import Abs, Date, Sum
+from frappe.query_builder.functions import Abs, Count, Date, Sum
from frappe.utils import (
add_days,
add_months,
@@ -784,34 +784,37 @@
from frappe.desk.form.load import get_communication_data
out = {}
- fields = "creation, count(*)"
after = add_years(None, -1).strftime("%Y-%m-%d")
- group_by = "group by Date(creation)"
data = get_communication_data(
doctype,
name,
after=after,
- group_by="group by creation",
- fields="C.creation as creation, count(C.name)",
+ group_by="group by communication_date",
+ fields="C.communication_date as communication_date, count(C.name)",
as_dict=False,
)
# fetch and append data from Activity Log
- data += frappe.db.sql(
- """select {fields}
- from `tabActivity Log`
- where (reference_doctype=%(doctype)s and reference_name=%(name)s)
- or (timeline_doctype in (%(doctype)s) and timeline_name=%(name)s)
- or (reference_doctype in ("Quotation", "Opportunity") and timeline_name=%(name)s)
- and status!='Success' and creation > {after}
- {group_by} order by creation desc
- """.format(
- fields=fields, group_by=group_by, after=after
- ),
- {"doctype": doctype, "name": name},
- as_dict=False,
- )
+ activity_log = frappe.qb.DocType("Activity Log")
+ data += (
+ frappe.qb.from_(activity_log)
+ .select(activity_log.communication_date, Count(activity_log.name))
+ .where(
+ (
+ ((activity_log.reference_doctype == doctype) & (activity_log.reference_name == name))
+ | ((activity_log.timeline_doctype == doctype) & (activity_log.timeline_name == name))
+ | (
+ (activity_log.reference_doctype.isin(["Quotation", "Opportunity"]))
+ & (activity_log.timeline_name == name)
+ )
+ )
+ & (activity_log.status != "Success")
+ & (activity_log.creation > after)
+ )
+ .groupby(activity_log.communication_date)
+ .orderby(activity_log.communication_date, order=frappe.qb.desc)
+ ).run()
timeline_items = dict(data)
diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py
index e4efefe..7162aef 100644
--- a/erpnext/accounts/report/gross_profit/gross_profit.py
+++ b/erpnext/accounts/report/gross_profit/gross_profit.py
@@ -975,7 +975,7 @@
& (sle.is_cancelled == 0)
)
.orderby(sle.item_code)
- .orderby(sle.warehouse, sle.posting_date, sle.posting_time, sle.creation, order=Order.desc)
+ .orderby(sle.warehouse, sle.posting_datetime, sle.creation, order=Order.desc)
.run(as_dict=True)
)
diff --git a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
index 3f178f4..eaeaa62 100644
--- a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
+++ b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
@@ -163,7 +163,7 @@
"""select
voucher_type, voucher_no, party_type, party, posting_date, debit, credit, remarks, against_voucher
from `tabGL Entry`
- where company=%(company)s and voucher_type in ('Journal Entry', 'Payment Entry') {0}
+ where company=%(company)s and voucher_type in ('Journal Entry', 'Payment Entry') and is_cancelled = 0 {0}
""".format(
get_conditions(filters)
),
diff --git a/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py b/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py
index 0e3acd7..b18570b 100644
--- a/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py
+++ b/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py
@@ -242,7 +242,7 @@
"width": 120,
},
{
- "label": _("Tax Amount"),
+ "label": _("TDS Amount") if filters.get("party_type") == "Supplier" else _("TCS Amount"),
"fieldname": "tax_amount",
"fieldtype": "Float",
"width": 120,
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index 64bc39a..157cfdd 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -982,46 +982,6 @@
return precision
-def get_stock_rbnb_difference(posting_date, company):
- stock_items = frappe.db.sql_list(
- """select distinct item_code
- from `tabStock Ledger Entry` where company=%s""",
- company,
- )
-
- pr_valuation_amount = frappe.db.sql(
- """
- select sum(pr_item.valuation_rate * pr_item.qty * pr_item.conversion_factor)
- from `tabPurchase Receipt Item` pr_item, `tabPurchase Receipt` pr
- where pr.name = pr_item.parent and pr.docstatus=1 and pr.company=%s
- and pr.posting_date <= %s and pr_item.item_code in (%s)"""
- % ("%s", "%s", ", ".join(["%s"] * len(stock_items))),
- tuple([company, posting_date] + stock_items),
- )[0][0]
-
- pi_valuation_amount = frappe.db.sql(
- """
- select sum(pi_item.valuation_rate * pi_item.qty * pi_item.conversion_factor)
- from `tabPurchase Invoice Item` pi_item, `tabPurchase Invoice` pi
- where pi.name = pi_item.parent and pi.docstatus=1 and pi.company=%s
- and pi.posting_date <= %s and pi_item.item_code in (%s)"""
- % ("%s", "%s", ", ".join(["%s"] * len(stock_items))),
- tuple([company, posting_date] + stock_items),
- )[0][0]
-
- # Balance should be
- stock_rbnb = flt(pr_valuation_amount, 2) - flt(pi_valuation_amount, 2)
-
- # Balance as per system
- stock_rbnb_account = "Stock Received But Not Billed - " + frappe.get_cached_value(
- "Company", company, "abbr"
- )
- sys_bal = get_balance_on(stock_rbnb_account, posting_date, in_account_currency=False)
-
- # Amount should be credited
- return flt(stock_rbnb) + flt(sys_bal)
-
-
def get_held_invoices(party_type, party):
"""
Returns a list of names Purchase Invoices for the given party that are on hold
@@ -1428,8 +1388,7 @@
.select(sle.voucher_type, sle.voucher_no, sle.posting_date, sle.posting_time, sle.creation)
.where((sle.is_cancelled == 0) & (sle.voucher_no.isin(voucher_nos)))
.groupby(sle.voucher_type, sle.voucher_no)
- .orderby(sle.posting_date)
- .orderby(sle.posting_time)
+ .orderby(sle.posting_datetime)
.orderby(sle.creation)
).run(as_dict=True)
sorted_vouchers = [(sle.voucher_type, sle.voucher_no) for sle in sles]
diff --git a/erpnext/assets/doctype/asset/depreciation.py b/erpnext/assets/doctype/asset/depreciation.py
index df4593b..191675c 100644
--- a/erpnext/assets/doctype/asset/depreciation.py
+++ b/erpnext/assets/doctype/asset/depreciation.py
@@ -561,15 +561,14 @@
def reverse_depreciation_entry_made_after_disposal(asset, date):
for row in asset.get("finance_books"):
asset_depr_schedule_doc = get_asset_depr_schedule_doc(asset.name, "Active", row.finance_book)
- if not asset_depr_schedule_doc:
+ if not asset_depr_schedule_doc or not asset_depr_schedule_doc.get("depreciation_schedule"):
continue
for schedule_idx, schedule in enumerate(asset_depr_schedule_doc.get("depreciation_schedule")):
- if schedule.schedule_date == date:
+ if schedule.schedule_date == date and schedule.journal_entry:
if not disposal_was_made_on_original_schedule_date(
schedule_idx, row, date
) or disposal_happens_in_the_future(date):
-
reverse_journal_entry = make_reverse_journal_entry(schedule.journal_entry)
reverse_journal_entry.posting_date = nowdate()
diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
index 2f0de97..110f2c4 100644
--- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
+++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
@@ -6,7 +6,7 @@
erpnext.assets.AssetCapitalization = class AssetCapitalization extends erpnext.stock.StockController {
setup() {
- this.frm.ignore_doctypes_on_cancel_all = ['Serial and Batch Bundle'];
+ this.frm.ignore_doctypes_on_cancel_all = ['Serial and Batch Bundle', 'Asset Movement'];
this.setup_posting_date_time_check();
}
diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
index c9ed806..e27a492 100644
--- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
+++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
@@ -138,6 +138,7 @@
"Repost Item Valuation",
"Serial and Batch Bundle",
"Asset",
+ "Asset Movement",
)
self.cancel_target_asset()
self.update_stock_ledger()
@@ -147,7 +148,7 @@
def cancel_target_asset(self):
if self.entry_type == "Capitalization" and self.target_asset:
asset_doc = frappe.get_doc("Asset", self.target_asset)
- frappe.db.set_value("Asset", self.target_asset, "capitalized_in", None)
+ asset_doc.db_set("capitalized_in", None)
if asset_doc.docstatus == 1:
asset_doc.cancel()
diff --git a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
index 146c03e..77469df 100644
--- a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
+++ b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
@@ -418,14 +418,13 @@
)
# Adjust depreciation amount in the last period based on the expected value after useful life
- if row.expected_value_after_useful_life and (
- (
- n == cint(final_number_of_depreciations) - 1
- and value_after_depreciation != row.expected_value_after_useful_life
+ if (
+ n == cint(final_number_of_depreciations) - 1
+ and flt(value_after_depreciation) != flt(row.expected_value_after_useful_life)
+ ) or flt(value_after_depreciation) < flt(row.expected_value_after_useful_life):
+ depreciation_amount += flt(value_after_depreciation) - flt(
+ row.expected_value_after_useful_life
)
- or value_after_depreciation < row.expected_value_after_useful_life
- ):
- depreciation_amount += value_after_depreciation - row.expected_value_after_useful_life
skip_row = True
if flt(depreciation_amount, asset_doc.precision("gross_purchase_amount")) > 0:
@@ -813,15 +812,11 @@
asset_depr_schedules_names = []
for row in asset_doc.get("finance_books"):
- draft_asset_depr_schedule_name = get_asset_depr_schedule_name(
- asset_doc.name, "Draft", row.finance_book
+ asset_depr_schedule = get_asset_depr_schedule_name(
+ asset_doc.name, ["Draft", "Active"], row.finance_book
)
- active_asset_depr_schedule_name = get_asset_depr_schedule_name(
- asset_doc.name, "Active", row.finance_book
- )
-
- if not draft_asset_depr_schedule_name and not active_asset_depr_schedule_name:
+ if not asset_depr_schedule:
name = make_draft_asset_depr_schedule(asset_doc, row)
asset_depr_schedules_names.append(name)
@@ -997,16 +992,20 @@
def get_asset_depr_schedule_name(asset_name, status, finance_book=None):
- finance_book_filter = ["finance_book", "is", "not set"]
- if finance_book:
+ if finance_book is None:
+ finance_book_filter = ["finance_book", "is", "not set"]
+ else:
finance_book_filter = ["finance_book", "=", finance_book]
+ if isinstance(status, str):
+ status = [status]
+
return frappe.db.get_value(
doctype="Asset Depreciation Schedule",
filters=[
["asset", "=", asset_name],
finance_book_filter,
- ["status", "=", status],
+ ["status", "in", status],
],
)
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 063c1e3..32a5a61 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -216,7 +216,8 @@
)
)
- if self.get("is_return") and self.get("return_against"):
+ if self.get("is_return") and self.get("return_against") and not self.get("is_pos"):
+ # if self.get("is_return") and self.get("return_against"):
document_type = "Credit Note" if self.doctype == "Sales Invoice" else "Debit Note"
frappe.msgprint(
_(
@@ -345,6 +346,12 @@
ple = frappe.qb.DocType("Payment Ledger Entry")
frappe.qb.from_(ple).delete().where(
(ple.voucher_type == self.doctype) & (ple.voucher_no == self.name)
+ | (
+ (ple.against_voucher_type == self.doctype)
+ & (ple.against_voucher_no == self.name)
+ & ple.delinked
+ == 1
+ )
).run()
frappe.db.sql(
"delete from `tabGL Entry` where voucher_type=%s and voucher_no=%s", (self.doctype, self.name)
diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index 27ac9d5..91ee53a 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -824,7 +824,8 @@
if self.doctype == "Purchase Invoice" and not self.get("update_stock"):
return
- frappe.db.sql("delete from `tabAsset Movement` where reference_name=%s", self.name)
+ asset_movement = frappe.db.get_value("Asset Movement", {"reference_name": self.name}, "name")
+ frappe.delete_doc("Asset Movement", asset_movement, force=1)
def validate_schedule_date(self):
if not self.get("items"):
diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
index dc49023..c8d40ed 100644
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -28,7 +28,8 @@
def validate(self):
super(SellingController, self).validate()
self.validate_items()
- self.validate_max_discount()
+ if not self.get("is_debit_note"):
+ self.validate_max_discount()
self.validate_selling_price()
self.set_qty_as_per_stock_uom()
self.set_po_nos(for_validate=True)
diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index dc5ce5e..fdbfd10 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -7,7 +7,7 @@
import frappe
from frappe import _, bold
-from frappe.utils import cint, flt, get_link_to_form, getdate
+from frappe.utils import cint, cstr, flt, get_link_to_form, getdate
import erpnext
from erpnext.accounts.general_ledger import (
@@ -174,13 +174,16 @@
table_name = "stock_items"
for row in self.get(table_name):
+ if row.serial_and_batch_bundle and (row.serial_no or row.batch_no):
+ self.validate_serial_nos_and_batches_with_bundle(row)
+
if not row.serial_no and not row.batch_no and not row.get("rejected_serial_no"):
continue
if not row.use_serial_batch_fields and (
row.serial_no or row.batch_no or row.get("rejected_serial_no")
):
- frappe.throw(_("Please enable Use Old Serial / Batch Fields to make_bundle"))
+ row.use_serial_batch_fields = 1
if row.use_serial_batch_fields and (
not row.serial_and_batch_bundle and not row.get("rejected_serial_and_batch_bundle")
@@ -232,6 +235,41 @@
}
)
+ def validate_serial_nos_and_batches_with_bundle(self, row):
+ from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
+
+ throw_error = False
+ if row.serial_no:
+ serial_nos = frappe.get_all(
+ "Serial and Batch Entry", fields=["serial_no"], filters={"parent": row.serial_and_batch_bundle}
+ )
+ serial_nos = sorted([cstr(d.serial_no) for d in serial_nos])
+ parsed_serial_nos = get_serial_nos(row.serial_no)
+
+ if len(serial_nos) != len(parsed_serial_nos):
+ throw_error = True
+ elif serial_nos != parsed_serial_nos:
+ for serial_no in serial_nos:
+ if serial_no not in parsed_serial_nos:
+ throw_error = True
+ break
+
+ elif row.batch_no:
+ batches = frappe.get_all(
+ "Serial and Batch Entry", fields=["batch_no"], filters={"parent": row.serial_and_batch_bundle}
+ )
+ batches = sorted([d.batch_no for d in batches])
+
+ if batches != [row.batch_no]:
+ throw_error = True
+
+ if throw_error:
+ frappe.throw(
+ _(
+ "At row {0}: Serial and Batch Bundle {1} has already created. Please remove the values from the serial no or batch no fields."
+ ).format(row.idx, row.serial_and_batch_bundle)
+ )
+
def set_use_serial_batch_fields(self):
if frappe.db.get_single_value("Stock Settings", "use_serial_batch_fields"):
for row in self.items:
diff --git a/erpnext/controllers/tests/test_subcontracting_controller.py b/erpnext/controllers/tests/test_subcontracting_controller.py
index 47762ac..95a7bcb 100644
--- a/erpnext/controllers/tests/test_subcontracting_controller.py
+++ b/erpnext/controllers/tests/test_subcontracting_controller.py
@@ -401,7 +401,7 @@
{
"main_item_code": "Subcontracted Item SA4",
"item_code": "Subcontracted SRM Item 3",
- "qty": 1.0,
+ "qty": 3.0,
"rate": 100.0,
"stock_uom": "Nos",
"warehouse": "_Test Warehouse - _TC",
@@ -914,12 +914,6 @@
else child_row.get("consumed_qty")
)
- if child_row.serial_no:
- details.serial_no.extend(get_serial_nos(child_row.serial_no))
-
- if child_row.batch_no:
- details.batch_no[child_row.batch_no] += child_row.get("qty") or child_row.get("consumed_qty")
-
if child_row.serial_and_batch_bundle:
doc = frappe.get_doc("Serial and Batch Bundle", child_row.serial_and_batch_bundle)
for row in doc.get("entries"):
@@ -928,6 +922,12 @@
if row.batch_no:
details.batch_no[row.batch_no] += row.qty * (-1 if doc.type_of_transaction == "Outward" else 1)
+ else:
+ if child_row.serial_no:
+ details.serial_no.extend(get_serial_nos(child_row.serial_no))
+
+ if child_row.batch_no:
+ details.batch_no[child_row.batch_no] += child_row.get("qty") or child_row.get("consumed_qty")
def make_stock_transfer_entry(**args):
diff --git a/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py b/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py
index dea3f2d..4f7436f 100644
--- a/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py
+++ b/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py
@@ -41,7 +41,9 @@
month_list = self.get_month_list()
for month in month_list:
- self.columns.append({"fieldname": month, "fieldtype": based_on, "label": month, "width": 200})
+ self.columns.append(
+ {"fieldname": month, "fieldtype": based_on, "label": _(month), "width": 200}
+ )
elif self.filters.get("range") == "Quarterly":
for quarter in range(1, 5):
@@ -156,7 +158,7 @@
for column in self.columns:
if column["fieldname"] != "opportunity_owner" and column["fieldname"] != "sales_stage":
- labels.append(column["fieldname"])
+ labels.append(_(column["fieldname"]))
self.chart = {"data": {"labels": labels, "datasets": datasets}, "type": "line"}
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index 6f35206..27c8493 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -1071,8 +1071,7 @@
frappe.qb.from_(sle)
.select(sle.valuation_rate)
.where((sle.item_code == item_code) & (sle.valuation_rate > 0) & (sle.is_cancelled == 0))
- .orderby(sle.posting_date, order=frappe.qb.desc)
- .orderby(sle.posting_time, order=frappe.qb.desc)
+ .orderby(sle.posting_datetime, order=frappe.qb.desc)
.orderby(sle.creation, order=frappe.qb.desc)
.limit(1)
).run(as_dict=True)
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py
index 3daec20..35aebb9 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.py
+++ b/erpnext/manufacturing/doctype/job_card/job_card.py
@@ -239,12 +239,12 @@
for row in self.sub_operations:
self.total_completed_qty += row.completed_qty
- def get_overlap_for(self, args, check_next_available_slot=False):
+ def get_overlap_for(self, args):
time_logs = []
- time_logs.extend(self.get_time_logs(args, "Job Card Time Log", check_next_available_slot))
+ time_logs.extend(self.get_time_logs(args, "Job Card Time Log"))
- time_logs.extend(self.get_time_logs(args, "Job Card Scheduled Time", check_next_available_slot))
+ time_logs.extend(self.get_time_logs(args, "Job Card Scheduled Time"))
if not time_logs:
return {}
@@ -269,7 +269,7 @@
self.workstation = workstation_time.get("workstation")
return workstation_time
- return time_logs[-1]
+ return time_logs[0]
def has_overlap(self, production_capacity, time_logs):
overlap = False
@@ -308,7 +308,7 @@
return True
return overlap
- def get_time_logs(self, args, doctype, check_next_available_slot=False):
+ def get_time_logs(self, args, doctype):
jc = frappe.qb.DocType("Job Card")
jctl = frappe.qb.DocType(doctype)
@@ -318,9 +318,6 @@
((jctl.from_time >= args.from_time) & (jctl.to_time <= args.to_time)),
]
- if check_next_available_slot:
- time_conditions.append(((jctl.from_time >= args.from_time) & (jctl.to_time >= args.to_time)))
-
query = (
frappe.qb.from_(jctl)
.from_(jc)
@@ -395,18 +392,28 @@
def validate_overlap_for_workstation(self, args, row):
# get the last record based on the to time from the job card
- data = self.get_overlap_for(args, check_next_available_slot=True)
+ data = self.get_overlap_for(args)
+
if not self.workstation:
workstations = get_workstations(self.workstation_type)
if workstations:
# Get the first workstation
self.workstation = workstations[0]
+ if not data:
+ row.planned_start_time = args.from_time
+ return
+
if data:
if data.get("planned_start_time"):
- row.planned_start_time = get_datetime(data.planned_start_time)
+ args.planned_start_time = get_datetime(data.planned_start_time)
else:
- row.planned_start_time = get_datetime(data.to_time + get_mins_between_operations())
+ args.planned_start_time = get_datetime(data.to_time + get_mins_between_operations())
+
+ args.from_time = args.planned_start_time
+ args.to_time = add_to_date(args.planned_start_time, minutes=row.remaining_time_in_mins)
+
+ self.validate_overlap_for_workstation(args, row)
def check_workstation_time(self, row):
workstation_doc = frappe.get_cached_doc("Workstation", self.workstation)
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py
index fdef8fe..517b2b0 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py
@@ -1507,19 +1507,17 @@
frappe.throw(_("For row {0}: Enter Planned Qty").format(data.get("idx")))
if bom_no:
- if (
- data.get("include_exploded_items")
- and doc.get("sub_assembly_items")
- and doc.get("skip_available_sub_assembly_item")
- ):
- item_details = get_raw_materials_of_sub_assembly_items(
- item_details,
- company,
- bom_no,
- include_non_stock_items,
- sub_assembly_items,
- planned_qty=planned_qty,
- )
+ if data.get("include_exploded_items") and doc.get("skip_available_sub_assembly_item"):
+ item_details = {}
+ if doc.get("sub_assembly_items"):
+ item_details = get_raw_materials_of_sub_assembly_items(
+ item_details,
+ company,
+ bom_no,
+ include_non_stock_items,
+ sub_assembly_items,
+ planned_qty=planned_qty,
+ )
elif data.get("include_exploded_items") and include_subcontracted_items:
# fetch exploded items from BOM
diff --git a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
index 1c748a8..53537f9 100644
--- a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
@@ -1232,6 +1232,35 @@
if row.item_code == "SubAssembly2 For SUB Test":
self.assertEqual(row.quantity, 10)
+ def test_sub_assembly_and_their_raw_materials_exists(self):
+ from erpnext.manufacturing.doctype.bom.test_bom import create_nested_bom
+
+ bom_tree = {
+ "FG1 For SUB Test": {
+ "SAB1 For SUB Test": {"CP1 For SUB Test": {}},
+ "SAB2 For SUB Test": {},
+ }
+ }
+
+ parent_bom = create_nested_bom(bom_tree, prefix="")
+ for item in ["SAB1 For SUB Test", "SAB2 For SUB Test"]:
+ make_stock_entry(item_code=item, qty=10, rate=100, target="_Test Warehouse - _TC")
+
+ plan = create_production_plan(
+ item_code=parent_bom.item,
+ planned_qty=10,
+ ignore_existing_ordered_qty=1,
+ do_not_submit=1,
+ skip_available_sub_assembly_item=1,
+ warehouse="_Test Warehouse - _TC",
+ )
+
+ items = get_items_for_material_requests(
+ plan.as_dict(), warehouses=[{"warehouse": "_Test Warehouse - _TC"}]
+ )
+
+ self.assertFalse(items)
+
def test_transfer_and_purchase_mrp_for_purchase_uom(self):
from erpnext.manufacturing.doctype.bom.test_bom import create_nested_bom
from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
diff --git a/erpnext/manufacturing/doctype/work_order/test_work_order.py b/erpnext/manufacturing/doctype/work_order/test_work_order.py
index efe9f53..c72232a 100644
--- a/erpnext/manufacturing/doctype/work_order/test_work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/test_work_order.py
@@ -1822,6 +1822,113 @@
valuation_rate = sum([item.valuation_rate * item.transfer_qty for item in mce.items]) / 10
self.assertEqual(me.items[0].valuation_rate, valuation_rate)
+ def test_capcity_planning_for_workstation(self):
+ frappe.db.set_single_value(
+ "Manufacturing Settings",
+ {
+ "disable_capacity_planning": 0,
+ "capacity_planning_for_days": 1,
+ "mins_between_operations": 10,
+ },
+ )
+
+ properties = {"is_stock_item": 1, "valuation_rate": 100}
+ fg_item = make_item("Test FG Item For Capacity Planning", properties).name
+
+ rm_item = make_item("Test RM Item For Capacity Planning", properties).name
+
+ workstation = "Test Workstation For Capacity Planning"
+ if not frappe.db.exists("Workstation", workstation):
+ make_workstation(workstation=workstation, production_capacity=1)
+
+ operation = "Test Operation For Capacity Planning"
+ if not frappe.db.exists("Operation", operation):
+ make_operation(operation=operation, workstation=workstation)
+
+ bom_doc = make_bom(
+ item=fg_item,
+ source_warehouse="Stores - _TC",
+ raw_materials=[rm_item],
+ with_operations=1,
+ do_not_submit=True,
+ )
+
+ bom_doc.append(
+ "operations",
+ {"operation": operation, "time_in_mins": 1420, "hour_rate": 100, "workstation": workstation},
+ )
+ bom_doc.submit()
+
+ # 1st Work Order,
+ # Capacity to run parallel the operation 'Test Operation For Capacity Planning' is 2
+ wo_doc = make_wo_order_test_record(
+ production_item=fg_item, qty=1, planned_start_date="2024-02-25 00:00:00", do_not_submit=1
+ )
+
+ wo_doc.submit()
+ job_cards = frappe.get_all(
+ "Job Card",
+ filters={"work_order": wo_doc.name},
+ )
+
+ self.assertEqual(len(job_cards), 1)
+
+ # 2nd Work Order,
+ wo_doc = make_wo_order_test_record(
+ production_item=fg_item, qty=1, planned_start_date="2024-02-25 00:00:00", do_not_submit=1
+ )
+
+ wo_doc.submit()
+ job_cards = frappe.get_all(
+ "Job Card",
+ filters={"work_order": wo_doc.name},
+ )
+
+ self.assertEqual(len(job_cards), 1)
+
+ # 3rd Work Order, capacity is full
+ wo_doc = make_wo_order_test_record(
+ production_item=fg_item, qty=1, planned_start_date="2024-02-25 00:00:00", do_not_submit=1
+ )
+
+ self.assertRaises(CapacityError, wo_doc.submit)
+
+ frappe.db.set_single_value(
+ "Manufacturing Settings", {"disable_capacity_planning": 1, "mins_between_operations": 0}
+ )
+
+
+def make_operation(**kwargs):
+ kwargs = frappe._dict(kwargs)
+
+ operation_doc = frappe.get_doc(
+ {
+ "doctype": "Operation",
+ "name": kwargs.operation,
+ "workstation": kwargs.workstation,
+ }
+ )
+ operation_doc.insert()
+
+ return operation_doc
+
+
+def make_workstation(**kwargs):
+ kwargs = frappe._dict(kwargs)
+
+ workstation_doc = frappe.get_doc(
+ {
+ "doctype": "Workstation",
+ "workstation_name": kwargs.workstation,
+ "workstation_type": kwargs.workstation_type,
+ "production_capacity": kwargs.production_capacity or 0,
+ "hour_rate": kwargs.hour_rate or 100,
+ }
+ )
+ workstation_doc.insert()
+
+ return workstation_doc
+
def prepare_boms_for_sub_assembly_test():
if not frappe.db.exists("BOM", {"item": "Test Final SF Item 1"}):
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py
index 39beb36..5e22707 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/work_order.py
@@ -242,8 +242,12 @@
def calculate_operating_cost(self):
self.planned_operating_cost, self.actual_operating_cost = 0.0, 0.0
for d in self.get("operations"):
- d.planned_operating_cost = flt(d.hour_rate) * (flt(d.time_in_mins) / 60.0)
- d.actual_operating_cost = flt(d.hour_rate) * (flt(d.actual_operation_time) / 60.0)
+ d.planned_operating_cost = flt(
+ flt(d.hour_rate) * (flt(d.time_in_mins) / 60.0), d.precision("planned_operating_cost")
+ )
+ d.actual_operating_cost = flt(
+ flt(d.hour_rate) * (flt(d.actual_operation_time) / 60.0), d.precision("actual_operating_cost")
+ )
self.planned_operating_cost += flt(d.planned_operating_cost)
self.actual_operating_cost += flt(d.actual_operating_cost)
@@ -588,7 +592,6 @@
def prepare_data_for_job_card(self, row, index, plan_days, enable_capacity_planning):
self.set_operation_start_end_time(index, row)
- original_start_time = row.planned_start_time
job_card_doc = create_job_card(
self, row, auto_create=True, enable_capacity_planning=enable_capacity_planning
)
@@ -597,11 +600,15 @@
row.planned_start_time = job_card_doc.scheduled_time_logs[-1].from_time
row.planned_end_time = job_card_doc.scheduled_time_logs[-1].to_time
- if date_diff(row.planned_start_time, original_start_time) > plan_days:
+ if date_diff(row.planned_end_time, self.planned_start_date) > plan_days:
frappe.message_log.pop()
frappe.throw(
- _("Unable to find the time slot in the next {0} days for the operation {1}.").format(
- plan_days, row.operation
+ _(
+ "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}."
+ ).format(
+ plan_days,
+ row.operation,
+ get_link_to_form("Manufacturing Settings", "Manufacturing Settings"),
),
CapacityError,
)
diff --git a/erpnext/manufacturing/report/completed_work_orders/completed_work_orders.json b/erpnext/manufacturing/report/completed_work_orders/completed_work_orders.json
index be50e93..7925b8a 100644
--- a/erpnext/manufacturing/report/completed_work_orders/completed_work_orders.json
+++ b/erpnext/manufacturing/report/completed_work_orders/completed_work_orders.json
@@ -1,25 +1,28 @@
{
- "add_total_row": 0,
- "apply_user_permissions": 1,
- "creation": "2013-08-12 12:44:27",
- "disabled": 0,
- "docstatus": 0,
- "doctype": "Report",
- "idx": 3,
- "is_standard": "Yes",
- "modified": "2018-02-13 04:58:51.549413",
- "modified_by": "Administrator",
- "module": "Manufacturing",
- "name": "Completed Work Orders",
- "owner": "Administrator",
- "query": "SELECT\n `tabWork Order`.name as \"Work Order:Link/Work Order:200\",\n `tabWork Order`.creation as \"Date:Date:120\",\n `tabWork Order`.production_item as \"Item:Link/Item:150\",\n `tabWork Order`.qty as \"To Produce:Int:100\",\n `tabWork Order`.produced_qty as \"Produced:Int:100\",\n `tabWork Order`.company as \"Company:Link/Company:\"\nFROM\n `tabWork Order`\nWHERE\n `tabWork Order`.docstatus=1\n AND ifnull(`tabWork Order`.produced_qty,0) = `tabWork Order`.qty",
- "ref_doctype": "Work Order",
- "report_name": "Completed Work Orders",
- "report_type": "Query Report",
+ "add_total_row": 0,
+ "columns": [],
+ "creation": "2013-08-12 12:44:27",
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "filters": [],
+ "idx": 3,
+ "is_standard": "Yes",
+ "letterhead": null,
+ "modified": "2024-02-21 14:35:14.301848",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Completed Work Orders",
+ "owner": "Administrator",
+ "prepared_report": 0,
+ "query": "SELECT\n `tabWork Order`.name as \"Work Order:Link/Work Order:200\",\n `tabWork Order`.creation as \"Date:Date:120\",\n `tabWork Order`.production_item as \"Item:Link/Item:150\",\n `tabWork Order`.qty as \"To Produce:Int:100\",\n `tabWork Order`.produced_qty as \"Produced:Int:100\",\n `tabWork Order`.company as \"Company:Link/Company:\"\nFROM\n `tabWork Order`\nWHERE\n `tabWork Order`.docstatus=1\n AND ifnull(`tabWork Order`.produced_qty,0) >= `tabWork Order`.qty",
+ "ref_doctype": "Work Order",
+ "report_name": "Completed Work Orders",
+ "report_type": "Query Report",
"roles": [
{
"role": "Manufacturing User"
- },
+ },
{
"role": "Stock User"
}
diff --git a/erpnext/manufacturing/report/work_order_summary/work_order_summary.py b/erpnext/manufacturing/report/work_order_summary/work_order_summary.py
index 97f30ef..8d37708 100644
--- a/erpnext/manufacturing/report/work_order_summary/work_order_summary.py
+++ b/erpnext/manufacturing/report/work_order_summary/work_order_summary.py
@@ -58,7 +58,7 @@
query_filters["creation"] = ("between", [filters.get("from_date"), filters.get("to_date")])
data = frappe.get_all(
- "Work Order", fields=fields, filters=query_filters, order_by="planned_start_date asc", debug=1
+ "Work Order", fields=fields, filters=query_filters, order_by="planned_start_date asc"
)
res = []
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 38c138c..5d30323 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -263,6 +263,7 @@
[post_model_sync]
execute:frappe.delete_doc_if_exists('Workspace', 'ERPNext Integrations Settings')
+erpnext.patches.v14_0.update_posting_datetime_and_dropped_indexes #22-02-2024
erpnext.patches.v14_0.rename_ongoing_status_in_sla_documents
erpnext.patches.v14_0.delete_shopify_doctypes
erpnext.patches.v14_0.delete_healthcare_doctypes
@@ -358,3 +359,4 @@
erpnext.patches.v14_0.migrate_gl_to_payment_ledger
erpnext.stock.doctype.delivery_note.patches.drop_unused_return_against_index # 2023-12-20
erpnext.patches.v14_0.set_maintain_stock_for_bom_item
+erpnext.patches.v15_0.delete_orphaned_asset_movement_item_records
\ No newline at end of file
diff --git a/erpnext/patches/v14_0/update_posting_datetime_and_dropped_indexes.py b/erpnext/patches/v14_0/update_posting_datetime_and_dropped_indexes.py
new file mode 100644
index 0000000..ca126a4
--- /dev/null
+++ b/erpnext/patches/v14_0/update_posting_datetime_and_dropped_indexes.py
@@ -0,0 +1,19 @@
+import frappe
+
+
+def execute():
+ frappe.db.sql(
+ """
+ UPDATE `tabStock Ledger Entry`
+ SET posting_datetime = DATE_FORMAT(timestamp(posting_date, posting_time), '%Y-%m-%d %H:%i:%s')
+ """
+ )
+
+ drop_indexes()
+
+
+def drop_indexes():
+ if not frappe.db.has_index("tabStock Ledger Entry", "posting_sort_index"):
+ return
+
+ frappe.db.sql_ddl("ALTER TABLE `tabStock Ledger Entry` DROP INDEX `posting_sort_index`")
diff --git a/erpnext/patches/v15_0/delete_orphaned_asset_movement_item_records.py b/erpnext/patches/v15_0/delete_orphaned_asset_movement_item_records.py
new file mode 100644
index 0000000..a1d7dc9
--- /dev/null
+++ b/erpnext/patches/v15_0/delete_orphaned_asset_movement_item_records.py
@@ -0,0 +1,11 @@
+import frappe
+
+
+def execute():
+ # nosemgrep
+ frappe.db.sql(
+ """
+ DELETE FROM `tabAsset Movement Item`
+ WHERE parent NOT IN (SELECT name FROM `tabAsset Movement`)
+ """
+ )
diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py
index b9d801c..e26d04a 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.py
+++ b/erpnext/projects/doctype/timesheet/timesheet.py
@@ -83,7 +83,7 @@
def set_status(self):
self.status = {"0": "Draft", "1": "Submitted", "2": "Cancelled"}[str(self.docstatus or 0)]
- if self.per_billed == 100:
+ if flt(self.per_billed, self.precision("per_billed")) >= 100.0:
self.status = "Billed"
if self.sales_invoice:
diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js
index b3d301d..1d0d47e 100644
--- a/erpnext/public/js/controllers/buying.js
+++ b/erpnext/public/js/controllers/buying.js
@@ -368,6 +368,7 @@
let update_values = {
"serial_and_batch_bundle": r.name,
+ "use_serial_batch_fields": 0,
"qty": qty / flt(item.conversion_factor || 1, precision("conversion_factor", item))
}
@@ -408,6 +409,7 @@
let update_values = {
"serial_and_batch_bundle": r.name,
+ "use_serial_batch_fields": 0,
"rejected_qty": qty / flt(item.conversion_factor || 1, precision("conversion_factor", item))
}
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 1975c34..775bdb4 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -106,7 +106,6 @@
frappe.ui.form.on(this.frm.doctype + " Item", {
items_add: function(frm, cdt, cdn) {
- debugger
var item = frappe.get_doc(cdt, cdn);
if (!item.warehouse && frm.doc.set_warehouse) {
item.warehouse = frm.doc.set_warehouse;
@@ -145,6 +144,12 @@
});
}
+ if(this.frm.fields_dict['items'].grid.get_field('batch_no')) {
+ this.frm.set_query('batch_no', 'items', function(doc, cdt, cdn) {
+ return me.set_query_for_batch(doc, cdt, cdn);
+ });
+ }
+
if(
this.frm.docstatus < 2
&& this.frm.fields_dict["payment_terms_template"]
@@ -160,7 +165,7 @@
}
if(this.frm.fields_dict["items"]) {
- this["items_remove"] = this.calculate_net_weight;
+ this["items_remove"] = this.process_item_removal;
}
if(this.frm.fields_dict["recurring_print_format"]) {
@@ -936,25 +941,35 @@
due_date() {
// due_date is to be changed, payment terms template and/or payment schedule must
// be removed as due_date is automatically changed based on payment terms
- if (this.frm.doc.due_date && !this.frm.updating_party_details && !this.frm.doc.is_pos) {
- if (this.frm.doc.payment_terms_template ||
- (this.frm.doc.payment_schedule && this.frm.doc.payment_schedule.length)) {
- var message1 = "";
- var message2 = "";
- var final_message = __("Please clear the") + " ";
-
- if (this.frm.doc.payment_terms_template) {
- message1 = __("selected Payment Terms Template");
- final_message = final_message + message1;
- }
-
- if ((this.frm.doc.payment_schedule || []).length) {
- message2 = __("Payment Schedule Table");
- if (message1.length !== 0) message2 = " and " + message2;
- final_message = final_message + message2;
- }
- frappe.msgprint(final_message);
+ if (
+ this.frm.doc.due_date &&
+ !this.frm.updating_party_details &&
+ !this.frm.doc.is_pos &&
+ (
+ this.frm.doc.payment_terms_template ||
+ this.frm.doc.payment_schedule?.length
+ )
+ ) {
+ const to_clear = [];
+ if (this.frm.doc.payment_terms_template) {
+ to_clear.push("Payment Terms Template");
}
+
+ if (this.frm.doc.payment_schedule?.length) {
+ to_clear.push("Payment Schedule Table");
+ }
+
+ frappe.confirm(
+ __(
+ "Do you want to clear the selected {0}?",
+ [frappe.utils.comma_and(to_clear.map(dt => __(dt)))]
+ ),
+ () => {
+ this.frm.set_value("payment_terms_template", "");
+ this.frm.clear_table("payment_schedule");
+ this.frm.refresh_field("payment_schedule");
+ }
+ );
}
}
@@ -1282,6 +1297,11 @@
}
}
+ process_item_removal() {
+ this.frm.trigger("calculate_taxes_and_totals");
+ this.frm.trigger("calculate_net_weight");
+ }
+
calculate_net_weight(){
/* Calculate Total Net Weight then further applied shipping rule to calculate shipping charges.*/
var me = this;
@@ -1503,31 +1523,33 @@
}
remove_pricing_rule_for_item(item) {
- let me = this;
- return this.frm.call({
- method: "erpnext.accounts.doctype.pricing_rule.pricing_rule.remove_pricing_rule_for_item",
- args: {
- pricing_rules: item.pricing_rules,
- item_details: {
- "doctype": item.doctype,
- "name": item.name,
- "item_code": item.item_code,
- "pricing_rules": item.pricing_rules,
- "parenttype": item.parenttype,
- "parent": item.parent,
- "price_list_rate": item.price_list_rate
+ if (item.pricing_rules){
+ let me = this;
+ return this.frm.call({
+ method: "erpnext.accounts.doctype.pricing_rule.pricing_rule.remove_pricing_rule_for_item",
+ args: {
+ pricing_rules: item.pricing_rules,
+ item_details: {
+ "doctype": item.doctype,
+ "name": item.name,
+ "item_code": item.item_code,
+ "pricing_rules": item.pricing_rules,
+ "parenttype": item.parenttype,
+ "parent": item.parent,
+ "price_list_rate": item.price_list_rate
+ },
+ item_code: item.item_code,
+ rate: item.price_list_rate,
},
- item_code: item.item_code,
- rate: item.price_list_rate,
- },
- callback: function(r) {
- if (!r.exc && r.message) {
- me.remove_pricing_rule(r.message);
- me.calculate_taxes_and_totals();
- if(me.frm.doc.apply_discount_on) me.frm.trigger("apply_discount_on");
+ callback: function(r) {
+ if (!r.exc && r.message) {
+ me.remove_pricing_rule(r.message);
+ me.calculate_taxes_and_totals();
+ if(me.frm.doc.apply_discount_on) me.frm.trigger("apply_discount_on");
+ }
}
- }
- });
+ });
+ }
}
apply_pricing_rule(item, calculate_taxes_and_totals) {
@@ -1633,18 +1655,6 @@
return item_list;
}
- items_delete() {
- this.update_localstorage_scanned_data();
- }
-
- update_localstorage_scanned_data() {
- let doctypes = ["Sales Invoice", "Purchase Invoice", "Delivery Note", "Purchase Receipt"];
- if (this.frm.is_new() && doctypes.includes(this.frm.doc.doctype)) {
- const barcode_scanner = new erpnext.utils.BarcodeScanner({frm:this.frm});
- barcode_scanner.update_localstorage_scanned_data();
- }
- }
-
_set_values_for_item_list(children) {
const items_rule_dict = {};
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index 68bcafc..aee761f 100755
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -40,7 +40,10 @@
is_perpetual_inventory_enabled: function(company) {
if(company) {
- return frappe.get_doc(":Company", company).enable_perpetual_inventory
+ let company_local = locals[":Company"] && locals[":Company"][company];
+ if(company_local) {
+ return cint(company_local.enable_perpetual_inventory);
+ }
}
},
diff --git a/erpnext/public/js/utils/sales_common.js b/erpnext/public/js/utils/sales_common.js
index 4bb7843..a957530 100644
--- a/erpnext/public/js/utils/sales_common.js
+++ b/erpnext/public/js/utils/sales_common.js
@@ -339,6 +339,7 @@
frappe.model.set_value(item.doctype, item.name, {
"serial_and_batch_bundle": r.name,
+ "use_serial_batch_fields": 0,
"qty": qty / flt(item.conversion_factor || 1, precision("conversion_factor", item))
});
}
diff --git a/erpnext/public/js/utils/serial_no_batch_selector.js b/erpnext/public/js/utils/serial_no_batch_selector.js
index 80ade70..fccaf88 100644
--- a/erpnext/public/js/utils/serial_no_batch_selector.js
+++ b/erpnext/public/js/utils/serial_no_batch_selector.js
@@ -71,6 +71,10 @@
let warehouse = this.item?.type_of_transaction === "Outward" ?
(this.item.warehouse || this.item.s_warehouse) : "";
+ if (this.frm.doc.doctype === 'Stock Entry') {
+ warehouse = this.item.s_warehouse || this.item.t_warehouse;
+ }
+
if (!warehouse && this.frm.doc.doctype === 'Stock Reconciliation') {
warehouse = this.get_warehouse();
}
@@ -367,19 +371,11 @@
label: __('Batch No'),
in_list_view: 1,
get_query: () => {
- if (this.item.type_of_transaction !== "Outward") {
- return {
- filters: {
- 'item': this.item.item_code,
- }
- }
- } else {
- return {
- query : "erpnext.controllers.queries.get_batch_no",
- filters: {
- 'item_code': this.item.item_code,
- 'warehouse': this.get_warehouse()
- }
+ return {
+ query : "erpnext.controllers.queries.get_batch_no",
+ filters: {
+ 'item_code': this.item.item_code,
+ 'warehouse': this.item.s_warehouse || this.item.t_warehouse,
}
}
},
diff --git a/erpnext/selling/doctype/customer/test_customer.py b/erpnext/selling/doctype/customer/test_customer.py
index 47153a8..a8ebccd 100644
--- a/erpnext/selling/doctype/customer/test_customer.py
+++ b/erpnext/selling/doctype/customer/test_customer.py
@@ -297,11 +297,35 @@
if credit_limit > outstanding_amt:
set_credit_limit("_Test Customer", "_Test Company", credit_limit)
- # Makes Sales invoice from Sales Order
- so.save(ignore_permissions=True)
- si = make_sales_invoice(so.name)
- si.save(ignore_permissions=True)
- self.assertRaises(frappe.ValidationError, make_sales_order)
+ def test_customer_credit_limit_after_submit(self):
+ from erpnext.controllers.accounts_controller import update_child_qty_rate
+ from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
+
+ outstanding_amt = self.get_customer_outstanding_amount()
+ credit_limit = get_credit_limit("_Test Customer", "_Test Company")
+
+ if outstanding_amt <= 0.0:
+ item_qty = int((abs(outstanding_amt) + 200) / 100)
+ make_sales_order(qty=item_qty)
+
+ if credit_limit <= 0.0:
+ set_credit_limit("_Test Customer", "_Test Company", outstanding_amt + 100)
+
+ so = make_sales_order(rate=100, qty=1)
+ # Update qty in submitted Sales Order to trigger Credit Limit validation
+ fields = ["name", "item_code", "delivery_date", "conversion_factor", "qty", "rate", "uom", "idx"]
+ modified_item = frappe._dict()
+ for x in fields:
+ modified_item[x] = so.items[0].get(x)
+ modified_item["docname"] = so.items[0].name
+ modified_item["qty"] = 2
+ self.assertRaises(
+ frappe.ValidationError,
+ update_child_qty_rate,
+ so.doctype,
+ frappe.json.dumps([modified_item]),
+ so.name,
+ )
def test_customer_credit_limit_on_change(self):
outstanding_amt = self.get_customer_outstanding_amount()
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 9661bac..ac392e7 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -515,6 +515,9 @@
def on_update(self):
pass
+ def on_update_after_submit(self):
+ self.check_credit_limit()
+
def before_update_after_submit(self):
self.validate_po()
self.validate_drop_ship()
diff --git a/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py b/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py
index 7d28f2b..f2f1e4c 100644
--- a/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py
+++ b/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py
@@ -206,42 +206,36 @@
def get_actual_data(filters, sales_users_or_territory_data, date_field, sales_field):
fiscal_year = get_fiscal_year(fiscal_year=filters.get("fiscal_year"), as_dict=1)
- dates = [fiscal_year.year_start_date, fiscal_year.year_end_date]
- select_field = "`tab{0}`.{1}".format(filters.get("doctype"), sales_field)
- child_table = "`tab{0}`".format(filters.get("doctype") + " Item")
+ parent_doc = frappe.qb.DocType(filters.get("doctype"))
+ child_doc = frappe.qb.DocType(filters.get("doctype") + " Item")
+ sales_team = frappe.qb.DocType("Sales Team")
+
+ query = (
+ frappe.qb.from_(parent_doc)
+ .inner_join(child_doc)
+ .on(child_doc.parent == parent_doc.name)
+ .inner_join(sales_team)
+ .on(sales_team.parent == parent_doc.name)
+ .select(
+ child_doc.item_group,
+ (child_doc.stock_qty * sales_team.allocated_percentage / 100).as_("stock_qty"),
+ (child_doc.base_net_amount * sales_team.allocated_percentage / 100).as_("base_net_amount"),
+ sales_team.sales_person,
+ parent_doc[date_field],
+ )
+ .where(
+ (parent_doc.docstatus == 1)
+ & (parent_doc[date_field].between(fiscal_year.year_start_date, fiscal_year.year_end_date))
+ )
+ )
if sales_field == "sales_person":
- select_field = "`tabSales Team`.sales_person"
- child_table = "`tab{0}`, `tabSales Team`".format(filters.get("doctype") + " Item")
- cond = """`tabSales Team`.parent = `tab{0}`.name and
- `tabSales Team`.sales_person in ({1}) """.format(
- filters.get("doctype"), ",".join(["%s"] * len(sales_users_or_territory_data))
- )
+ query = query.where(sales_team.sales_person.isin(sales_users_or_territory_data))
else:
- cond = "`tab{0}`.{1} in ({2})".format(
- filters.get("doctype"), sales_field, ",".join(["%s"] * len(sales_users_or_territory_data))
- )
+ query = query.where(parent_doc[sales_field].isin(sales_users_or_territory_data))
- return frappe.db.sql(
- """ SELECT `tab{child_doc}`.item_group,
- `tab{child_doc}`.stock_qty, `tab{child_doc}`.base_net_amount,
- {select_field}, `tab{parent_doc}`.{date_field}
- FROM `tab{parent_doc}`, {child_table}
- WHERE
- `tab{child_doc}`.parent = `tab{parent_doc}`.name
- and `tab{parent_doc}`.docstatus = 1 and {cond}
- and `tab{parent_doc}`.{date_field} between %s and %s""".format(
- cond=cond,
- date_field=date_field,
- select_field=select_field,
- child_table=child_table,
- parent_doc=filters.get("doctype"),
- child_doc=filters.get("doctype") + " Item",
- ),
- tuple(sales_users_or_territory_data + dates),
- as_dict=1,
- )
+ return query.run(as_dict=True)
def get_parents_data(filters, partner_doctype):
diff --git a/erpnext/selling/report/sales_person_target_variance_based_on_item_group/test_sales_person_target_variance_based_on_item_group.py b/erpnext/selling/report/sales_person_target_variance_based_on_item_group/test_sales_person_target_variance_based_on_item_group.py
new file mode 100644
index 0000000..4ae5d2b
--- /dev/null
+++ b/erpnext/selling/report/sales_person_target_variance_based_on_item_group/test_sales_person_target_variance_based_on_item_group.py
@@ -0,0 +1,84 @@
+import frappe
+from frappe.tests.utils import FrappeTestCase
+from frappe.utils import flt, nowdate
+
+from erpnext.accounts.utils import get_fiscal_year
+from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
+from erpnext.selling.report.sales_person_target_variance_based_on_item_group.sales_person_target_variance_based_on_item_group import (
+ execute,
+)
+
+
+class TestSalesPersonTargetVarianceBasedOnItemGroup(FrappeTestCase):
+ def setUp(self):
+ self.fiscal_year = get_fiscal_year(nowdate())[0]
+
+ def tearDown(self):
+ frappe.db.rollback()
+
+ def test_achieved_target_and_variance(self):
+ # Create a Target Distribution
+ distribution = frappe.new_doc("Monthly Distribution")
+ distribution.distribution_id = "Target Report Distribution"
+ distribution.fiscal_year = self.fiscal_year
+ distribution.get_months()
+ distribution.insert()
+
+ # Create sales people with targets
+ person_1 = create_sales_person_with_target("Sales Person 1", self.fiscal_year, distribution.name)
+ person_2 = create_sales_person_with_target("Sales Person 2", self.fiscal_year, distribution.name)
+
+ # Create a Sales Order with 50-50 contribution
+ so = make_sales_order(
+ rate=1000,
+ qty=20,
+ do_not_submit=True,
+ )
+ so.set(
+ "sales_team",
+ [
+ {
+ "sales_person": person_1.name,
+ "allocated_percentage": 50,
+ "allocated_amount": 10000,
+ },
+ {
+ "sales_person": person_2.name,
+ "allocated_percentage": 50,
+ "allocated_amount": 10000,
+ },
+ ],
+ )
+ so.submit()
+
+ # Check Achieved Target and Variance
+ result = execute(
+ frappe._dict(
+ {
+ "fiscal_year": self.fiscal_year,
+ "doctype": "Sales Order",
+ "period": "Yearly",
+ "target_on": "Quantity",
+ }
+ )
+ )[1]
+ row = frappe._dict(result[0])
+ self.assertSequenceEqual(
+ [flt(value, 2) for value in (row.total_target, row.total_achieved, row.total_variance)],
+ [50, 10, -40],
+ )
+
+
+def create_sales_person_with_target(sales_person_name, fiscal_year, distribution_id):
+ sales_person = frappe.new_doc("Sales Person")
+ sales_person.sales_person_name = sales_person_name
+ sales_person.append(
+ "targets",
+ {
+ "fiscal_year": fiscal_year,
+ "target_qty": 50,
+ "target_amount": 30000,
+ "distribution_id": distribution_id,
+ },
+ )
+ return sales_person.insert()
diff --git a/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py b/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py
index 9f3ba0d..847488f 100644
--- a/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py
+++ b/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py
@@ -36,6 +36,7 @@
d.base_net_amount,
d.sales_person,
d.allocated_percentage,
+ (d.stock_qty * d.allocated_percentage / 100),
d.contribution_amt,
company_currency,
]
@@ -103,7 +104,7 @@
"fieldtype": "Link",
"width": 140,
},
- {"label": _("Qty"), "fieldname": "qty", "fieldtype": "Float", "width": 140},
+ {"label": _("SO Total Qty"), "fieldname": "qty", "fieldtype": "Float", "width": 140},
{
"label": _("Amount"),
"options": "currency",
@@ -120,6 +121,12 @@
},
{"label": _("Contribution %"), "fieldname": "contribution", "fieldtype": "Float", "width": 140},
{
+ "label": _("Contribution Qty"),
+ "fieldname": "contribution_qty",
+ "fieldtype": "Float",
+ "width": 140,
+ },
+ {
"label": _("Contribution Amount"),
"options": "currency",
"fieldname": "contribution_amt",
diff --git a/erpnext/setup/demo.py b/erpnext/setup/demo.py
index df2c49b..688d45a 100644
--- a/erpnext/setup/demo.py
+++ b/erpnext/setup/demo.py
@@ -95,7 +95,17 @@
def make_transactions(company):
frappe.db.set_single_value("Stock Settings", "allow_negative_stock", 1)
- start_date = get_fiscal_year(date=getdate())[1]
+ from erpnext.accounts.utils import FiscalYearError
+
+ try:
+ start_date = get_fiscal_year(date=getdate())[1]
+ except FiscalYearError:
+ # User might have setup fiscal year for previous or upcoming years
+ active_fiscal_years = frappe.db.get_all("Fiscal Year", filters={"disabled": 0}, as_list=1)
+ if active_fiscal_years:
+ start_date = frappe.db.get_value("Fiscal Year", active_fiscal_years[0][0], "year_start_date")
+ else:
+ frappe.throw(_("There are no active Fiscal Years for which Demo Data can be generated."))
for doctype in frappe.get_hooks("demo_transaction_doctypes"):
data = read_data_file_using_hooks(doctype)
@@ -159,6 +169,7 @@
if i % 2 != 0:
payment = get_payment_entry(invoice.doctype, invoice.name)
+ payment.posting_date = order.transaction_date
payment.reference_no = invoice.name
payment.submit()
diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js
index 1b40f2b..a913e28 100644
--- a/erpnext/stock/doctype/material_request/material_request.js
+++ b/erpnext/stock/doctype/material_request/material_request.js
@@ -199,6 +199,7 @@
get_item_data: function(frm, item, overwrite_warehouse=false) {
if (item && !item.item_code) { return; }
+
frappe.call({
method: "erpnext.stock.get_item_details.get_item_details",
args: {
@@ -225,20 +226,22 @@
},
callback: function(r) {
const d = item;
- const qty_fields = ['actual_qty', 'projected_qty', 'min_order_qty'];
+ const allow_to_change_fields = ['actual_qty', 'projected_qty', 'min_order_qty', 'item_name', 'description', 'stock_uom', 'uom', 'conversion_factor', 'stock_qty'];
if(!r.exc) {
$.each(r.message, function(key, value) {
- if(!d[key] || qty_fields.includes(key)) {
+ if(!d[key] || allow_to_change_fields.includes(key)) {
d[key] = value;
}
});
if (d.price_list_rate != r.message.price_list_rate) {
+ d.rate = 0.0;
d.price_list_rate = r.message.price_list_rate;
-
frappe.model.set_value(d.doctype, d.name, "rate", d.price_list_rate);
}
+
+ refresh_field("items");
}
}
});
@@ -435,7 +438,7 @@
frm.events.get_item_data(frm, item, false);
},
- rate: function(frm, doctype, name) {
+ rate(frm, doctype, name) {
const item = locals[doctype][name];
item.amount = flt(item.qty) * flt(item.rate);
frappe.model.set_value(doctype, name, "amount", item.amount);
diff --git a/erpnext/stock/doctype/pick_list/pick_list.js b/erpnext/stock/doctype/pick_list/pick_list.js
index 056cd5c..3a5daa1 100644
--- a/erpnext/stock/doctype/pick_list/pick_list.js
+++ b/erpnext/stock/doctype/pick_list/pick_list.js
@@ -330,6 +330,7 @@
let qty = Math.abs(r.total_qty);
frappe.model.set_value(item.doctype, item.name, {
"serial_and_batch_bundle": r.name,
+ "use_serial_batch_fields": 0,
"qty": qty / flt(item.conversion_factor || 1, precision("conversion_factor", item))
});
}
diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index 3afed4b..daa0166 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -2317,6 +2317,119 @@
serial_no_status = frappe.db.get_value("Serial No", sn, "status")
self.assertTrue(serial_no_status != "Active")
+ def test_sle_qty_after_transaction(self):
+ item = make_item(
+ "_Test Item Qty After Transaction",
+ properties={"is_stock_item": 1, "valuation_method": "FIFO"},
+ ).name
+
+ posting_date = today()
+ posting_time = nowtime()
+
+ # Step 1: Create Purchase Receipt
+ pr = make_purchase_receipt(
+ item_code=item,
+ qty=1,
+ rate=100,
+ posting_date=posting_date,
+ posting_time=posting_time,
+ do_not_save=1,
+ )
+
+ for i in range(9):
+ pr.append(
+ "items",
+ {
+ "item_code": item,
+ "qty": 1,
+ "rate": 100,
+ "warehouse": pr.items[0].warehouse,
+ "cost_center": pr.items[0].cost_center,
+ "expense_account": pr.items[0].expense_account,
+ "uom": pr.items[0].uom,
+ "stock_uom": pr.items[0].stock_uom,
+ "conversion_factor": pr.items[0].conversion_factor,
+ },
+ )
+
+ self.assertEqual(len(pr.items), 10)
+ pr.save()
+ pr.submit()
+
+ data = frappe.get_all(
+ "Stock Ledger Entry",
+ fields=["qty_after_transaction", "creation", "posting_datetime"],
+ filters={"voucher_no": pr.name, "is_cancelled": 0},
+ order_by="creation",
+ )
+
+ for index, d in enumerate(data):
+ self.assertEqual(d.qty_after_transaction, 1 + index)
+
+ # Step 2: Create Purchase Receipt
+ pr = make_purchase_receipt(
+ item_code=item,
+ qty=1,
+ rate=100,
+ posting_date=posting_date,
+ posting_time=posting_time,
+ do_not_save=1,
+ )
+
+ for i in range(9):
+ pr.append(
+ "items",
+ {
+ "item_code": item,
+ "qty": 1,
+ "rate": 100,
+ "warehouse": pr.items[0].warehouse,
+ "cost_center": pr.items[0].cost_center,
+ "expense_account": pr.items[0].expense_account,
+ "uom": pr.items[0].uom,
+ "stock_uom": pr.items[0].stock_uom,
+ "conversion_factor": pr.items[0].conversion_factor,
+ },
+ )
+
+ self.assertEqual(len(pr.items), 10)
+ pr.save()
+ pr.submit()
+
+ data = frappe.get_all(
+ "Stock Ledger Entry",
+ fields=["qty_after_transaction", "creation", "posting_datetime"],
+ filters={"voucher_no": pr.name, "is_cancelled": 0},
+ order_by="creation",
+ )
+
+ for index, d in enumerate(data):
+ self.assertEqual(d.qty_after_transaction, 11 + index)
+
+ def test_auto_set_batch_based_on_bundle(self):
+ item_code = make_item(
+ "_Test Auto Set Batch Based on Bundle",
+ properties={
+ "has_batch_no": 1,
+ "batch_number_series": "BATCH-BNU-TASBBB-.#####",
+ "create_new_batch": 1,
+ },
+ ).name
+
+ frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 1)
+
+ pr = make_purchase_receipt(
+ item_code=item_code,
+ qty=5,
+ rate=100,
+ )
+
+ self.assertTrue(pr.items[0].batch_no)
+ batch_no = get_batch_from_bundle(pr.items[0].serial_and_batch_bundle)
+ self.assertEqual(pr.items[0].batch_no, batch_no)
+
+ frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 0)
+
def prepare_data_for_internal_transfer():
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_internal_supplier
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 91b7430..1f7bb4d 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
@@ -207,13 +207,24 @@
};
});
- frm.set_query('batch_no', 'entries', () => {
- return {
- filters: {
- item: frm.doc.item_code,
- disabled: 0,
+ frm.set_query('batch_no', 'entries', (doc) => {
+
+ if (doc.type_of_transaction ==="Outward") {
+ return {
+ query : "erpnext.controllers.queries.get_batch_no",
+ filters: {
+ item_code: doc.item_code,
+ warehouse: doc.warehouse,
+ }
}
- };
+ } else {
+ return {
+ filters: {
+ item: doc.item_code,
+ disabled: 0,
+ }
+ };
+ }
});
frm.set_query('warehouse', 'entries', () => {
diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py b/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py
index 88b262a..b932c13 100644
--- a/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py
+++ b/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py
@@ -5,7 +5,7 @@
import frappe
from frappe.tests.utils import FrappeTestCase, change_settings
-from frappe.utils import add_days, add_to_date, flt, nowdate, nowtime, today
+from frappe.utils import flt, nowtime, today
from erpnext.stock.doctype.item.test_item import make_item
from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import (
@@ -191,6 +191,7 @@
doc.flags.ignore_links = True
doc.flags.ignore_validate = True
doc.submit()
+ doc.reload()
bundle_doc = make_serial_batch_bundle(
{
diff --git a/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json b/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
index 5de2c2e..844270b 100644
--- a/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
+++ b/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
@@ -68,7 +68,7 @@
{
"fieldname": "incoming_rate",
"fieldtype": "Float",
- "label": "Incoming Rate",
+ "label": "Valuation Rate",
"no_copy": 1,
"read_only": 1,
"read_only_depends_on": "eval:parent.type_of_transaction == \"Outward\""
@@ -76,6 +76,7 @@
{
"fieldname": "outgoing_rate",
"fieldtype": "Float",
+ "hidden": 1,
"label": "Outgoing Rate",
"no_copy": 1,
"read_only": 1
@@ -95,6 +96,7 @@
"default": "0",
"fieldname": "is_outward",
"fieldtype": "Check",
+ "hidden": 1,
"label": "Is Outward",
"read_only": 1
},
@@ -120,7 +122,7 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2023-12-10 19:47:48.227772",
+ "modified": "2024-02-23 12:44:18.054270",
"modified_by": "Administrator",
"module": "Stock",
"name": "Serial and Batch Entry",
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index 427147c..7f79f04 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -1180,6 +1180,7 @@
if (r) {
frappe.model.set_value(item.doctype, item.name, {
"serial_and_batch_bundle": r.name,
+ "use_serial_batch_fields": 0,
"qty": Math.abs(r.total_qty) / flt(item.conversion_factor || 1, precision("conversion_factor", item))
});
}
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 276b2f4..832894b 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -839,6 +839,7 @@
currency=erpnext.get_company_currency(self.company),
company=self.company,
raise_error_if_no_rate=raise_error_if_no_rate,
+ batch_no=d.batch_no,
serial_and_batch_bundle=d.serial_and_batch_bundle,
)
@@ -867,7 +868,7 @@
if reset_outgoing_rate:
args = self.get_args_for_incoming_rate(d)
rate = get_incoming_rate(args, raise_error_if_no_rate)
- if rate > 0:
+ if rate >= 0:
d.basic_rate = rate
d.basic_amount = flt(flt(d.transfer_qty) * flt(d.basic_rate), d.precision("basic_amount"))
@@ -890,6 +891,8 @@
"allow_zero_valuation": item.allow_zero_valuation_rate,
"serial_and_batch_bundle": item.serial_and_batch_bundle,
"voucher_detail_no": item.name,
+ "batch_no": item.batch_no,
+ "serial_no": item.serial_no,
}
)
@@ -1899,6 +1902,7 @@
return
id = create_serial_and_batch_bundle(
+ self,
row,
frappe._dict(
{
@@ -2169,7 +2173,7 @@
"to_warehouse": "",
"qty": qty,
"item_name": item.item_name,
- "serial_and_batch_bundle": create_serial_and_batch_bundle(row, item, "Outward"),
+ "serial_and_batch_bundle": create_serial_and_batch_bundle(self, row, item, "Outward"),
"description": item.description,
"stock_uom": item.stock_uom,
"expense_account": item.expense_account,
@@ -2547,6 +2551,7 @@
row = frappe._dict({"serial_nos": serial_nos[0 : cint(d.qty)]})
id = create_serial_and_batch_bundle(
+ self,
row,
frappe._dict(
{
@@ -3070,7 +3075,7 @@
return data
-def create_serial_and_batch_bundle(row, child, type_of_transaction=None):
+def create_serial_and_batch_bundle(parent_doc, row, child, type_of_transaction=None):
item_details = frappe.get_cached_value(
"Item", child.item_code, ["has_serial_no", "has_batch_no"], as_dict=1
)
@@ -3088,6 +3093,8 @@
"item_code": child.item_code,
"warehouse": child.warehouse,
"type_of_transaction": type_of_transaction,
+ "posting_date": parent_doc.posting_date,
+ "posting_time": parent_doc.posting_time,
}
)
diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
index 99c050a..9d1a3f7 100644
--- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
@@ -1611,24 +1611,22 @@
item_code = "Test Negative Item - 001"
item_doc = create_item(item_code=item_code, is_stock_item=1, valuation_rate=10)
- make_stock_entry(
+ se1 = make_stock_entry(
item_code=item_code,
posting_date=add_days(today(), -3),
posting_time="00:00:00",
- purpose="Material Receipt",
+ target="_Test Warehouse - _TC",
qty=10,
to_warehouse="_Test Warehouse - _TC",
- do_not_save=True,
)
- make_stock_entry(
+ se2 = make_stock_entry(
item_code=item_code,
posting_date=today(),
posting_time="00:00:00",
- purpose="Material Receipt",
+ source="_Test Warehouse - _TC",
qty=8,
from_warehouse="_Test Warehouse - _TC",
- do_not_save=True,
)
sr_doc = create_stock_reconciliation(
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 be37994..3a094f1 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -11,6 +11,7 @@
"warehouse",
"posting_date",
"posting_time",
+ "posting_datetime",
"is_adjustment_entry",
"auto_created_serial_and_batch_bundle",
"column_break_6",
@@ -100,7 +101,6 @@
"oldfieldtype": "Date",
"print_width": "100px",
"read_only": 1,
- "search_index": 1,
"width": "100px"
},
{
@@ -253,7 +253,6 @@
"options": "Company",
"print_width": "150px",
"read_only": 1,
- "search_index": 1,
"width": "150px"
},
{
@@ -348,6 +347,11 @@
"fieldname": "auto_created_serial_and_batch_bundle",
"fieldtype": "Check",
"label": "Auto Created Serial and Batch Bundle"
+ },
+ {
+ "fieldname": "posting_datetime",
+ "fieldtype": "Datetime",
+ "label": "Posting Datetime"
}
],
"hide_toolbar": 1,
@@ -356,7 +360,7 @@
"in_create": 1,
"index_web_pages_for_search": 1,
"links": [],
- "modified": "2023-11-14 16:47:39.791967",
+ "modified": "2024-02-07 09:18:13.999231",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Ledger Entry",
diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
index 04441f0..a3e51ca 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
@@ -51,6 +51,7 @@
item_code: DF.Link | None
outgoing_rate: DF.Currency
posting_date: DF.Date | None
+ posting_datetime: DF.Datetime | None
posting_time: DF.Time | None
project: DF.Link | None
qty_after_transaction: DF.Float
@@ -92,6 +93,12 @@
self.validate_with_last_transaction_posting_time()
self.validate_inventory_dimension_negative_stock()
+ def set_posting_datetime(self):
+ from erpnext.stock.utils import get_combine_datetime
+
+ self.posting_datetime = get_combine_datetime(self.posting_date, self.posting_time)
+ self.db_set("posting_datetime", self.posting_datetime)
+
def validate_inventory_dimension_negative_stock(self):
if self.is_cancelled:
return
@@ -162,6 +169,7 @@
return inv_dimension_dict
def on_submit(self):
+ self.set_posting_datetime()
self.check_stock_frozen_date()
# Added to handle few test cases where serial_and_batch_bundles are not required
@@ -332,9 +340,7 @@
def on_doctype_update():
- frappe.db.add_index(
- "Stock Ledger Entry", fields=["posting_date", "posting_time"], index_name="posting_sort_index"
- )
frappe.db.add_index("Stock Ledger Entry", ["voucher_no", "voucher_type"])
frappe.db.add_index("Stock Ledger Entry", ["batch_no", "item_code", "warehouse"])
frappe.db.add_index("Stock Ledger Entry", ["warehouse", "item_code"], "item_warehouse")
+ frappe.db.add_index("Stock Ledger Entry", ["posting_datetime", "creation"])
diff --git a/erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py
index c099953..40a2d5a 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py
+++ b/erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py
@@ -2,6 +2,7 @@
# See license.txt
import json
+import time
from uuid import uuid4
import frappe
@@ -1077,7 +1078,7 @@
frappe.qb.from_(sle)
.select("qty_after_transaction")
.where((sle.item_code == item) & (sle.warehouse == warehouse) & (sle.is_cancelled == 0))
- .orderby(CombineDatetime(sle.posting_date, sle.posting_time))
+ .orderby(sle.posting_datetime)
.orderby(sle.creation)
).run(pluck=True)
@@ -1154,6 +1155,89 @@
except Exception as e:
self.fail("Double processing of qty for clashing timestamp.")
+ def test_previous_sle_with_clashed_timestamp(self):
+
+ item = make_item().name
+ warehouse = "_Test Warehouse - _TC"
+
+ reciept1 = make_stock_entry(
+ item_code=item,
+ to_warehouse=warehouse,
+ qty=100,
+ rate=10,
+ posting_date="2021-01-01",
+ posting_time="02:00:00",
+ )
+
+ time.sleep(3)
+
+ reciept2 = make_stock_entry(
+ item_code=item,
+ to_warehouse=warehouse,
+ qty=5,
+ posting_date="2021-01-01",
+ rate=10,
+ posting_time="02:00:00.1234",
+ )
+
+ sle = frappe.get_all(
+ "Stock Ledger Entry",
+ filters={"voucher_no": reciept1.name},
+ fields=["qty_after_transaction", "actual_qty"],
+ )
+ self.assertEqual(sle[0].qty_after_transaction, 100)
+ self.assertEqual(sle[0].actual_qty, 100)
+
+ sle = frappe.get_all(
+ "Stock Ledger Entry",
+ filters={"voucher_no": reciept2.name},
+ fields=["qty_after_transaction", "actual_qty"],
+ )
+ self.assertEqual(sle[0].qty_after_transaction, 105)
+ self.assertEqual(sle[0].actual_qty, 5)
+
+ def test_backdated_sle_with_same_timestamp(self):
+
+ item = make_item().name
+ warehouse = "_Test Warehouse - _TC"
+
+ reciept1 = make_stock_entry(
+ item_code=item,
+ to_warehouse=warehouse,
+ qty=5,
+ posting_date="2021-01-01",
+ rate=10,
+ posting_time="02:00:00.1234",
+ )
+
+ time.sleep(3)
+
+ # backdated entry with same timestamp but different ms part
+ reciept2 = make_stock_entry(
+ item_code=item,
+ to_warehouse=warehouse,
+ qty=100,
+ rate=10,
+ posting_date="2021-01-01",
+ posting_time="02:00:00",
+ )
+
+ sle = frappe.get_all(
+ "Stock Ledger Entry",
+ filters={"voucher_no": reciept1.name},
+ fields=["qty_after_transaction", "actual_qty"],
+ )
+ self.assertEqual(sle[0].qty_after_transaction, 5)
+ self.assertEqual(sle[0].actual_qty, 5)
+
+ sle = frappe.get_all(
+ "Stock Ledger Entry",
+ filters={"voucher_no": reciept2.name},
+ fields=["qty_after_transaction", "actual_qty"],
+ )
+ self.assertEqual(sle[0].qty_after_transaction, 105)
+ self.assertEqual(sle[0].actual_qty, 100)
+
@change_settings("System Settings", {"float_precision": 3, "currency_precision": 2})
def test_transfer_invariants(self):
"""Extact stock value should be transferred."""
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
index ce08615..06fd5f9 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
@@ -834,6 +834,7 @@
if voucher_detail_no != row.name:
continue
+ val_rate = 0.0
current_qty = 0.0
if row.current_serial_and_batch_bundle:
current_qty = self.get_current_qty_for_serial_or_batch(row)
@@ -843,7 +844,6 @@
row.warehouse,
self.posting_date,
self.posting_time,
- voucher_no=self.name,
)
current_qty = item_dict.get("qty")
@@ -885,7 +885,7 @@
{"voucher_detail_no": row.name, "actual_qty": ("<", 0), "is_cancelled": 0},
"name",
)
- and (not row.current_serial_and_batch_bundle and not row.batch_no)
+ and (not row.current_serial_and_batch_bundle)
):
self.set_current_serial_and_batch_bundle(voucher_detail_no, save=True)
row.reload()
@@ -906,8 +906,13 @@
def has_negative_stock_allowed(self):
allow_negative_stock = cint(frappe.db.get_single_value("Stock Settings", "allow_negative_stock"))
+ if allow_negative_stock:
+ return True
- if all(d.serial_and_batch_bundle and flt(d.qty) == flt(d.current_qty) for d in self.items):
+ if any(
+ ((d.serial_and_batch_bundle or d.batch_no) and flt(d.qty) == flt(d.current_qty))
+ for d in self.items
+ ):
allow_negative_stock = True
return allow_negative_stock
diff --git a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py
index 7e03ac3..26fe8e1 100644
--- a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py
+++ b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py
@@ -7,7 +7,7 @@
from frappe import _
from frappe.model.document import Document
from frappe.query_builder.functions import Sum
-from frappe.utils import cint, flt
+from frappe.utils import cint, flt, nowdate, nowtime
from erpnext.stock.utils import get_or_make_bin, get_stock_balance
@@ -866,6 +866,8 @@
bundle = frappe.new_doc("Serial and Batch Bundle")
bundle.type_of_transaction = "Outward"
bundle.voucher_type = "Delivery Note"
+ bundle.posting_date = nowdate()
+ bundle.posting_time = nowtime()
for field in ("item_code", "warehouse", "has_serial_no", "has_batch_no"):
setattr(bundle, field, sre[field])
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json
index c698283..fb8089e 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.json
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.json
@@ -424,6 +424,7 @@
},
{
"default": "1",
+ "description": "On submission of the stock transaction, system will auto create the Serial and Batch Bundle based on the Serial No / Batch fields.",
"fieldname": "use_serial_batch_fields",
"fieldtype": "Check",
"label": "Use Serial / Batch Fields"
@@ -434,7 +435,7 @@
"index_web_pages_for_search": 1,
"issingle": 1,
"links": [],
- "modified": "2024-02-04 12:01:31.931864",
+ "modified": "2024-02-24 12:50:51.740097",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Settings",
diff --git a/erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py b/erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py
index e4f657c..da958a8 100644
--- a/erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py
+++ b/erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py
@@ -5,7 +5,7 @@
import frappe
from frappe import _
from frappe.query_builder import Field
-from frappe.query_builder.functions import CombineDatetime, Min
+from frappe.query_builder.functions import Min
from frappe.utils import add_days, getdate, today
import erpnext
@@ -75,7 +75,7 @@
& (sle.company == report_filters.company)
& (sle.is_cancelled == 0)
)
- .orderby(CombineDatetime(sle.posting_date, sle.posting_time), sle.creation)
+ .orderby(sle.posting_datetime, sle.creation)
).run(as_dict=True)
for d in data:
diff --git a/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py b/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py
index 9e75201..dd79e7f 100644
--- a/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py
+++ b/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py
@@ -213,13 +213,11 @@
query = (
frappe.qb.from_(sle)
- .force_index("posting_sort_index")
.left_join(sle2)
.on(
(sle.item_code == sle2.item_code)
& (sle.warehouse == sle2.warehouse)
- & (sle.posting_date < sle2.posting_date)
- & (sle.posting_time < sle2.posting_time)
+ & (sle.posting_datetime < sle2.posting_datetime)
& (sle.name < sle2.name)
)
.select(sle.item_code, sle.warehouse, sle.qty_after_transaction, sle.company)
diff --git a/erpnext/stock/report/stock_balance/stock_balance.py b/erpnext/stock/report/stock_balance/stock_balance.py
index 2693238..500affa 100644
--- a/erpnext/stock/report/stock_balance/stock_balance.py
+++ b/erpnext/stock/report/stock_balance/stock_balance.py
@@ -8,7 +8,7 @@
import frappe
from frappe import _
from frappe.query_builder import Order
-from frappe.query_builder.functions import Coalesce, CombineDatetime
+from frappe.query_builder.functions import Coalesce
from frappe.utils import add_days, cint, date_diff, flt, getdate
from frappe.utils.nestedset import get_descendants_of
@@ -300,7 +300,7 @@
item_table.item_name,
)
.where((sle.docstatus < 2) & (sle.is_cancelled == 0))
- .orderby(CombineDatetime(sle.posting_date, sle.posting_time))
+ .orderby(sle.posting_datetime)
.orderby(sle.creation)
.orderby(sle.actual_qty)
)
diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.js b/erpnext/stock/report/stock_ledger/stock_ledger.js
index b00b422..2ec757b 100644
--- a/erpnext/stock/report/stock_ledger/stock_ledger.js
+++ b/erpnext/stock/report/stock_ledger/stock_ledger.js
@@ -91,6 +91,12 @@
"options": "Currency\nFloat",
"default": "Currency"
},
+ {
+ "fieldname": "segregate_serial_batch_bundle",
+ "label": __("Segregate Serial / Batch Bundle"),
+ "fieldtype": "Check",
+ "default": 0
+ }
],
"formatter": function (value, row, column, data, default_formatter) {
value = default_formatter(value, row, column, data);
diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py
index 86af9e9..d859f4e 100644
--- a/erpnext/stock/report/stock_ledger/stock_ledger.py
+++ b/erpnext/stock/report/stock_ledger/stock_ledger.py
@@ -2,6 +2,8 @@
# License: GNU General Public License v3. See license.txt
+import copy
+
import frappe
from frappe import _
from frappe.query_builder.functions import CombineDatetime
@@ -26,6 +28,10 @@
item_details = get_item_details(items, sl_entries, include_uom)
opening_row = get_opening_balance(filters, columns, sl_entries)
precision = cint(frappe.db.get_single_value("System Settings", "float_precision"))
+ bundle_details = {}
+
+ if filters.get("segregate_serial_batch_bundle"):
+ bundle_details = get_serial_batch_bundle_details(sl_entries)
data = []
conversion_factors = []
@@ -45,6 +51,9 @@
item_detail = item_details[sle.item_code]
sle.update(item_detail)
+ if bundle_info := bundle_details.get(sle.serial_and_batch_bundle):
+ data.extend(get_segregated_bundle_entries(sle, bundle_info))
+ continue
if filters.get("batch_no") or inventory_dimension_filters_applied:
actual_qty += flt(sle.actual_qty, precision)
@@ -76,6 +85,60 @@
return columns, data
+def get_segregated_bundle_entries(sle, bundle_details):
+ segregated_entries = []
+ qty_before_transaction = sle.qty_after_transaction - sle.actual_qty
+ stock_value_before_transaction = sle.stock_value - sle.stock_value_difference
+
+ for row in bundle_details:
+ new_sle = copy.deepcopy(sle)
+ new_sle.update(row)
+
+ new_sle.update(
+ {
+ "in_out_rate": flt(new_sle.stock_value_difference / row.qty) if row.qty else 0,
+ "in_qty": row.qty if row.qty > 0 else 0,
+ "out_qty": row.qty if row.qty < 0 else 0,
+ "qty_after_transaction": qty_before_transaction + row.qty,
+ "stock_value": stock_value_before_transaction + new_sle.stock_value_difference,
+ "incoming_rate": row.incoming_rate if row.qty > 0 else 0,
+ }
+ )
+
+ qty_before_transaction += row.qty
+ stock_value_before_transaction += new_sle.stock_value_difference
+
+ new_sle.valuation_rate = (
+ stock_value_before_transaction / qty_before_transaction if qty_before_transaction else 0
+ )
+
+ segregated_entries.append(new_sle)
+
+ return segregated_entries
+
+
+def get_serial_batch_bundle_details(sl_entries):
+ bundle_details = []
+ for sle in sl_entries:
+ if sle.serial_and_batch_bundle:
+ bundle_details.append(sle.serial_and_batch_bundle)
+
+ if not bundle_details:
+ return frappe._dict({})
+
+ _bundle_details = frappe._dict({})
+ batch_entries = frappe.get_all(
+ "Serial and Batch Entry",
+ filters={"parent": ("in", bundle_details)},
+ fields=["parent", "qty", "incoming_rate", "stock_value_difference", "batch_no", "serial_no"],
+ order_by="parent, idx",
+ )
+ for entry in batch_entries:
+ _bundle_details.setdefault(entry.parent, []).append(entry)
+
+ return _bundle_details
+
+
def update_available_serial_nos(available_serial_nos, sle):
serial_nos = get_serial_nos(sle.serial_no)
key = (sle.item_code, sle.warehouse)
@@ -256,7 +319,6 @@
"options": "Serial and Batch Bundle",
"width": 100,
},
- {"label": _("Balance Serial No"), "fieldname": "balance_serial_no", "width": 100},
{
"label": _("Project"),
"fieldname": "project",
@@ -283,7 +345,7 @@
frappe.qb.from_(sle)
.select(
sle.item_code,
- CombineDatetime(sle.posting_date, sle.posting_time).as_("date"),
+ sle.posting_datetime.as_("date"),
sle.warehouse,
sle.posting_date,
sle.posting_time,
diff --git a/erpnext/stock/serial_batch_bundle.py b/erpnext/stock/serial_batch_bundle.py
index d8b5b34..52c5b00 100644
--- a/erpnext/stock/serial_batch_bundle.py
+++ b/erpnext/stock/serial_batch_bundle.py
@@ -5,7 +5,7 @@
from frappe import _, bold
from frappe.model.naming import make_autoname
from frappe.query_builder.functions import CombineDatetime, Sum
-from frappe.utils import cint, flt, get_link_to_form, now, nowtime, today
+from frappe.utils import cint, cstr, flt, get_link_to_form, now, nowtime, today
from erpnext.stock.deprecated_serial_batch import (
DeprecatedBatchNoValuation,
@@ -138,9 +138,17 @@
self.child_doctype, self.sle.voucher_detail_no, "rejected_serial_and_batch_bundle", sn_doc.name
)
else:
- frappe.db.set_value(
- self.child_doctype, self.sle.voucher_detail_no, "serial_and_batch_bundle", sn_doc.name
- )
+ values_to_update = {
+ "serial_and_batch_bundle": sn_doc.name,
+ }
+
+ if frappe.db.get_single_value("Stock Settings", "use_serial_batch_fields"):
+ if sn_doc.has_serial_no:
+ values_to_update["serial_no"] = ",".join(cstr(d.serial_no) for d in sn_doc.entries)
+ elif sn_doc.has_batch_no and len(sn_doc.entries) == 1:
+ values_to_update["batch_no"] = sn_doc.entries[0].batch_no
+
+ frappe.db.set_value(self.child_doctype, self.sle.voucher_detail_no, values_to_update)
@property
def child_doctype(self):
@@ -905,8 +913,6 @@
self.batches = get_available_batches(kwargs)
def set_auto_serial_batch_entries_for_inward(self):
- print(self.get("serial_nos"))
-
if (self.get("batches") and self.has_batch_no) or (
self.get("serial_nos") and self.has_serial_no
):
diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py
index d0815c9..2ae6c19 100644
--- a/erpnext/stock/stock_ledger.py
+++ b/erpnext/stock/stock_ledger.py
@@ -9,7 +9,7 @@
import frappe
from frappe import _, scrub
from frappe.model.meta import get_field_precision
-from frappe.query_builder.functions import CombineDatetime, Sum
+from frappe.query_builder.functions import Sum
from frappe.utils import (
cint,
cstr,
@@ -33,6 +33,7 @@
get_sre_reserved_serial_nos_details,
)
from erpnext.stock.utils import (
+ get_combine_datetime,
get_incoming_outgoing_rate_for_cancel,
get_incoming_rate,
get_or_make_bin,
@@ -95,6 +96,7 @@
sle_doc = make_entry(sle, allow_negative_stock, via_landed_cost_voucher)
args = sle_doc.as_dict()
+ args["posting_datetime"] = get_combine_datetime(args.posting_date, args.posting_time)
if sle.get("voucher_type") == "Stock Reconciliation":
# preserve previous_qty_after_transaction for qty reposting
@@ -616,12 +618,14 @@
self.process_sle(sle)
def get_sle_against_current_voucher(self):
- self.args["time_format"] = "%H:%i:%s"
+ self.args["posting_datetime"] = get_combine_datetime(
+ self.args.posting_date, self.args.posting_time
+ )
return frappe.db.sql(
"""
select
- *, timestamp(posting_date, posting_time) as "timestamp"
+ *, posting_datetime as "timestamp"
from
`tabStock Ledger Entry`
where
@@ -629,8 +633,7 @@
and warehouse = %(warehouse)s
and is_cancelled = 0
and (
- posting_date = %(posting_date)s and
- time_format(posting_time, %(time_format)s) = time_format(%(posting_time)s, %(time_format)s)
+ posting_datetime = %(posting_datetime)s
)
order by
creation ASC
@@ -1399,11 +1402,11 @@
def get_previous_sle_of_current_voucher(args, operator="<", exclude_current_voucher=False):
"""get stock ledger entries filtered by specific posting datetime conditions"""
- args["time_format"] = "%H:%i:%s"
if not args.get("posting_date"):
- args["posting_date"] = "1900-01-01"
- if not args.get("posting_time"):
- args["posting_time"] = "00:00"
+ args["posting_datetime"] = "1900-01-01 00:00:00"
+
+ if not args.get("posting_datetime"):
+ args["posting_datetime"] = get_combine_datetime(args["posting_date"], args["posting_time"])
voucher_condition = ""
if exclude_current_voucher:
@@ -1412,23 +1415,20 @@
sle = frappe.db.sql(
"""
- select *, timestamp(posting_date, posting_time) as "timestamp"
+ select *, posting_datetime as "timestamp"
from `tabStock Ledger Entry`
where item_code = %(item_code)s
and warehouse = %(warehouse)s
and is_cancelled = 0
{voucher_condition}
and (
- posting_date < %(posting_date)s or
- (
- posting_date = %(posting_date)s and
- time_format(posting_time, %(time_format)s) {operator} time_format(%(posting_time)s, %(time_format)s)
- )
+ posting_datetime {operator} %(posting_datetime)s
)
- order by timestamp(posting_date, posting_time) desc, creation desc
+ order by posting_datetime desc, creation desc
limit 1
for update""".format(
- operator=operator, voucher_condition=voucher_condition
+ operator=operator,
+ voucher_condition=voucher_condition,
),
args,
as_dict=1,
@@ -1469,9 +1469,7 @@
extra_cond=None,
):
"""get stock ledger entries filtered by specific posting datetime conditions"""
- conditions = " and timestamp(posting_date, posting_time) {0} timestamp(%(posting_date)s, %(posting_time)s)".format(
- operator
- )
+ conditions = " and posting_datetime {0} %(posting_datetime)s".format(operator)
if previous_sle.get("warehouse"):
conditions += " and warehouse = %(warehouse)s"
elif previous_sle.get("warehouse_condition"):
@@ -1497,9 +1495,11 @@
)
if not previous_sle.get("posting_date"):
- previous_sle["posting_date"] = "1900-01-01"
- if not previous_sle.get("posting_time"):
- previous_sle["posting_time"] = "00:00"
+ previous_sle["posting_datetime"] = "1900-01-01 00:00:00"
+ else:
+ previous_sle["posting_datetime"] = get_combine_datetime(
+ previous_sle["posting_date"], previous_sle["posting_time"]
+ )
if operator in (">", "<=") and previous_sle.get("name"):
conditions += " and name!=%(name)s"
@@ -1509,12 +1509,12 @@
return frappe.db.sql(
"""
- select *, timestamp(posting_date, posting_time) as "timestamp"
+ select *, posting_datetime as "timestamp"
from `tabStock Ledger Entry`
where item_code = %%(item_code)s
and is_cancelled = 0
%(conditions)s
- order by timestamp(posting_date, posting_time) %(order)s, creation %(order)s
+ order by posting_datetime %(order)s, creation %(order)s
%(limit)s %(for_update)s"""
% {
"conditions": conditions,
@@ -1540,7 +1540,7 @@
"posting_date",
"posting_time",
"voucher_detail_no",
- "timestamp(posting_date, posting_time) as timestamp",
+ "posting_datetime as timestamp",
],
as_dict=1,
)
@@ -1552,13 +1552,10 @@
sle = frappe.qb.DocType("Stock Ledger Entry")
- timestamp_condition = CombineDatetime(sle.posting_date, sle.posting_time) < CombineDatetime(
- posting_date, posting_time
- )
+ timestamp_condition = sle.posting_datetime < get_combine_datetime(posting_date, posting_time)
if creation:
timestamp_condition |= (
- CombineDatetime(sle.posting_date, sle.posting_time)
- == CombineDatetime(posting_date, posting_time)
+ sle.posting_datetime == get_combine_datetime(posting_date, posting_time)
) & (sle.creation < creation)
batch_details = (
@@ -1639,7 +1636,7 @@
AND valuation_rate >= 0
AND is_cancelled = 0
AND NOT (voucher_no = %s AND voucher_type = %s)
- order by posting_date desc, posting_time desc, name desc limit 1""",
+ order by posting_datetime desc, name desc limit 1""",
(item_code, warehouse, voucher_no, voucher_type),
):
return flt(last_valuation_rate[0][0])
@@ -1698,7 +1695,7 @@
datetime_limit_condition = ""
qty_shift = args.actual_qty
- args["time_format"] = "%H:%i:%s"
+ args["posting_datetime"] = get_combine_datetime(args["posting_date"], args["posting_time"])
# find difference/shift in qty caused by stock reconciliation
if args.voucher_type == "Stock Reconciliation":
@@ -1708,8 +1705,6 @@
next_stock_reco_detail = get_next_stock_reco(args)
if next_stock_reco_detail:
detail = next_stock_reco_detail[0]
-
- # add condition to update SLEs before this date & time
datetime_limit_condition = get_datetime_limit_condition(detail)
frappe.db.sql(
@@ -1722,13 +1717,9 @@
and voucher_no != %(voucher_no)s
and is_cancelled = 0
and (
- posting_date > %(posting_date)s or
- (
- posting_date = %(posting_date)s and
- time_format(posting_time, %(time_format)s) > time_format(%(posting_time)s, %(time_format)s)
- )
+ posting_datetime > %(posting_datetime)s
)
- {datetime_limit_condition}
+ {datetime_limit_condition}
""",
args,
)
@@ -1785,20 +1776,11 @@
& (sle.voucher_no != kwargs.get("voucher_no"))
& (sle.is_cancelled == 0)
& (
- (
- CombineDatetime(sle.posting_date, sle.posting_time)
- > CombineDatetime(kwargs.get("posting_date"), kwargs.get("posting_time"))
- )
- | (
- (
- CombineDatetime(sle.posting_date, sle.posting_time)
- == CombineDatetime(kwargs.get("posting_date"), kwargs.get("posting_time"))
- )
- & (sle.creation > kwargs.get("creation"))
- )
+ sle.posting_datetime
+ >= get_combine_datetime(kwargs.get("posting_date"), kwargs.get("posting_time"))
)
)
- .orderby(CombineDatetime(sle.posting_date, sle.posting_time))
+ .orderby(sle.posting_datetime)
.orderby(sle.creation)
.limit(1)
)
@@ -1810,11 +1792,13 @@
def get_datetime_limit_condition(detail):
+ posting_datetime = get_combine_datetime(detail.posting_date, detail.posting_time)
+
return f"""
and
- (timestamp(posting_date, posting_time) < timestamp('{detail.posting_date}', '{detail.posting_time}')
+ (posting_datetime < '{posting_datetime}'
or (
- timestamp(posting_date, posting_time) = timestamp('{detail.posting_date}', '{detail.posting_time}')
+ posting_datetime = '{posting_datetime}'
and creation < '{detail.creation}'
)
)"""
@@ -1888,10 +1872,10 @@
item_code = %(item_code)s
and warehouse = %(warehouse)s
and voucher_no != %(voucher_no)s
- and timestamp(posting_date, posting_time) >= timestamp(%(posting_date)s, %(posting_time)s)
+ and posting_datetime >= %(posting_datetime)s
and is_cancelled = 0
and qty_after_transaction < 0
- order by timestamp(posting_date, posting_time) asc
+ order by posting_datetime asc
limit 1
""",
args,
@@ -1904,20 +1888,20 @@
"""
with batch_ledger as (
select
- posting_date, posting_time, voucher_type, voucher_no,
- sum(actual_qty) over (order by posting_date, posting_time, creation) as cumulative_total
+ posting_date, posting_time, posting_datetime, voucher_type, voucher_no,
+ sum(actual_qty) over (order by posting_datetime, creation) as cumulative_total
from `tabStock Ledger Entry`
where
item_code = %(item_code)s
and warehouse = %(warehouse)s
and batch_no=%(batch_no)s
and is_cancelled = 0
- order by posting_date, posting_time, creation
+ order by posting_datetime, creation
)
select * from batch_ledger
where
cumulative_total < 0.0
- and timestamp(posting_date, posting_time) >= timestamp(%(posting_date)s, %(posting_time)s)
+ and posting_datetime >= %(posting_datetime)s
limit 1
""",
args,
@@ -2059,6 +2043,7 @@
def get_stock_value_difference(item_code, warehouse, posting_date, posting_time, voucher_no=None):
table = frappe.qb.DocType("Stock Ledger Entry")
+ posting_datetime = get_combine_datetime(posting_date, posting_time)
query = (
frappe.qb.from_(table)
@@ -2067,10 +2052,7 @@
(table.is_cancelled == 0)
& (table.item_code == item_code)
& (table.warehouse == warehouse)
- & (
- (table.posting_date < posting_date)
- | ((table.posting_date == posting_date) & (table.posting_time <= posting_time))
- )
+ & (table.posting_datetime <= posting_datetime)
)
)
diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py
index 9eac172..93e2fa4 100644
--- a/erpnext/stock/utils.py
+++ b/erpnext/stock/utils.py
@@ -8,7 +8,7 @@
import frappe
from frappe import _
from frappe.query_builder.functions import CombineDatetime, IfNull, Sum
-from frappe.utils import cstr, flt, get_link_to_form, nowdate, nowtime
+from frappe.utils import cstr, flt, get_link_to_form, get_time, getdate, nowdate, nowtime
import erpnext
from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import (
@@ -262,7 +262,7 @@
item_code=args.get("item_code"),
)
- in_rate = sn_obj.get_incoming_rate()
+ return sn_obj.get_incoming_rate()
elif item_details and item_details.has_batch_no and args.get("serial_and_batch_bundle"):
args.actual_qty = args.qty
@@ -272,23 +272,33 @@
item_code=args.get("item_code"),
)
- in_rate = batch_obj.get_incoming_rate()
+ return batch_obj.get_incoming_rate()
elif (args.get("serial_no") or "").strip() and not args.get("serial_and_batch_bundle"):
- in_rate = get_avg_purchase_rate(args.get("serial_no"))
+ args.actual_qty = args.qty
+ args.serial_nos = get_serial_nos_data(args.get("serial_no"))
+
+ sn_obj = SerialNoValuation(
+ sle=args, warehouse=args.get("warehouse"), item_code=args.get("item_code")
+ )
+
+ return sn_obj.get_incoming_rate()
elif (
args.get("batch_no")
and frappe.db.get_value("Batch", args.get("batch_no"), "use_batchwise_valuation", cache=True)
and not args.get("serial_and_batch_bundle")
):
- in_rate = get_batch_incoming_rate(
- item_code=args.get("item_code"),
+
+ args.actual_qty = args.qty
+ args.batch_nos = frappe._dict({args.batch_no: args})
+
+ batch_obj = BatchNoValuation(
+ sle=args,
warehouse=args.get("warehouse"),
- batch_no=args.get("batch_no"),
- posting_date=args.get("posting_date"),
- posting_time=args.get("posting_time"),
+ item_code=args.get("item_code"),
)
+ return batch_obj.get_incoming_rate()
else:
valuation_method = get_valuation_method(args.get("item_code"))
previous_sle = get_previous_sle(args)
@@ -647,3 +657,18 @@
):
scan_result.update(item_info)
return scan_result
+
+
+def get_combine_datetime(posting_date, posting_time):
+ import datetime
+
+ if isinstance(posting_date, str):
+ posting_date = getdate(posting_date)
+
+ if isinstance(posting_time, str):
+ posting_time = get_time(posting_time)
+
+ if isinstance(posting_time, datetime.timedelta):
+ posting_time = (datetime.datetime.min + posting_time).time()
+
+ return datetime.datetime.combine(posting_date, posting_time).replace(microsecond=0)
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py b/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
index 5523c31..0450038 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
@@ -643,10 +643,6 @@
)
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()