nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-20 21:49:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-02-18 20:10:30 +05:30
committed by GitHub
parent 42923656ee
commit 050bb1eef5
1 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
erpnext/stock/utils.py
View File

@@ -663,31 +663,4 @@ 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) 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)