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

[fix] [minor] paid amount should be zero if not pos invoice

Browse Source
This commit is contained in:
Nabin Hait 2013-08-16 15:15:16 +05:30
parent 6c18cbcb4b
commit 21cf403b57
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -521,6 +521,8 @@ class DocType(SellingController):
self.make_packing_list() self.make_packing_list()
else: else:
self.doclist = self.doc.clear_table(self.doclist, 'packing_details') self.doclist = self.doc.clear_table(self.doclist, 'packing_details')
if not cint(self.doc.is_pos):
webnotes.conn.set(self.doc,'paid_amount',0) webnotes.conn.set(self.doc,'paid_amount',0)
def check_prev_docstatus(self): def check_prev_docstatus(self):

2
controllers/accounts_controller.py
View File

@ -75,7 +75,7 @@ class AccountsController(TransactionBase):
self.doc.conversion_rate = self.doc.plc_conversion_rate self.doc.conversion_rate = self.doc.plc_conversion_rate
if self.meta.get_field("currency"): if self.meta.get_field("currency"):
if self.doc.currency != company_currency: if self.doc.currency and self.doc.currency != company_currency:
if not self.doc.conversion_rate: if not self.doc.conversion_rate:
exchange = self.doc.currency + "-" + company_currency exchange = self.doc.currency + "-" + company_currency
self.doc.conversion_rate = flt(webnotes.conn.get_value("Currency Exchange", self.doc.conversion_rate = flt(webnotes.conn.get_value("Currency Exchange",