From f550ecf93ebce7ebdfcc2fc799489a7b53cce950 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Sat, 2 May 2015 18:45:02 +0530 Subject: [PATCH 1/4] Maintain same currency exchnage rate while mapping --- erpnext/public/js/transaction.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/public/js/transaction.js b/erpnext/public/js/transaction.js index ba0fa408d80..4a45b3c5c89 100644 --- a/erpnext/public/js/transaction.js +++ b/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); From a0b1124d6fc4f5f58d58901a7f0dbd8a16aabb25 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 6 May 2015 11:59:23 +0530 Subject: [PATCH 2/4] minor fix in report --- .../payment_period_based_on_invoice_date.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py index b1d74373fca..88e823dbd56 100644 --- a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +++ b/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] From d5e2788cb4effb7701f603dc93b2a09460d1773e Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 7 May 2015 15:28:21 +0530 Subject: [PATCH 3/4] Permission for Stock ledger and balance report --- erpnext/config/stock.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/config/stock.py b/erpnext/config/stock.py index fbf7d7ce921..d9e75592e77 100644 --- a/erpnext/config/stock.py +++ b/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", From 7e143a5fdd044c63b9f612d6f3656ea4f3011ad8 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Thu, 7 May 2015 19:00:37 +0600 Subject: [PATCH 4/4] bumped to version 4.25.5 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index 54e52d20ca7..b35f45ac41a 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '4.25.4' +__version__ = '4.25.5' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 24fdfb2114d..4d30cee800e 100644 --- a/erpnext/hooks.py +++ b/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" diff --git a/setup.py b/setup.py index 6337b78b464..f2089c1f0c5 100644 --- a/setup.py +++ b/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()