nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-29 22:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Enhancement in credit note (#18511)

Browse Source 
* fix: Credit note enhancement

* Fix: Print format for Sales Invoice Return

* fix: Zero quantity validation fix for credit note
This commit is contained in:
Deepesh Garg
2019-07-31 15:58:19 +05:30
committed by Nabin Hait
parent 36c724d7b5
commit d301d26fda
7 changed files with 182 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/accounts_controller.py
View File

@@ -60,7 +60,9 @@ class AccountsController(TransactionBase):
def validate(self):
self.validate_qty_is_not_zero()
if not self.get('is_return'):
self.validate_qty_is_not_zero()
if self.get("_action") and self._action != "update_after_submit":
self.set_missing_values(for_validate=True)

7
erpnext/controllers/taxes_and_totals.py
View File

@@ -81,7 +81,12 @@ class calculate_taxes_and_totals(object):
item.discount_amount = item.price_list_rate - item.rate
item.net_rate = item.rate
item.amount = flt(item.rate * item.qty, item.precision("amount"))
if not item.qty and self.doc.is_return:
item.amount = flt(-1 * item.rate, item.precision("amount"))
else:
item.amount = flt(item.rate * item.qty, item.precision("amount"))
item.net_amount = item.amount
self._set_in_company_currency(item, ["price_list_rate", "rate", "net_rate", "amount", "net_amount"])