From 7ef2c0fc341fdb3715a33e174bb944a4e59bfe3e Mon Sep 17 00:00:00 2001 From: bcornwellmott Date: Wed, 26 Oct 2016 11:02:48 -0700 Subject: [PATCH 1/3] Fix calendar view for Timesheet All the calendar events for Timesheets show up on one date. This is because there was a change to the timesheet_calendar.js file when the Gantt chart was added, but the get_events for the calendar wasn't fixed at the same time. Just fixing the reference to the start and end times. --- erpnext/projects/doctype/timesheet/timesheet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py index 60435bc72bb..9e32b528be4 100644 --- a/erpnext/projects/doctype/timesheet/timesheet.py +++ b/erpnext/projects/doctype/timesheet/timesheet.py @@ -369,7 +369,7 @@ def get_events(start, end, filters=None): conditions = get_conditions(filters) return frappe.db.sql("""select `tabTimesheet Detail`.name as name, `tabTimesheet Detail`.docstatus as status, `tabTimesheet Detail`.parent as parent, - from_time, hours, activity_type, project, to_time + from_time as start_date, hours, activity_type, project, to_time as end_date from `tabTimesheet Detail`, `tabTimesheet` where `tabTimesheet Detail`.parent = `tabTimesheet`.name and `tabTimesheet`.docstatus < 2 From 7488cf1ce1989a49ecd177eab939bfc958810d77 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Fri, 28 Oct 2016 18:01:43 +0530 Subject: [PATCH 2/3] [Fix] country wise tax, country name issue --- erpnext/setup/setup_wizard/data/country_wise_tax.json | 2 +- erpnext/setup/setup_wizard/setup_wizard.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/setup/setup_wizard/data/country_wise_tax.json b/erpnext/setup/setup_wizard/data/country_wise_tax.json index 06f7f0908b9..780b88fa5f6 100644 --- a/erpnext/setup/setup_wizard/data/country_wise_tax.json +++ b/erpnext/setup/setup_wizard/data/country_wise_tax.json @@ -1039,7 +1039,7 @@ } }, - "Russia": { + "Russian Federation": { "Russia VAT 18%": { "account_name": "VAT 18%", "tax_rate": 18.00, diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py index 7c65f88965f..66000cdc974 100644 --- a/erpnext/setup/setup_wizard/setup_wizard.py +++ b/erpnext/setup/setup_wizard/setup_wizard.py @@ -247,7 +247,7 @@ def get_fy_details(fy_start_date, fy_end_date): def create_sales_tax(args): country_wise_tax = get_country_wise_tax(args.get("country")) - if len(country_wise_tax)>0: + if country_wise_tax and len(country_wise_tax) > 0: for sales_tax, tax_data in country_wise_tax.items(): make_tax_account_and_template(args.get("company_name").strip(), tax_data.get('account_name'), tax_data.get('tax_rate'), sales_tax) From 9a8be357e6f538ffd793eb631bf2a6cda0a95673 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 31 Oct 2016 15:34:31 +0600 Subject: [PATCH 3/3] bumped to version 7.1.2 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index fc52f5ac411..d018c4f7451 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import frappe -__version__ = '7.1.1' +__version__ = '7.1.2' def get_default_company(user=None): '''Get default company for user'''