Merge branch 'hotfix'
This commit is contained in:
commit
4058af24e2
@ -1,2 +1,2 @@
|
|||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
__version__ = '6.27.8'
|
__version__ = '6.27.9'
|
||||||
|
@ -400,10 +400,10 @@ $.extend(erpnext.journal_entry, {
|
|||||||
var row = locals[cdt][cdn];
|
var row = locals[cdt][cdn];
|
||||||
|
|
||||||
frappe.model.set_value(cdt, cdn, "debit",
|
frappe.model.set_value(cdt, cdn, "debit",
|
||||||
flt(flt(row.debit_in_account_currency)*row.exchange_rate), precision("debit", row));
|
flt(flt(row.debit_in_account_currency)*row.exchange_rate, precision("debit", row)));
|
||||||
|
|
||||||
frappe.model.set_value(cdt, cdn, "credit",
|
frappe.model.set_value(cdt, cdn, "credit",
|
||||||
flt(flt(row.credit_in_account_currency)*row.exchange_rate), precision("credit", row));
|
flt(flt(row.credit_in_account_currency)*row.exchange_rate, precision("credit", row)));
|
||||||
|
|
||||||
cur_frm.cscript.update_totals(frm.doc);
|
cur_frm.cscript.update_totals(frm.doc);
|
||||||
},
|
},
|
||||||
|
@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
|
|||||||
app_description = """ERP made simple"""
|
app_description = """ERP made simple"""
|
||||||
app_icon = "icon-th"
|
app_icon = "icon-th"
|
||||||
app_color = "#e74c3c"
|
app_color = "#e74c3c"
|
||||||
app_version = "6.27.8"
|
app_version = "6.27.9"
|
||||||
app_email = "info@erpnext.com"
|
app_email = "info@erpnext.com"
|
||||||
app_license = "GNU General Public License (v3)"
|
app_license = "GNU General Public License (v3)"
|
||||||
source_link = "https://github.com/frappe/erpnext"
|
source_link = "https://github.com/frappe/erpnext"
|
||||||
|
2
setup.py
2
setup.py
@ -1,7 +1,7 @@
|
|||||||
from setuptools import setup, find_packages
|
from setuptools import setup, find_packages
|
||||||
from pip.req import parse_requirements
|
from pip.req import parse_requirements
|
||||||
|
|
||||||
version = "6.27.8"
|
version = "6.27.9"
|
||||||
requirements = parse_requirements("requirements.txt", session="")
|
requirements = parse_requirements("requirements.txt", session="")
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user