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

Dont display old fraction outstanding in AR report

Browse Source
This commit is contained in:
Nabin Hait 2014-01-22 15:36:44 +05:30
parent 423932fab2
commit c7676797e1
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
accounts/report/accounts_receivable/accounts_receivable.py
View File

@ -37,12 +37,15 @@ class AccountsReceivableReport(object):
return columns return columns
def get_data(self, customer_naming_by): def get_data(self, customer_naming_by):
from accounts.utils import get_currency_precision
currency_precision = get_currency_precision() or 2
data = [] data = []
future_vouchers = self.get_entries_after(self.filters.report_date) future_vouchers = self.get_entries_after(self.filters.report_date)
for gle in self.get_entries_till(self.filters.report_date): for gle in self.get_entries_till(self.filters.report_date):
if self.is_receivable(gle, future_vouchers): if self.is_receivable(gle, future_vouchers):
outstanding_amount = self.get_outstanding_amount(gle, self.filters.report_date) outstanding_amount = self.get_outstanding_amount(gle, self.filters.report_date)
if abs(outstanding_amount) > 0.0: if abs(outstanding_amount) > 0.1/10**currency_precision:
due_date = self.get_due_date(gle) due_date = self.get_due_date(gle)
invoiced_amount = gle.debit if (gle.debit > 0) else 0 invoiced_amount = gle.debit if (gle.debit > 0) else 0
payment_received = invoiced_amount - outstanding_amount payment_received = invoiced_amount - outstanding_amount

11
accounts/utils.py
View File

@ -378,4 +378,13 @@ def get_account_for(account_for_doctype, account_for):
account_for_field = "account_type" account_for_field = "account_type"
return webnotes.conn.get_value("Account", {account_for_field: account_for_doctype, return webnotes.conn.get_value("Account", {account_for_field: account_for_doctype,
"master_name": account_for}) "master_name": account_for})
def get_currency_precision(currency=None):
if not currency:
currency = webnotes.conn.get_value("Company",
webnotes.conn.get_default("company"), "default_currency")
currency_format = webnotes.conn.get_value("Currency", currency, "number_format")
from webnotes.utils import get_number_format_info
return get_number_format_info(currency_format)[2]

9
stock/report/item_prices/item_prices.py
View File

@ -15,6 +15,7 @@ def execute(filters=None):
bom_rate = get_item_bom_rate() bom_rate = get_item_bom_rate()
val_rate_map = get_valuation_rate() val_rate_map = get_valuation_rate()
from accounts.utils import get_currency_precision
precision = get_currency_precision() or 2 precision = get_currency_precision() or 2
data = [] data = []
for item in sorted(item_map): for item in sorted(item_map):
@ -29,14 +30,6 @@ def execute(filters=None):
]) ])
return columns, data return columns, data
def get_currency_precision():
company_currency = webnotes.conn.get_value("Company",
webnotes.conn.get_default("company"), "default_currency")
currency_format = webnotes.conn.get_value("Currency", company_currency, "number_format")
from webnotes.utils import get_number_format_info
return get_number_format_info(currency_format)[2]
def get_columns(filters): def get_columns(filters):
"""return columns based on filters""" """return columns based on filters"""