Merge branch 'develop' into refactor/report/bom-stock-report

This commit is contained in:
Sagar Sharma 2022-09-20 20:21:38 +05:30 committed by GitHub
commit 92e03e2c22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -194,16 +194,16 @@ class BuyingController(SubcontractingController):
if self.meta.get_field("base_in_words"):
if self.meta.get_field("base_rounded_total") and not self.is_rounded_total_disabled():
amount = self.base_rounded_total
amount = abs(self.base_rounded_total)
else:
amount = self.base_grand_total
amount = abs(self.base_grand_total)
self.base_in_words = money_in_words(amount, self.company_currency)
if self.meta.get_field("in_words"):
if self.meta.get_field("rounded_total") and not self.is_rounded_total_disabled():
amount = self.rounded_total
amount = abs(self.rounded_total)
else:
amount = self.grand_total
amount = abs(self.grand_total)
self.in_words = money_in_words(amount, self.currency)