nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 11:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Pratik Vyas
2014-10-30 14:22:17 +05:30
parent 80e95388f5 dda239fd49
commit c59cd46391
6 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

@@ -1 +1 @@
__version__ = '4.9.1' __version__ = '4.9.2'

5
erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
View File

@@ -96,13 +96,14 @@ class PaymentReconciliation(Document):
payment_amount = payment_amount[0][0] if payment_amount else 0 payment_amount = payment_amount[0][0] if payment_amount else 0
if d.invoice_amount > payment_amount: if d.invoice_amount - payment_amount > 0.005:
non_reconciled_invoices.append({ non_reconciled_invoices.append({
'voucher_no': d.voucher_no, 'voucher_no': d.voucher_no,
'voucher_type': d.voucher_type, 'voucher_type': d.voucher_type,
'posting_date': d.posting_date, 'posting_date': d.posting_date,
'invoice_amount': flt(d.invoice_amount), 'invoice_amount': flt(d.invoice_amount),
'outstanding_amount': d.invoice_amount - payment_amount}) 'outstanding_amount': flt(d.invoice_amount - payment_amount, 2)
})
self.add_invoice_entries(non_reconciled_invoices) self.add_invoice_entries(non_reconciled_invoices)

2
erpnext/hooks.py
View File

@@ -4,7 +4,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.9.1" app_version = "4.9.2"
error_report_email = "support@erpnext.com" error_report_email = "support@erpnext.com"

11
erpnext/support/doctype/customer_issue/customer_issue.js
View File

@@ -51,9 +51,14 @@ cur_frm.fields_dict['serial_no'].get_query = function(doc, cdt, cdn) {
['Serial No', 'docstatus', '!=', 2], ['Serial No', 'docstatus', '!=', 2],
['Serial No', 'status', '=', "Delivered"] ['Serial No', 'status', '=', "Delivered"]
]; ];
if(doc.item_code) cond = ['Serial No', 'item_code', '=', doc.item_code]; if(doc.item_code) {
if(doc.customer) cond = ['Serial No', 'customer', '=', doc.customer]; cond = ['Serial No', 'item_code', '=', doc.item_code];
filter.push(cond); filter.push(cond);
}
if(doc.customer) {
cond = ['Serial No', 'customer', '=', doc.customer];
filter.push(cond);
}
return{ return{
filters:filter filters:filter
} }

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.9.1" version = "4.9.2"
with open("requirements.txt", "r") as f: with open("requirements.txt", "r") as f:
install_requires = f.readlines() install_requires = f.readlines()

1
test_sites/test_site/site_config.json
View File

@@ -2,5 +2,6 @@
"db_name": "test_frappe", "db_name": "test_frappe",
"db_password": "test_frappe", "db_password": "test_frappe",
"admin_password": "admin", "admin_password": "admin",
"host_name": "http://localhost:8888",
"mute_emails": 1 "mute_emails": 1
} }