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

Changed frappe.conn to frappe.db

Browse Source
This commit is contained in:
Anand Doshi
2014-02-26 12:35:33 +05:30
parent 901f4434fd
commit e9baaa68e7
191 changed files with 1375 additions and 1375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/projects/doctype/project/project.py
View File

@@ -32,12 +32,12 @@ class DocType:
self.add_calendar_event()
def update_percent_complete(self):
total = frappe.conn.sql("""select count(*) from tabTask where project=%s""",
total = frappe.db.sql("""select count(*) from tabTask where project=%s""",
self.doc.name)[0][0]
if total:
completed = frappe.conn.sql("""select count(*) from tabTask where
completed = frappe.db.sql("""select count(*) from tabTask where
project=%s and status in ('Closed', 'Cancelled')""", self.doc.name)[0][0]
frappe.conn.set_value("Project", self.doc.name, "percent_complete",
frappe.db.set_value("Project", self.doc.name, "percent_complete",
int(float(completed) / total * 100))
def add_calendar_event(self):

8
erpnext/projects/doctype/task/task.py
View File

@@ -21,7 +21,7 @@ class DocType:
}
def get_customer_details(self):
cust = frappe.conn.sql("select customer_name from `tabCustomer` where name=%s", self.doc.customer)
cust = frappe.db.sql("select customer_name from `tabCustomer` where name=%s", self.doc.customer)
if cust:
ret = {'customer_name': cust and cust[0][0] or ''}
return ret
@@ -38,7 +38,7 @@ class DocType:
self.update_status()
def update_status(self):
status = frappe.conn.get_value("Task", self.doc.name, "status")
status = frappe.db.get_value("Task", self.doc.name, "status")
if self.doc.status=="Working" and status !="Working" and not self.doc.act_start_date:
self.doc.act_start_date = today()
@@ -66,7 +66,7 @@ def get_events(start, end, filters=None):
if filters[key]:
conditions += " and " + key + ' = "' + filters[key].replace('"', '\"') + '"'
data = frappe.conn.sql("""select name, exp_start_date, exp_end_date,
data = frappe.db.sql("""select name, exp_start_date, exp_end_date,
subject, status, project from `tabTask`
where ((exp_start_date between '%(start)s' and '%(end)s') \
or (exp_end_date between '%(start)s' and '%(end)s'))
@@ -80,7 +80,7 @@ def get_events(start, end, filters=None):
def get_project(doctype, txt, searchfield, start, page_len, filters):
from erpnext.controllers.queries import get_match_cond
return frappe.conn.sql(""" select name from `tabProject`
return frappe.db.sql(""" select name from `tabProject`
where %(key)s like "%(txt)s"
%(mcond)s
order by name

4
erpnext/projects/doctype/time_log/time_log.py
View File

@@ -38,7 +38,7 @@ class DocType:
self.doc.status="Billed"
def validate_overlap(self):
existing = frappe.conn.sql_list("""select name from `tabTime Log` where owner=%s and
existing = frappe.db.sql_list("""select name from `tabTime Log` where owner=%s and
(
(from_time between %s and %s) or
(to_time between %s and %s) or
@@ -67,7 +67,7 @@ def get_events(start, end):
frappe.msgprint(_("No Permission"), raise_exception=1)
match = build_match_conditions("Time Log")
data = frappe.conn.sql("""select name, from_time, to_time,
data = frappe.db.sql("""select name, from_time, to_time,
activity_type, task, project from `tabTime Log`
where from_time between '%(start)s' and '%(end)s' or to_time between '%(start)s' and '%(end)s'
%(match)s""" % {

6
erpnext/projects/doctype/time_log_batch/test_time_log_batch.py
View File

@@ -15,15 +15,15 @@ class TimeLogBatchTest(unittest.TestCase):
time_log.insert()
time_log.submit()
self.assertEquals(frappe.conn.get_value("Time Log", time_log.doc.name, "status"), "Submitted")
self.assertEquals(frappe.db.get_value("Time Log", time_log.doc.name, "status"), "Submitted")
tlb = frappe.bean(copy=test_records[0])
tlb.doclist[1].time_log = time_log.doc.name
tlb.insert()
tlb.submit()
self.assertEquals(frappe.conn.get_value("Time Log", time_log.doc.name, "status"), "Batched for Billing")
self.assertEquals(frappe.db.get_value("Time Log", time_log.doc.name, "status"), "Batched for Billing")
tlb.cancel()
self.assertEquals(frappe.conn.get_value("Time Log", time_log.doc.name, "status"), "Submitted")
self.assertEquals(frappe.db.get_value("Time Log", time_log.doc.name, "status"), "Submitted")
test_records = [[
{

6
erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py
View File

@@ -19,7 +19,7 @@ def execute(filters=None):
task_map = get_task_map()
conditions = build_conditions(filters)
time_logs = frappe.conn.sql("""select * from `tabTime Log`
time_logs = frappe.db.sql("""select * from `tabTime Log`
where docstatus < 2 %s order by owner asc""" % (conditions, ), filters, as_dict=1)
if time_logs:
@@ -49,7 +49,7 @@ def execute(filters=None):
return columns, data
def get_profile_map():
profiles = frappe.conn.sql("""select name,
profiles = frappe.db.sql("""select name,
concat(first_name, if(last_name, (' ' + last_name), '')) as fullname
from tabProfile""", as_dict=1)
profile_map = {}
@@ -59,7 +59,7 @@ def get_profile_map():
return profile_map
def get_task_map():
tasks = frappe.conn.sql("""select name, subject from tabTask""", as_dict=1)
tasks = frappe.db.sql("""select name, subject from tabTask""", as_dict=1)
task_map = {}
for t in tasks:
task_map.setdefault(t.name, []).append(t.subject)

10
erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py
View File

@@ -28,11 +28,11 @@ def get_columns():
"Project Start Date:Date:120", "Completion Date:Date:120"]
def get_project_details():
return frappe.conn.sql(""" select name, project_name, status, company, customer, project_value,
return frappe.db.sql(""" select name, project_name, status, company, customer, project_value,
project_start_date, completion_date from tabProject where docstatus < 2""", as_dict=1)
def get_purchased_items_cost():
pr_items = frappe.conn.sql("""select project_name, sum(base_amount) as amount
pr_items = frappe.db.sql("""select project_name, sum(base_amount) as amount
from `tabPurchase Receipt Item` where ifnull(project_name, '') != ''
and docstatus = 1 group by project_name""", as_dict=1)
@@ -43,7 +43,7 @@ def get_purchased_items_cost():
return pr_item_map
def get_issued_items_cost():
se_items = frappe.conn.sql("""select se.project_name, sum(se_item.amount) as amount
se_items = frappe.db.sql("""select se.project_name, sum(se_item.amount) as amount
from `tabStock Entry` se, `tabStock Entry Detail` se_item
where se.name = se_item.parent and se.docstatus = 1 and ifnull(se_item.t_warehouse, '') = ''
and ifnull(se.project_name, '') != '' group by se.project_name""", as_dict=1)
@@ -55,12 +55,12 @@ def get_issued_items_cost():
return se_item_map
def get_delivered_items_cost():
dn_items = frappe.conn.sql("""select dn.project_name, sum(dn_item.base_amount) as amount
dn_items = frappe.db.sql("""select dn.project_name, sum(dn_item.base_amount) as amount
from `tabDelivery Note` dn, `tabDelivery Note Item` dn_item
where dn.name = dn_item.parent and dn.docstatus = 1 and ifnull(dn.project_name, '') != ''
group by dn.project_name""", as_dict=1)
si_items = frappe.conn.sql("""select si.project_name, sum(si_item.base_amount) as amount
si_items = frappe.db.sql("""select si.project_name, sum(si_item.base_amount) as amount
from `tabSales Invoice` si, `tabSales Invoice Item` si_item
where si.name = si_item.parent and si.docstatus = 1 and ifnull(si.update_stock, 0) = 1
and ifnull(si.is_pos, 0) = 1 and ifnull(si.project_name, '') != ''

4
erpnext/projects/utils.py
View File

@@ -8,7 +8,7 @@ import frappe
@frappe.whitelist()
def get_time_log_list(doctype, txt, searchfield, start, page_len, filters):
return frappe.conn.get_values("Time Log", filters, ["name", "activity_type", "owner"])
return frappe.db.get_values("Time Log", filters, ["name", "activity_type", "owner"])
@frappe.whitelist()
def query_task(doctype, txt, searchfield, start, page_len, filters):
@@ -19,7 +19,7 @@ def query_task(doctype, txt, searchfield, start, page_len, filters):
match_conditions = build_match_conditions("Task")
match_conditions = ("and" + match_conditions) if match_conditions else ""
return frappe.conn.sql("""select name, subject from `tabTask`
return frappe.db.sql("""select name, subject from `tabTask`
where (`%s` like %s or `subject` like %s) %s
order by
case when `subject` like %s then 0 else 1 end,