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

Conflicts:
	accounts/doctype/purchase_invoice/purchase_invoice.py
	stock/doctype/purchase_receipt/purchase_receipt.py
This commit is contained in:
Anand Doshi
2013-02-27 18:14:28 +05:30
41 changed files with 540 additions and 469 deletions

View File

@@ -348,3 +348,25 @@ class BuyingController(AccountsController):
self._precision.tax = self.meta.get_precision_map(parentfield = \
"purchase_tax_details")
return self._precision
@property
def sub_contracted_items(self):
if not hasattr(self, "_sub_contracted_items"):
item_codes = list(set(item.item_code for item in
self.doclist.get({"parentfield": self.fname})))
self._sub_contracted_items = [r[0] for r in webnotes.conn.sql("""select name
from `tabItem` where name in (%s) and is_sub_contracted_item='Yes'""" % \
(", ".join((["%s"]*len(item_codes))),), item_codes)]
return self._sub_contracted_items
@property
def purchase_items(self):
if not hasattr(self, "_purchase_items"):
item_codes = list(set(item.item_code for item in
self.doclist.get({"parentfield": self.fname})))
self._purchase_items = [r[0] for r in webnotes.conn.sql("""select name
from `tabItem` where name in (%s) and is_purchase_item='Yes'""" % \
(", ".join((["%s"]*len(item_codes))),), item_codes)]
return self._purchase_items