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

[fix] [minor] fixes after merging akhilesh's changes

Browse Source
This commit is contained in:
Anand Doshi
2013-08-12 20:01:55 +05:30
parent 9e59aff54e
commit 05a340e764
5 changed files with 44 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -197,18 +197,10 @@ class DocType(SellingController):
if pos:
self.doc.conversion_rate = flt(pos.conversion_rate)
if not self.doc.debit_to:
self.doc.debit_to = self.doc.customer and webnotes.conn.get_value("Account", {
"name": self.doc.customer + " - " + self.get_company_abbr(),
"docstatus": ["!=", 2]
}) or pos.customer_account
if self.doc.debit_to and not self.doc.customer:
self.doc.customer = webnotes.conn.get_value("Account", {
"name": self.doc.debit_to,
"master_type": "Customer"
}, "master_name")
if not for_validate:
self.doc.customer = pos.customer
self.set_customer_defaults()
for fieldname in ('territory', 'naming_series', 'currency', 'charge', 'letter_head', 'tc_name',
'selling_price_list', 'company', 'select_print_heading', 'cash_bank_account'):
if (not for_validate) or (for_validate and not self.doc.fields.get(fieldname)):