nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-03 16:40:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5538 from rohitwaghchaure/time_sheet_wages

Browse Source 
[Enhancement] Time log wages and multiple active salary structure
This commit is contained in:
Rushabh Mehta
2016-06-27 17:13:48 +05:30
committed by GitHub
parent 3be51643cc d6c986da8f
commit 822209cb03
97 changed files with 3112 additions and 2670 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/setup/doctype/company/delete_company_transactions.py
View File

@@ -18,7 +18,7 @@ def delete_company_transactions(company_name):
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 @@ def delete_bins(company_name):
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):

2
erpnext/setup/setup_wizard/domainify.py
View File

@@ -43,7 +43,7 @@ domains = {
},
'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': [