nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 18:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v4.x.x'

Browse Source
This commit is contained in:
Pratik Vyas
2015-05-07 18:30:37 +05:30
parent 05f8b6d870 7e143a5fdd
commit 6eca3693b1
6 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

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

5
erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
View File

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

4
erpnext/config/stock.py
View File

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

2
erpnext/hooks.py
View File

@@ -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_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations"
app_icon = "icon-th" app_icon = "icon-th"
app_color = "#e74c3c" app_color = "#e74c3c"
app_version = "4.25.4" app_version = "4.25.5"
error_report_email = "support@erpnext.com" error_report_email = "support@erpnext.com"

3
erpnext/public/js/transaction.js
View File

@@ -232,7 +232,8 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
this.set_dynamic_labels(); this.set_dynamic_labels();
var company_currency = this.get_company_currency(); 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, this.get_exchange_rate(this.frm.doc.currency, company_currency,
function(exchange_rate) { function(exchange_rate) {
me.frm.set_value("conversion_rate", exchange_rate); me.frm.set_value("conversion_rate", exchange_rate);

2
setup.py
View File

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