CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-22 19:55:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: millisecond issue for posting datetime

Browse Source 
(cherry picked from commit ac9e5c0163)

# Conflicts:
#	erpnext/patches.txt
#	erpnext/stock/utils.py
This commit is contained in:
Rohit Waghchaure
2025-02-18 13:56:00 +05:30
committed by Mergify
parent 20709f1b3e
commit 42923656ee
3 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/patches.txt
View File

@@ -392,4 +392,8 @@ erpnext.patches.v15_0.migrate_checkbox_to_select_for_reconciliation_effect
erpnext.patches.v15_0.sync_auto_reconcile_config erpnext.patches.v15_0.sync_auto_reconcile_config
execute:frappe.db.set_single_value("Accounts Settings", "exchange_gain_loss_posting_date", "Payment") execute:frappe.db.set_single_value("Accounts Settings", "exchange_gain_loss_posting_date", "Payment")
erpnext.patches.v14_0.disable_add_row_in_gross_profit erpnext.patches.v14_0.disable_add_row_in_gross_profit
<<<<<<< HEAD
erpnext.patches.v15_0.set_difference_amount_in_asset_value_adjustment erpnext.patches.v15_0.set_difference_amount_in_asset_value_adjustment
=======
erpnext.patches.v14_0.update_posting_datetime
>>>>>>> ac9e5c0163 (fix: millisecond issue for posting datetime)

10
erpnext/patches/v14_0/update_posting_datetime.py Normal file
View File

@@ -0,0 +1,10 @@
import frappe
def execute():
frappe.db.sql(
"""
UPDATE `tabStock Ledger Entry`
SET posting_datetime = timestamp(posting_date, posting_time)
"""
)

27
erpnext/stock/utils.py
View File

@@ -663,4 +663,31 @@ def get_combine_datetime(posting_date, posting_time):
if isinstance(posting_time, datetime.timedelta): if isinstance(posting_time, datetime.timedelta):
posting_time = (datetime.datetime.min + posting_time).time() posting_time = (datetime.datetime.min + posting_time).time()
<<<<<<< HEAD
return datetime.datetime.combine(posting_date, posting_time).replace(microsecond=0) return datetime.datetime.combine(posting_date, posting_time).replace(microsecond=0)
=======
return datetime.datetime.combine(posting_date, posting_time)
@frappe.request_cache
def get_default_stock_uom() -> str | None:
if default_uom := frappe.get_cached_value("Stock Settings", None, "stock_uom"):
return default_uom
acceptable_default_uoms = dict.fromkeys(
(
"Nos",
# In the past, we used to create translated UOMs during initial setup.
# These could either be in the system language...
_("Nos", frappe.get_system_settings("language")),
# or the current user's language
_("Nos"),
)
)
available_default_uoms = frappe.db.get_values(
"UOM", {"name": ("in", tuple(acceptable_default_uoms))}, pluck="name"
)
return next((uom for uom in acceptable_default_uoms if uom in available_default_uoms), None)
>>>>>>> ac9e5c0163 (fix: millisecond issue for posting datetime)