From bdc8a88b4df1a9e4ed52118f3e83245c0839b0ad Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 18 Oct 2016 14:44:01 +0530 Subject: [PATCH 1/4] [minor] fix date comparisons --- .../doctype/academic_term/academic_term.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/erpnext/schools/doctype/academic_term/academic_term.py b/erpnext/schools/doctype/academic_term/academic_term.py index 891feb86798..45103482a90 100644 --- a/erpnext/schools/doctype/academic_term/academic_term.py +++ b/erpnext/schools/doctype/academic_term/academic_term.py @@ -5,34 +5,34 @@ from __future__ import unicode_literals import frappe from frappe import msgprint, _ -from frappe.utils import get_datetime, get_datetime_str +from frappe.utils import get_datetime from frappe.model.document import Document class AcademicTerm(Document): def autoname(self): self.name = self.academic_year + " ({})".format(self.term_name) if self.term_name else "" - + def validate(self): #Check if entry with same academic_year and the term_name already exists validate_duplication(self) self.title = self.academic_year + " ({})".format(self.term_name) if self.term_name else "" - + #Check that start of academic year is earlier than end of academic year if self.term_start_date and self.term_end_date and self.term_start_date > self.term_end_date: frappe.throw(_("The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.")) - - """Check that the start of the term is not before the start of the academic year and end of term is not after + + """Check that the start of the term is not before the start of the academic year and end of term is not after the end of the academic year""" year = frappe.get_doc("Academic Year",self.academic_year) - if self.term_start_date and get_datetime_str(year.year_start_date) and (self.term_start_date < get_datetime_str(year.year_start_date)): + if self.term_start_date and get_datetime(year.year_start_date) and (self.term_start_date < get_datetime(year.year_start_date)): frappe.throw(_("The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.").format(self.academic_year)) - - if self.term_end_date and get_datetime_str(year.year_end_date) and (self.term_end_date > get_datetime_str(year.year_end_date)): + + if self.term_end_date and get_datetime_(year.year_end_date) and (self.term_end_date > get_datetime(year.year_end_date)): frappe.throw(_("The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.").format(self.academic_year)) def validate_duplication(self): - term = frappe.db.sql("""select name from `tabAcademic Term` where academic_year= %s and term_name= %s + term = frappe.db.sql("""select name from `tabAcademic Term` where academic_year= %s and term_name= %s and docstatus<2 and name != %s""", (self.academic_year, self.term_name, self.name)) if term: frappe.throw(_("An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.").format(self.academic_year,self.term_name)) From 1aac9563067c10ace82da38b0976fd79832215d4 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 25 Oct 2016 15:01:30 +0530 Subject: [PATCH 2/4] [minor] [fixes] can rename program and disable role on domainify --- .../production_planning_tool.py | 18 +++++++++--------- erpnext/schools/doctype/program/program.json | 15 +++++++++++++-- erpnext/setup/setup_wizard/domainify.py | 1 + 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py index aa9e78c3996..3433f1fd453 100644 --- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py @@ -175,7 +175,7 @@ class ProductionPlanningTool(Document): and bom.is_active = 1) %s""" % \ (", ".join(["%s"] * len(mr_list)), item_condition), tuple(mr_list), as_dict=1) - self.add_items(items) + self.add_items(items) def add_items(self, items): @@ -314,7 +314,7 @@ class ProductionPlanningTool(Document): } """ item_list = [] - + for bom, so_wise_qty in bom_dict.items(): bom_wise_item_details = {} if self.use_multi_level_bom and self.only_raw_materials and self.include_subcontracted: @@ -335,19 +335,19 @@ class ProductionPlanningTool(Document): # so no childs of SA items bom_wise_item_details = self.get_subitems(bom_wise_item_details, bom,1, \ self.use_multi_level_bom,self.only_raw_materials, self.include_subcontracted,non_stock_item) - + for item, item_details in bom_wise_item_details.items(): for so_qty in so_wise_qty: item_list.append([item, flt(item_details.qty) * so_qty[1], item_details.description, item_details.stock_uom, item_details.min_order_qty, so_qty[0]]) - + self.make_items_dict(item_list) def get_subitems(self,bom_wise_item_details, bom, parent_qty, include_sublevel, only_raw, supply_subs,non_stock_item=0): for d in frappe.db.sql("""SELECT bom_item.item_code, default_material_request_type, - ifnull(%(parent_qty)s * sum(bom_item.qty/ifnull(bom.quantity, 1)), 0) as qty, + ifnull(%(parent_qty)s * sum(bom_item.qty/ifnull(bom.quantity, 1)), 0) as qty, item.is_sub_contracted_item as is_sub_contracted, item.default_bom as default_bom, - bom_item.description as description, bom_item.stock_uom as stock_uom, item.min_order_qty + bom_item.description as description, bom_item.stock_uom as stock_uom, item.min_order_qty as min_order_qty FROM `tabBOM Item` bom_item, `tabBOM` bom, tabItem item where bom.name = bom_item.parent and bom.name = %(bom)s and bom_item.docstatus < 2 and bom_item.item_code = item.name @@ -364,7 +364,7 @@ class ProductionPlanningTool(Document): if include_sublevel: if (d.default_material_request_type == "Purchase" and d.is_sub_contracted \ and supply_subs) or (d.default_material_request_type == "Manufacture"): - child_details = self.get_subitems(bom_wise_item_details,d.default_bom, \ + self.get_subitems(bom_wise_item_details,d.default_bom, \ d.qty, include_sublevel, only_raw, supply_subs) return bom_wise_item_details @@ -409,12 +409,12 @@ class ProductionPlanningTool(Document): items_to_be_requested = frappe._dict() if not self.create_material_requests_for_all_required_qty: - item_projected_qty = self.get_projected_qty() + item_projected_qty = self.get_projected_qty() for item, so_item_qty in self.item_dict.items(): total_qty = sum([flt(d[0]) for d in so_item_qty]) requested_qty = 0 - + if self.create_material_requests_for_all_required_qty: requested_qty = total_qty elif total_qty > item_projected_qty.get(item, 0): diff --git a/erpnext/schools/doctype/program/program.json b/erpnext/schools/doctype/program/program.json index ca6e1dfac6e..0ee9be00588 100644 --- a/erpnext/schools/doctype/program/program.json +++ b/erpnext/schools/doctype/program/program.json @@ -1,7 +1,7 @@ { "allow_copy": 0, "allow_import": 1, - "allow_rename": 0, + "allow_rename": 1, "autoname": "field:program_name", "beta": 0, "creation": "2015-09-07 12:54:03.609282", @@ -10,11 +10,13 @@ "doctype": "DocType", "document_type": "", "editable_grid": 0, + "engine": "InnoDB", "fields": [ { "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "program_name", "fieldtype": "Data", "hidden": 0, @@ -40,6 +42,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "program_code", "fieldtype": "Data", "hidden": 0, @@ -65,6 +68,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "program_abbreviation", "fieldtype": "Data", "hidden": 0, @@ -90,6 +94,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_3", "fieldtype": "Column Break", "hidden": 0, @@ -114,6 +119,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "department", "fieldtype": "Link", "hidden": 0, @@ -140,6 +146,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_5", "fieldtype": "Section Break", "hidden": 0, @@ -165,6 +172,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "courses", "fieldtype": "Table", "hidden": 0, @@ -191,6 +199,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "fee_schedule", "fieldtype": "Section Break", "hidden": 0, @@ -216,6 +225,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "fees", "fieldtype": "Table", "hidden": 0, @@ -250,7 +260,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2016-08-27 03:21:35.806511", + "modified": "2016-10-18 12:17:05.479801", "modified_by": "Administrator", "module": "Schools", "name": "Program", @@ -267,6 +277,7 @@ "export": 1, "if_owner": 0, "import": 0, + "is_custom": 0, "permlevel": 0, "print": 1, "read": 1, diff --git a/erpnext/setup/setup_wizard/domainify.py b/erpnext/setup/setup_wizard/domainify.py index 4d6ea5c9e18..9d5bf3059df 100644 --- a/erpnext/setup/setup_wizard/domainify.py +++ b/erpnext/setup/setup_wizard/domainify.py @@ -97,6 +97,7 @@ def setup_roles(data): '''Add, remove roles from `data.allow_roles` or `data.remove_roles`''' def remove_role(role): frappe.db.sql('delete from tabUserRole where role=%s', role) + frappe.set_value('Role', role, 'disabled', 1) if data.remove_roles: for role in data.remove_roles: From e855f53f086c7dccecc0118e414f07dc08bc2b2e Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 2 Nov 2016 07:34:17 +0530 Subject: [PATCH 3/4] [minor] fix ellipsis style --- erpnext/hr/doctype/employee/employee.json | 90 ++++++++++++- erpnext/public/js/pos/pos_item.html | 4 +- .../public/js/templates/item_selector.html | 2 +- .../doctype/sales_order/sales_order.json | 123 +++++++++++++++++- .../form_grid/includes/visible_cols.html | 2 +- erpnext/templates/includes/issue_row.html | 2 +- .../templates/includes/products_as_list.html | 6 +- .../templates/includes/transaction_row.html | 2 +- 8 files changed, 218 insertions(+), 13 deletions(-) diff --git a/erpnext/hr/doctype/employee/employee.json b/erpnext/hr/doctype/employee/employee.json index a99d8742cf6..7fea82d815c 100644 --- a/erpnext/hr/doctype/employee/employee.json +++ b/erpnext/hr/doctype/employee/employee.json @@ -23,6 +23,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "", "length": 0, "no_copy": 0, @@ -49,6 +50,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Employee", "length": 0, "no_copy": 1, @@ -74,6 +76,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Series", "length": 0, "no_copy": 1, @@ -102,6 +105,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Salutation", "length": 0, "no_copy": 0, @@ -130,6 +134,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, + "in_standard_filter": 0, "label": "Full Name", "length": 0, "no_copy": 0, @@ -157,6 +162,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, + "in_standard_filter": 1, "label": "Company", "length": 0, "no_copy": 0, @@ -184,6 +190,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "User ID", "length": 0, "no_copy": 0, @@ -210,6 +217,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Image", "length": 0, "no_copy": 1, @@ -236,6 +244,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "length": 0, "no_copy": 0, "permlevel": 0, @@ -261,6 +270,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, + "in_standard_filter": 0, "label": "Employee Number", "length": 0, "no_copy": 0, @@ -288,6 +298,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Date of Joining", "length": 0, "no_copy": 0, @@ -316,6 +327,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, + "in_standard_filter": 0, "label": "Date of Birth", "length": 0, "no_copy": 0, @@ -343,6 +355,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, + "in_standard_filter": 0, "label": "Gender", "length": 0, "no_copy": 0, @@ -371,6 +384,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Employment Details", "length": 0, "no_copy": 0, @@ -397,6 +411,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, + "in_standard_filter": 1, "label": "Status", "length": 0, "no_copy": 0, @@ -425,6 +440,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, + "in_standard_filter": 1, "label": "Employment Type", "length": 0, "no_copy": 0, @@ -454,6 +470,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Holiday List", "length": 0, "no_copy": 0, @@ -482,6 +499,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "length": 0, "no_copy": 0, "permlevel": 0, @@ -506,6 +524,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, + "in_standard_filter": 0, "label": "Offer Date", "length": 0, "no_copy": 0, @@ -533,6 +552,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Confirmation Date", "length": 0, "no_copy": 0, @@ -560,6 +580,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, + "in_standard_filter": 0, "label": "Contract End Date", "length": 0, "no_copy": 0, @@ -587,6 +608,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Date Of Retirement", "length": 0, "no_copy": 0, @@ -614,6 +636,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Job Profile", "length": 0, "no_copy": 0, @@ -639,6 +662,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, + "in_standard_filter": 1, "label": "Branch", "length": 0, "no_copy": 0, @@ -667,6 +691,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, + "in_standard_filter": 1, "label": "Department", "length": 0, "no_copy": 0, @@ -695,6 +720,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, + "in_standard_filter": 0, "label": "Designation", "length": 0, "no_copy": 0, @@ -724,6 +750,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, + "in_standard_filter": 0, "label": "Company Email", "length": 0, "no_copy": 0, @@ -752,6 +779,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Notice (days)", "length": 0, "no_copy": 0, @@ -779,6 +807,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Salary Information", "length": 0, "no_copy": 0, @@ -806,6 +835,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Salary Mode", "length": 0, "no_copy": 0, @@ -835,6 +865,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, + "in_standard_filter": 0, "label": "Bank Name", "length": 0, "no_copy": 0, @@ -863,6 +894,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Bank A/C No.", "length": 0, "no_copy": 0, @@ -890,6 +922,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Organization Profile", "length": 0, "no_copy": 0, @@ -915,6 +948,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Reports to", "length": 0, "no_copy": 0, @@ -944,6 +978,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Leave Approvers", "length": 0, "no_copy": 0, @@ -970,6 +1005,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Contact Details", "length": 0, "no_copy": 0, @@ -987,14 +1023,16 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "", "fieldname": "prefered_contact_email", "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, + "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Prefered Contact Email", "length": 0, "no_copy": 0, @@ -1014,13 +1052,15 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "prefered_email", "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, + "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Prefered Email", "length": 0, "no_copy": 0, @@ -1040,6 +1080,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "cell_number", "fieldtype": "Data", "hidden": 0, @@ -1047,6 +1088,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Cell Number", "length": 0, "no_copy": 0, @@ -1072,6 +1114,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Personal Email", "length": 0, "no_copy": 0, @@ -1098,6 +1141,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Unsubscribed", "length": 0, "no_copy": 0, @@ -1123,6 +1167,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Emergency Contact", "length": 0, "no_copy": 0, @@ -1148,6 +1193,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Relation", "length": 0, "no_copy": 0, @@ -1173,6 +1219,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Emergency Phone", "length": 0, "no_copy": 0, @@ -1198,6 +1245,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "length": 0, "no_copy": 0, "permlevel": 0, @@ -1223,6 +1271,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Permanent Address Is", "length": 0, "no_copy": 0, @@ -1249,6 +1298,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Permanent Address", "length": 0, "no_copy": 0, @@ -1274,6 +1324,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Current Address Is", "length": 0, "no_copy": 0, @@ -1300,6 +1351,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Current Address", "length": 0, "no_copy": 0, @@ -1325,6 +1377,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "", "length": 0, "no_copy": 0, @@ -1351,6 +1404,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Bio", "length": 0, "no_copy": 0, @@ -1376,6 +1430,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Personal Details", "length": 0, "no_copy": 0, @@ -1401,6 +1456,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Passport Number", "length": 0, "no_copy": 0, @@ -1426,6 +1482,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Date of Issue", "length": 0, "no_copy": 0, @@ -1451,6 +1508,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Valid Upto", "length": 0, "no_copy": 0, @@ -1476,6 +1534,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Place of Issue", "length": 0, "no_copy": 0, @@ -1501,6 +1560,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "length": 0, "no_copy": 0, "permlevel": 0, @@ -1526,6 +1586,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Marital Status", "length": 0, "no_copy": 0, @@ -1552,6 +1613,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Blood Group", "length": 0, "no_copy": 0, @@ -1579,6 +1641,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Family Background", "length": 0, "no_copy": 0, @@ -1605,6 +1668,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Health Details", "length": 0, "no_copy": 0, @@ -1630,6 +1694,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Educational Qualification", "length": 0, "no_copy": 0, @@ -1655,6 +1720,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Education", "length": 0, "no_copy": 0, @@ -1681,6 +1747,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Previous Work Experience", "length": 0, "no_copy": 0, @@ -1707,6 +1774,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "External Work History", "length": 0, "no_copy": 0, @@ -1733,6 +1801,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "History In Company", "length": 0, "no_copy": 0, @@ -1759,6 +1828,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Internal Work History", "length": 0, "no_copy": 0, @@ -1785,6 +1855,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Exit", "length": 0, "no_copy": 0, @@ -1811,6 +1882,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Resignation Letter Date", "length": 0, "no_copy": 0, @@ -1838,6 +1910,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, + "in_standard_filter": 0, "label": "Relieving Date", "length": 0, "no_copy": 0, @@ -1865,6 +1938,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Reason for Leaving", "length": 0, "no_copy": 0, @@ -1892,6 +1966,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Leave Encashed?", "length": 0, "no_copy": 0, @@ -1920,6 +1995,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Encashment Date", "length": 0, "no_copy": 0, @@ -1947,6 +2023,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Exit Interview Details", "length": 0, "no_copy": 0, @@ -1975,6 +2052,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Held On", "length": 0, "no_copy": 0, @@ -2002,6 +2080,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Reason for Resignation", "length": 0, "no_copy": 0, @@ -2030,6 +2109,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "New Workplace", "length": 0, "no_copy": 0, @@ -2057,6 +2137,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Feedback", "length": 0, "no_copy": 0, @@ -2085,7 +2166,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-10-18 18:12:12.474098", + "modified": "2016-10-26 07:20:39.490313", "modified_by": "Administrator", "module": "HR", "name": "Employee", @@ -2101,6 +2182,7 @@ "export": 0, "if_owner": 0, "import": 0, + "is_custom": 0, "permlevel": 0, "print": 1, "read": 1, @@ -2121,6 +2203,7 @@ "export": 0, "if_owner": 0, "import": 0, + "is_custom": 0, "permlevel": 0, "print": 1, "read": 1, @@ -2142,6 +2225,7 @@ "export": 0, "if_owner": 0, "import": 0, + "is_custom": 0, "permlevel": 0, "print": 1, "read": 1, diff --git a/erpnext/public/js/pos/pos_item.html b/erpnext/public/js/pos/pos_item.html index aec36a7f809..b33076dc6ac 100644 --- a/erpnext/public/js/pos/pos_item.html +++ b/erpnext/public/js/pos/pos_item.html @@ -6,8 +6,8 @@ {% if (!item_image) { %}{{ abbr }}{% } %}
-
{%= item_name ? (item_name + " (" + item_code + ")") : item_code %}
-
{%= item_price %}
+
{%= item_name ? (item_name + " (" + item_code + ")") : item_code %}
+
{%= item_price %}
\ No newline at end of file diff --git a/erpnext/public/js/templates/item_selector.html b/erpnext/public/js/templates/item_selector.html index 47da67c8ee9..89171f87751 100644 --- a/erpnext/public/js/templates/item_selector.html +++ b/erpnext/public/js/templates/item_selector.html @@ -8,7 +8,7 @@ {% if(!item.image) { %}{{ item.abbr }}{% } %}
-
{{ item.name }}
+
{{ item.name }}
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index c8158a6aea8..fe5ecbf7235 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -10,6 +10,7 @@ "doctype": "DocType", "document_type": "Document", "editable_grid": 1, + "engine": "InnoDB", "fields": [ { "allow_on_submit": 0, @@ -23,6 +24,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "", "length": 0, "no_copy": 0, @@ -49,6 +51,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "length": 0, "no_copy": 0, "oldfieldtype": "Column Break", @@ -76,6 +79,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Title", "length": 0, "no_copy": 1, @@ -102,6 +106,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Series", "length": 0, "no_copy": 1, @@ -130,6 +135,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, + "in_standard_filter": 1, "label": "Customer", "length": 0, "no_copy": 0, @@ -158,6 +164,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Customer Name", "length": 0, "no_copy": 0, @@ -185,6 +192,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Order Type", "length": 0, "no_copy": 0, @@ -213,6 +221,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "length": 0, "no_copy": 0, "oldfieldtype": "Column Break", @@ -239,6 +248,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Amended From", "length": 0, "no_copy": 1, @@ -269,6 +279,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, + "in_standard_filter": 0, "label": "Company", "length": 0, "no_copy": 0, @@ -299,6 +310,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, + "in_standard_filter": 0, "label": "Date", "length": 0, "no_copy": 1, @@ -328,6 +340,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, + "in_standard_filter": 0, "label": "Delivery Date", "length": 0, "no_copy": 1, @@ -358,6 +371,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Customer's Purchase Order", "length": 0, "no_copy": 0, @@ -388,6 +402,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Customer's Purchase Order Date", "length": 0, "no_copy": 0, @@ -418,6 +433,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Address and Contact", "length": 0, "no_copy": 0, @@ -444,6 +460,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, + "in_standard_filter": 0, "label": "Customer Address", "length": 0, "no_copy": 0, @@ -470,6 +487,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Address", "length": 0, "no_copy": 0, @@ -495,6 +513,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, + "in_standard_filter": 0, "label": "Contact Person", "length": 0, "no_copy": 0, @@ -521,6 +540,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Contact", "length": 0, "no_copy": 0, @@ -546,6 +566,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Mobile No", "length": 0, "no_copy": 0, @@ -571,6 +592,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Contact Email", "length": 0, "no_copy": 0, @@ -597,6 +619,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "length": 0, "no_copy": 0, "permlevel": 0, @@ -622,6 +645,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, + "in_standard_filter": 0, "label": "Shipping Address Name", "length": 0, "no_copy": 0, @@ -648,6 +672,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Shipping Address", "length": 0, "no_copy": 0, @@ -674,6 +699,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, + "in_standard_filter": 0, "label": "Customer Group", "length": 0, "no_copy": 0, @@ -701,6 +727,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, + "in_standard_filter": 0, "label": "Territory", "length": 0, "no_copy": 0, @@ -727,6 +754,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Currency and Price List", "length": 0, "no_copy": 0, @@ -753,6 +781,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Currency", "length": 0, "no_copy": 0, @@ -783,6 +812,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Exchange Rate", "length": 0, "no_copy": 0, @@ -812,6 +842,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "length": 0, "no_copy": 0, "permlevel": 0, @@ -837,6 +868,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Price List", "length": 0, "no_copy": 0, @@ -866,6 +898,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Price List Currency", "length": 0, "no_copy": 0, @@ -893,6 +926,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Price List Exchange Rate", "length": 0, "no_copy": 0, @@ -919,6 +953,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Ignore Pricing Rule", "length": 0, "no_copy": 1, @@ -944,6 +979,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "", "length": 0, "no_copy": 0, @@ -971,6 +1007,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Items", "length": 0, "no_copy": 0, @@ -999,6 +1036,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "length": 0, "no_copy": 0, "permlevel": 0, @@ -1023,6 +1061,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "length": 0, "no_copy": 0, "permlevel": 0, @@ -1047,6 +1086,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Total (Company Currency)", "length": 0, "no_copy": 0, @@ -1074,6 +1114,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Net Total (Company Currency)", "length": 0, "no_copy": 0, @@ -1103,6 +1144,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "length": 0, "no_copy": 0, "permlevel": 0, @@ -1127,6 +1169,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Total", "length": 0, "no_copy": 0, @@ -1154,6 +1197,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Net Total", "length": 0, "no_copy": 0, @@ -1180,6 +1224,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Taxes and Charges", "length": 0, "no_copy": 0, @@ -1207,6 +1252,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Taxes and Charges", "length": 0, "no_copy": 0, @@ -1235,6 +1281,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "length": 0, "no_copy": 0, "permlevel": 0, @@ -1259,6 +1306,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Shipping Rule", "length": 0, "no_copy": 0, @@ -1286,6 +1334,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "length": 0, "no_copy": 0, "permlevel": 0, @@ -1310,6 +1359,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Sales Taxes and Charges", "length": 0, "no_copy": 0, @@ -1338,6 +1388,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Taxes and Charges Calculation", "length": 0, "no_copy": 0, @@ -1364,6 +1415,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "length": 0, "no_copy": 0, "permlevel": 0, @@ -1388,6 +1440,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Total Taxes and Charges (Company Currency)", "length": 0, "no_copy": 0, @@ -1417,6 +1470,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "length": 0, "no_copy": 0, "permlevel": 0, @@ -1442,6 +1496,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Total Taxes and Charges", "length": 0, "no_copy": 0, @@ -1469,6 +1524,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Additional Discount", "length": 0, "no_copy": 0, @@ -1496,6 +1552,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Apply Additional Discount On", "length": 0, "no_copy": 0, @@ -1523,6 +1580,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Additional Discount Amount (Company Currency)", "length": 0, "no_copy": 0, @@ -1550,6 +1608,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "length": 0, "no_copy": 0, "permlevel": 0, @@ -1575,6 +1634,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Additional Discount Percentage", "length": 0, "no_copy": 0, @@ -1602,6 +1662,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Additional Discount Amount", "length": 0, "no_copy": 0, @@ -1628,6 +1689,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "", "length": 0, "no_copy": 0, @@ -1655,6 +1717,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Grand Total (Company Currency)", "length": 0, "no_copy": 0, @@ -1684,6 +1747,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Rounded Total (Company Currency)", "length": 0, "no_copy": 0, @@ -1714,6 +1778,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "In Words (Company Currency)", "length": 0, "no_copy": 0, @@ -1742,6 +1807,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "length": 0, "no_copy": 0, "oldfieldtype": "Column Break", @@ -1768,6 +1834,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, + "in_standard_filter": 0, "label": "Grand Total", "length": 0, "no_copy": 0, @@ -1797,6 +1864,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Rounded Total", "length": 0, "no_copy": 0, @@ -1826,6 +1894,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "In Words", "length": 0, "no_copy": 0, @@ -1854,6 +1923,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Advance Paid", "length": 0, "no_copy": 1, @@ -1882,6 +1952,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Packing List", "length": 0, "no_copy": 0, @@ -1909,6 +1980,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Packed Items", "length": 0, "no_copy": 0, @@ -1938,6 +2010,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Terms and Conditions", "length": 0, "no_copy": 0, @@ -1965,6 +2038,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Terms", "length": 0, "no_copy": 0, @@ -1993,6 +2067,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Terms and Conditions Details", "length": 0, "no_copy": 0, @@ -2021,6 +2096,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "More Information", "length": 0, "no_copy": 0, @@ -2049,6 +2125,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, + "in_standard_filter": 0, "label": "Project", "length": 0, "no_copy": 0, @@ -2077,6 +2154,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Party Account Currency", "length": 0, "no_copy": 1, @@ -2104,6 +2182,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "length": 0, "no_copy": 0, "permlevel": 0, @@ -2129,6 +2208,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Source", "length": 0, "no_copy": 0, @@ -2158,6 +2238,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Campaign", "length": 0, "no_copy": 0, @@ -2186,6 +2267,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Printing Details", "length": 0, "no_copy": 0, @@ -2212,6 +2294,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Print Language", "length": 0, "no_copy": 0, @@ -2238,6 +2321,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Letter Head", "length": 0, "no_copy": 0, @@ -2266,6 +2350,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "length": 0, "no_copy": 0, "oldfieldtype": "Column Break", @@ -2292,6 +2377,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Print Heading", "length": 0, "no_copy": 1, @@ -2320,6 +2406,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Billing and Delivery Status", "length": 0, "no_copy": 0, @@ -2348,6 +2435,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, + "in_standard_filter": 0, "label": "Status", "length": 0, "no_copy": 1, @@ -2377,6 +2465,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Delivery Status", "length": 0, "no_copy": 1, @@ -2405,6 +2494,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, + "in_standard_filter": 0, "label": "% Delivered", "length": 0, "no_copy": 1, @@ -2433,6 +2523,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "length": 0, "no_copy": 0, "permlevel": 0, @@ -2459,6 +2550,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, + "in_standard_filter": 0, "label": "% Amount Billed", "length": 0, "no_copy": 1, @@ -2487,6 +2579,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Billing Status", "length": 0, "no_copy": 1, @@ -2514,6 +2607,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Commission", "length": 0, "no_copy": 0, @@ -2541,6 +2635,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, + "in_standard_filter": 0, "label": "Sales Partner", "length": 0, "no_copy": 0, @@ -2570,6 +2665,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "length": 0, "no_copy": 0, "permlevel": 0, @@ -2595,6 +2691,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Commission Rate", "length": 0, "no_copy": 0, @@ -2623,6 +2720,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Total Commission", "length": 0, "no_copy": 0, @@ -2652,6 +2750,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Sales Team", "length": 0, "no_copy": 0, @@ -2677,6 +2776,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Sales Team1", "length": 0, "no_copy": 0, @@ -2706,6 +2806,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Recurring Order", "length": 0, "no_copy": 0, @@ -2732,6 +2833,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Settings", "length": 0, "no_copy": 0, @@ -2760,6 +2862,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Is Recurring", "length": 0, "no_copy": 1, @@ -2787,6 +2890,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Reference Document", "length": 0, "no_copy": 1, @@ -2815,6 +2919,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Frequency", "length": 0, "no_copy": 1, @@ -2843,6 +2948,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Repeat on Day of Month", "length": 0, "no_copy": 1, @@ -2870,6 +2976,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Recurring Upto", "length": 0, "no_copy": 1, @@ -2896,6 +3003,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Submit on creation", "length": 0, "no_copy": 0, @@ -2924,6 +3032,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Notify by email", "length": 0, "no_copy": 1, @@ -2952,6 +3061,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Notification Email Address", "length": 0, "no_copy": 1, @@ -2979,6 +3089,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Recurring Print Format", "length": 0, "no_copy": 0, @@ -3006,6 +3117,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "This Document", "length": 0, "no_copy": 0, @@ -3033,6 +3145,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "From Date", "length": 0, "no_copy": 1, @@ -3060,6 +3173,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "To Date", "length": 0, "no_copy": 1, @@ -3087,6 +3201,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Next Date", "length": 0, "no_copy": 1, @@ -3112,7 +3227,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-09-16 06:07:17.882648", + "modified": "2016-10-26 07:12:39.118595", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order", @@ -3128,6 +3243,7 @@ "export": 0, "if_owner": 1, "import": 0, + "is_custom": 0, "permlevel": 0, "print": 1, "read": 1, @@ -3148,6 +3264,7 @@ "export": 1, "if_owner": 0, "import": 1, + "is_custom": 0, "permlevel": 0, "print": 1, "read": 1, @@ -3168,6 +3285,7 @@ "export": 0, "if_owner": 0, "import": 0, + "is_custom": 0, "permlevel": 0, "print": 1, "read": 1, @@ -3188,6 +3306,7 @@ "export": 0, "if_owner": 0, "import": 0, + "is_custom": 0, "permlevel": 0, "print": 1, "read": 1, @@ -3208,6 +3327,7 @@ "export": 0, "if_owner": 0, "import": 0, + "is_custom": 0, "permlevel": 0, "print": 0, "read": 1, @@ -3228,6 +3348,7 @@ "export": 0, "if_owner": 0, "import": 0, + "is_custom": 0, "permlevel": 1, "print": 0, "read": 1, diff --git a/erpnext/templates/form_grid/includes/visible_cols.html b/erpnext/templates/form_grid/includes/visible_cols.html index caa13667db2..3a0cc8d7239 100644 --- a/erpnext/templates/form_grid/includes/visible_cols.html +++ b/erpnext/templates/form_grid/includes/visible_cols.html @@ -2,7 +2,7 @@ {% var val = doc.get_formatted(df.fieldname); if((df.fieldname !== "description" && df.fieldname !== "item_name") && val) { %}
-
+
{%= __(df.label) %}:
diff --git a/erpnext/templates/includes/issue_row.html b/erpnext/templates/includes/issue_row.html index f19ea852f95..c0b0d2b98c0 100644 --- a/erpnext/templates/includes/issue_row.html +++ b/erpnext/templates/includes/issue_row.html @@ -5,7 +5,7 @@ {{ doc.name }}
-
+
{{ doc.subject }}
diff --git a/erpnext/templates/includes/products_as_list.html b/erpnext/templates/includes/products_as_list.html index b2069e45099..20ca59daf35 100644 --- a/erpnext/templates/includes/products_as_list.html +++ b/erpnext/templates/includes/products_as_list.html @@ -6,12 +6,12 @@ {{ product_image_square(thumbnail or website_image) }}
-
{{ item_name }}
+
{{ item_name }}
{% set website_description = website_description or description %} {% if website_description != item_name %} -
{{ website_description or description }}
+
{{ website_description or description }}
{% elif item_code != item_name %} -
{{ _('Item Code') }}: {{ item_code }}
+
{{ _('Item Code') }}: {{ item_code }}
{% endif %}
diff --git a/erpnext/templates/includes/transaction_row.html b/erpnext/templates/includes/transaction_row.html index f0fee97d465..10d76057d22 100644 --- a/erpnext/templates/includes/transaction_row.html +++ b/erpnext/templates/includes/transaction_row.html @@ -9,7 +9,7 @@ {{ frappe.utils.format_datetime(doc.modified, "medium") }}
-
+
{{ doc.items_preview }}
From f87b7b0c4ecc6b6001173a0f01f35c63cab86e39 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 2 Nov 2016 10:53:53 +0530 Subject: [PATCH 4/4] [fix] typo --- erpnext/schools/doctype/academic_term/academic_term.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/schools/doctype/academic_term/academic_term.py b/erpnext/schools/doctype/academic_term/academic_term.py index 45103482a90..4a1a941cd6b 100644 --- a/erpnext/schools/doctype/academic_term/academic_term.py +++ b/erpnext/schools/doctype/academic_term/academic_term.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import frappe -from frappe import msgprint, _ +from frappe import _ from frappe.utils import get_datetime from frappe.model.document import Document @@ -27,7 +27,7 @@ class AcademicTerm(Document): if self.term_start_date and get_datetime(year.year_start_date) and (self.term_start_date < get_datetime(year.year_start_date)): frappe.throw(_("The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.").format(self.academic_year)) - if self.term_end_date and get_datetime_(year.year_end_date) and (self.term_end_date > get_datetime(year.year_end_date)): + if self.term_end_date and get_datetime(year.year_end_date) and (self.term_end_date > get_datetime(year.year_end_date)): frappe.throw(_("The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.").format(self.academic_year))