nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-07 07:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50594 from frappe/version-14-hotfix

Browse Source
This commit is contained in:
Diptanil Saha
2025-11-18 18:37:55 +05:30
committed by GitHub
parent 457a81123b e6f505ef81
commit cd437b5a26
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
View File

@@ -449,7 +449,7 @@ def send_auto_email():
selected = frappe.get_list( selected = frappe.get_list(
"Process Statement Of Accounts", "Process Statement Of Accounts",
filters={"enable_auto_email": 1}, filters={"enable_auto_email": 1},
or_filters={"to_date": format_date(today()), "posting_date": format_date(today())}, or_filters={"to_date": today(), "posting_date": today()},
) )
for entry in selected: for entry in selected:
send_emails(entry.name, from_scheduler=True) send_emails(entry.name, from_scheduler=True)

17
erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
View File

@@ -13,7 +13,7 @@ from erpnext.controllers.stock_controller import StockController
from erpnext.stock.doctype.batch.batch import get_batch_qty from erpnext.stock.doctype.batch.batch import get_batch_qty
from erpnext.stock.doctype.inventory_dimension.inventory_dimension import get_inventory_dimensions from erpnext.stock.doctype.inventory_dimension.inventory_dimension import get_inventory_dimensions
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
from erpnext.stock.utils import get_stock_balance from erpnext.stock.utils import get_combine_datetime, get_stock_balance
class OpeningEntryAccountError(frappe.ValidationError): class OpeningEntryAccountError(frappe.ValidationError):
@@ -646,6 +646,7 @@ class StockReconciliation(StockController):
self.posting_date, self.posting_date,
self.posting_time, self.posting_time,
self.name, self.name,
sle_creation,
) )
precesion = row.precision("current_qty") precesion = row.precision("current_qty")
@@ -705,8 +706,11 @@ class StockReconciliation(StockController):
return allow_negative_stock return allow_negative_stock
def get_batch_qty_for_stock_reco(item_code, warehouse, batch_no, posting_date, posting_time, voucher_no): def get_batch_qty_for_stock_reco(
item_code, warehouse, batch_no, posting_date, posting_time, voucher_no, sle_creation
):
ledger = frappe.qb.DocType("Stock Ledger Entry") ledger = frappe.qb.DocType("Stock Ledger Entry")
posting_datetime = get_combine_datetime(posting_date, posting_time)
query = ( query = (
frappe.qb.from_(ledger) frappe.qb.from_(ledger)
@@ -719,12 +723,11 @@ def get_batch_qty_for_stock_reco(item_code, warehouse, batch_no, posting_date, p
& (ledger.docstatus == 1) & (ledger.docstatus == 1)
& (ledger.is_cancelled == 0) & (ledger.is_cancelled == 0)
& (ledger.batch_no == batch_no) & (ledger.batch_no == batch_no)
& (ledger.posting_date <= posting_date)
& (
CombineDatetime(ledger.posting_date, ledger.posting_time)
<= CombineDatetime(posting_date, posting_time)
)
& (ledger.voucher_no != voucher_no) & (ledger.voucher_no != voucher_no)
& (
(ledger.posting_datetime < posting_datetime)
| ((ledger.posting_datetime == posting_datetime) & (ledger.creation < sle_creation))
)
) )
.groupby(ledger.batch_no) .groupby(ledger.batch_no)
) )