Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Nabin Hait 2016-02-26 17:34:46 +05:30
commit 593bfddb74
5 changed files with 7 additions and 8 deletions
Show Stats 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__ = '6.23.4' __version__ = '6.23.5'

2
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
View File

@ -28,7 +28,7 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
this.frm.add_custom_button(__('Payment'), this.make_bank_entry, __("Make")); this.frm.add_custom_button(__('Payment'), this.make_bank_entry, __("Make"));
cur_frm.page.set_inner_btn_group_as_primary(__("Make")); cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
} }
if(Math.abs(flt(doc.outstanding_amount)) < flt(doc.grand_total)) { if(doc.outstanding_amount >= 0 || Math.abs(flt(doc.outstanding_amount)) < flt(doc.grand_total)) {
cur_frm.add_custom_button(__('Debit Note'), this.make_debit_note, __("Make")); cur_frm.add_custom_button(__('Debit Note'), this.make_debit_note, __("Make"));
} }
} }

2
erpnext/hooks.py
View File

@ -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.23.4" app_version = "6.23.5"
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"

7
erpnext/projects/doctype/time_log/time_log.py
View File

@ -88,10 +88,9 @@ class TimeLog(Document):
existing = frappe.db.sql("""select name, from_time, to_time from `tabTime Log` existing = frappe.db.sql("""select name, from_time, to_time from `tabTime Log`
where `{0}`=%(val)s and where `{0}`=%(val)s and
( (
(from_time > %(from_time)s and from_time < %(to_time)s) or (%(from_time)s between from_time and to_time) or
(to_time > %(from_time)s and to_time < %(to_time)s) or (%(to_time)s between from_time and to_time) or
(%(from_time)s > from_time and %(from_time)s < to_time) or (%(from_time)s <= from_time and %(to_time)s >= to_time))
(%(from_time)s = from_time and %(to_time)s = to_time))
and name!=%(name)s and name!=%(name)s
and docstatus < 2""".format(fieldname), and docstatus < 2""".format(fieldname),
{ {

2
setup.py
View File

@ -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.23.4" version = "6.23.5"
requirements = parse_requirements("requirements.txt", session="") requirements = parse_requirements("requirements.txt", session="")
setup( setup(