Skip to content

Commit b3737c8

Browse files
committed
Merge branch 'hotfix'
2 parents fba985d + 6d5a29a commit b3737c8

File tree

38 files changed

+40
-1527
lines changed

38 files changed

+40
-1527
lines changed

erpnext/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from erpnext.hooks import regional_overrides
66
from frappe.utils import getdate
77

8-
__version__ = '10.1.51'
8+
__version__ = '10.1.52'
99

1010
def get_default_company(user=None):
1111
'''Get default company for user'''

erpnext/config/desktop.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -291,14 +291,6 @@ def get_data():
291291
"label": _("Healthcare"),
292292
"hidden": 1
293293
},
294-
{
295-
"module_name": "Hub",
296-
"color": "#009248",
297-
"icon": "/assets/erpnext/images/hub_logo.svg",
298-
"type": "page",
299-
"link": "hub",
300-
"label": _("Hub")
301-
},
302294
{
303295
"module_name": "Data Import",
304296
"color": "#FFF168",

erpnext/config/hub_node.py

Lines changed: 0 additions & 24 deletions
This file was deleted.

erpnext/hr/doctype/salary_slip/salary_slip.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ var get_emp_and_leave_details = function(doc, dt, dn) {
126126
}
127127

128128
cur_frm.cscript.employee = function(doc,dt,dn){
129-
doc.salary_structure = ''
130129
get_emp_and_leave_details(doc, dt, dn);
131130
}
132131

@@ -249,4 +248,4 @@ var total_work_hours = function(frm, dt, dn) {
249248
frm.refresh_field('gross_pay');
250249
calculate_net_pay(frm.doc, dt, dn);
251250
});
252-
}
251+
}

erpnext/hub_node/__init__.py

Lines changed: 0 additions & 184 deletions
This file was deleted.

erpnext/hub_node/data_migration_mapping/__init__.py

Whitespace-only changes.

erpnext/hub_node/data_migration_mapping/company_to_hub_company/__init__.py

Whitespace-only changes.

erpnext/hub_node/data_migration_mapping/company_to_hub_company/company_to_hub_company.json

Lines changed: 0 additions & 45 deletions
This file was deleted.

erpnext/hub_node/data_migration_mapping/hub_message_to_lead/__init__.py

Lines changed: 0 additions & 29 deletions
This file was deleted.

erpnext/hub_node/data_migration_mapping/hub_message_to_lead/hub_message_to_lead.json

Lines changed: 0 additions & 31 deletions
This file was deleted.

erpnext/hub_node/data_migration_mapping/item_to_hub_item/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)