diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 3338d3f426..bc7ef5726b 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import frappe -__version__ = '7.2.7' +__version__ = '7.2.8' def get_default_company(user=None): '''Get default company for user''' diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.js b/erpnext/hr/doctype/process_payroll/process_payroll.js index 0ad8cec549..cfb646d033 100644 --- a/erpnext/hr/doctype/process_payroll/process_payroll.js +++ b/erpnext/hr/doctype/process_payroll/process_payroll.js @@ -7,6 +7,7 @@ frappe.ui.form.on("Process Payroll", { frm.doc.start_date = ''; frm.doc.end_date = ''; frm.doc.payroll_frequency = ''; + frm.toggle_reqd(['payroll_frequency'], !frm.doc.salary_slip_based_on_timesheet); }, refresh: function(frm) { @@ -25,6 +26,10 @@ frappe.ui.form.on("Process Payroll", { frm.trigger("set_start_end_dates"); }, + salary_slip_based_on_timesheet: function(frm) { + frm.toggle_reqd(['payroll_frequency'], !frm.doc.salary_slip_based_on_timesheet); + }, + payment_account: function(frm) { frm.toggle_display(['make_bank_entry'], (frm.doc.payment_account!="" && frm.doc.payment_account!="undefined")); }, diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.py b/erpnext/hr/doctype/process_payroll/process_payroll.py index 45030cba13..7741263aac 100644 --- a/erpnext/hr/doctype/process_payroll/process_payroll.py +++ b/erpnext/hr/doctype/process_payroll/process_payroll.py @@ -68,7 +68,7 @@ class ProcessPayroll(Document): def check_mandatory(self): - for fieldname in ['company', 'payroll_frequency', 'start_date', 'end_date']: + for fieldname in ['company', 'start_date', 'end_date']: if not self.get(fieldname): frappe.throw(_("Please set {0}").format(self.meta.get_label(fieldname))) diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py index c3dbcd4180..490a70721a 100644 --- a/erpnext/projects/doctype/timesheet/timesheet.py +++ b/erpnext/projects/doctype/timesheet/timesheet.py @@ -199,13 +199,22 @@ class Timesheet(Document): (%(to_time)s > tsd.from_time and %(to_time)s < tsd.to_time) or (%(from_time)s <= tsd.from_time and %(to_time)s >= tsd.to_time)) and tsd.name!=%(name)s + and ts.name!=%(parent)s and ts.docstatus < 2""".format(cond), { "val": value, "from_time": args.from_time, "to_time": args.to_time, - "name": args.name or "No Name" + "name": args.name or "No Name", + "parent": args.parent or "No Name" }, as_dict=True) + # check internal overlap + for time_log in self.time_logs: + if (fieldname != 'workstation' or args.get(fieldname) == time_log.get(fieldname)) and \ + args.idx != time_log.idx and ((args.from_time > time_log.from_time and args.from_time < time_log.to_time) or + (args.to_time > time_log.from_time and args.to_time < time_log.to_time) or + (args.from_time <= time_log.from_time and args.to_time >= time_log.to_time)): + return self return existing[0] if existing else None @@ -359,7 +368,8 @@ 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 as start_date, hours, activity_type, project, to_time as end_date + from_time as start_date, hours, activity_type, project, to_time as end_date, + CONCAT(`tabTimesheet Detail`.parent, ' (', ROUND(hours,2),' hrs)') as title from `tabTimesheet Detail`, `tabTimesheet` where `tabTimesheet Detail`.parent = `tabTimesheet`.name and `tabTimesheet`.docstatus < 2 diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json index a31aed4a89..d90235143b 100644 --- a/erpnext/stock/doctype/item/item.json +++ b/erpnext/stock/doctype/item/item.json @@ -26,7 +26,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "", "length": 0, "no_copy": 0, @@ -55,7 +54,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Series", "length": 0, "no_copy": 0, @@ -84,7 +82,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Item Code", "length": 0, "no_copy": 1, @@ -115,7 +112,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 1, "label": "Variant Of", "length": 0, "no_copy": 0, @@ -144,7 +140,6 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, - "in_standard_filter": 0, "label": "Item Name", "length": 0, "no_copy": 0, @@ -173,7 +168,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Barcode", "length": 0, "no_copy": 1, @@ -201,7 +195,6 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, - "in_standard_filter": 1, "label": "Item Group", "length": 0, "no_copy": 0, @@ -232,7 +225,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Default Unit of Measure", "length": 0, "no_copy": 0, @@ -262,7 +254,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "length": 0, "no_copy": 0, "permlevel": 0, @@ -288,7 +279,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Disabled", "length": 0, "no_copy": 0, @@ -318,7 +308,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Maintain Stock", "length": 0, "no_copy": 0, @@ -349,7 +338,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Opening Stock", "length": 0, "no_copy": 0, @@ -365,40 +353,39 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "eval:(doc.__islocal && doc.is_stock_item && !doc.has_serial_no && !doc.has_batch_no && doc.opening_stock)", - "fieldname": "valuation_rate", - "fieldtype": "Currency", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Valuation Rate", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_on_submit": 0, "bold": 1, "collapsible": 0, "columns": 0, + "depends_on": "eval:(doc.__islocal && doc.is_stock_item && !doc.has_serial_no && !doc.has_batch_no && doc.opening_stock)", + "fieldname": "valuation_rate", + "fieldtype": "Currency", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Valuation Rate", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, "fieldname": "standard_rate", "fieldtype": "Currency", "hidden": 0, @@ -406,7 +393,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Standard Selling Rate", "length": 0, "no_copy": 0, @@ -434,7 +420,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Is Fixed Asset", "length": 0, "no_copy": 0, @@ -463,7 +448,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Asset Category", "length": 0, "no_copy": 0, @@ -492,7 +476,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Image", "length": 0, "no_copy": 0, @@ -521,7 +504,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Description", "length": 0, "no_copy": 0, @@ -549,7 +531,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Brand", "length": 0, "no_copy": 0, @@ -579,7 +560,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Description", "length": 0, "no_copy": 0, @@ -610,7 +590,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Inventory", "length": 0, "no_copy": 0, @@ -641,7 +620,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Default Warehouse", "length": 0, "no_copy": 0, @@ -673,7 +651,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "End of Life", "length": 0, "no_copy": 0, @@ -704,7 +681,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Has Batch No", "length": 0, "no_copy": 0, @@ -737,7 +713,6 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, - "in_standard_filter": 0, "label": "Has Serial No", "length": 0, "no_copy": 0, @@ -769,7 +744,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Serial Number Series", "length": 0, "no_copy": 0, @@ -797,7 +771,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Default Material Request Type", "length": 0, "no_copy": 0, @@ -827,7 +800,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "length": 0, "no_copy": 0, "oldfieldtype": "Column Break", @@ -857,7 +829,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Allow over delivery or receipt upto this percent", "length": 0, "no_copy": 0, @@ -887,7 +858,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Valuation Method", "length": 0, "no_copy": 0, @@ -916,7 +886,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Warranty Period (in days)", "length": 0, "no_copy": 0, @@ -947,7 +916,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Net Weight", "length": 0, "no_copy": 0, @@ -975,7 +943,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Weight UOM", "length": 0, "no_copy": 0, @@ -1005,7 +972,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Auto re-order", "length": 0, "no_copy": 0, @@ -1035,7 +1001,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Reorder level based on Warehouse", "length": 0, "no_copy": 0, @@ -1065,7 +1030,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Variants", "length": 0, "no_copy": 0, @@ -1096,7 +1060,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Has Variants", "length": 0, "no_copy": 1, @@ -1126,7 +1089,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Attributes", "length": 0, "no_copy": 1, @@ -1155,7 +1117,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Purchase Details", "length": 0, "no_copy": 0, @@ -1185,7 +1146,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Is Purchase Item", "length": 0, "no_copy": 0, @@ -1216,7 +1176,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Minimum Order Qty", "length": 0, "no_copy": 0, @@ -1245,7 +1204,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Safety Stock", "length": 0, "no_copy": 0, @@ -1275,7 +1233,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Lead Time in days", "length": 0, "no_copy": 0, @@ -1306,7 +1263,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Default Buying Cost Center", "length": 0, "no_copy": 0, @@ -1338,7 +1294,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Default Expense Account", "length": 0, "no_copy": 0, @@ -1369,7 +1324,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Unit of Measure Conversion", "length": 0, "no_copy": 0, @@ -1399,7 +1353,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "UOMs", "length": 0, "no_copy": 1, @@ -1430,7 +1383,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Last Purchase Rate", "length": 0, "no_copy": 1, @@ -1460,7 +1412,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Supplier Details", "length": 0, "no_copy": 0, @@ -1489,7 +1440,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Default Supplier", "length": 0, "no_copy": 0, @@ -1517,7 +1467,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Delivered by Supplier (Drop Ship)", "length": 0, "no_copy": 0, @@ -1546,7 +1495,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Manufacturer", "length": 0, "no_copy": 0, @@ -1575,7 +1523,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Manufacturer Part Number", "length": 0, "no_copy": 0, @@ -1603,7 +1550,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Item Code for Suppliers", "length": 0, "no_copy": 0, @@ -1633,7 +1579,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Supplier Items", "length": 0, "no_copy": 0, @@ -1661,7 +1606,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Sales Details", "length": 0, "no_copy": 0, @@ -1691,7 +1635,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Is Sales Item", "length": 0, "no_copy": 0, @@ -1721,7 +1664,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Publish in Hub", "length": 0, "no_copy": 0, @@ -1750,7 +1692,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Synced With Hub", "length": 0, "no_copy": 0, @@ -1779,7 +1720,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Default Income Account", "length": 0, "no_copy": 0, @@ -1808,7 +1748,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Default Selling Cost Center", "length": 0, "no_copy": 0, @@ -1837,7 +1776,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Customer Item Codes", "length": 0, "no_copy": 0, @@ -1868,7 +1806,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Customer Items", "length": 0, "no_copy": 0, @@ -1897,7 +1834,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Max Discount (%)", "length": 0, "no_copy": 0, @@ -1926,7 +1862,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Item Tax", "length": 0, "no_copy": 0, @@ -1956,7 +1891,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Taxes", "length": 0, "no_copy": 0, @@ -1986,7 +1920,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Inspection Criteria", "length": 0, "no_copy": 0, @@ -2016,7 +1949,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Inspection Required before Purchase", "length": 0, "no_copy": 0, @@ -2046,7 +1978,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Inspection Required before Delivery", "length": 0, "no_copy": 0, @@ -2076,7 +2007,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Quality Parameters", "length": 0, "no_copy": 0, @@ -2107,7 +2037,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Manufacturing", "length": 0, "no_copy": 0, @@ -2137,7 +2066,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Default BOM", "length": 0, "no_copy": 1, @@ -2169,7 +2097,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Supply Raw Materials for Purchase", "length": 0, "no_copy": 0, @@ -2199,7 +2126,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "length": 0, "no_copy": 0, "permlevel": 0, @@ -2226,7 +2152,6 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, - "in_standard_filter": 0, "label": "Customer Code", "length": 0, "no_copy": 1, @@ -2253,7 +2178,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Website", "length": 0, "no_copy": 0, @@ -2282,7 +2206,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Show in Website", "length": 0, "no_copy": 0, @@ -2310,7 +2233,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Show in Website (Variant)", "length": 0, "no_copy": 0, @@ -2339,7 +2261,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Route", "length": 0, "no_copy": 0, @@ -2369,7 +2290,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Weightage", "length": 0, "no_copy": 0, @@ -2398,7 +2318,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Slideshow", "length": 0, "no_copy": 0, @@ -2428,7 +2347,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Image", "length": 0, "no_copy": 0, @@ -2456,7 +2374,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Thumbnail", "length": 0, "no_copy": 0, @@ -2484,7 +2401,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "length": 0, "no_copy": 0, "permlevel": 0, @@ -2512,7 +2428,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Website Warehouse", "length": 0, "no_copy": 0, @@ -2542,7 +2457,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Website Item Groups", "length": 0, "no_copy": 0, @@ -2572,7 +2486,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Website Specifications", "length": 0, "no_copy": 0, @@ -2600,7 +2513,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Copy From Item Group", "length": 0, "no_copy": 0, @@ -2628,7 +2540,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Website Specifications", "length": 0, "no_copy": 0, @@ -2657,7 +2568,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Website Description", "length": 0, "no_copy": 0, @@ -2684,7 +2594,6 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "in_standard_filter": 0, "label": "Total Projected Qty", "length": 0, "no_copy": 0, @@ -2713,7 +2622,7 @@ "issingle": 0, "istable": 0, "max_attachments": 1, - "modified": "2016-12-27 12:17:44.227302", + "modified": "2017-01-10 12:02:51.807965", "modified_by": "Administrator", "module": "Stock", "name": "Item",