Merge branch 'master' of github.com:webnotes/erpnext
This commit is contained in:
commit
7adf17e95d
@ -322,8 +322,9 @@ class DocType(TransactionBase):
|
||||
|
||||
|
||||
def pull_project_customer(self):
|
||||
res = webnotes.conn.sql("select customer from `tabProject` where name = '%s'"%self.doc.project_name)
|
||||
if res:
|
||||
res = webnotes.conn.sql("select customer from `tabProject` where name = '%s'" %
|
||||
self.doc.project_name)
|
||||
if res and res[0][0]:
|
||||
get_obj('DocType Mapper', 'Project-Sales Invoice').dt_map('Project', 'Sales Invoice', self.doc.project_name, self.doc, self.doclist, "[['Project', 'Sales Invoice']]")
|
||||
|
||||
def get_company_abbr(self):
|
||||
|
8
patches/december_2012/clear_web_cache.py
Normal file
8
patches/december_2012/clear_web_cache.py
Normal file
@ -0,0 +1,8 @@
|
||||
import webnotes
|
||||
def execute():
|
||||
# build wn-web.js and wn-web.css
|
||||
from website.helpers.make_web_include_files import make
|
||||
make()
|
||||
|
||||
import website.utils
|
||||
website.utils.clear_cache()
|
@ -741,4 +741,8 @@ patch_list = [
|
||||
'patch_module': 'patches.december_2012',
|
||||
'patch_file': 'replace_createlocal',
|
||||
},
|
||||
{
|
||||
'patch_module': 'patches.december_2012',
|
||||
'patch_file': 'clear_web_cache',
|
||||
},
|
||||
]
|
@ -59,7 +59,7 @@ class DocType(TransactionBase):
|
||||
#-------------------------
|
||||
def pull_project_customer(self):
|
||||
res = sql("select customer from `tabProject` where name = '%s'"%self.doc.project_name)
|
||||
if res:
|
||||
if res and res[0][0]:
|
||||
get_obj('DocType Mapper', 'Project-Sales Order').dt_map('Project', 'Sales Order', self.doc.project_name, self.doc, self.doclist, "[['Project', 'Sales Order']]")
|
||||
|
||||
|
||||
|
@ -80,8 +80,8 @@ class DocType(TransactionBase):
|
||||
|
||||
|
||||
def pull_project_customer(self):
|
||||
res = sql("select customer from `tabProject` where name = '%s'"%self.doc.project_name)
|
||||
if res:
|
||||
res = sql("select customer from `tabProject` where name = '%s'" % self.doc.project_name)
|
||||
if res and res[0][0]:
|
||||
get_obj('DocType Mapper', 'Project-Delivery Note').dt_map('Project', 'Delivery Note', self.doc.project_name, self.doc, self.doclist, "[['Project', 'Delivery Note']]")
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user