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

Merge branch 'responsive' of github.com:webnotes/erpnext into responsive

Browse Source
This commit is contained in:
Nabin Hait
2013-07-11 11:58:43 +05:30
parent 789976f272 63d844b2d2
commit c0816d7efe
31 changed files with 474 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
stock/doctype/stock_entry/stock_entry.py
View File

@@ -665,11 +665,15 @@ class DocType(StockController):
return result and result[0] or {}
def get_cust_addr(self):
from utilities.transaction_base import get_default_address, get_address_display
res = sql("select customer_name from `tabCustomer` where name = '%s'"%self.doc.customer)
addr = self.get_address_text(customer = self.doc.customer)
address_display = None
customer_address = get_default_address("customer", self.doc.customer)
if customer_address:
address_display = get_address_display(customer_address)
ret = {
'customer_name' : res and res[0][0] or '',
'customer_address' : addr and addr[0] or ''}
'customer_address' : address_display}
return ret
@@ -682,12 +686,17 @@ class DocType(StockController):
return result and result[0] or {}
def get_supp_addr(self):
from utilities.transaction_base import get_default_address, get_address_display
res = sql("""select supplier_name from `tabSupplier`
where name=%s""", self.doc.supplier)
addr = self.get_address_text(supplier = self.doc.supplier)
address_display = None
supplier_address = get_default_address("customer", self.doc.customer)
if supplier_address:
address_display = get_address_display(supplier_address)
ret = {
'supplier_name' : res and res[0][0] or '',
'supplier_address' : addr and addr[0] or ''}
'supplier_address' : address_display }
return ret
def validate_with_material_request(self):