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

install, web serving, session booting webnotes/wnframework#351

Browse Source
This commit is contained in:
Rushabh Mehta
2013-12-12 19:12:19 +05:30
parent d2dd83c3a3
commit 1f84799f2d
199 changed files with 583 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,7 @@ import webnotes
from webnotes.utils import flt, getdate
from webnotes import msgprint
from utilities.transaction_base import delete_events
from erpnext.utilities.transaction_base import delete_events
class DocType:
def __init__(self, doc, doclist=None):

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

@@ -80,7 +80,7 @@ def get_events(start, end, filters=None):
return data
def get_project(doctype, txt, searchfield, start, page_len, filters):
from controllers.queries import get_match_cond
from erpnext.controllers.queries import get_match_cond
return webnotes.conn.sql(""" select name from `tabProject`
where %(key)s like "%(txt)s"
%(mcond)s

2
erpnext/projects/doctype/task/task_calendar.js
View File

@@ -18,5 +18,5 @@ wn.views.calendar["Task"] = {
"label": wn._("Project")
}
],
get_events_method: "projects.doctype.task.task.get_events"
get_events_method: "erpnext.projects.doctype.task.task.get_events"
}

2
erpnext/projects/doctype/time_log/test_time_log.py
View File

@@ -4,7 +4,7 @@
import webnotes
import unittest
from projects.doctype.time_log.time_log import OverlapError
from erpnext.projects.doctype.time_log.time_log import OverlapError
class TestTimeLog(unittest.TestCase):
def test_duplication(self):

2
erpnext/projects/doctype/time_log/time_log_calendar.js
View File

@@ -9,5 +9,5 @@ wn.views.calendar["Time Log"] = {
"title": "title",
"allDay": "allDay"
},
get_events_method: "projects.doctype.time_log.time_log.get_events"
get_events_method: "erpnext.projects.doctype.time_log.time_log.get_events"
}

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

@@ -5,7 +5,7 @@ import webnotes, unittest
class TimeLogBatchTest(unittest.TestCase):
def test_time_log_status(self):
from projects.doctype.time_log.test_time_log import test_records as time_log_records
from erpnext.projects.doctype.time_log.test_time_log import test_records as time_log_records
time_log = webnotes.bean(copy=time_log_records[0])
time_log.doc.fields.update({
"from_time": "2013-01-02 10:00:00",