mirror of
https://github.com/frappe/erpnext.git
synced 2026-09-02 08:03:21 +00:00
chore: whitespace cleanup from codebase
This commit is contained in:
@@ -1 +1 @@
|
||||
cur_frm.add_fetch('employee', 'employee_name', 'employee_name');
|
||||
cur_frm.add_fetch('employee', 'employee_name', 'employee_name');
|
||||
|
||||
@@ -13,7 +13,7 @@ class ActivityCost(Document):
|
||||
def validate(self):
|
||||
self.set_title()
|
||||
self.check_unique()
|
||||
|
||||
|
||||
def set_title(self):
|
||||
if self.employee:
|
||||
if not self.employee_name:
|
||||
|
||||
@@ -22,4 +22,4 @@ class TestActivityCost(unittest.TestCase):
|
||||
activity_cost1.insert()
|
||||
activity_cost2 = frappe.copy_doc(activity_cost1)
|
||||
self.assertRaises(DuplicationError, activity_cost2.insert )
|
||||
frappe.db.sql("delete from `tabActivity Cost`")
|
||||
frappe.db.sql("delete from `tabActivity Cost`")
|
||||
|
||||
@@ -5,4 +5,4 @@ from __future__ import unicode_literals
|
||||
from frappe.model.document import Document
|
||||
|
||||
class ActivityType(Document):
|
||||
pass
|
||||
pass
|
||||
|
||||
@@ -4,4 +4,4 @@ from __future__ import unicode_literals
|
||||
|
||||
|
||||
import frappe
|
||||
test_records = frappe.get_test_records('Activity Type')
|
||||
test_records = frappe.get_test_records('Activity Type')
|
||||
|
||||
@@ -23,4 +23,4 @@
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
{% endfor %}
|
||||
|
||||
@@ -22,7 +22,7 @@ class ProjectTemplate(Document):
|
||||
task_details_format = get_link_to_form("Task",task_details.name)
|
||||
dependency_task_format = get_link_to_form("Task", dependency_task.task)
|
||||
frappe.throw(_("Task {0} depends on Task {1}. Please add Task {1} to the Tasks list.").format(frappe.bold(task_details_format), frappe.bold(dependency_task_format)))
|
||||
|
||||
|
||||
def check_dependent_task_presence(self, task):
|
||||
for task_details in self.tasks:
|
||||
if task_details.task == task:
|
||||
|
||||
@@ -26,4 +26,4 @@ def make_project_template(project_template_name, project_tasks=[]):
|
||||
})
|
||||
doc.insert()
|
||||
|
||||
return frappe.get_doc('Project Template', project_template_name)
|
||||
return frappe.get_doc('Project Template', project_template_name)
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
|
||||
frappe.ui.form.on('Project Type', {
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
@@ -10,4 +10,4 @@ from frappe import _
|
||||
class ProjectType(Document):
|
||||
def on_trash(self):
|
||||
if self.name == "External":
|
||||
frappe.throw(_("You cannot delete Project Type 'External'"))
|
||||
frappe.throw(_("You cannot delete Project Type 'External'"))
|
||||
|
||||
@@ -39,4 +39,4 @@ def email_sending(project_name,frequency,date_start,date_end,progress,number_of_
|
||||
for emails in email:
|
||||
frappe.sendmail(recipients=emails,subject=frappe._(project_name + ' ' + 'Summary'),message = msg)
|
||||
else:
|
||||
pass
|
||||
pass
|
||||
|
||||
@@ -10,4 +10,4 @@ class TestProjectUpdate(unittest.TestCase):
|
||||
pass
|
||||
|
||||
test_records = frappe.get_test_records('Project Update')
|
||||
test_ignore = ["Sales Order"]
|
||||
test_ignore = ["Sales Order"]
|
||||
|
||||
@@ -81,4 +81,4 @@ frappe.treeview_settings['Task'] = {
|
||||
}
|
||||
],
|
||||
extend_toolbar: true
|
||||
};
|
||||
};
|
||||
|
||||
@@ -20,4 +20,4 @@
|
||||
.playpause {
|
||||
border-right: 1px dashed #fff;
|
||||
border-bottom: 1px dashed #fff;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -399,4 +399,4 @@ function set_project_in_timelog(frm) {
|
||||
frappe.model.set_value(item.doctype, item.name, "project", frm.doc.parent_project);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -238,9 +238,9 @@ def get_projectwise_timesheet_data(project=None, parent=None, from_time=None, to
|
||||
|
||||
@frappe.whitelist()
|
||||
def get_timesheet_detail_rate(timelog, currency):
|
||||
timelog_detail = frappe.db.sql("""SELECT tsd.billing_amount as billing_amount,
|
||||
ts.currency as currency FROM `tabTimesheet Detail` tsd
|
||||
INNER JOIN `tabTimesheet` ts ON ts.name=tsd.parent
|
||||
timelog_detail = frappe.db.sql("""SELECT tsd.billing_amount as billing_amount,
|
||||
ts.currency as currency FROM `tabTimesheet Detail` tsd
|
||||
INNER JOIN `tabTimesheet` ts ON ts.name=tsd.parent
|
||||
WHERE tsd.name = '{0}'""".format(timelog), as_dict = 1)[0]
|
||||
|
||||
if timelog_detail.currency:
|
||||
|
||||
@@ -9,8 +9,8 @@ frappe.views.calendar["Timesheet"] = {
|
||||
"title": "title"
|
||||
},
|
||||
style_map: {
|
||||
"0": "info",
|
||||
"1": "standard",
|
||||
"0": "info",
|
||||
"1": "standard",
|
||||
"2": "danger"
|
||||
},
|
||||
gantt: true,
|
||||
|
||||
@@ -10,4 +10,4 @@ def get_data():
|
||||
'items': ['Sales Invoice', 'Salary Slip']
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,13 +4,13 @@ frappe.listview_settings['Timesheet'] = {
|
||||
if (doc.status== "Billed") {
|
||||
return [__("Billed"), "green", "status,=," + "Billed"]
|
||||
}
|
||||
|
||||
|
||||
if (doc.status== "Payslip") {
|
||||
return [__("Payslip"), "green", "status,=," + "Payslip"]
|
||||
}
|
||||
|
||||
|
||||
if (doc.status== "Completed") {
|
||||
return [__("Completed"), "green", "status,=," + "Completed"]
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user