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

Merge branch 'develop' into e-commerce-refactor-develop

Browse Source
This commit is contained in:
Ankush Menat
2022-01-31 17:14:36 +05:30
parent b5abf68b0d f026ec6bad
commit 6cd7c47409
385 changed files with 7137 additions and 18033 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/utilities/transaction_base.py
View File

@@ -181,8 +181,6 @@ class TransactionBase(StatusUpdater):
if len(child_table_values) > 1:
self.set(default_field, None)
else:
self.set(default_field, list(child_table_values)[0])
def delete_events(ref_type, ref_name):
events = frappe.db.sql_list(""" SELECT

6
erpnext/utilities/workspace/utilities/utilities.json
View File

@@ -1,6 +1,6 @@
{
"charts": [],
"content": "[{\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Video\", \"col\": 4}}]",
"content": "[{\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Reports & Masters</b></span>\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Video\",\"col\":4}}]",
"creation": "2020-09-10 12:21:22.335307",
"docstatus": 0,
"doctype": "Workspace",
@@ -40,7 +40,7 @@
"type": "Link"
}
],
"modified": "2021-08-05 12:16:03.350805",
"modified": "2022-01-13 17:50:10.067510",
"modified_by": "Administrator",
"module": "Utilities",
"name": "Utilities",
@@ -49,7 +49,7 @@
"public": 1,
"restrict_to_domain": "",
"roles": [],
"sequence_id": 30,
"sequence_id": 30.0,
"shortcuts": [],
"title": "Utilities"
}