a[resolved] merge-conflicts

erpnext/__init__.py

@@ -5,7 +5,7 @@ import frappe
 from erpnext.hooks import regional_overrides
 from frappe.utils import getdate
 
-__version__ = '10.1.52'
+__version__ = '10.1.53'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/accounts/report/accounts_receivable/accounts_receivable.py

@@ -256,14 +256,16 @@ class ReceivablePayableReport(object):
 
 		for e in self.get_gl_entries_for(gle.party, gle.party_type, gle.voucher_type, gle.voucher_no):
 			if getdate(e.posting_date) <= report_date and e.name!=gle.name:
-				amount = flt(e.get(reverse_dr_or_cr)) - flt(e.get(dr_or_cr))
+				amount = flt(e.get(reverse_dr_or_cr), currency_precision) - flt(e.get(dr_or_cr), currency_precision)
 				if e.voucher_no not in return_entries:
 					payment_amount += amount
 				else:
 					credit_note_amount += amount
 
-		outstanding_amount = flt((flt(gle.get(dr_or_cr)) - flt(gle.get(reverse_dr_or_cr)) \
-			- payment_amount - credit_note_amount), currency_precision)
+		outstanding_amount = (flt((flt(gle.get(dr_or_cr), currency_precision)
+			- flt(gle.get(reverse_dr_or_cr), currency_precision)
+			- payment_amount - credit_note_amount), currency_precision))
+
 		credit_note_amount = flt(credit_note_amount, currency_precision)
 
 		return outstanding_amount, credit_note_amount

erpnext/hr/doctype/salary_slip/salary_slip.py

@@ -258,7 +258,9 @@ class SalarySlip(TransactionBase):
 			'end_date': self.end_date, 'joining_date': joining_date})
 
 		if st_name:
-			return st_name and st_name[0][0] or ''
+			self.salary_structure = st_name[0][0]
+			return self.salary_structure
+
 		else:
 			self.salary_structure = None
 			frappe.msgprint(_("No active or default Salary Structure found for employee {0} for the given dates")

erpnext/templates/print_formats/includes/taxes.html

@@ -2,7 +2,7 @@
 	{%- if doc.discount_amount -%}
 		<div class="row">
 			<div class="col-xs-5 {%- if doc._align_labels_right %} text-right{%- endif -%}">
-				<label>{{ _("Discount Amount") }}</label></div>
+				<label>{{ _(doc.meta.get_label('discount_amount')) }}</label></div>
 			<div class="col-xs-7 text-right">
 				- {{ doc.get_formatted("discount_amount", doc) }}
 			</div>