From 98ec1164fc5932f354acb64f282c7046f103d3de Mon Sep 17 00:00:00 2001 From: Valmik Jangla Date: Fri, 4 Mar 2016 12:13:27 +0530 Subject: [PATCH] Removed from Attendance, Upload Attendance, and Sales Order --- erpnext/hr/doctype/attendance/attendance.json | 38 ++++++------------- erpnext/hr/doctype/attendance/attendance.py | 2 - .../hr/doctype/attendance/test_records.json | 1 - .../employee_attendance_tool.py | 1 - .../upload_attendance/upload_attendance.py | 5 +-- .../doctype/sales_order/sales_order.json | 30 +-------------- .../doctype/sales_order/test_records.json | 1 - 7 files changed, 14 insertions(+), 64 deletions(-) diff --git a/erpnext/hr/doctype/attendance/attendance.json b/erpnext/hr/doctype/attendance/attendance.json index de32328c1e0..ffeb02340cb 100644 --- a/erpnext/hr/doctype/attendance/attendance.json +++ b/erpnext/hr/doctype/attendance/attendance.json @@ -17,6 +17,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -42,6 +43,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Series", @@ -68,6 +70,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Employee", @@ -94,6 +97,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Employee Name", @@ -120,6 +124,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Status", @@ -146,6 +151,7 @@ "fieldtype": "Link", "hidden": 1, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Leave Type", @@ -172,6 +178,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -196,6 +203,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, "label": "Attendance Date", @@ -213,32 +221,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "fiscal_year", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "in_filter": 1, - "in_list_view": 0, - "label": "Fiscal Year", - "length": 0, - "no_copy": 0, - "oldfieldname": "fiscal_year", - "oldfieldtype": "Select", - "options": "Fiscal Year", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_on_submit": 0, "bold": 0, @@ -247,6 +229,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Company", @@ -273,6 +256,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 1, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Amended From", @@ -300,7 +284,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-01-25 15:36:36.252173", + "modified": "2016-03-04 01:18:30.089630", "modified_by": "Administrator", "module": "HR", "name": "Attendance", diff --git a/erpnext/hr/doctype/attendance/attendance.py b/erpnext/hr/doctype/attendance/attendance.py index 7d6c8ad3778..feecae08ebd 100644 --- a/erpnext/hr/doctype/attendance/attendance.py +++ b/erpnext/hr/doctype/attendance/attendance.py @@ -41,9 +41,7 @@ class Attendance(Document): def validate(self): from erpnext.controllers.status_updater import validate_status - from erpnext.accounts.utils import validate_fiscal_year validate_status(self.status, ["Present", "Absent", "Half Day"]) - validate_fiscal_year(self.att_date, self.fiscal_year, _("Attendance Date"), self) self.validate_att_date() self.validate_duplicate_record() self.check_leave_record() diff --git a/erpnext/hr/doctype/attendance/test_records.json b/erpnext/hr/doctype/attendance/test_records.json index 41b40ffe9ad..12983dcb495 100644 --- a/erpnext/hr/doctype/attendance/test_records.json +++ b/erpnext/hr/doctype/attendance/test_records.json @@ -5,7 +5,6 @@ "employee": "_T-Employee-0001", "status": "Present", "att_date": "2014-02-01", - "fiscal_year": "_Test Fiscal Year 2014", "company": "_Test Company" } ] diff --git a/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.py b/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.py index 622b0d95dba..353008e612c 100644 --- a/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.py +++ b/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.py @@ -4,7 +4,6 @@ from __future__ import unicode_literals import frappe -import copy import json from frappe.model.document import Document diff --git a/erpnext/hr/doctype/upload_attendance/upload_attendance.py b/erpnext/hr/doctype/upload_attendance/upload_attendance.py index faa1a94e18a..0c5a0ba8b9f 100644 --- a/erpnext/hr/doctype/upload_attendance/upload_attendance.py +++ b/erpnext/hr/doctype/upload_attendance/upload_attendance.py @@ -37,7 +37,7 @@ def add_header(w): w.writerow(["Status should be one of these values: " + status]) w.writerow(["If you are overwriting existing attendance records, 'ID' column mandatory"]) w.writerow(["ID", "Employee", "Employee Name", "Date", "Status", - "Fiscal Year", "Company", "Naming Series"]) + "Company", "Naming Series"]) return w def add_data(w, args): @@ -55,8 +55,7 @@ def add_data(w, args): row = [ existing_attendance and existing_attendance.name or "", employee.name, employee.employee_name, date, - existing_attendance and existing_attendance.status or "", - get_fiscal_year(date)[0], employee.company, + existing_attendance and existing_attendance.status or "", employee.company, existing_attendance and existing_attendance.naming_series or get_naming_series(), ] w.writerow(row) diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index 7a8cce4a76f..249bc8e8d2d 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -2010,34 +2010,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "fiscal_year", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 1, - "in_list_view": 0, - "label": "Fiscal Year", - "length": 0, - "no_copy": 0, - "oldfieldname": "fiscal_year", - "oldfieldtype": "Select", - "options": "Fiscal Year", - "permlevel": 0, - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 1, - "set_only_once": 0, - "unique": 0, - "width": "150px" - }, { "allow_on_submit": 0, "bold": 0, @@ -3046,7 +3018,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-03-03 03:25:45.123126", + "modified": "2016-03-04 01:39:38.279978", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order", diff --git a/erpnext/selling/doctype/sales_order/test_records.json b/erpnext/selling/doctype/sales_order/test_records.json index 95a43b9f275..9df66f45d01 100644 --- a/erpnext/selling/doctype/sales_order/test_records.json +++ b/erpnext/selling/doctype/sales_order/test_records.json @@ -9,7 +9,6 @@ "customer_name": "_Test Customer", "delivery_date": "2013-02-23", "doctype": "Sales Order", - "fiscal_year": "_Test Fiscal Year 2013", "base_grand_total": 1000.0, "grand_total": 1000.0, "naming_series": "_T-Sales Order-",