nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 23:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7889 from rohitwaghchaure/sales_return_issue_for_pos

Browse Source 
[Fix] Sales Return Invoice (Is POS) doesn't show correct payment data
This commit is contained in:
Nabin Hait
2017-03-04 18:32:40 +05:30
committed by GitHub
parent feb45727e5 a31ffbc745
commit a07c3193cf
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/controllers/sales_and_purchase_return.py
View File

@@ -184,7 +184,7 @@ def make_return_doc(doctype, source_name, target_doc=None):
doc.return_against = source.name doc.return_against = source.name
doc.ignore_pricing_rule = 1 doc.ignore_pricing_rule = 1
if doctype == "Sales Invoice": if doctype == "Sales Invoice":
doc.is_pos = 0 doc.is_pos = source.is_pos
# look for Print Heading "Credit Note" # look for Print Heading "Credit Note"
if not doc.select_print_heading: if not doc.select_print_heading:
@@ -198,6 +198,20 @@ def make_return_doc(doctype, source_name, target_doc=None):
if tax.charge_type == "Actual": if tax.charge_type == "Actual":
tax.tax_amount = -1 * tax.tax_amount tax.tax_amount = -1 * tax.tax_amount
if doc.get("is_return"):
if doc.doctype == 'Sales Invoice':
doc.set('payments', [])
for data in source.payments:
doc.append('payments', {
'mode_of_payment': data.mode_of_payment,
'type': data.type,
'amount': -1 * data.amount,
'base_amount': -1 * data.base_amount
})
elif doc.doctype == 'Purchase Invoice':
doc.paid_amount = -1 * source.paid_amount
doc.base_paid_amount = -1 * source.base_paid_amount
doc.discount_amount = -1 * source.discount_amount doc.discount_amount = -1 * source.discount_amount
doc.run_method("calculate_taxes_and_totals") doc.run_method("calculate_taxes_and_totals")