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

Merge branch 'version-13' into version-13-hotfix

Browse Source
This commit is contained in:
Deepesh Garg
2023-01-03 22:22:12 +05:30
committed by GitHub
parent 865f233add d97e673874
commit 208d541373
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@@ -4,7 +4,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
__version__ = "13.36.1" __version__ = "13.42.7"
def get_default_company(user=None): def get_default_company(user=None):

13
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@@ -9,7 +9,18 @@ import frappe
from frappe import _ from frappe import _
from frappe.model.mapper import get_mapped_doc from frappe.model.mapper import get_mapped_doc
from frappe.query_builder.functions import Sum from frappe.query_builder.functions import Sum
from frappe.utils import cint, comma_or, cstr, flt, format_time, formatdate, getdate, nowdate from frappe.utils import (
add_days,
cint,
comma_or,
cstr,
flt,
format_time,
formatdate,
getdate,
nowdate,
today,
)
from six import iteritems, itervalues, string_types from six import iteritems, itervalues, string_types
import erpnext import erpnext