[Enhancement] Time log wages and multiple active salary structure
diff --git a/erpnext/setup/doctype/company/delete_company_transactions.py b/erpnext/setup/doctype/company/delete_company_transactions.py
index a78898f..7b3326b 100644
--- a/erpnext/setup/doctype/company/delete_company_transactions.py
+++ b/erpnext/setup/doctype/company/delete_company_transactions.py
@@ -18,7 +18,7 @@
frappe.PermissionError)
delete_bins(company_name)
- delete_time_logs(company_name)
+ delete_time_sheets(company_name)
delete_lead_addresses(company_name)
for doctype in frappe.db.sql_list("""select parent from
@@ -70,21 +70,12 @@
frappe.db.sql("""delete from tabBin where warehouse in
(select name from tabWarehouse where company=%s)""", company_name)
-def delete_time_logs(company_name):
+def delete_time_sheets(company_name):
# Delete Time Logs as it is linked to Production Order / Project / Task, which are linked to company
frappe.db.sql("""
- delete from `tabTime Log`
+ delete from `tabTime Sheet`
where
- (ifnull(project, '') != ''
- and exists(select name from `tabProject` where name=`tabTime Log`.project and company=%(company)s))
- or (ifnull(task, '') != ''
- and exists(select name from `tabTask` where name=`tabTime Log`.task and company=%(company)s))
- or (ifnull(production_order, '') != ''
- and exists(select name from `tabProduction Order`
- where name=`tabTime Log`.production_order and company=%(company)s))
- or (ifnull(sales_invoice, '') != ''
- and exists(select name from `tabSales Invoice`
- where name=`tabTime Log`.sales_invoice and company=%(company)s))
+ company=%(company)s
""", {"company": company_name})
def delete_lead_addresses(company_name):
diff --git a/erpnext/setup/setup_wizard/domainify.py b/erpnext/setup/setup_wizard/domainify.py
index f77b05d..f4cc35a 100644
--- a/erpnext/setup/setup_wizard/domainify.py
+++ b/erpnext/setup/setup_wizard/domainify.py
@@ -43,7 +43,7 @@
},
'Services': {
- 'desktop_icons': ['Project', 'Time Log', 'Customer', 'Sales Order', 'Sales Invoice', 'Lead', 'Opportunity',
+ 'desktop_icons': ['Project', 'Time Sheet', 'Customer', 'Sales Order', 'Sales Invoice', 'Lead', 'Opportunity',
'Expense Claim', 'Employee', 'HR', 'ToDo'],
'remove_roles': ['Manufacturing User', 'Manufacturing Manager'],
'properties': [