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

Merge branch 'version-15' into version-15-hotfix

Browse Source
This commit is contained in:
ruthra kumar
2024-06-19 11:02:14 +05:30
committed by GitHub
parent c110a9f2ad 9ccfbe1bf5
commit e3608f285f
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@@ -3,7 +3,7 @@ import inspect
import frappe import frappe
__version__ = "15.22.2" __version__ = "15.27.6"
def get_default_company(user=None): def get_default_company(user=None):

2
erpnext/accounts/doctype/accounts_settings/accounts_settings.json
View File

@@ -469,7 +469,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2024-03-15 12:11:36.085158", "modified": "2024-05-11 23:19:44.673975",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Accounts Settings", "name": "Accounts Settings",

1
erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
View File

@@ -2961,7 +2961,6 @@ class TestPurchaseReceipt(FrappeTestCase):
self.assertSequenceEqual(expected_gle, gl_entries) self.assertSequenceEqual(expected_gle, gl_entries)
frappe.local.enable_perpetual_inventory["_Test Company"] = old_perpetual_inventory frappe.local.enable_perpetual_inventory["_Test Company"] = old_perpetual_inventory
def prepare_data_for_internal_transfer(): def prepare_data_for_internal_transfer():
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_internal_supplier from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_internal_supplier
from erpnext.selling.doctype.customer.test_customer import create_internal_customer from erpnext.selling.doctype.customer.test_customer import create_internal_customer