Fixed merge conflict

2017-03-30 13:15:22 +05:30
parent f90a3295c4 c4894a5287
commit 1f6bd0ad37
7 changed files with 14 additions and 6 deletions
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -761,7 +761,8 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 			"sales_partner": me.frm.doc.sales_partner,
 			"ignore_pricing_rule": me.frm.doc.ignore_pricing_rule,
 			"doctype": me.frm.doc.doctype,
-			"name": me.frm.doc.name
+			"name": me.frm.doc.name,
+			"is_return": cint(me.frm.doc.is_return)
 		};
 	},