Merge branch 'v4.x.x'

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '4.25.4'
+__version__ = '4.25.5'

erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py

@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import msgprint, _
+from frappe.utils import flt
 from erpnext.accounts.report.accounts_receivable.accounts_receivable import get_ageing_data
 
 def execute(filters=None):
@@ -19,10 +20,10 @@ def execute(filters=None):
 	for d in entries:
 		if d.against_voucher:
 			against_date = d.against_voucher and invoice_posting_date_map[d.against_voucher] or ""
-			outstanding_amount = d.debit or -1*d.credit
+			outstanding_amount = flt(d.debit) or -1*flt(d.credit)
 		else:
 			against_date = d.against_invoice and invoice_posting_date_map[d.against_invoice] or ""
-			outstanding_amount = d.credit or -1*d.debit
+			outstanding_amount = flt(d.credit) or -1*flt(d.debit)
 
 		row = [d.name, d.account, d.posting_date, d.against_voucher or d.against_invoice,
 			against_date, d.debit, d.credit, d.cheque_no, d.cheque_date, d.remark]

erpnext/config/stock.py

@@ -140,13 +140,13 @@ def get_data():
 					"type": "report",
 					"is_query_report": True,
 					"name": "Stock Ledger",
-					"doctype": "Item",
+					"doctype": "Stock Ledger Entry",
 				},
 				{
 					"type": "report",
 					"is_query_report": True,
 					"name": "Stock Balance",
-					"doctype": "Warehouse"
+					"doctype": "Stock Ledger Entry"
 				},
 				{
 					"type": "report",

erpnext/hooks.py

@@ -5,7 +5,7 @@ app_publisher = "Web Notes Technologies Pvt. Ltd. and Contributors"
 app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations"
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "4.25.4"
+app_version = "4.25.5"
 
 error_report_email = "support@erpnext.com"
 

erpnext/public/js/transaction.js

@@ -232,7 +232,8 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
 		this.set_dynamic_labels();
 
 		var company_currency = this.get_company_currency();
-		if(this.frm.doc.currency !== company_currency) {
+		// Added `ignore_pricing_rule` to determine if document is loading after mapping from another doc
+		if(this.frm.doc.currency !== company_currency && !this.frm.doc.ignore_pricing_rule) {
 			this.get_exchange_rate(this.frm.doc.currency, company_currency,
 				function(exchange_rate) {
 					me.frm.set_value("conversion_rate", exchange_rate);

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = "4.25.4"
+version = "4.25.5"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()