From 4d47c63db1e3bac677edfded2b34c42c3ae3666f Mon Sep 17 00:00:00 2001 From: ashish-greycube Date: Wed, 24 Oct 2018 16:35:31 +0530 Subject: [PATCH 1/8] Update employee_advance.py https://github.com/frappe/erpnext/issues/13694 Cancel of already paid "Expense Claim" gives error IntegrityError: (1048, u"Column 'claimed_amount' cannot be null") Sol: claimed_amount should be flt --- erpnext/hr/doctype/employee_advance/employee_advance.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/hr/doctype/employee_advance/employee_advance.py b/erpnext/hr/doctype/employee_advance/employee_advance.py index 6f550bcee8..ee0cb831ab 100644 --- a/erpnext/hr/doctype/employee_advance/employee_advance.py +++ b/erpnext/hr/doctype/employee_advance/employee_advance.py @@ -69,7 +69,7 @@ class EmployeeAdvance(Document): where employee_advance = %s and docstatus=1 and allocated_amount > 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() def get_due_advance_amount(employee, posting_date): @@ -109,4 +109,4 @@ def make_bank_entry(dt, dn): "account_type": payment_account.account_type }) - return je.as_dict() \ No newline at end of file + return je.as_dict() From 3df1327b94fba7883cefdf073988a3cbc86d3061 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 29 Oct 2018 15:15:10 +0530 Subject: [PATCH 2/8] fix: Delete button in POS mobile Delete button was covered by page-actions container --- erpnext/public/less/erpnext.less | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/erpnext/public/less/erpnext.less b/erpnext/public/less/erpnext.less index 262b0c308c..d4f6c12f77 100644 --- a/erpnext/public/less/erpnext.less +++ b/erpnext/public/less/erpnext.less @@ -412,6 +412,12 @@ body[data-route="pos"] { .collapse-btn { cursor: pointer; } + + @media (max-width: @screen-xs) { + .page-actions { + max-width: 110px; + } + } } .price-info { From 7b91f9fa0c5e0f0e8b2c42463a4332bab691737c Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Wed, 24 Oct 2018 15:12:26 +0530 Subject: [PATCH 3/8] Bug Fixes --- .../report/production_analytics/production_analytics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/manufacturing/report/production_analytics/production_analytics.py b/erpnext/manufacturing/report/production_analytics/production_analytics.py index 1dc821c6e1..20b098a2c5 100644 --- a/erpnext/manufacturing/report/production_analytics/production_analytics.py +++ b/erpnext/manufacturing/report/production_analytics/production_analytics.py @@ -31,7 +31,7 @@ def get_columns(filters): columns.append( { "label": _(label), - "field_name":field_name, + "fieldname":field_name, "fieldtype": "Float", "width": 120 }, From 69bbe1995c317c9c6c3aecfeccb6b1543d835570 Mon Sep 17 00:00:00 2001 From: Shreya Shah Date: Mon, 29 Oct 2018 15:38:21 +0530 Subject: [PATCH 4/8] Update production_analytics.py --- .../report/production_analytics/production_analytics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/manufacturing/report/production_analytics/production_analytics.py b/erpnext/manufacturing/report/production_analytics/production_analytics.py index 20b098a2c5..0602193d51 100644 --- a/erpnext/manufacturing/report/production_analytics/production_analytics.py +++ b/erpnext/manufacturing/report/production_analytics/production_analytics.py @@ -31,7 +31,7 @@ def get_columns(filters): columns.append( { "label": _(label), - "fieldname":field_name, + "fieldname": field_name, "fieldtype": "Float", "width": 120 }, From 152a0c86b0b3c28ca9cd7db0fc48c106261d1509 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 29 Oct 2018 16:50:18 +0530 Subject: [PATCH 5/8] [Fix] Delete button not working in POS for Ipad --- erpnext/accounts/page/pos/pos.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js index 528e3d3f9c..314b91bea5 100755 --- a/erpnext/accounts/page/pos/pos.js +++ b/erpnext/accounts/page/pos/pos.js @@ -1573,15 +1573,16 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ style="margin-right: 5px;">${__('Print')} ${__('New')}`); - $('.print_doc').click(function () { - var html = frappe.render(me.print_template_data, me.frm.doc) - me.print_document(html) + this.msgprint.msg_area.find('.print_doc').on('click', function() { + var html = frappe.render(me.print_template_data, me.frm.doc); + me.print_document(html); }) - $('.new_doc').click(function () { - me.msgprint.hide() - me.make_new_cart() + this.msgprint.msg_area.find('.new_doc').on('click', function() { + me.msgprint.hide(); + me.make_new_cart(); }) + }, print_document: function (html) { From 452619c668e39bd5ffcdba5f2dbbbc5d9eaa4bf8 Mon Sep 17 00:00:00 2001 From: Shreya Shah Date: Tue, 30 Oct 2018 11:26:01 +0530 Subject: [PATCH 6/8] fix(report): Return if not list (#15849) --- .../student_monthly_attendance_sheet.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py b/erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py index 0c7baa848f..3f1d5b371b 100644 --- a/erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py +++ b/erpnext/education/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py @@ -73,6 +73,7 @@ def get_attendance_list(from_date, to_date, student_group, students_list): return att_map def get_students_with_leave_application(from_date, to_date, students_list): + if not students_list: return leave_applications = frappe.db.sql(""" select student, from_date, to_date from `tabStudent Leave Application` From 1f7a5dcd0701ce50c7015415497deac9eed59490 Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Tue, 30 Oct 2018 12:48:42 +0000 Subject: [PATCH 7/8] bumped to version 10.1.65 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index ecc34a395e..105bff46bf 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '10.1.64' +__version__ = '10.1.65' def get_default_company(user=None): '''Get default company for user''' From d45fef542373bbe15b1cc5cb28cb25319ee3f609 Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Tue, 30 Oct 2018 12:53:35 +0000 Subject: [PATCH 8/8] bumped to version 11.0.3-beta.16 --- erpnext/hooks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 6c1575c54e..9d21e4ba43 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -12,7 +12,7 @@ app_license = "GNU General Public License (v3)" source_link = "https://github.com/frappe/erpnext" develop_version = '11.x.x-develop' -staging_version = '11.0.3-beta.15' +staging_version = '11.0.3-beta.16' error_report_email = "support@erpnext.com"