schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix] In words showing grand total instead of rounded total (#15065)

Browse Source
This commit is contained in:
rohitwaghchaure
2018-08-01 18:09:51 +05:30
committed by Nabin Hait
parent 0452b405f4
commit ae4ff5a403
5 changed files with 192 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/controllers/buying_controller.py
View File

@@ -99,9 +99,16 @@ class BuyingController(StockController):
def set_total_in_words(self):
from frappe.utils import money_in_words
if self.meta.get_field("base_in_words"):
self.base_in_words = money_in_words(self.base_grand_total, self.company_currency)
amount = (self.base_rounded_total
if not self.get("disable_rounded_total") else self.base_grand_total)
self.base_in_words = money_in_words(amount, self.company_currency)
if self.meta.get_field("in_words"):
self.in_words = money_in_words(self.grand_total, self.currency)
amount = (self.rounded_total
if not self.get("disable_rounded_total") else self.grand_total)
self.in_words = money_in_words(amount, self.currency)
# update valuation rate
def update_valuation_rate(self, parentfield):