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

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

Browse Source 
Conflicts:
	accounts/doctype/gl_control/gl_control.py
This commit is contained in:
Anand Doshi
2013-01-17 20:31:41 +05:30
parent 8957bf9e09 16546d25e7
commit ef02ddfc40
92 changed files with 1234 additions and 1924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
selling/doctype/customer/customer.py
View File

@@ -123,7 +123,7 @@ class DocType(TransactionBase):
abbr = self.get_company_abbr()
if not sql("select name from tabAccount where name=%s", (self.doc.name + " - " + abbr)):
parent_account = self.get_receivables_group()
arg = {'account_name':self.doc.name,'parent_account': parent_account, 'group_or_ledger':'Ledger', 'company':self.doc.company,'account_type':'','tax_rate':'0','master_type':'Customer','master_name':self.doc.name,'address':self.doc.address}
arg = {'account_name':self.doc.name,'parent_account': parent_account, 'group_or_ledger':'Ledger', 'company':self.doc.company,'account_type':'','tax_rate':'0','master_type':'Customer','master_name':self.doc.name}
# create
ac = get_obj('GL Control').add_ac(cstr(arg))
@@ -172,11 +172,6 @@ class DocType(TransactionBase):
pass
def on_update(self):
# create customer addr
#self.create_customer_address()
# create customer contact
#self.create_customer_contact()
# update lead status
self.update_lead_status()
# create account head
self.create_account_head()

2
selling/doctype/quotation/quotation.js
View File

@@ -299,7 +299,7 @@ cur_frm.fields_dict['quotation_details'].grid.get_field('item_code').get_query=
and si_item.item_code = item.name \
and si.docstatus = 1 \
and si.customer = \"%(cust)s\" \
order by si.voucher_date desc \
order by si.posting_date desc \
limit 1 \
) as sales_rate, \
item.item_name, item.description \