Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Rushabh Mehta 2012-12-18 11:47:46 +05:30
commit 7adf17e95d
5 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
accounts/doctype/sales_invoice/sales_invoice.py
View File

@ -322,8 +322,9 @@ class DocType(TransactionBase):
def pull_project_customer(self): def pull_project_customer(self):
res = webnotes.conn.sql("select customer from `tabProject` where name = '%s'"%self.doc.project_name) res = webnotes.conn.sql("select customer from `tabProject` where name = '%s'" %
if res: 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']]") 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): def get_company_abbr(self):

8
patches/december_2012/clear_web_cache.py Normal file
View 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()

4
patches/patch_list.py
View File

@ -741,4 +741,8 @@ patch_list = [
'patch_module': 'patches.december_2012', 'patch_module': 'patches.december_2012',
'patch_file': 'replace_createlocal', 'patch_file': 'replace_createlocal',
}, },
{
'patch_module': 'patches.december_2012',
'patch_file': 'clear_web_cache',
},
] ]

2
selling/doctype/sales_order/sales_order.py
View File

@ -59,7 +59,7 @@ class DocType(TransactionBase):
#------------------------- #-------------------------
def pull_project_customer(self): def pull_project_customer(self):
res = sql("select customer from `tabProject` where name = '%s'"%self.doc.project_name) 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']]") get_obj('DocType Mapper', 'Project-Sales Order').dt_map('Project', 'Sales Order', self.doc.project_name, self.doc, self.doclist, "[['Project', 'Sales Order']]")

4
stock/doctype/delivery_note/delivery_note.py
View File

@ -80,8 +80,8 @@ class DocType(TransactionBase):
def pull_project_customer(self): def pull_project_customer(self):
res = sql("select customer from `tabProject` where name = '%s'"%self.doc.project_name) 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-Delivery Note').dt_map('Project', 'Delivery Note', self.doc.project_name, self.doc, self.doclist, "[['Project', 'Delivery Note']]") get_obj('DocType Mapper', 'Project-Delivery Note').dt_map('Project', 'Delivery Note', self.doc.project_name, self.doc, self.doclist, "[['Project', 'Delivery Note']]")