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

Merge branch 'staging' into develop

Browse Source
This commit is contained in:
Ameya Shenoy 2018-10-30 12:54:16 +00:00
commit df62296a26
No known key found for this signature in database
GPG Key ID: AC016A555657D0A3
7 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '10.1.64' __version__ = '10.1.65'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

13
erpnext/accounts/page/pos/pos.js
View File

@ -1573,15 +1573,16 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
style="margin-right: 5px;">${__('Print')}</a> style="margin-right: 5px;">${__('Print')}</a>
<a class="btn btn-default new_doc">${__('New')}</a>`); <a class="btn btn-default new_doc">${__('New')}</a>`);
$('.print_doc').click(function () { this.msgprint.msg_area.find('.print_doc').on('click', function() {
var html = frappe.render(me.print_template_data, me.frm.doc) var html = frappe.render(me.print_template_data, me.frm.doc);
me.print_document(html) me.print_document(html);
}) })
$('.new_doc').click(function () { this.msgprint.msg_area.find('.new_doc').on('click', function() {
me.msgprint.hide() me.msgprint.hide();
me.make_new_cart() me.make_new_cart();
}) })
}, },
print_document: function (html) { print_document: function (html) {

1
erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py
View File

@ -73,6 +73,7 @@ def get_attendance_list(from_date, to_date, student_group, students_list):
return att_map return att_map
def get_students_with_leave_application(from_date, to_date, students_list): def get_students_with_leave_application(from_date, to_date, students_list):
if not students_list: return
leave_applications = frappe.db.sql(""" leave_applications = frappe.db.sql("""
select student, from_date, to_date select student, from_date, to_date
from `tabStudent Leave Application` from `tabStudent Leave Application`

2
erpnext/hooks.py
View File

@ -12,7 +12,7 @@ app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext" source_link = "https://github.com/frappe/erpnext"
develop_version = '12.x.x-develop' develop_version = '12.x.x-develop'
staging_version = '11.0.3-beta.15' staging_version = '11.0.3-beta.16'
error_report_email = "support@erpnext.com" error_report_email = "support@erpnext.com"

4
erpnext/hr/doctype/employee_advance/employee_advance.py
View File

@ -69,7 +69,7 @@ class EmployeeAdvance(Document):
where employee_advance = %s and docstatus=1 and allocated_amount > 0 where employee_advance = %s and docstatus=1 and allocated_amount > 0
""", self.name)[0][0] """, self.name)[0][0]
frappe.db.set_value("Employee Advance", self.name, "claimed_amount", claimed_amount) frappe.db.set_value("Employee Advance", self.name, "claimed_amount", flt(claimed_amount))
@frappe.whitelist() @frappe.whitelist()
def get_due_advance_amount(employee, posting_date): def get_due_advance_amount(employee, posting_date):
@ -109,4 +109,4 @@ def make_bank_entry(dt, dn):
"account_type": payment_account.account_type "account_type": payment_account.account_type
}) })
return je.as_dict() return je.as_dict()

2
erpnext/manufacturing/report/production_analytics/production_analytics.py
View File

@ -31,7 +31,7 @@ def get_columns(filters):
columns.append( columns.append(
{ {
"label": _(label), "label": _(label),
"field_name":field_name, "fieldname": field_name,
"fieldtype": "Float", "fieldtype": "Float",
"width": 120 "width": 120
}, },

6
erpnext/public/less/erpnext.less
View File

@ -426,6 +426,12 @@ body[data-route="pos"] {
.collapse-btn { .collapse-btn {
cursor: pointer; cursor: pointer;
} }
@media (max-width: @screen-xs) {
.page-actions {
max-width: 110px;
}
}
} }
.price-info { .price-info {