From f947368881b853bdd85b422671ea5fd843b104c2 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 18 Jan 2013 16:04:51 +0530 Subject: [PATCH 01/20] added validation for sales return and purchase return --- stock/doctype/stock_entry/stock_entry.py | 56 +++++++++++++++++------- 1 file changed, 39 insertions(+), 17 deletions(-) diff --git a/stock/doctype/stock_entry/stock_entry.py b/stock/doctype/stock_entry/stock_entry.py index 00ae0e04339..6d09045d8c9 100644 --- a/stock/doctype/stock_entry/stock_entry.py +++ b/stock/doctype/stock_entry/stock_entry.py @@ -17,10 +17,9 @@ from __future__ import unicode_literals import webnotes -from webnotes.utils import cstr, cint, flt, getdate, now, comma_or -from webnotes.model import db_exists, delete_doc +from webnotes.utils import cstr, cint, flt, comma_or from webnotes.model.doc import Document, addchild -from webnotes.model.wrapper import getlist, copy_doclist +from webnotes.model.wrapper import getlist from webnotes.model.code import get_obj from webnotes import msgprint, _ from stock.utils import get_incoming_rate @@ -51,6 +50,7 @@ class DocType(TransactionBase): self.validate_incoming_rate() self.validate_bom() self.validate_finished_goods() + self.validate_return_reference_doc() def on_submit(self): self.update_serial_no(1) @@ -85,6 +85,15 @@ class DocType(TransactionBase): validate_for_manufacture_repack = any([d.bom_no for d in self.doclist.get( {"parentfield": "mtn_details"})]) + if self.doc.purpose in source_mandatory and self.doc.purpose not in target_mandatory: + self.doc.to_warehouse = None + for d in getlist(self.doclist, 'mtn_details'): + d.t_warehouse = None + elif self.doc.purpose in target_mandatory and self.doc.purpose not in source_mandatory: + self.doc.from_warehouse = None + for d in getlist(self.doclist, 'mtn_details'): + d.s_warehouse = None + for d in getlist(self.doclist, 'mtn_details'): if not d.s_warehouse and not d.t_warehouse: d.s_warehouse = self.doc.from_warehouse @@ -93,21 +102,13 @@ class DocType(TransactionBase): if not (d.s_warehouse or d.t_warehouse): msgprint(_("Atleast one warehouse is mandatory"), raise_exception=1) - if self.doc.purpose in source_mandatory: - if not d.s_warehouse: - msgprint(_("Row # ") + "%s: " % cint(d.idx) - + _("Source Warehouse") + _(" is mandatory"), raise_exception=1) - - if self.doc.purpose not in target_mandatory: - d.t_warehouse = None + if self.doc.purpose in source_mandatory and not d.s_warehouse: + msgprint(_("Row # ") + "%s: " % cint(d.idx) + + _("Source Warehouse") + _(" is mandatory"), raise_exception=1) - if self.doc.purpose in target_mandatory: - if not d.t_warehouse: - msgprint(_("Row # ") + "%s: " % cint(d.idx) - + _("Target Warehouse") + _(" is mandatory"), raise_exception=1) - - if self.doc.purpose not in source_mandatory: - d.s_warehouse = None + if self.doc.purpose in target_mandatory and not d.t_warehouse: + msgprint(_("Row # ") + "%s: " % cint(d.idx) + + _("Target Warehouse") + _(" is mandatory"), raise_exception=1) if self.doc.purpose == "Manufacture/Repack": if validate_for_manufacture_repack: @@ -225,7 +226,28 @@ class DocType(TransactionBase): + _("Quantity should be equal to Manufacturing Quantity. ") + _("To fetch items again, click on 'Get Items' button \ or update the Quantity manually."), raise_exception=1) + + def validate_return_reference_doc(self): + """ validate item with reference doc""" + ref_doctype = ref_docname = "" + if self.doc.purpose == "Sales Return" and \ + (self.doc.delivery_note_no or self.doc.sales_invoice_no): + ref_doctype = self.doc.delivery_note_no and "Delivery Note" or "Sales Invoice" + ref_docname = self.doc.delivery_note_no or self.doc.sales_invoice_no + elif self.doc.purpose == "Purchase Return" and self.doc.purchase_receipt_no: + ref_doctype = "Purchase Receipt" + ref_docname = self.doc.purchase_receipt_no + + if ref_doctype and ref_docname: + for item in self.doclist.get({"parentfield": "mtn_details"}): + ref_exists = webnotes.conn.sql("""select name from `tab%s` + where parent = %s and item_code = %s and docstatus=1""" % + (ref_doctype + " Item", '%s', '%s'), (ref_docname, item.item_code)) + if not ref_exists: + msgprint(_("Item: '") + item.item_code + _("' does not exists in ") + + ref_doctype + ": " + ref_docname, raise_exception=1) + def update_serial_no(self, is_submit): """Create / Update Serial No""" from stock.utils import get_valid_serial_nos From f2223102e2af2c007325b41322feb3f90f3f1795 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 18 Jan 2013 17:45:24 +0530 Subject: [PATCH 02/20] removed supplier account field from jv --- .../journal_voucher/journal_voucher.txt | 32 ++++++------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/accounts/doctype/journal_voucher/journal_voucher.txt b/accounts/doctype/journal_voucher/journal_voucher.txt index b30c4db432e..09c61483528 100644 --- a/accounts/doctype/journal_voucher/journal_voucher.txt +++ b/accounts/doctype/journal_voucher/journal_voucher.txt @@ -2,9 +2,9 @@ { "owner": "Administrator", "docstatus": 0, - "creation": "2013-01-17 12:30:11", + "creation": "2013-01-18 10:46:42", "modified_by": "Administrator", - "modified": "2013-01-17 14:27:43" + "modified": "2013-01-18 17:44:58" }, { "autoname": "naming_series:", @@ -28,6 +28,7 @@ "read": 1, "doctype": "DocPerm", "parenttype": "DocType", + "report": 1, "parentfield": "permissions" }, { @@ -102,8 +103,8 @@ }, { "print_hide": 0, - "oldfieldtype": "Table", "allow_on_submit": 1, + "oldfieldtype": "Table", "doctype": "DocField", "label": "Entries", "oldfieldname": "entries", @@ -460,27 +461,14 @@ "fieldtype": "Data", "permlevel": 1 }, - { - "print_hide": 1, - "no_copy": 1, - "oldfieldtype": "Link", - "doctype": "DocField", - "label": "Supplier Account", - "oldfieldname": "supplier_account", - "options": "Account", - "fieldname": "supplier_account", - "fieldtype": "Link", - "hidden": 0, - "permlevel": 0 - }, { "amend": 1, "create": 1, "doctype": "DocPerm", "submit": 1, "write": 1, - "role": "Accounts User", "cancel": 1, + "role": "Accounts User", "permlevel": 0 }, { @@ -489,8 +477,8 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "role": "Accounts User", "cancel": 0, + "role": "Accounts User", "permlevel": 1 }, { @@ -499,8 +487,8 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "role": "Accounts Manager", "cancel": 0, + "role": "Accounts Manager", "permlevel": 1 }, { @@ -509,8 +497,8 @@ "doctype": "DocPerm", "submit": 1, "write": 1, - "role": "Accounts Manager", "cancel": 1, + "role": "Accounts Manager", "permlevel": 0 }, { @@ -519,8 +507,8 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "role": "Auditor", "cancel": 0, + "role": "Auditor", "permlevel": 0 }, { @@ -529,8 +517,8 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "role": "Auditor", "cancel": 0, + "role": "Auditor", "permlevel": 1 } ] \ No newline at end of file From 3ab6c5fca95195566ada7bec4bee5f853204c4a6 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Sat, 19 Jan 2013 10:54:03 +0530 Subject: [PATCH 03/20] appraisal, don't validate points for self-appraisal --- hr/doctype/appraisal/appraisal.py | 31 +++++++++++-------- .../production_planning_tool.txt | 20 +++++++----- .../january_2013/change_patch_structure.py | 15 ++++----- website/helpers/contact.py | 2 +- 4 files changed, 39 insertions(+), 29 deletions(-) diff --git a/hr/doctype/appraisal/appraisal.py b/hr/doctype/appraisal/appraisal.py index 82fb77b2f69..849e48ac37a 100644 --- a/hr/doctype/appraisal/appraisal.py +++ b/hr/doctype/appraisal/appraisal.py @@ -29,7 +29,15 @@ class DocType: def __init__(self, doc, doclist=[]): self.doc = doc self.doclist = doclist - + + def validate(self): + if not self.doc.status: + self.doc.status = "Draft" + + self.validate_dates() + self.validate_existing_appraisal() + self.calculate_total() + def get_employee_name(self): emp_nm = sql("select employee_name from `tabEmployee` where name=%s", self.doc.employee) emp_nm= emp_nm and emp_nm[0][0] or '' @@ -47,25 +55,19 @@ class DocType: raise Exception def validate_existing_appraisal(self): - chk = sql("select name from `tabAppraisal` where employee=%s and (status='Submitted' or status='Completed') and ((start_date>=%s and start_date<=%s) or (end_date>=%s and end_date<=%s))",(self.doc.employee,self.doc.start_date,self.doc.end_date,self.doc.start_date,self.doc.end_date)) + chk = sql("""select name from `tabAppraisal` where employee=%s + and (status='Submitted' or status='Completed') + and ((start_date>=%s and start_date<=%s) + or (end_date>=%s and end_date<=%s))""",(self.doc.employee,self.doc.start_date,self.doc.end_date,self.doc.start_date,self.doc.end_date)) if chk: msgprint("You have already created Appraisal "\ +cstr(chk[0][0])+" in the current date range for employee "\ +cstr(self.doc.employee_name)) raise Exception - - def validate(self): - if not self.doc.status: - self.doc.status = "Draft" - - self.validate_dates() - self.validate_existing_appraisal() - self.calculate_total() def calculate_total(self): total, total_w = 0, 0 for d in getlist(self.doclist, 'appraisal_details'): - if d.score: d.score_earned = flt(d.score) * flt(d.per_weightage) / 100 total = total + d.score_earned @@ -74,9 +76,12 @@ class DocType: if int(total_w) != 100: msgprint("Total weightage assigned should be 100%. It is :" + str(total_w) + "%", raise_exception=1) + + if webnotes.conn.get_default("employee", webnotes.session.user) != self.doc.employee: - if total==0: - msgprint("Total can't be zero. You must atleast give some points!", raise_exception=1) + if total==0: + msgprint("Total can't be zero. You must atleast give some points!", raise_exception=1) + self.doc.total_score = total def on_submit(self): diff --git a/manufacturing/doctype/production_planning_tool/production_planning_tool.txt b/manufacturing/doctype/production_planning_tool/production_planning_tool.txt index d4a0d94774e..5eeb82da8f0 100644 --- a/manufacturing/doctype/production_planning_tool/production_planning_tool.txt +++ b/manufacturing/doctype/production_planning_tool/production_planning_tool.txt @@ -2,9 +2,9 @@ { "owner": "jai@webnotestech.com", "docstatus": 0, - "creation": "2013-01-16 14:48:56", + "creation": "2013-01-19 10:23:35", "modified_by": "Administrator", - "modified": "2013-01-17 11:39:55" + "modified": "2013-01-19 10:31:03" }, { "read_only": 1, @@ -31,8 +31,8 @@ "submit": 0, "doctype": "DocPerm", "write": 1, - "report": 0, "parenttype": "DocType", + "report": 1, "permlevel": 0, "parentfield": "permissions" }, @@ -70,9 +70,9 @@ { "doctype": "DocField", "label": "Company", - "reqd": 1, "fieldname": "company", "fieldtype": "Link", + "reqd": 1, "options": "Company" }, { @@ -161,9 +161,9 @@ "default": "1", "doctype": "DocField", "label": "Use Multi-Level BOM", - "reqd": 0, "fieldname": "use_multi_level_bom", - "fieldtype": "Check" + "fieldtype": "Check", + "reqd": 0 }, { "doctype": "DocField", @@ -181,9 +181,9 @@ }, { "doctype": "DocField", + "label": "Materials Requirement Planning (MRP)", "fieldname": "sb5", - "fieldtype": "Section Break", - "options": "Simple" + "fieldtype": "Section Break" }, { "description": "Download a report containing all raw materials with their latest inventory status", @@ -213,6 +213,10 @@ "fieldtype": "Button", "options": "raise_purchase_request" }, + { + "role": "System Manager", + "doctype": "DocPerm" + }, { "role": "Manufacturing User", "doctype": "DocPerm" diff --git a/patches/january_2013/change_patch_structure.py b/patches/january_2013/change_patch_structure.py index 37c4f087f3b..1370cdddcd1 100644 --- a/patches/january_2013/change_patch_structure.py +++ b/patches/january_2013/change_patch_structure.py @@ -2,11 +2,12 @@ import webnotes def execute(): webnotes.reload_doc("core", "doctype", "patch_log") - for d in webnotes.conn.sql("""select patch from __PatchLog"""): - webnotes.doc({ - "doctype": "Patch Log", - "patch": d[0] - }).insert() + if webnotes.conn.table_exists("__PatchLog"): + for d in webnotes.conn.sql("""select patch from __PatchLog"""): + webnotes.doc({ + "doctype": "Patch Log", + "patch": d[0] + }).insert() - webnotes.conn.commit() - webnotes.conn.sql("drop table __PatchLog") \ No newline at end of file + webnotes.conn.commit() + webnotes.conn.sql("drop table __PatchLog") \ No newline at end of file diff --git a/website/helpers/contact.py b/website/helpers/contact.py index df4510fa391..a9499abb790 100644 --- a/website/helpers/contact.py +++ b/website/helpers/contact.py @@ -50,7 +50,7 @@ def send_message(subject="Website Query", message="", sender="", status="Open"): lead.ignore_permissions = True lead.insert() - make(content=message, sender=sender, + make(content=message, sender=sender, subject=subject, doctype="Lead", name=lead.doc.name, lead=lead.doc.name) From f5b04cff8b2ff2a4a1fbee6b84ab2ff266422289 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 21 Jan 2013 10:14:10 +0530 Subject: [PATCH 04/20] added number format, sent country info in boot, link options not extracted from cache --- .../production_planning_tool.txt | 4 +- patches/patch_list.py | 1 + setup/doctype/currency/currency.js | 1 - setup/doctype/currency/currency.txt | 31 +++++-- startup/install.py | 3 +- stock/doctype/item/item.js | 14 ---- stock/doctype/item/item.py | 7 +- stock/doctype/item/item.txt | 83 +++++++------------ 8 files changed, 62 insertions(+), 82 deletions(-) diff --git a/manufacturing/doctype/production_planning_tool/production_planning_tool.txt b/manufacturing/doctype/production_planning_tool/production_planning_tool.txt index 5eeb82da8f0..dc1eb513996 100644 --- a/manufacturing/doctype/production_planning_tool/production_planning_tool.txt +++ b/manufacturing/doctype/production_planning_tool/production_planning_tool.txt @@ -4,7 +4,7 @@ "docstatus": 0, "creation": "2013-01-19 10:23:35", "modified_by": "Administrator", - "modified": "2013-01-19 10:31:03" + "modified": "2013-01-19 10:55:55" }, { "read_only": 1, @@ -32,7 +32,7 @@ "doctype": "DocPerm", "write": 1, "parenttype": "DocType", - "report": 1, + "report": 0, "permlevel": 0, "parentfield": "permissions" }, diff --git a/patches/patch_list.py b/patches/patch_list.py index d5d87a6b967..cf9e97fba27 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -151,4 +151,5 @@ patch_list = [ "patches.january_2013.change_patch_structure", "patches.january_2013.update_country_info", "patches.january_2013.remove_tds_entry_from_gl_mapper", + "patches.january_2013.update_number_format", ] \ No newline at end of file diff --git a/setup/doctype/currency/currency.js b/setup/doctype/currency/currency.js index cd42c189565..9a18372952b 100644 --- a/setup/doctype/currency/currency.js +++ b/setup/doctype/currency/currency.js @@ -1,3 +1,2 @@ cur_frm.cscript.refresh = function(doc) { - cur_frm.set_intro(doc.__islocal ? "" : "There is nothing to edit.") } \ No newline at end of file diff --git a/setup/doctype/currency/currency.txt b/setup/doctype/currency/currency.txt index fd755258749..c8dbb62bcca 100644 --- a/setup/doctype/currency/currency.txt +++ b/setup/doctype/currency/currency.txt @@ -2,9 +2,9 @@ { "owner": "Administrator", "docstatus": 0, - "creation": "2013-01-17 12:30:28", + "creation": "2013-01-19 10:23:31", "modified_by": "Administrator", - "modified": "2013-01-17 16:24:59" + "modified": "2013-01-19 11:10:45" }, { "read_only": 0, @@ -27,8 +27,12 @@ "name": "__common__", "parent": "Currency", "read": 1, + "create": 1, + "submit": 0, "doctype": "DocPerm", + "write": 1, "parenttype": "DocType", + "report": 1, "permlevel": 0, "parentfield": "permissions" }, @@ -63,18 +67,27 @@ "fieldname": "symbol", "fieldtype": "Data" }, + { + "doctype": "DocField", + "label": "Number Format", + "fieldname": "number_format", + "fieldtype": "Data" + }, + { + "cancel": 1, + "role": "Accounts Manager", + "doctype": "DocPerm" + }, { "amend": 0, - "create": 1, "doctype": "DocPerm", - "submit": 0, - "write": 1, - "report": 1, - "role": "System Manager", + "role": "Sales Master Manager", "cancel": 1 }, { - "role": "All", - "doctype": "DocPerm" + "amend": 0, + "doctype": "DocPerm", + "role": "Purchase Master Manager", + "cancel": 0 } ] \ No newline at end of file diff --git a/startup/install.py b/startup/install.py index e24f815c046..00b7b84d9fa 100644 --- a/startup/install.py +++ b/startup/install.py @@ -94,7 +94,8 @@ def import_country_and_currency(): "currency_name": country.currency, "fraction": country.currency_fraction, "symbol": country.currency_symbol, - "fraction_units": country.currency_fraction_units + "fraction_units": country.currency_fraction_units, + "number_format": country.number_format }).insert() def import_defaults(): diff --git a/stock/doctype/item/item.js b/stock/doctype/item/item.js index ab8fb43a6a2..6c2c8826458 100644 --- a/stock/doctype/item/item.js +++ b/stock/doctype/item/item.js @@ -36,20 +36,6 @@ cur_frm.cscript.item_code = function(doc) { if(!doc.description) cur_frm.set_value("description", doc.item_code); } -cur_frm.cscript.hide_website_fields = function(doc) { - var website_fields_list = ['page_name', 'website_image', 'web_short_description', - 'web_long_description']; - if (doc && cint(doc.show_in_website)) { - unhide_field(website_fields_list); - } else { - hide_field(website_fields_list); - } -} - -cur_frm.cscript.show_in_website = function(doc, dt, dn) { - cur_frm.cscript.hide_website_fields(doc); -} - cur_frm.fields_dict['default_bom'].get_query = function(doc) { //var d = locals[this.doctype][this.docname]; return 'SELECT DISTINCT `tabBOM`.`name` FROM `tabBOM` WHERE `tabBOM`.`item` = "' + doc.item_code + '" AND ifnull(`tabBOM`.`is_active`, 0) = 0 and `tabBOM`.docstatus != 2 AND `tabBOM`.%(key)s LIKE "%s" ORDER BY `tabBOM`.`name` LIMIT 50' diff --git a/stock/doctype/item/item.py b/stock/doctype/item/item.py index cca814ff087..748f01a759c 100644 --- a/stock/doctype/item/item.py +++ b/stock/doctype/item/item.py @@ -77,7 +77,12 @@ class DocType: def update_website(self): from website.utils import update_page_name - update_page_name(self.doc, self.doc.name + " " + self.doc.item_name) + if self.doc.name==self.doc.item_name: + page_name_from = self.doc.name + else: + page_name_from = self.doc.name + " " + self.doc.item_name + + update_page_name(self.doc, page_name_from) from website.helpers.product import invalidate_cache_for invalidate_cache_for(self.doc.item_group) diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt index 1f623bbd39d..43f9247047b 100644 --- a/stock/doctype/item/item.txt +++ b/stock/doctype/item/item.txt @@ -2,9 +2,9 @@ { "owner": "Administrator", "docstatus": 0, - "creation": "2012-12-28 11:01:35", + "creation": "2013-01-16 11:35:56", "modified_by": "Administrator", - "modified": "2013-01-16 11:14:57" + "modified": "2013-01-19 12:09:54" }, { "allow_attach": 1, @@ -32,8 +32,9 @@ "read": 1, "submit": 0, "doctype": "DocPerm", - "report": 1, "parenttype": "DocType", + "report": 1, + "permlevel": 0, "parentfield": "permissions" }, { @@ -431,6 +432,7 @@ "permlevel": 1 }, { + "read_only": 1, "no_copy": 1, "oldfieldtype": "Currency", "doctype": "DocField", @@ -439,7 +441,7 @@ "fieldname": "last_purchase_rate", "fieldtype": "Currency", "depends_on": "eval:doc.is_purchase_item==\"Yes\"", - "permlevel": 1 + "permlevel": 0 }, { "oldfieldtype": "Currency", @@ -691,6 +693,7 @@ "permlevel": 0 }, { + "read_only": 1, "no_copy": 1, "oldfieldtype": "Link", "doctype": "DocField", @@ -700,7 +703,7 @@ "fieldname": "default_bom", "fieldtype": "Link", "depends_on": "eval:doc.is_manufactured_item==\"Yes\"", - "permlevel": 1 + "permlevel": 0 }, { "description": "Selecting \"Yes\" will allow you to make a Production Order for this item.", @@ -765,21 +768,23 @@ "permlevel": 0 }, { + "read_only": 1, "description": "website page link", "depends_on": "show_in_website", "doctype": "DocField", "label": "Page Name", "fieldname": "page_name", "fieldtype": "Data", - "permlevel": 1 + "permlevel": 0 }, { "description": "Products will be sorted by weight-age in default searches. More the weight-age, higher the product will appear in the list.", - "search_index": 1, + "depends_on": "show_in_website", "doctype": "DocField", "label": "Weightage", "fieldname": "weightage", "fieldtype": "Int", + "search_index": 1, "permlevel": 0 }, { @@ -862,57 +867,27 @@ "fieldtype": "Text Editor", "permlevel": 0 }, + { + "amend": 0, + "create": 0, + "doctype": "DocPerm", + "write": 0, + "role": "Material Manager", + "cancel": 0 + }, + { + "amend": 0, + "create": 0, + "doctype": "DocPerm", + "write": 0, + "role": "Material User", + "cancel": 0 + }, { "create": 1, "doctype": "DocPerm", "write": 1, "role": "Material Master Manager", - "cancel": 1, - "permlevel": 0 - }, - { - "amend": 0, - "create": 0, - "doctype": "DocPerm", - "write": 0, - "role": "Material Manager", - "cancel": 0, - "permlevel": 0 - }, - { - "amend": 0, - "create": 0, - "doctype": "DocPerm", - "write": 0, - "role": "Material User", - "cancel": 0, - "permlevel": 0 - }, - { - "amend": 0, - "create": 0, - "doctype": "DocPerm", - "write": 0, - "role": "Material Master Manager", - "cancel": 0, - "permlevel": 1 - }, - { - "amend": 0, - "create": 0, - "doctype": "DocPerm", - "write": 0, - "role": "Material Manager", - "cancel": 0, - "permlevel": 1 - }, - { - "amend": 0, - "create": 0, - "doctype": "DocPerm", - "write": 0, - "role": "Material User", - "cancel": 0, - "permlevel": 1 + "cancel": 1 } ] \ No newline at end of file From 4ef3a2845097b10475cc50616460f4394d9bcd1f Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 21 Jan 2013 10:32:28 +0530 Subject: [PATCH 05/20] journal voucher difference fix --- accounts/doctype/journal_voucher/journal_voucher.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/accounts/doctype/journal_voucher/journal_voucher.py b/accounts/doctype/journal_voucher/journal_voucher.py index 7c1dcfee8d7..92a416d7ba6 100644 --- a/accounts/doctype/journal_voucher/journal_voucher.py +++ b/accounts/doctype/journal_voucher/journal_voucher.py @@ -176,9 +176,9 @@ class DocType: if flag == 0 and (flt(diff) != 0): jd = addchild(self.doc, 'entries', 'Journal Voucher Detail', self.doclist) if diff>0: - jd.credit = flt(diff) + jd.credit = flt(abs(diff)) elif diff<0: - jd.debit = flt(diff) + jd.debit = flt(abs(diff)) # Set the total debit, total credit and difference for d in getlist(self.doclist,'entries'): From d9cfee58a1c92de7c6b0b4b8dc0a24075b7c5bb3 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 21 Jan 2013 10:32:49 +0530 Subject: [PATCH 06/20] added patch --- patches/january_2013/update_number_format.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 patches/january_2013/update_number_format.py diff --git a/patches/january_2013/update_number_format.py b/patches/january_2013/update_number_format.py new file mode 100644 index 00000000000..96284a6f792 --- /dev/null +++ b/patches/january_2013/update_number_format.py @@ -0,0 +1,18 @@ +from __future__ import unicode_literals + +import webnotes + +def execute(): + from webnotes.country_info import get_all + data = get_all() + + webnotes.reload_doc("setup", "doctype", "currency") + + for c in data: + info = webnotes._dict(data[c]) + if webnotes.conn.exists("Currency", info.currency): + doc = webnotes.doc("Currency", info.currency) + doc.fields.update({ + "number_format": info.number_format, + }) + doc.save() From 8f4c78c4bf5ff94b7c90f1d157847e1ce5958cb0 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 21 Jan 2013 11:57:03 +0530 Subject: [PATCH 07/20] in payment matching tool only show outstanding invoices --- .../payment_to_invoice_matching_tool.js | 15 +++++++++------ .../payment_to_invoice_matching_tool.txt | 9 +++++++-- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js index 868e59aeff0..3bbadcb6353 100644 --- a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js +++ b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js @@ -33,12 +33,15 @@ cur_frm.cscript.refresh = function(doc) { cur_frm.fields_dict.voucher_no.get_query = function(doc) { if (!doc.account) msgprint("Please select Account first"); else { - return repl("select voucher_no, posting_date \ - from `tabGL Entry` where ifnull(is_cancelled, 'No') = 'No'\ - and account = '%(acc)s' \ - and voucher_type = '%(dt)s' \ - and voucher_no LIKE '%s' \ - ORDER BY posting_date DESC, voucher_no DESC LIMIT 50 \ + return repl("select gle.voucher_no, gle.posting_date \ + from `tabGL Entry` gle where gle.account = '%(acc)s' \ + and gle.voucher_type = '%(dt)s' \ + and gle.voucher_no LIKE '%s' \ + and ifnull(gle.is_cancelled, 'No') = 'No'\ + and (select sum(debit) - sum(credit) from `tabGL Entry` \ + where against_voucher_type = '%(dt)s' and against_voucher = gle.voucher_no \ + and ifnull(is_cancelled, 'No') = 'No') > 0 \ + ORDER BY gle.posting_date DESC, gle.voucher_no DESC LIMIT 50 \ ", {dt:doc.voucher_type, acc:doc.account}); } } diff --git a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt index 91d2613561f..d1442543c01 100644 --- a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt +++ b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt @@ -2,9 +2,9 @@ { "owner": "Administrator", "docstatus": 0, - "creation": "2012-07-03 13:30:46", + "creation": "2013-01-16 14:48:54", "modified_by": "Administrator", - "modified": "2012-12-31 10:34:43" + "modified": "2013-01-21 11:52:11" }, { "issingle": 1, @@ -25,7 +25,9 @@ "name": "__common__", "parent": "Payment to Invoice Matching Tool", "read": 1, + "submit": 0, "doctype": "DocPerm", + "report": 0, "parenttype": "DocType", "parentfield": "permissions" }, @@ -197,8 +199,11 @@ "permlevel": 0 }, { + "amend": 0, + "create": 0, "doctype": "DocPerm", "role": "All", + "cancel": 0, "permlevel": 1 } ] \ No newline at end of file From ec44cd763ebc3e19f792a3af4d55d9f30305973f Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 21 Jan 2013 12:29:20 +0530 Subject: [PATCH 08/20] in payment matching tool only show outstanding invoices --- .../payment_to_invoice_matching_tool.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js index 3bbadcb6353..f719db97aae 100644 --- a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js +++ b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js @@ -40,7 +40,7 @@ cur_frm.fields_dict.voucher_no.get_query = function(doc) { and ifnull(gle.is_cancelled, 'No') = 'No'\ and (select sum(debit) - sum(credit) from `tabGL Entry` \ where against_voucher_type = '%(dt)s' and against_voucher = gle.voucher_no \ - and ifnull(is_cancelled, 'No') = 'No') > 0 \ + and ifnull(is_cancelled, 'No') = 'No') != 0 \ ORDER BY gle.posting_date DESC, gle.voucher_no DESC LIMIT 50 \ ", {dt:doc.voucher_type, acc:doc.account}); } From 30b142b5638588158d6dbb024ea9ad085e4cc4f6 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 21 Jan 2013 14:12:36 +0530 Subject: [PATCH 09/20] removed unwanted import --- .../purchase_common/purchase_common.py | 58 +++++++++---------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/buying/doctype/purchase_common/purchase_common.py b/buying/doctype/purchase_common/purchase_common.py index bb342287e40..f48e46930ae 100644 --- a/buying/doctype/purchase_common/purchase_common.py +++ b/buying/doctype/purchase_common/purchase_common.py @@ -17,12 +17,11 @@ from __future__ import unicode_literals import webnotes -from webnotes.utils import add_days, cint, cstr, flt, getdate, now -from webnotes.model import db_exists -from webnotes.model.doc import Document, addchild -from webnotes.model.wrapper import getlist, copy_doclist +from webnotes.utils import add_days, cint, cstr, flt +from webnotes.model.doc import addchild +from webnotes.model.wrapper import getlist from webnotes.model.code import get_obj -from webnotes import form, msgprint, _ +from webnotes import msgprint, _ sql = webnotes.conn.sql @@ -405,60 +404,67 @@ class DocType(TransactionBase): def validate_doc(self, obj, prevdoc_doctype, prevdoc_docname): if prevdoc_docname : - get_name = sql("select name from `tab%s` where name = '%s'" % (prevdoc_doctype, prevdoc_docname)) + get_name = sql("select name from `tab%s` where name = '%s'" % + (prevdoc_doctype, prevdoc_docname)) name = get_name and get_name[0][0] or '' if name: #check for incorrect docname - dt = sql("select company, docstatus from `tab%s` where name = '%s'" % (prevdoc_doctype, name)) + dt = sql("select company, docstatus from `tab%s` where name = '%s'" % + (prevdoc_doctype, name)) company_name = dt and cstr(dt[0][0]) or '' docstatus = dt and dt[0][1] or 0 # check for docstatus if (docstatus != 1): - msgprint(cstr(prevdoc_doctype) + ": " + cstr(prevdoc_docname) + " is not Submitted Document.") + msgprint(cstr(prevdoc_doctype) + ": " + cstr(prevdoc_docname) + + " is not Submitted Document.") raise Exception # check for company if (company_name != obj.doc.company): - msgprint(cstr(prevdoc_doctype) + ": " + cstr(prevdoc_docname) + " does not belong to the Company: " + cstr(obj.doc.company)) + msgprint(cstr(prevdoc_doctype) + ": " + cstr(prevdoc_docname) + + " does not belong to the Company: " + cstr(obj.doc.company)) raise Exception if prevdoc_doctype in ['Purchase Order', 'Purchase Receipt']: - dt = sql("select supplier, currency from `tab%s` where name = '%s'" % (prevdoc_doctype, name)) + dt = sql("select supplier, currency from `tab%s` where name = '%s'" % + (prevdoc_doctype, name)) supplier = dt and dt[0][0] or '' currency = dt and dt[0][1] or '' # check for supplier if (supplier != obj.doc.supplier): - msgprint("Purchase Order: " + cstr(d.prevdoc_docname) + " supplier :" + cstr(supplier) + " does not match with supplier of current document.") + msgprint("Purchase Order: " + cstr(prevdoc_docname) + " supplier :" + + cstr(supplier) + " does not match with supplier of current document.") raise Exception # check for curency if (currency != obj.doc.currency): - msgprint("Purchase Order: " + cstr(d.prevdoc_docname) + " currency :" + cstr(currency) + " does not match with currency of current document.") + msgprint("Purchase Order: " + cstr(prevdoc_docname) + " currency :" + + cstr(currency) + " does not match with currency of current document.") raise Exception else: # if not name than - msgprint(cstr(prevdoc_doctype) + ": " + cstr(prevdoc_docname) + " is not a valid " + cstr(prevdoc_doctype)) + msgprint(cstr(prevdoc_doctype) + ": " + cstr(prevdoc_docname) + + " is not a valid " + cstr(prevdoc_doctype)) raise Exception - -# Validate values with reference document - #--------------------------------------- def validate_reference_value(self, obj): ref_doc = [] for d in getlist(obj.doclist, obj.fname): if d.prevdoc_doctype and d.prevdoc_docname and d.prevdoc_doctype not in ref_doc: mapper_name = d.prevdoc_doctype + '-' + obj.doc.doctype - get_obj('DocType Mapper', mapper_name, with_children = 1).validate_reference_value(obj, obj.doc.name) + get_obj('DocType Mapper', mapper_name, with_children = 1).\ + validate_reference_value(obj, obj.doc.name) ref_doc.append(d.prevdoc_doctype) # Check for Stopped status def check_for_stopped_status(self, doctype, docname): - stopped = sql("select name from `tab%s` where name = '%s' and status = 'Stopped'" % ( doctype, docname)) + stopped = sql("select name from `tab%s` where name = '%s' and status = 'Stopped'" % + ( doctype, docname)) if stopped: - msgprint("One cannot do any transaction against %s : %s, it's status is 'Stopped'" % ( doctype, docname)) - raise Exception + msgprint("One cannot do any transaction against %s : %s, it's status is 'Stopped'" % + ( doctype, docname), raise_exception=1) # Check Docstatus of Next DocType on Cancel AND of Previous DocType on Submit def check_docstatus(self, check, doctype, docname , detail_doctype = ''): @@ -631,9 +637,6 @@ class DocType(TransactionBase): idx += 1 return obj.doclist - - # Get Tax rate if account type is TAX - # ========================================================================= def get_rate(self, arg, obj): arg = eval(arg) rate = sql("select account_type, tax_rate from `tabAccount` where name = '%s'" %(arg['account_head']), as_dict=1) @@ -643,19 +646,12 @@ class DocType(TransactionBase): } #msgprint(ret) return ret - - - - # Get total in words - # ================================================================== + def get_total_in_words(self, currency, amount): from webnotes.utils import money_in_words return money_in_words(amount, currency) - # get against document date - #----------------------------- def get_prevdoc_date(self, obj): - import datetime for d in getlist(obj.doclist, obj.fname): if d.prevdoc_doctype and d.prevdoc_docname: dt = sql("select transaction_date from `tab%s` where name = '%s'" % (d.prevdoc_doctype, d.prevdoc_docname)) From aeb992a4fd5b532908fe98f1c0d94e8f0ad011ec Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 21 Jan 2013 14:20:02 +0530 Subject: [PATCH 10/20] get_query for item code in batch master --- stock/doctype/batch/batch.js | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 stock/doctype/batch/batch.js diff --git a/stock/doctype/batch/batch.js b/stock/doctype/batch/batch.js new file mode 100644 index 00000000000..93979da5b55 --- /dev/null +++ b/stock/doctype/batch/batch.js @@ -0,0 +1,21 @@ +// ERPNext - web based ERP (http://erpnext.com) +// Copyright (C) 2012 Web Notes Technologies Pvt Ltd +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +cur_frm.fields_dict['item'].get_query = function(doc, cdt, cdn) { + return erpnext.queries.item({ + 'ifnull(tabItem.is_stock_item, "No")': 'Yes' + }) +} \ No newline at end of file From bb9968491be0661734cc966550f754683ba6aae9 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 21 Jan 2013 14:22:07 +0530 Subject: [PATCH 11/20] added report permissions to txt files --- accounts/doctype/account/account.txt | 49 ++--- .../budget_distribution.txt | 16 +- accounts/doctype/cost_center/cost_center.txt | 33 ++-- accounts/doctype/fiscal_year/fiscal_year.txt | 15 +- accounts/doctype/gl_entry/gl_entry.txt | 5 +- .../mode_of_payment/mode_of_payment.txt | 7 +- .../period_closing_voucher.txt | 24 +-- accounts/doctype/pos_setting/pos_setting.txt | 5 +- .../purchase_invoice/purchase_invoice.txt | 125 +++++++------ .../purchase_taxes_and_charges_master.txt | 15 +- .../doctype/sales_invoice/sales_invoice.txt | 173 +++++++++--------- .../sales_taxes_and_charges_master.txt | 14 +- .../doctype/purchase_order/purchase_order.txt | 120 ++++++------ .../quality_inspection/quality_inspection.txt | 27 +-- buying/doctype/supplier/supplier.txt | 38 ++-- .../supplier_quotation/supplier_quotation.txt | 101 +++++----- home/doctype/feed/feed.txt | 3 +- hr/doctype/appraisal/appraisal.txt | 37 ++-- .../appraisal_template/appraisal_template.txt | 9 +- hr/doctype/attendance/attendance.txt | 41 +++-- hr/doctype/branch/branch.txt | 9 +- hr/doctype/deduction_type/deduction_type.txt | 9 +- hr/doctype/department/department.txt | 9 +- hr/doctype/designation/designation.txt | 9 +- hr/doctype/earning_type/earning_type.txt | 13 +- hr/doctype/employee/employee.txt | 105 +++++------ .../employment_type/employment_type.txt | 9 +- hr/doctype/expense_claim/expense_claim.txt | 39 ++-- .../expense_claim_type/expense_claim_type.txt | 3 +- hr/doctype/grade/grade.txt | 9 +- hr/doctype/holiday_list/holiday_list.txt | 19 +- .../leave_allocation/leave_allocation.txt | 8 +- .../leave_application/leave_application.txt | 43 +++-- hr/doctype/leave_type/leave_type.txt | 9 +- .../other_income_detail.txt | 7 +- hr/doctype/salary_slip/salary_slip.txt | 52 +++--- .../salary_slip_deduction.txt | 11 +- .../salary_slip_earning.txt | 11 +- .../salary_structure/salary_structure.txt | 56 +++--- manufacturing/doctype/bom/bom.txt | 59 +++--- manufacturing/doctype/bom_item/bom_item.txt | 21 ++- .../doctype/bom_operation/bom_operation.txt | 13 +- .../production_order/production_order.txt | 13 +- .../production_plan_sales_order.txt | 15 +- .../doctype/workstation/workstation.txt | 23 ++- .../doctype/activity_type/activity_type.txt | 7 +- projects/doctype/project/project.txt | 43 ++--- projects/doctype/timesheet/timesheet.txt | 20 +- selling/doctype/campaign/campaign.txt | 13 +- selling/doctype/customer/customer.txt | 75 ++++---- .../doctype/industry_type/industry_type.txt | 5 +- .../installation_note/installation_note.txt | 53 +++--- selling/doctype/opportunity/opportunity.txt | 81 ++++---- selling/doctype/quotation/quotation.txt | 133 +++++++------- selling/doctype/sales_order/sales_order.txt | 141 +++++++------- .../shipping_address/shipping_address.txt | 14 +- .../authorization_rule/authorization_rule.txt | 7 +- setup/doctype/brand/brand.txt | 5 +- setup/doctype/company/company.txt | 48 ++--- setup/doctype/country/country.txt | 19 +- .../doctype/customer_group/customer_group.txt | 31 ++-- setup/doctype/email_digest/email_digest.txt | 13 +- setup/doctype/item_group/item_group.txt | 34 ++-- .../naming_series_options.txt | 5 +- setup/doctype/price_list/price_list.txt | 11 +- setup/doctype/print_heading/print_heading.txt | 9 +- .../quotation_lost_reason.txt | 7 +- setup/doctype/sales_partner/sales_partner.txt | 34 ++-- setup/doctype/sales_person/sales_person.txt | 29 +-- setup/doctype/state/state.txt | 9 +- setup/doctype/supplier_type/supplier_type.txt | 9 +- .../terms_and_conditions.txt | 16 +- setup/doctype/territory/territory.txt | 45 ++--- setup/doctype/uom/uom.txt | 13 +- .../doctype/warehouse_type/warehouse_type.txt | 7 +- setup/doctype/workflow_rule/workflow_rule.txt | 5 +- stock/doctype/batch/batch.txt | 11 +- stock/doctype/bin/bin.txt | 3 +- stock/doctype/delivery_note/delivery_note.txt | 133 +++++++------- .../landed_cost_master/landed_cost_master.txt | 11 +- stock/doctype/packing_slip/packing_slip.txt | 29 +-- .../purchase_receipt/purchase_receipt.txt | 116 ++++++------ stock/doctype/sales_bom/sales_bom.txt | 13 +- stock/doctype/serial_no/serial_no.txt | 70 +++---- stock/doctype/stock_entry/stock_entry.txt | 114 ++++++------ .../stock_ledger_entry/stock_ledger_entry.txt | 9 +- stock/doctype/warehouse/warehouse.txt | 56 +++--- .../maintenance_schedule.txt | 52 +++--- .../maintenance_visit/maintenance_visit.txt | 63 ++++--- support/doctype/newsletter/newsletter.txt | 24 +-- utilities/doctype/address/address.txt | 28 +-- utilities/doctype/answer/answer.txt | 13 +- utilities/doctype/contact/contact.txt | 43 +++-- utilities/doctype/gl_mapper/gl_mapper.txt | 5 +- utilities/doctype/question/question.txt | 9 +- utilities/doctype/sms_log/sms_log.txt | 3 +- website/doctype/blog/blog.txt | 15 +- website/doctype/web_page/web_page.txt | 23 +-- .../website_slideshow/website_slideshow.txt | 5 +- 99 files changed, 1723 insertions(+), 1497 deletions(-) diff --git a/accounts/doctype/account/account.txt b/accounts/doctype/account/account.txt index e93631bd61b..f97f9c16a69 100644 --- a/accounts/doctype/account/account.txt +++ b/accounts/doctype/account/account.txt @@ -9,13 +9,13 @@ { "in_create": 1, "allow_rename": 1, - "description": "Heads (or groups) against which Accounting Entries are made and balances are maintained.", - "search_fields": "debit_or_credit, group_or_ledger", + "name": "__common__", "module": "Accounts", "doctype": "DocType", "allow_copy": 1, + "search_fields": "debit_or_credit, group_or_ledger", "document_type": "Master", - "name": "__common__" + "description": "Heads (or groups) against which Accounting Entries are made and balances are maintained." }, { "name": "__common__", @@ -27,10 +27,10 @@ { "name": "__common__", "parent": "Account", - "amend": 0, - "doctype": "DocPerm", - "submit": 0, "read": 1, + "submit": 0, + "doctype": "DocPerm", + "amend": 0, "parenttype": "DocType", "parentfield": "permissions" }, @@ -83,12 +83,12 @@ "doctype": "DocField", "label": "Group or Ledger", "oldfieldname": "group_or_ledger", - "permlevel": 1, + "options": "\nLedger\nGroup", "fieldname": "group_or_ledger", "fieldtype": "Select", "search_index": 1, "reqd": 1, - "options": "\nLedger\nGroup", + "permlevel": 1, "in_filter": 1 }, { @@ -107,11 +107,11 @@ "doctype": "DocField", "label": "Is PL Account", "oldfieldname": "is_pl_account", - "options": "Yes\nNo", + "permlevel": 1, "fieldname": "is_pl_account", "fieldtype": "Select", "search_index": 1, - "permlevel": 1, + "options": "Yes\nNo", "in_filter": 1 }, { @@ -119,12 +119,12 @@ "doctype": "DocField", "label": "Company", "oldfieldname": "company", - "options": "Company", + "permlevel": 1, "fieldname": "company", "fieldtype": "Link", "search_index": 1, "reqd": 1, - "permlevel": 1, + "options": "Company", "in_filter": 1 }, { @@ -139,11 +139,11 @@ "doctype": "DocField", "label": "Parent Account", "oldfieldname": "parent_account", - "options": "Account", + "permlevel": 0, "fieldname": "parent_account", "fieldtype": "Link", "search_index": 1, - "permlevel": 0 + "options": "Account" }, { "description": "Setting Account Type helps in selecting this Account in transactions.", @@ -151,11 +151,11 @@ "doctype": "DocField", "label": "Account Type", "oldfieldname": "account_type", - "options": "\nFixed Asset Account\nBank or Cash\nExpense Account\nTax\nIncome Account\nChargeable", + "permlevel": 0, "fieldname": "account_type", "fieldtype": "Select", "search_index": 0, - "permlevel": 0, + "options": "\nFixed Asset Account\nBank or Cash\nExpense Account\nTax\nIncome Account\nChargeable", "in_filter": 1 }, { @@ -176,10 +176,10 @@ "doctype": "DocField", "label": "Frozen", "oldfieldname": "freeze_account", - "options": "No\nYes", + "permlevel": 2, "fieldname": "freeze_account", "fieldtype": "Select", - "permlevel": 2 + "options": "No\nYes" }, { "print_hide": 1, @@ -209,20 +209,20 @@ "doctype": "DocField", "label": "Master Type", "oldfieldname": "master_type", - "options": "\nSupplier\nCustomer\nEmployee", + "permlevel": 0, "fieldname": "master_type", "fieldtype": "Select", - "permlevel": 0 + "options": "\nSupplier\nCustomer\nEmployee" }, { "oldfieldtype": "Link", "doctype": "DocField", "label": "Master Name", "oldfieldname": "master_name", - "options": "[Select]", + "permlevel": 0, "fieldname": "master_name", "fieldtype": "Link", - "permlevel": 0 + "options": "[Select]" }, { "read_only": 1, @@ -258,6 +258,7 @@ "create": 0, "doctype": "DocPerm", "write": 1, + "report": 1, "role": "Auditor", "cancel": 0, "permlevel": 0 @@ -282,6 +283,7 @@ "create": 0, "doctype": "DocPerm", "write": 0, + "report": 1, "role": "Sales User", "cancel": 0, "permlevel": 0 @@ -290,6 +292,7 @@ "create": 0, "doctype": "DocPerm", "write": 0, + "report": 1, "role": "Purchase User", "cancel": 0, "permlevel": 0 @@ -298,6 +301,7 @@ "create": 0, "doctype": "DocPerm", "write": 1, + "report": 1, "role": "Accounts User", "cancel": 0, "permlevel": 0 @@ -306,6 +310,7 @@ "create": 1, "doctype": "DocPerm", "write": 1, + "report": 1, "role": "Accounts Manager", "cancel": 1, "permlevel": 0 diff --git a/accounts/doctype/budget_distribution/budget_distribution.txt b/accounts/doctype/budget_distribution/budget_distribution.txt index c376e5a6ee0..c2105c6b521 100644 --- a/accounts/doctype/budget_distribution/budget_distribution.txt +++ b/accounts/doctype/budget_distribution/budget_distribution.txt @@ -11,12 +11,12 @@ "description": "**Budget Distribution** helps you distribute your budget across months if you have seasonality in your business.\n\nTo distribute a budget using this distribution, set this **Budget Distribution** in the **Cost Center**", "module": "Accounts", "allow_trash": 1, - "server_code_error": " ", "autoname": "field:distribution_id", + "show_in_menu": 0, "name": "__common__", "colour": "White:FFF", "doctype": "DocType", - "show_in_menu": 0, + "server_code_error": " ", "name_case": "Title Case", "version": 1 }, @@ -43,8 +43,9 @@ "create": 1, "doctype": "DocPerm", "write": 1, - "role": "System Manager", "cancel": 1, + "role": "System Manager", + "report": 1, "permlevel": 0 }, { @@ -64,6 +65,7 @@ "doctype": "DocPerm", "submit": 0, "write": 1, + "report": 1, "role": "Accounts Manager", "cancel": 1, "permlevel": 0 @@ -100,11 +102,11 @@ "doctype": "DocField", "label": "Fiscal Year", "oldfieldname": "fiscal_year", - "permlevel": 0, + "options": "link:Fiscal Year", "fieldname": "fiscal_year", "fieldtype": "Select", "oldfieldtype": "Select", - "options": "link:Fiscal Year", + "permlevel": 0, "in_filter": 1 }, { @@ -112,10 +114,10 @@ "doctype": "DocField", "label": "Budget Distribution Details", "oldfieldname": "budget_distribution_details", - "permlevel": 0, + "options": "Budget Distribution Detail", "fieldname": "budget_distribution_details", "fieldtype": "Table", - "options": "Budget Distribution Detail" + "permlevel": 0 }, { "oldfieldtype": "Small Text", diff --git a/accounts/doctype/cost_center/cost_center.txt b/accounts/doctype/cost_center/cost_center.txt index b145a0c9721..4b5c6c6bf93 100644 --- a/accounts/doctype/cost_center/cost_center.txt +++ b/accounts/doctype/cost_center/cost_center.txt @@ -7,11 +7,11 @@ "modified": "2012-12-06 12:12:46" }, { - "in_create": 1, + "description": "Track separate Income and Expense for product verticals or divisions.", "search_fields": "name,parent_cost_center", "module": "Accounts", "document_type": "Master", - "description": "Track separate Income and Expense for product verticals or divisions.", + "in_create": 1, "autoname": "field:cost_center_name", "name": "__common__", "allow_rename": 1, @@ -72,12 +72,12 @@ "doctype": "DocField", "label": "Parent Cost Center", "oldfieldname": "parent_cost_center", + "permlevel": 0, "trigger": "Client", "fieldname": "parent_cost_center", "fieldtype": "Link", "reqd": 1, - "options": "Cost Center", - "permlevel": 0 + "options": "Cost Center" }, { "oldfieldtype": "Link", @@ -85,12 +85,12 @@ "doctype": "DocField", "label": "Company", "oldfieldname": "company_name", + "permlevel": 0, "trigger": "Client", "fieldname": "company_name", "fieldtype": "Link", "reqd": 1, - "options": "Company", - "permlevel": 0 + "options": "Company" }, { "oldfieldtype": "Data", @@ -143,10 +143,10 @@ "doctype": "DocField", "label": "Distribution Id", "oldfieldname": "distribution_id", - "options": "Budget Distribution", + "permlevel": 0, "fieldname": "distribution_id", "fieldtype": "Link", - "permlevel": 0 + "options": "Budget Distribution" }, { "description": "Add rows to set annual budgets on Accounts.", @@ -155,10 +155,10 @@ "doctype": "DocField", "label": "Budget Details", "oldfieldname": "budget_details", - "options": "Budget Detail", + "permlevel": 0, "fieldname": "budget_details", "fieldtype": "Table", - "permlevel": 0 + "options": "Budget Detail" }, { "print_hide": 1, @@ -198,11 +198,11 @@ "doctype": "DocField", "label": "old_parent", "oldfieldname": "old_parent", - "permlevel": 0, + "options": "Cost Center", "fieldname": "old_parent", "fieldtype": "Link", "hidden": 1, - "options": "Cost Center", + "permlevel": 0, "report_hide": 1 }, { @@ -221,6 +221,7 @@ "doctype": "DocPerm", "submit": 0, "write": 1, + "report": 1, "role": "Accounts Manager", "cancel": 1, "permlevel": 0 @@ -241,6 +242,7 @@ "doctype": "DocPerm", "submit": 0, "write": 0, + "report": 1, "role": "Accounts User", "cancel": 0, "permlevel": 0 @@ -249,13 +251,14 @@ "create": 1, "doctype": "DocPerm", "write": 1, - "role": "System Manager", "cancel": 1, + "role": "System Manager", + "report": 1, "permlevel": 0 }, { - "doctype": "DocPerm", "role": "All", - "permlevel": 1 + "permlevel": 1, + "doctype": "DocPerm" } ] \ No newline at end of file diff --git a/accounts/doctype/fiscal_year/fiscal_year.txt b/accounts/doctype/fiscal_year/fiscal_year.txt index c34f8a2f9f0..51f32210a01 100644 --- a/accounts/doctype/fiscal_year/fiscal_year.txt +++ b/accounts/doctype/fiscal_year/fiscal_year.txt @@ -10,14 +10,14 @@ "section_style": "Tabbed", "description": "**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.", "module": "Accounts", - "doctype": "DocType", - "allow_trash": 1, "server_code_error": " ", - "document_type": "Master", + "allow_trash": 1, "autoname": "field:year", + "document_type": "Master", + "_last_update": "1322549700", "name": "__common__", "colour": "White:FFF", - "_last_update": "1322549700", + "doctype": "DocType", "show_in_menu": 0, "version": 1 }, @@ -29,15 +29,16 @@ "parentfield": "fields" }, { + "report": 1, "name": "__common__", "parent": "Fiscal Year", "read": 1, "create": 1, "doctype": "DocPerm", "write": 1, - "cancel": 1, "parenttype": "DocType", "role": "System Manager", + "cancel": 1, "permlevel": 0, "parentfield": "permissions" }, @@ -100,10 +101,10 @@ "doctype": "DocField", "label": "Year Closed", "oldfieldname": "is_fiscal_year_closed", - "options": "\nNo\nYes", + "permlevel": 0, "fieldname": "is_fiscal_year_closed", "fieldtype": "Select", "reqd": 0, - "permlevel": 0 + "options": "\nNo\nYes" } ] \ No newline at end of file diff --git a/accounts/doctype/gl_entry/gl_entry.txt b/accounts/doctype/gl_entry/gl_entry.txt index 76fc101da9f..611618788f2 100644 --- a/accounts/doctype/gl_entry/gl_entry.txt +++ b/accounts/doctype/gl_entry/gl_entry.txt @@ -11,12 +11,12 @@ "in_create": 1, "search_fields": "voucher_no,account,posting_date,against_voucher", "module": "Accounts", - "doctype": "DocType", "server_code_error": " ", "autoname": "GL.#######", + "_last_update": "1319016431", "name": "__common__", "colour": "White:FFF", - "_last_update": "1319016431", + "doctype": "DocType", "show_in_menu": 0, "version": 103 }, @@ -35,6 +35,7 @@ "create": 0, "doctype": "DocPerm", "write": 0, + "report": 1, "parenttype": "DocType", "parentfield": "permissions" }, diff --git a/accounts/doctype/mode_of_payment/mode_of_payment.txt b/accounts/doctype/mode_of_payment/mode_of_payment.txt index d865080ec06..902ab37cc32 100644 --- a/accounts/doctype/mode_of_payment/mode_of_payment.txt +++ b/accounts/doctype/mode_of_payment/mode_of_payment.txt @@ -7,10 +7,10 @@ "modified": "2012-12-04 16:33:37" }, { - "autoname": "field:mode_of_payment", "name": "__common__", - "doctype": "DocType", + "autoname": "field:mode_of_payment", "module": "Accounts", + "doctype": "DocType", "document_type": "Master" }, { @@ -24,15 +24,16 @@ { "parent": "Mode of Payment", "read": 1, + "doctype": "DocPerm", "cancel": 1, "name": "__common__", "amend": 0, "create": 1, - "doctype": "DocPerm", "submit": 0, "write": 1, "parenttype": "DocType", "role": "Accounts Manager", + "report": 1, "permlevel": 0, "parentfield": "permissions" }, diff --git a/accounts/doctype/period_closing_voucher/period_closing_voucher.txt b/accounts/doctype/period_closing_voucher/period_closing_voucher.txt index 26ce5453472..9261d8eff9f 100644 --- a/accounts/doctype/period_closing_voucher/period_closing_voucher.txt +++ b/accounts/doctype/period_closing_voucher/period_closing_voucher.txt @@ -11,12 +11,12 @@ "is_submittable": 1, "search_fields": "posting_date, fiscal_year", "module": "Accounts", - "doctype": "DocType", "server_code_error": " ", "autoname": "PCE/.###", + "_last_update": "1311621379", "name": "__common__", "colour": "White:FFF", - "_last_update": "1311621379", + "doctype": "DocType", "show_in_menu": 0, "version": 1 }, @@ -85,6 +85,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "System Manager", "cancel": 1, "permlevel": 0 @@ -94,8 +95,9 @@ "doctype": "DocPerm", "submit": 1, "write": 1, - "role": "Accounts Manager", "cancel": 1, + "role": "Accounts Manager", + "report": 1, "permlevel": 0 }, { @@ -130,11 +132,11 @@ "doctype": "DocField", "label": "Closing Fiscal Year", "oldfieldname": "fiscal_year", - "permlevel": 0, + "options": "link:Fiscal Year", "fieldname": "fiscal_year", "fieldtype": "Select", "reqd": 1, - "options": "link:Fiscal Year" + "permlevel": 0 }, { "no_copy": 1, @@ -161,11 +163,11 @@ "doctype": "DocField", "label": "Company", "oldfieldname": "company", - "permlevel": 0, + "options": "link:Company", "fieldname": "company", "fieldtype": "Select", "reqd": 1, - "options": "link:Company" + "permlevel": 0 }, { "oldfieldtype": "Column Break", @@ -180,21 +182,21 @@ "doctype": "DocField", "label": "Closing Account Head", "oldfieldname": "closing_account_head", + "permlevel": 0, "trigger": "Client", "fieldname": "closing_account_head", "fieldtype": "Link", "reqd": 1, - "options": "Account", - "permlevel": 0 + "options": "Account" }, { "oldfieldtype": "HTML", "doctype": "DocField", "label": "CoA Help", - "permlevel": 0, + "options": "To manage Account Head, click here", "fieldname": "coa_help", "fieldtype": "HTML", - "options": "To manage Account Head, click here" + "permlevel": 0 }, { "oldfieldtype": "Small Text", diff --git a/accounts/doctype/pos_setting/pos_setting.txt b/accounts/doctype/pos_setting/pos_setting.txt index b50ff81f6c6..b4b946f2376 100755 --- a/accounts/doctype/pos_setting/pos_setting.txt +++ b/accounts/doctype/pos_setting/pos_setting.txt @@ -10,12 +10,12 @@ "section_style": "Simple", "module": "Accounts", "doctype": "DocType", + "server_code_error": " ", "autoname": "POS/.####", - "show_in_menu": 0, "name": "__common__", "colour": "White:FFF", "_last_update": "1322549700", - "server_code_error": " ", + "show_in_menu": 0, "version": 1 }, { @@ -32,6 +32,7 @@ "read": 1, "doctype": "DocPerm", "parenttype": "DocType", + "report": 1, "permlevel": 0, "parentfield": "permissions" }, diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.txt b/accounts/doctype/purchase_invoice/purchase_invoice.txt index 98bf24ab9e2..1952fa2f179 100755 --- a/accounts/doctype/purchase_invoice/purchase_invoice.txt +++ b/accounts/doctype/purchase_invoice/purchase_invoice.txt @@ -7,13 +7,13 @@ "modified": "2013-01-18 13:25:16" }, { - "autoname": "naming_series:", - "allow_attach": 1, "is_submittable": 1, - "search_fields": "posting_date, credit_to, fiscal_year, bill_no, grand_total, outstanding_amount", + "allow_attach": 1, + "autoname": "naming_series:", "module": "Accounts", "doctype": "DocType", "read_only_onload": 1, + "search_fields": "posting_date, credit_to, fiscal_year, bill_no, grand_total, outstanding_amount", "name": "__common__" }, { @@ -70,8 +70,8 @@ "fieldtype": "Link", "search_index": 1, "reqd": 1, - "in_filter": 1, - "options": "Account" + "options": "Account", + "in_filter": 1 }, { "oldfieldtype": "Data", @@ -128,18 +128,18 @@ { "print_hide": 1, "description": "The date at which current entry will get or has actually executed.", - "default": "Today", + "no_copy": 0, "oldfieldtype": "Date", "doctype": "DocField", "label": "Posting Date", "oldfieldname": "posting_date", - "no_copy": 0, + "default": "Today", "fieldname": "posting_date", "fieldtype": "Date", "search_index": 1, "reqd": 1, - "in_filter": 1, - "permlevel": 0 + "permlevel": 0, + "in_filter": 1 }, { "print_hide": 1, @@ -152,8 +152,8 @@ "fieldtype": "Data", "search_index": 1, "reqd": 1, - "in_filter": 1, - "permlevel": 0 + "permlevel": 0, + "in_filter": 1 }, { "print_hide": 1, @@ -182,10 +182,10 @@ "doctype": "DocField", "label": "Entries", "oldfieldname": "entries", - "options": "Purchase Invoice Item", + "permlevel": 0, "fieldname": "entries", "fieldtype": "Table", - "permlevel": 0 + "options": "Purchase Invoice Item" }, { "doctype": "DocField", @@ -203,10 +203,10 @@ }, { "doctype": "DocField", - "options": "Simple", + "permlevel": 0, "fieldname": "section_break_17", "fieldtype": "Section Break", - "permlevel": 0 + "options": "Simple" }, { "print_hide": 1, @@ -215,10 +215,10 @@ "doctype": "DocField", "label": "Purchase Order", "oldfieldname": "purchase_order_main", - "options": "Purchase Order", + "permlevel": 0, "fieldname": "purchase_order_main", "fieldtype": "Link", - "permlevel": 0 + "options": "Purchase Order" }, { "print_hide": 1, @@ -227,19 +227,19 @@ "doctype": "DocField", "label": "Purchase Receipt", "oldfieldname": "purchase_receipt_main", - "options": "Purchase Receipt", + "permlevel": 0, "fieldname": "purchase_receipt_main", "fieldtype": "Link", - "permlevel": 0 + "options": "Purchase Receipt" }, { "oldfieldtype": "Button", "doctype": "DocField", "label": "Get Items", - "options": "pull_details", + "permlevel": 0, "fieldname": "get_items", "fieldtype": "Button", - "permlevel": 0 + "options": "pull_details" }, { "doctype": "DocField", @@ -254,10 +254,10 @@ "doctype": "DocField", "label": "Currency", "oldfieldname": "currency", - "options": "link:Currency", + "permlevel": 0, "fieldname": "currency", "fieldtype": "Select", - "permlevel": 0 + "options": "link:Currency" }, { "print_hide": 1, @@ -282,20 +282,20 @@ "description": "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)", "doctype": "DocField", "label": "Price List", - "options": "Price List", + "permlevel": 0, "fieldname": "price_list_name", "fieldtype": "Link", - "permlevel": 0 + "options": "Price List" }, { "print_hide": 1, "depends_on": "price_list_name", "doctype": "DocField", "label": "Price List Currency", - "options": "Currency", + "permlevel": 0, "fieldname": "price_list_currency", "fieldtype": "Link", - "permlevel": 0 + "options": "Currency" }, { "print_hide": 1, @@ -321,30 +321,30 @@ "doctype": "DocField", "label": "Purchase Taxes and Charges", "oldfieldname": "purchase_other_charges", - "options": "Purchase Taxes and Charges Master", + "permlevel": 0, "fieldname": "purchase_other_charges", "fieldtype": "Link", - "permlevel": 0 + "options": "Purchase Taxes and Charges Master" }, { "print_hide": 1, "oldfieldtype": "Button", "doctype": "DocField", "label": "Get Tax Detail", - "options": "get_purchase_tax_details", + "permlevel": 0, "fieldname": "get_tax_detail", "fieldtype": "Button", - "permlevel": 0 + "options": "get_purchase_tax_details" }, { "oldfieldtype": "Table", "doctype": "DocField", "label": "Purchase Taxes and Charges", "oldfieldname": "purchase_tax_details", - "options": "Purchase Taxes and Charges", + "permlevel": 0, "fieldname": "purchase_tax_details", "fieldtype": "Table", - "permlevel": 0 + "options": "Purchase Taxes and Charges" }, { "print_hide": 1, @@ -387,20 +387,20 @@ "doctype": "DocField", "label": "Supplier", "oldfieldname": "supplier", - "options": "Supplier", + "permlevel": 0, "fieldname": "supplier", "fieldtype": "Link", "hidden": 0, - "permlevel": 0 + "options": "Supplier" }, { "depends_on": "eval:doc.supplier", "doctype": "DocField", "label": "Supplier Address", - "options": "Address", + "permlevel": 0, "fieldname": "supplier_address", "fieldtype": "Link", - "permlevel": 0 + "options": "Address" }, { "doctype": "DocField", @@ -414,10 +414,10 @@ "depends_on": "eval:doc.supplier", "doctype": "DocField", "label": "Contact Person", - "options": "Contact", + "permlevel": 0, "fieldname": "contact_person", "fieldtype": "Link", - "permlevel": 0 + "options": "Contact" }, { "oldfieldtype": "Section Break", @@ -589,10 +589,10 @@ "depends_on": "eval:flt(doc.write_off_amount)!=0", "doctype": "DocField", "label": "Write Off Account", - "options": "Account", + "permlevel": 0, "fieldname": "write_off_account", "fieldtype": "Link", - "permlevel": 0 + "options": "Account" }, { "print_hide": 1, @@ -600,10 +600,10 @@ "depends_on": "eval:flt(doc.write_off_amount)!=0", "doctype": "DocField", "label": "Write Off Cost Center", - "options": "Account", + "permlevel": 0, "fieldname": "write_off_cost_center", "fieldtype": "Link", - "permlevel": 0 + "options": "Account" }, { "print_hide": 1, @@ -632,10 +632,10 @@ "oldfieldtype": "Button", "doctype": "DocField", "label": "Get Advances Paid", - "options": "get_advances", + "permlevel": 0, "fieldname": "get_advances_paid", "fieldtype": "Button", - "permlevel": 0 + "options": "get_advances" }, { "print_hide": 1, @@ -644,10 +644,10 @@ "doctype": "DocField", "label": "Purchase Invoice Advances", "oldfieldname": "advance_allocation_details", - "options": "Purchase Invoice Advance", + "permlevel": 0, "fieldname": "advance_allocation_details", "fieldtype": "Table", - "permlevel": 0 + "options": "Purchase Invoice Advance" }, { "print_hide": 1, @@ -665,11 +665,11 @@ "doctype": "DocField", "label": "Is Opening", "oldfieldname": "is_opening", - "permlevel": 0, + "options": "No\nYes", "fieldname": "is_opening", "fieldtype": "Select", "search_index": 1, - "options": "No\nYes", + "permlevel": 0, "in_filter": 1 }, { @@ -690,10 +690,10 @@ "doctype": "DocField", "label": "Amended From", "oldfieldname": "amended_from", - "options": "Purchase Invoice", + "permlevel": 1, "fieldname": "amended_from", "fieldtype": "Link", - "permlevel": 1 + "options": "Purchase Invoice" }, { "print_hide": 1, @@ -703,10 +703,10 @@ "doctype": "DocField", "label": "Select Print Heading", "oldfieldname": "select_print_heading", - "permlevel": 0, + "options": "Print Heading", "fieldname": "select_print_heading", "fieldtype": "Link", - "options": "Print Heading", + "permlevel": 0, "report_hide": 1 }, { @@ -727,10 +727,10 @@ "doctype": "DocField", "label": "Mode of Payment", "oldfieldname": "mode_of_payment", - "options": "link:Mode of Payment", + "permlevel": 0, "fieldname": "mode_of_payment", "fieldtype": "Select", - "permlevel": 0 + "options": "link:Mode of Payment" }, { "doctype": "DocField", @@ -744,11 +744,11 @@ "doctype": "DocField", "label": "Company", "oldfieldname": "company", - "options": "Company", + "permlevel": 0, "fieldname": "company", "fieldtype": "Link", "search_index": 1, - "permlevel": 0, + "options": "Company", "in_filter": 1 }, { @@ -757,11 +757,11 @@ "doctype": "DocField", "label": "Fiscal Year", "oldfieldname": "fiscal_year", - "options": "link:Fiscal Year", + "permlevel": 0, "fieldname": "fiscal_year", "fieldtype": "Select", "search_index": 1, - "permlevel": 0, + "options": "link:Fiscal Year", "in_filter": 1 }, { @@ -804,6 +804,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Accounts User", "cancel": 1, "permlevel": 0 @@ -824,6 +825,7 @@ "doctype": "DocPerm", "submit": 0, "write": 1, + "report": 1, "role": "Purchase User", "cancel": 0, "permlevel": 0 @@ -834,8 +836,9 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "role": "Supplier", "cancel": 0, + "role": "Supplier", + "report": 1, "permlevel": 0, "match": "supplier" }, @@ -855,6 +858,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Accounts Manager", "cancel": 1, "permlevel": 0 @@ -885,6 +889,7 @@ "doctype": "DocPerm", "submit": 0, "write": 0, + "report": 1, "role": "Auditor", "cancel": 0, "permlevel": 0 diff --git a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt b/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt index da33cb21b38..628560262ca 100644 --- a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt +++ b/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt @@ -10,14 +10,14 @@ "section_style": "Simple", "description": "Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like \"Shipping\", \"Insurance\", \"Handling\" etc.\n\n#### Note\n\nThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.\n\n#### Description of Columns\n\n1. Calculation Type: \n - This can be on **Net Total** (that is the sum of basic amount).\n - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.\n - **Actual** (as mentioned).\n2. Account Head: The Account ledger under which this tax will be booked\n3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.\n4. Description: Description of the tax (that will be printed in invoices / quotes).\n5. Rate: Tax rate.\n6. Amount: Tax amount.\n7. Total: Cumulative total to this point.\n8. Enter Row: If based on \"Previous Row Total\" you can select the row number which will be taken as a base for this calculation (default is the previous row).\n9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.\n10. Add or Deduct: Whether you want to add or deduct the tax.", "module": "Accounts", - "doctype": "DocType", - "allow_trash": 1, "server_code_error": " ", - "document_type": "Master", + "allow_trash": 1, "autoname": "field:title", + "document_type": "Master", + "_last_update": "1325570646", "name": "__common__", "colour": "White:FFF", - "_last_update": "1325570646", + "doctype": "DocType", "show_in_menu": 0, "version": 1 }, @@ -52,6 +52,7 @@ "doctype": "DocPerm", "submit": 0, "write": 0, + "report": 1, "role": "Purchase Manager", "cancel": 0, "permlevel": 0 @@ -60,8 +61,9 @@ "create": 1, "doctype": "DocPerm", "write": 1, - "role": "System Manager", "cancel": 1, + "role": "System Manager", + "report": 1, "permlevel": 0 }, { @@ -69,8 +71,9 @@ "doctype": "DocPerm", "submit": 0, "write": 1, - "role": "Purchase Master Manager", "cancel": 1, + "role": "Purchase Master Manager", + "report": 1, "permlevel": 0 }, { diff --git a/accounts/doctype/sales_invoice/sales_invoice.txt b/accounts/doctype/sales_invoice/sales_invoice.txt index 95156b16ee1..1c9e2e70c15 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.txt +++ b/accounts/doctype/sales_invoice/sales_invoice.txt @@ -8,12 +8,12 @@ }, { "is_submittable": 1, - "autoname": "naming_series:", "allow_attach": 1, - "search_fields": "posting_date, due_date, debit_to, fiscal_year, grand_total, outstanding_amount", + "autoname": "naming_series:", "module": "Accounts", "doctype": "DocType", "read_only_onload": 1, + "search_fields": "posting_date, due_date, debit_to, fiscal_year, grand_total, outstanding_amount", "name": "__common__" }, { @@ -104,8 +104,8 @@ "fieldtype": "Link", "search_index": 1, "reqd": 1, - "in_filter": 1, - "options": "Account" + "options": "Account", + "in_filter": 1 }, { "print_hide": 1, @@ -176,45 +176,45 @@ { "print_hide": 0, "description": "The date at which current entry will get or has actually executed.", - "default": "Today", + "no_copy": 1, "oldfieldtype": "Date", "colour": "White:FFF", "doctype": "DocField", "label": "Posting Date", "oldfieldname": "posting_date", - "no_copy": 1, + "default": "Today", "fieldname": "posting_date", "fieldtype": "Date", "search_index": 1, "reqd": 1, - "in_filter": 1, - "permlevel": 0 + "permlevel": 0, + "in_filter": 1 }, { "description": "Enter the date by which payments from customer is expected against this invoice.", - "default": "Today", + "no_copy": 1, "oldfieldtype": "Date", "colour": "White:FFF", "doctype": "DocField", "label": "Due Date", "oldfieldname": "due_date", - "no_copy": 1, + "default": "Today", "fieldname": "due_date", "fieldtype": "Date", "search_index": 0, "reqd": 1, - "in_filter": 1, - "permlevel": 0 + "permlevel": 0, + "in_filter": 1 }, { "oldfieldtype": "Select", "doctype": "DocField", "label": "Mode of Payment", "oldfieldname": "mode_of_payment", - "options": "link:Mode of Payment", + "permlevel": 0, "fieldname": "mode_of_payment", "fieldtype": "Select", - "permlevel": 0 + "options": "link:Mode of Payment" }, { "oldfieldtype": "Section Break", @@ -232,10 +232,10 @@ "doctype": "DocField", "label": "Entries", "oldfieldname": "entries", - "options": "Sales Invoice Item", + "permlevel": 0, "fieldname": "entries", "fieldtype": "Table", - "permlevel": 0 + "options": "Sales Invoice Item" }, { "print_hide": 1, @@ -247,10 +247,10 @@ }, { "doctype": "DocField", - "options": "Simple", + "permlevel": 0, "fieldname": "section_break0", "fieldtype": "Section Break", - "permlevel": 0 + "options": "Simple" }, { "doctype": "DocField", @@ -297,10 +297,10 @@ "doctype": "DocField", "label": "Sales Order", "oldfieldname": "sales_order_main", - "options": "Sales Order", + "permlevel": 0, "fieldname": "sales_order_main", "fieldtype": "Link", - "permlevel": 0 + "options": "Sales Order" }, { "print_hide": 1, @@ -310,10 +310,10 @@ "doctype": "DocField", "label": "Delivery Note", "oldfieldname": "delivery_note_main", - "options": "Delivery Note", + "permlevel": 0, "fieldname": "delivery_note_main", "fieldtype": "Link", - "permlevel": 0 + "options": "Delivery Note" }, { "print_hide": 1, @@ -345,11 +345,11 @@ "doctype": "DocField", "label": "Price List", "oldfieldname": "price_list_name", - "options": "link:Price List", + "permlevel": 0, "fieldname": "price_list_name", "fieldtype": "Select", "reqd": 1, - "permlevel": 0 + "options": "link:Price List" }, { "print_hide": 1, @@ -357,11 +357,11 @@ "colour": "White:FFF", "doctype": "DocField", "label": "Price List Currency", - "options": "link:Currency", + "permlevel": 0, "fieldname": "price_list_currency", "fieldtype": "Select", "reqd": 1, - "permlevel": 0 + "options": "link:Currency" }, { "print_hide": 1, @@ -387,11 +387,11 @@ "doctype": "DocField", "label": "Currency", "oldfieldname": "currency", - "options": "link:Currency", + "permlevel": 0, "fieldname": "currency", "fieldtype": "Select", "reqd": 1, - "permlevel": 0 + "options": "link:Currency" }, { "print_hide": 1, @@ -421,10 +421,10 @@ "doctype": "DocField", "label": "Taxes and Charges", "oldfieldname": "charge", - "options": "Sales Taxes and Charges Master", + "permlevel": 0, "fieldname": "charge", "fieldtype": "Link", - "permlevel": 0 + "options": "Sales Taxes and Charges Master" }, { "print_hide": 1, @@ -443,10 +443,10 @@ "doctype": "DocField", "label": "Taxes and Charges1", "oldfieldname": "other_charges", - "options": "Sales Taxes and Charges", + "permlevel": 0, "fieldname": "other_charges", "fieldtype": "Table", - "permlevel": 0 + "options": "Sales Taxes and Charges" }, { "print_hide": 1, @@ -652,10 +652,10 @@ "doctype": "DocField", "label": "Cash/Bank Account", "oldfieldname": "cash_bank_account", - "options": "Account", + "permlevel": 0, "fieldname": "cash_bank_account", "fieldtype": "Link", - "permlevel": 0 + "options": "Account" }, { "colour": "White:FFF", @@ -688,20 +688,20 @@ "colour": "White:FFF", "doctype": "DocField", "label": "Write Off Account", - "options": "Account", + "permlevel": 0, "fieldname": "write_off_account", "fieldtype": "Link", - "permlevel": 0 + "options": "Account" }, { "print_hide": 1, "colour": "White:FFF", "doctype": "DocField", "label": "Write Off Cost Center", - "options": "Cost Center", + "permlevel": 0, "fieldname": "write_off_cost_center", "fieldtype": "Link", - "permlevel": 0 + "options": "Cost Center" }, { "oldfieldtype": "Section Break", @@ -718,10 +718,10 @@ "doctype": "DocField", "label": "Select Terms and Conditions", "oldfieldname": "tc_name", - "options": "Terms and Conditions", + "permlevel": 0, "fieldname": "tc_name", "fieldtype": "Link", - "permlevel": 0 + "options": "Terms and Conditions" }, { "print_hide": 1, @@ -729,11 +729,11 @@ "colour": "White:FFF", "doctype": "DocField", "label": "Get Terms and Conditions", + "permlevel": 0, "trigger": "Server", "fieldname": "get_terms", "fieldtype": "Button", - "options": "get_tc_details", - "permlevel": 0 + "options": "get_tc_details" }, { "print_hide": 1, @@ -741,10 +741,10 @@ "colour": "White:FFF", "doctype": "DocField", "label": "Terms and Conditions HTML", - "options": "You can add Terms and Notes that will be printed in the Transaction", + "permlevel": 0, "fieldname": "terms_html", "fieldtype": "HTML", - "permlevel": 0 + "options": "You can add Terms and Notes that will be printed in the Transaction" }, { "oldfieldtype": "Text Editor", @@ -773,19 +773,19 @@ "print_hide": 1, "doctype": "DocField", "label": "Customer Address", - "options": "Address", + "permlevel": 0, "fieldname": "customer_address", "fieldtype": "Link", - "permlevel": 0 + "options": "Address" }, { "print_hide": 1, "doctype": "DocField", "label": "Contact Person", - "options": "Contact", + "permlevel": 0, "fieldname": "contact_person", "fieldtype": "Link", - "permlevel": 0 + "options": "Contact" }, { "doctype": "DocField", @@ -799,11 +799,11 @@ "search_index": 0, "doctype": "DocField", "label": "Territory", - "options": "Territory", + "permlevel": 0, "fieldname": "territory", "fieldtype": "Link", "reqd": 1, - "permlevel": 0, + "options": "Territory", "in_filter": 1 }, { @@ -811,10 +811,10 @@ "search_index": 0, "doctype": "DocField", "label": "Customer Group", - "options": "Customer Group", + "permlevel": 0, "fieldname": "customer_group", "fieldtype": "Link", - "permlevel": 0, + "options": "Customer Group", "in_filter": 1 }, { @@ -882,20 +882,20 @@ "doctype": "DocField", "label": "Letter Head", "oldfieldname": "letter_head", - "options": "link:Letter Head", + "permlevel": 0, "fieldname": "letter_head", "fieldtype": "Select", - "permlevel": 0 + "options": "link:Letter Head" }, { "print_hide": 1, "no_copy": 1, "doctype": "DocField", "label": "C-Form Applicable", - "options": "No\nYes", + "permlevel": 0, "fieldname": "c_form_applicable", "fieldtype": "Select", - "permlevel": 0, + "options": "No\nYes", "report_hide": 0 }, { @@ -903,10 +903,10 @@ "no_copy": 1, "doctype": "DocField", "label": "C-Form No", - "options": "C-Form", + "permlevel": 1, "fieldname": "c_form_no", "fieldtype": "Link", - "permlevel": 1 + "options": "C-Form" }, { "print_hide": 1, @@ -915,11 +915,11 @@ "doctype": "DocField", "label": "Campaign", "oldfieldname": "campaign", - "options": "Campaign", + "permlevel": 0, "fieldname": "campaign", "fieldtype": "Link", "depends_on": "eval:doc.source == 'Campaign'", - "permlevel": 0 + "options": "Campaign" }, { "description": "Track this Sales Invoice against any Project", @@ -933,8 +933,8 @@ "fieldname": "project_name", "fieldtype": "Link", "search_index": 1, - "in_filter": 1, - "options": "Project" + "options": "Project", + "in_filter": 1 }, { "print_hide": 1, @@ -967,10 +967,10 @@ "doctype": "DocField", "label": "Source", "oldfieldname": "source", - "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign", + "permlevel": 0, "fieldname": "source", "fieldtype": "Select", - "permlevel": 0 + "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign" }, { "print_hide": 1, @@ -978,12 +978,12 @@ "doctype": "DocField", "label": "Company", "oldfieldname": "company", - "permlevel": 0, + "options": "Company", "fieldname": "company", "fieldtype": "Link", "search_index": 0, "reqd": 1, - "options": "Company", + "permlevel": 0, "in_filter": 1 }, { @@ -1008,10 +1008,10 @@ "doctype": "DocField", "label": "Amended From", "oldfieldname": "amended_from", - "options": "Sales Invoice", + "permlevel": 1, "fieldname": "amended_from", "fieldtype": "Link", - "permlevel": 1 + "options": "Sales Invoice" }, { "print_hide": 1, @@ -1064,10 +1064,10 @@ "oldfieldtype": "Button", "doctype": "DocField", "label": "Get Advances Received", - "options": "get_advances", + "permlevel": 0, "fieldname": "get_advances_received", "fieldtype": "Button", - "permlevel": 0 + "options": "get_advances" }, { "print_hide": 1, @@ -1075,10 +1075,10 @@ "doctype": "DocField", "label": "Sales Invoice Advance", "oldfieldname": "advance_adjustment_details", - "options": "Sales Invoice Advance", + "permlevel": 0, "fieldname": "advance_adjustment_details", "fieldtype": "Table", - "permlevel": 0 + "options": "Sales Invoice Advance" }, { "print_hide": 1, @@ -1092,10 +1092,10 @@ "print_hide": 1, "doctype": "DocField", "label": "Packing Details", - "options": "Delivery Note Packing Item", + "permlevel": 0, "fieldname": "packing_details", "fieldtype": "Table", - "permlevel": 0 + "options": "Delivery Note Packing Item" }, { "print_hide": 1, @@ -1122,11 +1122,11 @@ "doctype": "DocField", "label": "Sales Partner", "oldfieldname": "sales_partner", + "permlevel": 0, "trigger": "Client", "fieldname": "sales_partner", "fieldtype": "Link", "options": "Sales Partner", - "permlevel": 0, "in_filter": 1 }, { @@ -1176,10 +1176,10 @@ "doctype": "DocField", "label": "Sales Team1", "oldfieldname": "sales_team", - "options": "Sales Team", + "permlevel": 0, "fieldname": "sales_team", "fieldtype": "Table", - "permlevel": 0 + "options": "Sales Team" }, { "print_hide": 1, @@ -1222,10 +1222,10 @@ "allow_on_submit": 1, "doctype": "DocField", "label": "Recurring Type", - "permlevel": 0, + "options": "Monthly\nQuarterly\nHalf-yearly\nYearly", "fieldname": "recurring_type", "fieldtype": "Select", - "options": "Monthly\nQuarterly\nHalf-yearly\nYearly" + "permlevel": 0 }, { "print_hide": 1, @@ -1346,9 +1346,9 @@ "permlevel": 0 }, { - "doctype": "DocPerm", "role": "Material Manager", - "permlevel": 0 + "permlevel": 0, + "doctype": "DocPerm" }, { "amend": 1, @@ -1358,6 +1358,7 @@ "write": 1, "read": 1, "role": "Accounts User", + "report": 1, "permlevel": 0, "cancel": 1 }, @@ -1369,13 +1370,14 @@ "write": 0, "read": 1, "role": "Accounts User", - "permlevel": 1, - "cancel": 0 + "cancel": 0, + "permlevel": 1 }, { "read": 1, "doctype": "DocPerm", "role": "Customer", + "report": 1, "permlevel": 0, "match": "customer" }, @@ -1387,8 +1389,8 @@ "write": 0, "read": 1, "role": "Accounts Manager", - "permlevel": 1, - "cancel": 0 + "cancel": 0, + "permlevel": 1 }, { "amend": 1, @@ -1398,6 +1400,7 @@ "write": 1, "read": 1, "role": "Accounts Manager", + "report": 1, "permlevel": 0, "cancel": 1 } diff --git a/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt b/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt index d789d8553f6..a2e44b42839 100644 --- a/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt +++ b/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt @@ -10,14 +10,14 @@ "section_style": "Tabbed", "description": "Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like \"Shipping\", \"Insurance\", \"Handling\" etc.\n\n#### Note\n\nThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.\n\n#### Description of Columns\n\n1. Calculation Type: \n - This can be on **Net Total** (that is the sum of basic amount).\n - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.\n - **Actual** (as mentioned).\n2. Account Head: The Account ledger under which this tax will be booked\n3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.\n4. Description: Description of the tax (that will be printed in invoices / quotes).\n5. Rate: Tax rate.\n6. Amount: Tax amount.\n7. Total: Cumulative total to this point.\n8. Enter Row: If based on \"Previous Row Total\" you can select the row number which will be taken as a base for this calculation (default is the previous row).\n9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.", "module": "Accounts", - "doctype": "DocType", - "allow_trash": 1, "server_code_error": " ", - "document_type": "Master", + "allow_trash": 1, "autoname": "field:title", + "document_type": "Master", + "_last_update": "1322549700", "name": "__common__", "colour": "White:FFF", - "_last_update": "1322549700", + "doctype": "DocType", "show_in_menu": 0, "version": 1 }, @@ -67,6 +67,7 @@ "doctype": "DocPerm", "submit": 0, "write": 0, + "report": 1, "role": "Sales User", "cancel": 0, "permlevel": 0 @@ -77,6 +78,7 @@ "doctype": "DocPerm", "submit": 0, "write": 1, + "report": 1, "role": "Accounts Manager", "cancel": 1, "permlevel": 0 @@ -85,8 +87,9 @@ "create": 1, "doctype": "DocPerm", "write": 1, - "role": "System Manager", "cancel": 1, + "role": "System Manager", + "report": 1, "permlevel": 0 }, { @@ -95,6 +98,7 @@ "doctype": "DocPerm", "submit": 0, "write": 1, + "report": 1, "role": "Sales Master Manager", "cancel": 1, "permlevel": 0 diff --git a/buying/doctype/purchase_order/purchase_order.txt b/buying/doctype/purchase_order/purchase_order.txt index 9bea0b18565..3c75008647c 100644 --- a/buying/doctype/purchase_order/purchase_order.txt +++ b/buying/doctype/purchase_order/purchase_order.txt @@ -7,14 +7,14 @@ "modified": "2013-01-18 13:24:20" }, { - "autoname": "naming_series:", - "allow_attach": 1, + "document_type": "Transaction", "is_submittable": 1, - "search_fields": "status, transaction_date, supplier,grand_total", + "allow_attach": 1, + "autoname": "naming_series:", "module": "Buying", "doctype": "DocType", "read_only_onload": 1, - "document_type": "Transaction", + "search_fields": "status, transaction_date, supplier,grand_total", "name": "__common__" }, { @@ -44,11 +44,11 @@ "doctype": "DocField", "label": "Series", "oldfieldname": "naming_series", - "permlevel": 0, + "options": "\nPO", "fieldname": "naming_series", "fieldtype": "Select", "reqd": 1, - "options": "\nPO" + "permlevel": 0 }, { "print_hide": 1, @@ -62,8 +62,8 @@ "fieldtype": "Link", "search_index": 1, "reqd": 1, - "in_filter": 1, - "options": "Supplier" + "options": "Supplier", + "in_filter": 1 }, { "doctype": "DocField", @@ -144,17 +144,17 @@ "doctype": "DocField", "label": "Purchase Order Items", "oldfieldname": "po_details", - "options": "Purchase Order Item", + "permlevel": 0, "fieldname": "po_details", "fieldtype": "Table", - "permlevel": 0 + "options": "Purchase Order Item" }, { "doctype": "DocField", - "options": "Simple", + "permlevel": 0, "fieldname": "sb_last_purchase", "fieldtype": "Section Break", - "permlevel": 0 + "options": "Simple" }, { "print_hide": 0, @@ -195,11 +195,11 @@ "doctype": "DocField", "label": "Select Purchase Request", "oldfieldname": "indent_no", - "permlevel": 0, + "options": "Purchase Request", "fieldname": "indent_no", "fieldtype": "Link", "hidden": 0, - "options": "Purchase Request" + "permlevel": 0 }, { "print_hide": 1, @@ -207,11 +207,11 @@ "oldfieldtype": "Button", "doctype": "DocField", "label": "Get Items", - "options": "get_indent_details", + "permlevel": 0, "fieldname": "get_items", "fieldtype": "Button", "hidden": 0, - "permlevel": 0 + "options": "get_indent_details" }, { "print_width": "50%", @@ -227,19 +227,19 @@ "no_copy": 1, "doctype": "DocField", "label": "Select Supplier Quotation", - "options": "Supplier Quotation", + "permlevel": 0, "fieldname": "supplier_quotation", "fieldtype": "Link", - "permlevel": 0 + "options": "Supplier Quotation" }, { "print_hide": 1, "doctype": "DocField", "label": "Get Items", - "options": "get_supplier_quotation_items", + "permlevel": 0, "fieldname": "get_supplier_quotation_items", "fieldtype": "Button", - "permlevel": 0 + "options": "get_supplier_quotation_items" }, { "doctype": "DocField", @@ -262,11 +262,11 @@ "doctype": "DocField", "label": "Currency", "oldfieldname": "currency", - "permlevel": 0, + "options": "link:Currency", "fieldname": "currency", "fieldtype": "Select", "reqd": 1, - "options": "link:Currency" + "permlevel": 0 }, { "print_hide": 1, @@ -294,20 +294,20 @@ "description": "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)", "doctype": "DocField", "label": "Price List", - "options": "Price List", + "permlevel": 0, "fieldname": "price_list_name", "fieldtype": "Link", - "permlevel": 0 + "options": "Price List" }, { "print_hide": 1, "depends_on": "price_list_name", "doctype": "DocField", "label": "Price List Currency", - "options": "Currency", + "permlevel": 0, "fieldname": "price_list_currency", "fieldtype": "Link", - "permlevel": 0 + "options": "Currency" }, { "print_hide": 1, @@ -335,20 +335,20 @@ "doctype": "DocField", "label": "Purchase Taxes and Charges", "oldfieldname": "purchase_other_charges", - "options": "Purchase Taxes and Charges Master", + "permlevel": 0, "fieldname": "purchase_other_charges", "fieldtype": "Link", - "permlevel": 0 + "options": "Purchase Taxes and Charges Master" }, { "print_hide": 1, "oldfieldtype": "Button", "doctype": "DocField", "label": "Get Tax Detail", - "options": "get_purchase_tax_details", + "permlevel": 0, "fieldname": "get_tax_detail", "fieldtype": "Button", - "permlevel": 0 + "options": "get_purchase_tax_details" }, { "no_copy": 0, @@ -356,10 +356,10 @@ "doctype": "DocField", "label": "Purchase Taxes and Charges", "oldfieldname": "purchase_tax_details", - "options": "Purchase Taxes and Charges", + "permlevel": 0, "fieldname": "purchase_tax_details", "fieldtype": "Table", - "permlevel": 0 + "options": "Purchase Taxes and Charges" }, { "print_hide": 1, @@ -544,29 +544,29 @@ "doctype": "DocField", "label": "Select Terms and Conditions", "oldfieldname": "tc_name", - "options": "Terms and Conditions", + "permlevel": 0, "fieldname": "tc_name", "fieldtype": "Link", - "permlevel": 0 + "options": "Terms and Conditions" }, { "oldfieldtype": "Button", "doctype": "DocField", "label": "Get Terms and Conditions", - "options": "get_tc_details", + "permlevel": 0, "fieldname": "get_terms", "fieldtype": "Button", - "permlevel": 0 + "options": "get_tc_details" }, { "print_hide": 1, "oldfieldtype": "HTML", "doctype": "DocField", "label": "Terms and Conditions HTML", - "options": "You can add Terms and Notes that will be printed in the Transaction", + "permlevel": 0, "fieldname": "terms_html", "fieldtype": "HTML", - "permlevel": 0 + "options": "You can add Terms and Notes that will be printed in the Transaction" }, { "oldfieldtype": "Text Editor", @@ -588,10 +588,10 @@ "print_hide": 1, "doctype": "DocField", "label": "Supplier Address", - "options": "Address", + "permlevel": 0, "fieldname": "supplier_address", "fieldtype": "Link", - "permlevel": 0, + "options": "Address", "in_filter": 1 }, { @@ -604,10 +604,10 @@ "print_hide": 1, "doctype": "DocField", "label": "Contact Person", - "options": "Contact", + "permlevel": 0, "fieldname": "contact_person", "fieldtype": "Link", - "permlevel": 0, + "options": "Contact", "in_filter": 1 }, { @@ -638,10 +638,10 @@ "default": "No", "doctype": "DocField", "label": "Is Subcontracted", - "options": "\nYes\nNo", + "permlevel": 0, "fieldname": "is_subcontracted", "fieldtype": "Select", - "permlevel": 0 + "options": "\nYes\nNo" }, { "print_hide": 1, @@ -657,15 +657,15 @@ }, { "print_hide": 1, - "allow_on_submit": 1, "oldfieldtype": "Select", + "allow_on_submit": 1, "doctype": "DocField", "label": "Letter Head", "oldfieldname": "letter_head", - "options": "link:Letter Head", + "permlevel": 0, "fieldname": "letter_head", "fieldtype": "Select", - "permlevel": 0 + "options": "link:Letter Head" }, { "print_hide": 1, @@ -706,8 +706,8 @@ "fieldtype": "Link", "search_index": 1, "reqd": 1, - "in_filter": 1, - "options": "Company" + "options": "Company", + "in_filter": 1 }, { "print_hide": 1, @@ -732,10 +732,10 @@ "doctype": "DocField", "label": "Select Print Heading", "oldfieldname": "select_print_heading", - "permlevel": 0, + "options": "Print Heading", "fieldname": "select_print_heading", "fieldtype": "Link", - "options": "Print Heading", + "permlevel": 0, "report_hide": 1 }, { @@ -830,16 +830,16 @@ }, { "print_hide": 1, - "allow_on_submit": 1, "no_copy": 0, "oldfieldtype": "Table", + "allow_on_submit": 1, "doctype": "DocField", "label": "Purchase Order Items Supplied", "oldfieldname": "po_raw_material_details", - "options": "Purchase Order Item Supplied", + "permlevel": 1, "fieldname": "po_raw_material_details", "fieldtype": "Table", - "permlevel": 1 + "options": "Purchase Order Item Supplied" }, { "print_hide": 1, @@ -857,26 +857,28 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Purchase User", "cancel": 1, "permlevel": 0 }, { - "doctype": "DocPerm", "role": "All", - "permlevel": 1 + "permlevel": 1, + "doctype": "DocPerm" }, { "doctype": "DocPerm", "role": "Supplier", + "report": 1, "permlevel": 0, "match": "supplier" }, { - "doctype": "DocPerm", "write": 1, "role": "All", - "permlevel": 2 + "permlevel": 2, + "doctype": "DocPerm" }, { "amend": 0, @@ -894,6 +896,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Purchase Manager", "cancel": 1, "permlevel": 0 @@ -914,6 +917,7 @@ "doctype": "DocPerm", "submit": 0, "write": 0, + "report": 1, "role": "Material User", "cancel": 0, "permlevel": 0 diff --git a/buying/doctype/quality_inspection/quality_inspection.txt b/buying/doctype/quality_inspection/quality_inspection.txt index 64bc087795b..0a76f2752e2 100644 --- a/buying/doctype/quality_inspection/quality_inspection.txt +++ b/buying/doctype/quality_inspection/quality_inspection.txt @@ -9,15 +9,15 @@ { "section_style": "Simple", "is_submittable": 1, + "doctype": "DocType", "search_fields": "item_code, report_date, purchase_receipt_no, delivery_note_no", "module": "Buying", - "_last_update": "1317365120", "server_code_error": " ", "print_outline": "Yes", "autoname": "QAI/.######", "name": "__common__", "colour": "White:FFF", - "doctype": "DocType", + "_last_update": "1317365120", "show_in_menu": 0, "version": 38 }, @@ -51,6 +51,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "cancel": 1, "permlevel": 0 }, @@ -75,11 +76,11 @@ "no_copy": 1, "doctype": "DocField", "label": "Naming Series", - "permlevel": 0, + "options": "\nQAI/11-12/", "fieldname": "naming_series", "fieldtype": "Select", "reqd": 1, - "options": "\nQAI/11-12/" + "permlevel": 0 }, { "oldfieldtype": "Select", @@ -87,12 +88,12 @@ "doctype": "DocField", "label": "Inspection Type", "oldfieldname": "inspection_type", + "permlevel": 0, "trigger": "Client", "fieldname": "inspection_type", "fieldtype": "Select", "reqd": 1, "options": "\nIncoming\nOutgoing\nIn Process", - "permlevel": 0, "in_filter": 1 }, { @@ -161,21 +162,21 @@ "doctype": "DocField", "label": "Item Serial No", "oldfieldname": "item_serial_no", - "permlevel": 0, + "options": "Serial No", "fieldname": "item_serial_no", "fieldtype": "Link", "hidden": 0, - "options": "Serial No" + "permlevel": 0 }, { "oldfieldtype": "Link", "doctype": "DocField", "label": "Batch No", "oldfieldname": "batch_no", - "permlevel": 0, + "options": "Batch", "fieldname": "batch_no", "fieldtype": "Link", - "options": "Batch" + "permlevel": 0 }, { "oldfieldtype": "Link", @@ -262,10 +263,10 @@ "oldfieldtype": "Section Break", "doctype": "DocField", "label": "Specification Details", - "permlevel": 0, + "options": "Simple", "fieldname": "specification_details", "fieldtype": "Section Break", - "options": "Simple" + "permlevel": 0 }, { "doctype": "DocField", @@ -280,9 +281,9 @@ "doctype": "DocField", "label": "Quality Inspection Readings", "oldfieldname": "qa_specification_details", - "permlevel": 0, + "options": "Quality Inspection Reading", "fieldname": "qa_specification_details", "fieldtype": "Table", - "options": "Quality Inspection Reading" + "permlevel": 0 } ] \ No newline at end of file diff --git a/buying/doctype/supplier/supplier.txt b/buying/doctype/supplier/supplier.txt index b1ab5b4fdc0..b27c297a6c2 100644 --- a/buying/doctype/supplier/supplier.txt +++ b/buying/doctype/supplier/supplier.txt @@ -7,13 +7,13 @@ "modified": "2012-12-27 14:02:18" }, { - "autoname": "naming_series:", + "document_type": "Master", "description": "Supplier of Goods or Services.", + "autoname": "naming_series:", "allow_rename": 1, - "search_fields": "supplier_name,supplier_type", "module": "Buying", "doctype": "DocType", - "document_type": "Master", + "search_fields": "supplier_name,supplier_type", "name": "__common__" }, { @@ -60,11 +60,11 @@ "doctype": "DocField", "label": "Supplier Type", "oldfieldname": "supplier_type", - "options": "Supplier Type", + "permlevel": 0, "fieldname": "supplier_type", "fieldtype": "Link", "reqd": 1, - "permlevel": 0 + "options": "Supplier Type" }, { "doctype": "DocField", @@ -79,10 +79,10 @@ "doctype": "DocField", "label": "Series", "oldfieldname": "naming_series", - "options": "\nSUPP\nSUPP/10-11/", + "permlevel": 0, "fieldname": "naming_series", "fieldtype": "Select", - "permlevel": 0 + "options": "\nSUPP\nSUPP/10-11/" }, { "oldfieldtype": "Column Break", @@ -96,10 +96,10 @@ "depends_on": "eval:doc.__islocal", "doctype": "DocField", "label": "Address Desc", - "options": "Addresses will appear only when you save the supplier", + "permlevel": 0, "fieldname": "address_desc", "fieldtype": "HTML", - "permlevel": 0 + "options": "Addresses will appear only when you save the supplier" }, { "doctype": "DocField", @@ -119,10 +119,10 @@ "depends_on": "eval:doc.__islocal", "doctype": "DocField", "label": "Contact Desc", - "options": "Contact Details will appear only when you save the supplier", + "permlevel": 0, "fieldname": "contact_desc", "fieldtype": "HTML", - "permlevel": 0 + "options": "Contact Details will appear only when you save the supplier" }, { "doctype": "DocField", @@ -158,23 +158,23 @@ "doctype": "DocField", "label": "Company", "oldfieldname": "company", - "permlevel": 0, + "options": "Company", "fieldname": "company", "fieldtype": "Link", "search_index": 0, "reqd": 1, - "in_filter": 1, - "options": "Company" + "permlevel": 0, + "in_filter": 1 }, { "description": "This currency will get fetched in Purchase transactions of this supplier", "no_copy": 1, "doctype": "DocField", "label": "Default Currency", - "options": "link:Currency", + "permlevel": 0, "fieldname": "default_currency", "fieldtype": "Select", - "permlevel": 0 + "options": "link:Currency" }, { "description": "Statutory info and other general information about your Supplier", @@ -225,14 +225,15 @@ "doctype": "DocPerm", "submit": 0, "write": 0, + "report": 1, "role": "Purchase Manager", "cancel": 0, "permlevel": 0 }, { - "doctype": "DocPerm", "role": "Purchase Master Manager", - "permlevel": 1 + "permlevel": 1, + "doctype": "DocPerm" }, { "amend": 0, @@ -240,6 +241,7 @@ "doctype": "DocPerm", "submit": 0, "write": 1, + "report": 1, "role": "Purchase Master Manager", "cancel": 1, "permlevel": 0 diff --git a/buying/doctype/supplier_quotation/supplier_quotation.txt b/buying/doctype/supplier_quotation/supplier_quotation.txt index df83deba290..140d5b17d18 100644 --- a/buying/doctype/supplier_quotation/supplier_quotation.txt +++ b/buying/doctype/supplier_quotation/supplier_quotation.txt @@ -7,14 +7,14 @@ "modified": "2013-01-18 13:25:50" }, { - "autoname": "naming_series:", - "allow_attach": 1, + "document_type": "Transaction", "is_submittable": 1, - "search_fields": "status, transaction_date, supplier,grand_total", + "allow_attach": 1, + "autoname": "naming_series:", "module": "Buying", "doctype": "DocType", "read_only_onload": 1, - "document_type": "Transaction", + "search_fields": "status, transaction_date, supplier,grand_total", "name": "__common__" }, { @@ -44,11 +44,11 @@ "doctype": "DocField", "label": "Series", "oldfieldname": "naming_series", - "permlevel": 0, + "options": "SQTN", "fieldname": "naming_series", "fieldtype": "Select", "reqd": 1, - "options": "SQTN" + "permlevel": 0 }, { "print_hide": 1, @@ -62,8 +62,8 @@ "fieldtype": "Link", "search_index": 1, "reqd": 1, - "in_filter": 1, - "options": "Supplier" + "options": "Supplier", + "in_filter": 1 }, { "doctype": "DocField", @@ -144,17 +144,17 @@ "doctype": "DocField", "label": "Quotation Items", "oldfieldname": "po_details", - "options": "Supplier Quotation Item", + "permlevel": 0, "fieldname": "quotation_items", "fieldtype": "Table", - "permlevel": 0 + "options": "Supplier Quotation Item" }, { "doctype": "DocField", - "options": "Simple", + "permlevel": 0, "fieldname": "section_break0", "fieldtype": "Section Break", - "permlevel": 0 + "options": "Simple" }, { "oldfieldtype": "Button", @@ -166,10 +166,10 @@ }, { "doctype": "DocField", - "options": "Simple", + "permlevel": 0, "fieldname": "section_break_14", "fieldtype": "Section Break", - "permlevel": 0 + "options": "Simple" }, { "print_hide": 1, @@ -179,21 +179,21 @@ "doctype": "DocField", "label": "Select Purchase Request", "oldfieldname": "indent_no", - "permlevel": 0, + "options": "Purchase Request", "fieldname": "indent_no", "fieldtype": "Link", "hidden": 0, - "options": "Purchase Request" + "permlevel": 0 }, { "oldfieldtype": "Button", "doctype": "DocField", "label": "Get Items", - "options": "get_indent_details", + "permlevel": 0, "fieldname": "get_items", "fieldtype": "Button", "hidden": 0, - "permlevel": 0 + "options": "get_indent_details" }, { "doctype": "DocField", @@ -210,11 +210,11 @@ "doctype": "DocField", "label": "Currency", "oldfieldname": "currency", - "permlevel": 0, + "options": "link:Currency", "fieldname": "currency", "fieldtype": "Select", "reqd": 1, - "options": "link:Currency" + "permlevel": 0 }, { "print_hide": 1, @@ -244,20 +244,20 @@ "description": "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)", "doctype": "DocField", "label": "Price List", - "options": "Price List", + "permlevel": 0, "fieldname": "price_list_name", "fieldtype": "Link", - "permlevel": 0 + "options": "Price List" }, { "print_hide": 1, "depends_on": "price_list_name", "doctype": "DocField", "label": "Price List Currency", - "options": "Currency", + "permlevel": 0, "fieldname": "price_list_currency", "fieldtype": "Link", - "permlevel": 0 + "options": "Currency" }, { "print_hide": 1, @@ -284,20 +284,20 @@ "doctype": "DocField", "label": "Purchase Taxes and Charges", "oldfieldname": "purchase_other_charges", - "options": "Purchase Taxes and Charges Master", + "permlevel": 0, "fieldname": "purchase_other_charges", "fieldtype": "Link", - "permlevel": 0 + "options": "Purchase Taxes and Charges Master" }, { "print_hide": 1, "oldfieldtype": "Button", "doctype": "DocField", "label": "Get Tax Detail", - "options": "get_purchase_tax_details", + "permlevel": 0, "fieldname": "get_tax_detail", "fieldtype": "Button", - "permlevel": 0 + "options": "get_purchase_tax_details" }, { "no_copy": 0, @@ -305,10 +305,10 @@ "doctype": "DocField", "label": "Purchase Taxes and Charges", "oldfieldname": "purchase_tax_details", - "options": "Purchase Taxes and Charges", + "permlevel": 0, "fieldname": "purchase_tax_details", "fieldtype": "Table", - "permlevel": 0 + "options": "Purchase Taxes and Charges" }, { "print_hide": 1, @@ -494,10 +494,10 @@ "doctype": "DocField", "label": "Letter Head", "oldfieldname": "letter_head", - "options": "link:Letter Head", + "permlevel": 0, "fieldname": "letter_head", "fieldtype": "Select", - "permlevel": 0 + "options": "link:Letter Head" }, { "print_hide": 1, @@ -505,29 +505,29 @@ "doctype": "DocField", "label": "Select Terms and Conditions", "oldfieldname": "tc_name", - "options": "Terms and Conditions", + "permlevel": 0, "fieldname": "tc_name", "fieldtype": "Link", - "permlevel": 0 + "options": "Terms and Conditions" }, { "oldfieldtype": "Button", "doctype": "DocField", "label": "Get Terms and Conditions", - "options": "get_tc_details", + "permlevel": 0, "fieldname": "get_terms", "fieldtype": "Button", - "permlevel": 0 + "options": "get_tc_details" }, { "print_hide": 1, "oldfieldtype": "HTML", "doctype": "DocField", "label": "Terms and Conditions HTML", - "options": "You can add Terms and Notes that will be printed in the Transaction", + "permlevel": 0, "fieldname": "terms_html", "fieldtype": "HTML", - "permlevel": 0 + "options": "You can add Terms and Notes that will be printed in the Transaction" }, { "oldfieldtype": "Text Editor", @@ -549,20 +549,20 @@ "print_hide": 1, "doctype": "DocField", "label": "Supplier Address", - "options": "Address", + "permlevel": 0, "fieldname": "supplier_address", "fieldtype": "Link", - "permlevel": 0, + "options": "Address", "in_filter": 1 }, { "print_hide": 1, "doctype": "DocField", "label": "Contact Person", - "options": "Contact", + "permlevel": 0, "fieldname": "contact_person", "fieldtype": "Link", - "permlevel": 0, + "options": "Contact", "in_filter": 1 }, { @@ -593,10 +593,10 @@ "default": "No", "doctype": "DocField", "label": "Is Subcontracted", - "options": "\nYes\nNo", + "permlevel": 0, "fieldname": "is_subcontracted", "fieldtype": "Select", - "permlevel": 0 + "options": "\nYes\nNo" }, { "print_hide": 1, @@ -637,8 +637,8 @@ "fieldtype": "Link", "search_index": 1, "reqd": 1, - "in_filter": 1, - "options": "Company" + "options": "Company", + "in_filter": 1 }, { "print_hide": 1, @@ -663,10 +663,10 @@ "doctype": "DocField", "label": "Select Print Heading", "oldfieldname": "select_print_heading", - "permlevel": 0, + "options": "Print Heading", "fieldname": "select_print_heading", "fieldtype": "Link", - "options": "Print Heading", + "permlevel": 0, "report_hide": 1 }, { @@ -708,6 +708,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Manufacturing Manager", "cancel": 1, "permlevel": 0 @@ -718,6 +719,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Purchase Manager", "cancel": 1, "permlevel": 0 @@ -728,6 +730,7 @@ "doctype": "DocPerm", "submit": 0, "write": 1, + "report": 1, "role": "Purchase User", "cancel": 0, "permlevel": 0 @@ -738,6 +741,7 @@ "doctype": "DocPerm", "submit": 0, "write": 0, + "report": 1, "role": "Material User", "cancel": 0, "permlevel": 0 @@ -748,6 +752,7 @@ "doctype": "DocPerm", "submit": 0, "write": 0, + "report": 1, "role": "Supplier", "cancel": 0, "permlevel": 0 diff --git a/home/doctype/feed/feed.txt b/home/doctype/feed/feed.txt index dc228298b01..4383bd7825a 100644 --- a/home/doctype/feed/feed.txt +++ b/home/doctype/feed/feed.txt @@ -9,11 +9,11 @@ { "section_style": "Simple", "name": "__common__", + "autoname": "_FEED.#####", "colour": "White:FFF", "module": "Home", "doctype": "DocType", "version": 1, - "autoname": "_FEED.#####", "show_in_menu": 0 }, { @@ -29,6 +29,7 @@ "read": 1, "name": "__common__", "doctype": "DocPerm", + "report": 1, "parenttype": "DocType", "role": "System Manager", "permlevel": 0, diff --git a/hr/doctype/appraisal/appraisal.txt b/hr/doctype/appraisal/appraisal.txt index 8005a2c2ff6..b0b201e82b3 100644 --- a/hr/doctype/appraisal/appraisal.txt +++ b/hr/doctype/appraisal/appraisal.txt @@ -11,12 +11,12 @@ "is_submittable": 1, "search_fields": "status, employee, employee_name", "module": "HR", - "doctype": "DocType", "server_code_error": " ", "autoname": "APRSL.#####", + "_last_update": "1316075905", "name": "__common__", "colour": "White:FFF", - "_last_update": "1316075905", + "doctype": "DocType", "show_in_menu": 0, "version": 1 }, @@ -54,11 +54,11 @@ "doctype": "DocField", "label": "Appraisal Template", "oldfieldname": "kra_template", - "options": "Appraisal Template", + "permlevel": 0, "fieldname": "kra_template", "fieldtype": "Link", "reqd": 1, - "permlevel": 0 + "options": "Appraisal Template" }, { "doctype": "DocField", @@ -99,17 +99,17 @@ }, { "permlevel": 1, - "depends_on": "kra_template", + "doctype": "DocField", "no_copy": 1, "search_index": 1, "colour": "White:FFF", - "doctype": "DocField", + "oldfieldtype": "Select", "label": "Status", "oldfieldname": "status", "default": "Draft", "fieldname": "status", "fieldtype": "Select", - "oldfieldtype": "Select", + "depends_on": "kra_template", "reqd": 1, "options": "\nDraft\nSubmitted\nCompleted\nCancelled", "in_filter": 1 @@ -142,11 +142,11 @@ "oldfieldtype": "Section Break", "doctype": "DocField", "label": "Goals", - "permlevel": 0, + "options": "Simple", "fieldname": "section_break0", "fieldtype": "Section Break", "depends_on": "kra_template", - "options": "Simple" + "permlevel": 0 }, { "oldfieldtype": "Table", @@ -155,20 +155,20 @@ "doctype": "DocField", "label": "Appraisal Goals", "oldfieldname": "appraisal_details", - "permlevel": 0, + "options": "Appraisal Goal", "fieldname": "appraisal_details", "fieldtype": "Table", - "options": "Appraisal Goal" + "permlevel": 0 }, { "oldfieldtype": "Button", "allow_on_submit": 0, "doctype": "DocField", "label": "Calculate Total Score", - "permlevel": 0, + "options": "calculate_total", "fieldname": "calculate_total_score", "fieldtype": "Button", - "options": "calculate_total" + "permlevel": 0 }, { "no_copy": 1, @@ -209,11 +209,11 @@ "doctype": "DocField", "label": "Company", "oldfieldname": "company", - "permlevel": 0, + "options": "link:Company", "fieldname": "company", "fieldtype": "Select", "reqd": 1, - "options": "link:Company", + "permlevel": 0, "in_filter": 1 }, { @@ -221,11 +221,11 @@ "doctype": "DocField", "label": "Fiscal Year", "oldfieldname": "fiscal_year", - "permlevel": 0, + "options": "link:Fiscal Year", "fieldname": "fiscal_year", "fieldtype": "Select", "reqd": 1, - "options": "link:Fiscal Year", + "permlevel": 0, "in_filter": 1 }, { @@ -262,6 +262,7 @@ "submit": 0, "write": 1, "role": "Employee", + "report": 1, "permlevel": 0, "match": "owner" }, @@ -271,6 +272,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "System Manager", "cancel": 1, "permlevel": 0 @@ -281,6 +283,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "HR User", "cancel": 1, "permlevel": 0 diff --git a/hr/doctype/appraisal_template/appraisal_template.txt b/hr/doctype/appraisal_template/appraisal_template.txt index 2a66bd39b49..c208ea601cb 100644 --- a/hr/doctype/appraisal_template/appraisal_template.txt +++ b/hr/doctype/appraisal_template/appraisal_template.txt @@ -7,10 +7,10 @@ "modified": "2013-01-07 17:16:25" }, { - "autoname": "field:kra_title", "name": "__common__", - "doctype": "DocType", + "autoname": "field:kra_title", "module": "HR", + "doctype": "DocType", "document_type": "Master" }, { @@ -24,6 +24,7 @@ { "parent": "Appraisal Template", "read": 1, + "report": 1, "name": "__common__", "create": 1, "doctype": "DocPerm", @@ -67,9 +68,9 @@ }, { "doctype": "DocField", - "label": "Total Points", "fieldname": "total_points", - "fieldtype": "Int" + "fieldtype": "Int", + "label": "Total Points" }, { "doctype": "DocPerm" diff --git a/hr/doctype/attendance/attendance.txt b/hr/doctype/attendance/attendance.txt index bd8b2a35188..11dfd09778c 100644 --- a/hr/doctype/attendance/attendance.txt +++ b/hr/doctype/attendance/attendance.txt @@ -7,13 +7,13 @@ "modified": "2012-12-23 09:42:45" }, { + "document_type": "Master", "is_submittable": 1, - "autoname": "naming_series:", "name": "__common__", - "search_fields": "employee, employee_name, att_date, status", + "autoname": "naming_series:", "module": "HR", "doctype": "DocType", - "document_type": "Master" + "search_fields": "employee, employee_name, att_date, status" }, { "name": "__common__", @@ -31,8 +31,9 @@ "doctype": "DocPerm", "write": 1, "parenttype": "DocType", - "cancel": 1, + "report": 1, "permlevel": 0, + "cancel": 1, "parentfield": "permissions" }, { @@ -43,10 +44,10 @@ "oldfieldtype": "Section Break", "doctype": "DocField", "label": "Attendance Details", - "options": "Simple", + "permlevel": 0, "fieldname": "attendance_details", "fieldtype": "Section Break", - "permlevel": 0 + "options": "Simple" }, { "no_copy": 1, @@ -54,23 +55,23 @@ "doctype": "DocField", "label": "Naming Series", "oldfieldname": "naming_series", - "options": "ATT", + "permlevel": 0, "fieldname": "naming_series", "fieldtype": "Select", "reqd": 1, - "permlevel": 0 + "options": "ATT" }, { "oldfieldtype": "Link", "doctype": "DocField", "label": "Employee", "oldfieldname": "employee", - "options": "Employee", + "permlevel": 0, "fieldname": "employee", "fieldtype": "Link", "search_index": 1, "reqd": 1, - "permlevel": 0, + "options": "Employee", "in_filter": 1 }, { @@ -88,12 +89,12 @@ "doctype": "DocField", "label": "Status", "oldfieldname": "status", - "permlevel": 0, + "options": "\nPresent\nAbsent\nHalf Day", "fieldname": "status", "fieldtype": "Select", "search_index": 1, "reqd": 1, - "options": "\nPresent\nAbsent\nHalf Day", + "permlevel": 0, "in_filter": 1 }, { @@ -102,11 +103,11 @@ "doctype": "DocField", "label": "Leave Type", "oldfieldname": "leave_type", - "options": "Leave Type", + "permlevel": 0, "fieldname": "leave_type", "fieldtype": "Link", "hidden": 1, - "permlevel": 0, + "options": "Leave Type", "report_hide": 1 }, { @@ -134,11 +135,11 @@ "doctype": "DocField", "label": "Fiscal Year", "oldfieldname": "fiscal_year", - "options": "link:Fiscal Year", + "permlevel": 0, "fieldname": "fiscal_year", "fieldtype": "Select", "reqd": 1, - "permlevel": 0, + "options": "link:Fiscal Year", "in_filter": 1 }, { @@ -146,11 +147,11 @@ "doctype": "DocField", "label": "Company", "oldfieldname": "company", - "options": "link:Company", + "permlevel": 0, "fieldname": "company", "fieldtype": "Select", "reqd": 1, - "permlevel": 0, + "options": "link:Company", "in_filter": 1 }, { @@ -169,10 +170,10 @@ "no_copy": 1, "doctype": "DocField", "label": "Amended From", - "options": "Attendance", + "permlevel": 1, "fieldname": "amended_from", "fieldtype": "Link", - "permlevel": 1 + "options": "Attendance" }, { "role": "System Manager", diff --git a/hr/doctype/branch/branch.txt b/hr/doctype/branch/branch.txt index d49e5bb2fb6..4683b042fd4 100644 --- a/hr/doctype/branch/branch.txt +++ b/hr/doctype/branch/branch.txt @@ -9,13 +9,13 @@ { "section_style": "Simple", "module": "HR", - "server_code_error": " ", - "allow_trash": 1, "doctype": "DocType", - "autoname": "field:branch", + "allow_trash": 1, "document_type": "Master", + "autoname": "field:branch", "name": "__common__", "colour": "White:FFF", + "server_code_error": " ", "show_in_menu": 0, "version": 11 }, @@ -27,14 +27,15 @@ "parentfield": "fields" }, { + "report": 1, "name": "__common__", "parent": "Branch", "read": 1, "create": 1, "doctype": "DocPerm", "write": 1, - "parenttype": "DocType", "cancel": 1, + "parenttype": "DocType", "permlevel": 0, "parentfield": "permissions" }, diff --git a/hr/doctype/deduction_type/deduction_type.txt b/hr/doctype/deduction_type/deduction_type.txt index 43a8d625e59..d7c9f7fe96b 100644 --- a/hr/doctype/deduction_type/deduction_type.txt +++ b/hr/doctype/deduction_type/deduction_type.txt @@ -9,13 +9,13 @@ { "section_style": "Simple", "module": "HR", - "server_code_error": " ", - "allow_trash": 1, "doctype": "DocType", - "autoname": "field:deduction_name", + "allow_trash": 1, "document_type": "Master", + "autoname": "field:deduction_name", "name": "__common__", "colour": "White:FFF", + "server_code_error": " ", "show_in_menu": 0, "version": 10 }, @@ -27,14 +27,15 @@ "parentfield": "fields" }, { + "report": 1, "name": "__common__", "parent": "Deduction Type", "read": 1, "create": 1, "doctype": "DocPerm", "write": 1, - "parenttype": "DocType", "cancel": 1, + "parenttype": "DocType", "permlevel": 0, "parentfield": "permissions" }, diff --git a/hr/doctype/department/department.txt b/hr/doctype/department/department.txt index 981efd96c77..192d0d76113 100644 --- a/hr/doctype/department/department.txt +++ b/hr/doctype/department/department.txt @@ -9,13 +9,13 @@ { "section_style": "Simple", "module": "HR", - "server_code_error": " ", - "allow_trash": 1, "doctype": "DocType", - "autoname": "field:department_name", + "allow_trash": 1, "document_type": "Master", + "autoname": "field:department_name", "name": "__common__", "colour": "White:FFF", + "server_code_error": " ", "show_in_menu": 0, "version": 7 }, @@ -27,14 +27,15 @@ "parentfield": "fields" }, { + "report": 1, "name": "__common__", "parent": "Department", "read": 1, "create": 1, "doctype": "DocPerm", "write": 1, - "parenttype": "DocType", "cancel": 1, + "parenttype": "DocType", "permlevel": 0, "parentfield": "permissions" }, diff --git a/hr/doctype/designation/designation.txt b/hr/doctype/designation/designation.txt index 3a3de3731e7..314dc198eb2 100644 --- a/hr/doctype/designation/designation.txt +++ b/hr/doctype/designation/designation.txt @@ -9,13 +9,13 @@ { "section_style": "Simple", "module": "HR", - "server_code_error": " ", - "allow_trash": 1, "doctype": "DocType", - "autoname": "field:designation_name", + "allow_trash": 1, "document_type": "Master", + "autoname": "field:designation_name", "name": "__common__", "colour": "White:FFF", + "server_code_error": " ", "show_in_menu": 0, "version": 7 }, @@ -27,14 +27,15 @@ "parentfield": "fields" }, { + "report": 1, "name": "__common__", "parent": "Designation", "read": 1, "create": 1, "doctype": "DocPerm", "write": 1, - "parenttype": "DocType", "cancel": 1, + "parenttype": "DocType", "permlevel": 0, "parentfield": "permissions" }, diff --git a/hr/doctype/earning_type/earning_type.txt b/hr/doctype/earning_type/earning_type.txt index fa89b681596..77039b1f406 100644 --- a/hr/doctype/earning_type/earning_type.txt +++ b/hr/doctype/earning_type/earning_type.txt @@ -9,13 +9,13 @@ { "section_style": "Simple", "module": "HR", - "server_code_error": " ", - "allow_trash": 1, "doctype": "DocType", - "autoname": "field:earning_name", + "allow_trash": 1, "document_type": "Master", + "autoname": "field:earning_name", "name": "__common__", "colour": "White:FFF", + "server_code_error": " ", "show_in_menu": 0, "version": 13 }, @@ -27,14 +27,15 @@ "parentfield": "fields" }, { + "report": 1, "name": "__common__", "parent": "Earning Type", "read": 1, "create": 1, "doctype": "DocPerm", "write": 1, - "parenttype": "DocType", "cancel": 1, + "parenttype": "DocType", "permlevel": 0, "parentfield": "permissions" }, @@ -90,12 +91,12 @@ "doctype": "DocField", "label": "Taxable", "oldfieldname": "taxable", + "permlevel": 0, "trigger": "Client", "fieldname": "taxable", "fieldtype": "Select", "reqd": 1, - "options": "\nYes\nNo", - "permlevel": 0 + "options": "\nYes\nNo" }, { "oldfieldtype": "Currency", diff --git a/hr/doctype/employee/employee.txt b/hr/doctype/employee/employee.txt index 6e3e8288f57..b03ae255790 100644 --- a/hr/doctype/employee/employee.txt +++ b/hr/doctype/employee/employee.txt @@ -7,12 +7,12 @@ "modified": "2013-01-09 14:46:42" }, { - "autoname": "naming_series:", + "document_type": "Master", "allow_attach": 1, - "search_fields": "employee_name", + "autoname": "naming_series:", "module": "HR", "doctype": "DocType", - "document_type": "Master", + "search_fields": "employee_name", "name": "__common__" }, { @@ -53,10 +53,10 @@ }, { "doctype": "DocField", - "label": "Image View", "options": "image", "fieldname": "image_view", "fieldtype": "Image", + "label": "Image View", "permlevel": 0 }, { @@ -77,22 +77,22 @@ "doctype": "DocField", "label": "Naming Series", "oldfieldname": "naming_series", - "options": "EMP/", + "permlevel": 0, "fieldname": "naming_series", "fieldtype": "Select", "reqd": 0, - "permlevel": 0 + "options": "EMP/" }, { "oldfieldtype": "Select", "doctype": "DocField", "label": "Salutation", "oldfieldname": "salutation", - "options": "\nMr\nMs", + "permlevel": 0, "fieldname": "salutation", "fieldtype": "Select", "search_index": 0, - "permlevel": 0 + "options": "\nMr\nMs" }, { "oldfieldtype": "Data", @@ -106,10 +106,10 @@ }, { "doctype": "DocField", - "label": "Image", "options": "attach_files:", "fieldname": "image", "fieldtype": "Select", + "label": "Image", "permlevel": 0 }, { @@ -123,10 +123,10 @@ "description": "System User (login) ID. If set, it will become default for all HR forms.", "doctype": "DocField", "label": "User ID", - "options": "Profile", + "permlevel": 0, "fieldname": "user_id", "fieldtype": "Link", - "permlevel": 0 + "options": "Profile" }, { "oldfieldtype": "Data", @@ -167,23 +167,23 @@ "doctype": "DocField", "label": "Gender", "oldfieldname": "gender", - "options": "\nMale\nFemale", + "permlevel": 0, "fieldname": "gender", "fieldtype": "Select", "search_index": 0, "reqd": 1, - "permlevel": 0, + "options": "\nMale\nFemale", "in_filter": 1 }, { "print_hide": 1, "doctype": "DocField", "label": "Company", - "options": "link:Company", + "permlevel": 0, "fieldname": "company", "fieldtype": "Select", "reqd": 1, - "permlevel": 0, + "options": "link:Company", "in_filter": 1 }, { @@ -205,12 +205,12 @@ "doctype": "DocField", "label": "Status", "oldfieldname": "status", - "permlevel": 0, + "options": "\nActive\nLeft", "fieldname": "status", "fieldtype": "Select", "search_index": 1, "reqd": 1, - "options": "\nActive\nLeft", + "permlevel": 0, "in_filter": 1 }, { @@ -218,11 +218,11 @@ "doctype": "DocField", "label": "Employment Type", "oldfieldname": "employment_type", - "options": "Employment Type", + "permlevel": 0, "fieldname": "employment_type", "fieldtype": "Link", "search_index": 0, - "permlevel": 0, + "options": "Employment Type", "in_filter": 1 }, { @@ -231,10 +231,10 @@ "doctype": "DocField", "label": "Holiday List", "oldfieldname": "holiday_list", - "options": "Holiday List", + "permlevel": 0, "fieldname": "holiday_list", "fieldtype": "Link", - "permlevel": 0 + "options": "Holiday List" }, { "doctype": "DocField", @@ -302,11 +302,11 @@ "doctype": "DocField", "label": "Branch", "oldfieldname": "branch", - "options": "Branch", + "permlevel": 0, "fieldname": "branch", "fieldtype": "Link", "reqd": 0, - "permlevel": 0, + "options": "Branch", "in_filter": 1 }, { @@ -314,11 +314,11 @@ "doctype": "DocField", "label": "Department", "oldfieldname": "department", - "options": "Department", + "permlevel": 0, "fieldname": "department", "fieldtype": "Link", "reqd": 0, - "permlevel": 0, + "options": "Department", "in_filter": 1 }, { @@ -326,12 +326,12 @@ "doctype": "DocField", "label": "Designation", "oldfieldname": "designation", - "options": "Designation", + "permlevel": 0, "fieldname": "designation", "fieldtype": "Link", "search_index": 1, "reqd": 0, - "permlevel": 0, + "options": "Designation", "in_filter": 1 }, { @@ -339,11 +339,11 @@ "doctype": "DocField", "label": "Grade", "oldfieldname": "grade", - "options": "Grade", + "permlevel": 0, "fieldname": "grade", "fieldtype": "Link", "reqd": 0, - "permlevel": 0, + "options": "Grade", "in_filter": 1 }, { @@ -351,10 +351,10 @@ "doctype": "DocField", "label": "Reports to", "oldfieldname": "reports_to", - "options": "Employee", + "permlevel": 0, "fieldname": "reports_to", "fieldtype": "Link", - "permlevel": 0 + "options": "Employee" }, { "description": "Provide email id registered in company", @@ -382,22 +382,22 @@ "doctype": "DocField", "label": "Salary Mode", "oldfieldname": "salary_mode", - "options": "\nBank\nCash\nCheque", + "permlevel": 0, "fieldname": "salary_mode", "fieldtype": "Select", - "permlevel": 0 + "options": "\nBank\nCash\nCheque" }, { "oldfieldtype": "Link", "doctype": "DocField", "label": "Bank Name", "oldfieldname": "bank_name", - "options": "Suggest", + "permlevel": 0, "fieldname": "bank_name", "fieldtype": "Data", "depends_on": "eval:doc.salary_mode == 'Bank'", "hidden": 0, - "permlevel": 0, + "options": "Suggest", "in_filter": 1 }, { @@ -477,10 +477,10 @@ }, { "doctype": "DocField", - "label": "Emergency Contact Details", "options": "Emergency Contact Details", "fieldname": "emergency_contact_details", "fieldtype": "HTML", + "label": "Emergency Contact Details", "permlevel": 0 }, { @@ -513,10 +513,10 @@ }, { "doctype": "DocField", - "label": "Permanent Accommodation Type", "options": "\nRented\nOwned", "fieldname": "permanent_accommodation_type", "fieldtype": "Select", + "label": "Permanent Accommodation Type", "permlevel": 0 }, { @@ -528,10 +528,10 @@ }, { "doctype": "DocField", - "label": "Current Accommodation Type", "options": "\nRented\nOwned", "fieldname": "current_accommodation_type", "fieldtype": "Select", + "label": "Current Accommodation Type", "permlevel": 0 }, { @@ -616,18 +616,18 @@ }, { "doctype": "DocField", - "label": "Marital Status", "options": "\nSingle\nMarried\nDivorced\nWidowed", "fieldname": "marital_status", "fieldtype": "Select", + "label": "Marital Status", "permlevel": 0 }, { "doctype": "DocField", - "label": "Blood Group", "options": "\nA+\nA-\nB+\nB-\nAB+\nAB-\nO+\nO-", "fieldname": "blood_group", "fieldtype": "Select", + "label": "Blood Group", "permlevel": 0 }, { @@ -662,10 +662,10 @@ }, { "doctype": "DocField", - "label": "Educational Qualification Details", "options": "Employee Education", "fieldname": "educational_qualification_details", "fieldtype": "Table", + "label": "Educational Qualification Details", "permlevel": 0 }, { @@ -677,34 +677,34 @@ }, { "doctype": "DocField", - "label": "Previous Work Experience", "options": "Simple", "fieldname": "previous_work_experience", "fieldtype": "Section Break", + "label": "Previous Work Experience", "permlevel": 0 }, { "doctype": "DocField", - "label": "Employee External Work History", "options": "Employee External Work History", "fieldname": "previous_experience_details", "fieldtype": "Table", + "label": "Employee External Work History", "permlevel": 0 }, { "doctype": "DocField", - "label": "History In Company", "options": "Simple", "fieldname": "history_in_company", "fieldtype": "Section Break", + "label": "History In Company", "permlevel": 0 }, { "doctype": "DocField", - "label": "Employee Internal Work Historys", "options": "Employee Internal Work History", "fieldname": "experience_in_company_details", "fieldtype": "Table", + "label": "Employee Internal Work Historys", "permlevel": 0 }, { @@ -755,10 +755,10 @@ "doctype": "DocField", "label": "Leave Encashed?", "oldfieldname": "leave_encashed", - "options": "\nYes\nNo", + "permlevel": 0, "fieldname": "leave_encashed", "fieldtype": "Select", - "permlevel": 0 + "options": "\nYes\nNo" }, { "oldfieldtype": "Date", @@ -793,10 +793,10 @@ "doctype": "DocField", "label": "Reason for Resignation", "oldfieldname": "reason_for_resignation", - "options": "\nBetter Prospects\nHealth Concerns", + "permlevel": 0, "fieldname": "reason_for_resignation", "fieldtype": "Select", - "permlevel": 0 + "options": "\nBetter Prospects\nHealth Concerns" }, { "oldfieldtype": "Data", @@ -838,8 +838,9 @@ "create": 0, "doctype": "DocPerm", "write": 0, - "role": "Employee", "cancel": 0, + "role": "Employee", + "report": 1, "permlevel": 0, "match": "employee" }, @@ -855,8 +856,9 @@ "create": 1, "doctype": "DocPerm", "write": 1, - "role": "HR User", "cancel": 1, + "role": "HR User", + "report": 1, "permlevel": 0, "match": "company" }, @@ -864,6 +866,7 @@ "create": 1, "doctype": "DocPerm", "write": 1, + "report": 1, "role": "HR Manager", "cancel": 1, "permlevel": 0 diff --git a/hr/doctype/employment_type/employment_type.txt b/hr/doctype/employment_type/employment_type.txt index 137ca0691d5..0fc5a0fb8c7 100644 --- a/hr/doctype/employment_type/employment_type.txt +++ b/hr/doctype/employment_type/employment_type.txt @@ -9,13 +9,13 @@ { "section_style": "Simple", "module": "HR", - "server_code_error": " ", - "allow_trash": 1, "doctype": "DocType", - "autoname": "field:employee_type_name", + "allow_trash": 1, "document_type": "Master", + "autoname": "field:employee_type_name", "name": "__common__", "colour": "White:FFF", + "server_code_error": " ", "show_in_menu": 0, "version": 16 }, @@ -27,14 +27,15 @@ "parentfield": "fields" }, { + "report": 1, "name": "__common__", "parent": "Employment Type", "read": 1, "create": 1, "doctype": "DocPerm", "write": 1, - "parenttype": "DocType", "cancel": 1, + "parenttype": "DocType", "permlevel": 0, "parentfield": "permissions" }, diff --git a/hr/doctype/expense_claim/expense_claim.txt b/hr/doctype/expense_claim/expense_claim.txt index a5a0860085a..569ea41e62f 100644 --- a/hr/doctype/expense_claim/expense_claim.txt +++ b/hr/doctype/expense_claim/expense_claim.txt @@ -8,11 +8,11 @@ }, { "is_submittable": 1, - "autoname": "EXP.######", "name": "__common__", - "search_fields": "approval_status,employee,employee_name", + "autoname": "EXP.######", "module": "HR", - "doctype": "DocType" + "doctype": "DocType", + "search_fields": "approval_status,employee,employee_name" }, { "name": "__common__", @@ -67,7 +67,6 @@ "permlevel": 0 }, { - "reqd": 0, "no_copy": 1, "oldfieldtype": "Currency", "colour": "White:FFF", @@ -77,6 +76,7 @@ "width": "160px", "fieldname": "total_claimed_amount", "fieldtype": "Currency", + "reqd": 0, "permlevel": 1, "in_filter": 0 }, @@ -107,30 +107,30 @@ "doctype": "DocField", "label": "Expense Claim Details", "oldfieldname": "expense_voucher_details", - "options": "Expense Claim Detail", + "permlevel": 0, "fieldname": "expense_voucher_details", "fieldtype": "Table", - "permlevel": 0 + "options": "Expense Claim Detail" }, { "doctype": "DocField", - "options": "Simple", + "permlevel": 0, "fieldname": "sb1", "fieldtype": "Section Break", - "permlevel": 0 + "options": "Simple" }, { - "permlevel": 0, "oldfieldtype": "Link", "colour": "White:FFF", "doctype": "DocField", "label": "From Employee", "oldfieldname": "employee", - "reqd": 1, + "permlevel": 0, "trigger": "Client", "fieldname": "employee", "fieldtype": "Link", "search_index": 1, + "reqd": 1, "options": "Employee", "in_filter": 1 }, @@ -151,11 +151,11 @@ "doctype": "DocField", "label": "Fiscal Year", "oldfieldname": "fiscal_year", - "options": "link:Fiscal Year", + "permlevel": 0, "fieldname": "fiscal_year", "fieldtype": "Select", "reqd": 1, - "permlevel": 0, + "options": "link:Fiscal Year", "in_filter": 1 }, { @@ -163,11 +163,11 @@ "doctype": "DocField", "label": "Company", "oldfieldname": "company", - "options": "link:Company", + "permlevel": 0, "fieldname": "company", "fieldtype": "Select", "reqd": 1, - "permlevel": 0, + "options": "link:Company", "in_filter": 1 }, { @@ -188,10 +188,10 @@ "in_filter": 1 }, { - "allow_on_submit": 0, "no_copy": 1, "oldfieldtype": "Small Text", "colour": "White:FFF", + "allow_on_submit": 0, "doctype": "DocField", "label": "Remark", "oldfieldname": "remark", @@ -243,6 +243,7 @@ "doctype": "DocPerm", "write": 1, "role": "Employee", + "report": 1, "permlevel": 0, "match": "owner" }, @@ -252,8 +253,9 @@ "doctype": "DocPerm", "submit": 1, "write": 1, - "role": "Expense Approver", "cancel": 1, + "role": "Expense Approver", + "report": 1, "permlevel": 0, "match": "exp_approver:user" }, @@ -263,13 +265,14 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "HR User", "cancel": 1, "permlevel": 0 }, { - "doctype": "DocPerm", "role": "All", - "permlevel": 1 + "permlevel": 1, + "doctype": "DocPerm" } ] \ No newline at end of file diff --git a/hr/doctype/expense_claim_type/expense_claim_type.txt b/hr/doctype/expense_claim_type/expense_claim_type.txt index 72825da1733..9a0236fd87d 100644 --- a/hr/doctype/expense_claim_type/expense_claim_type.txt +++ b/hr/doctype/expense_claim_type/expense_claim_type.txt @@ -9,12 +9,12 @@ { "section_style": "Simple", "name": "__common__", + "autoname": "field:expense_type", "colour": "White:FFF", "module": "HR", "server_code_error": " ", "version": 5, "doctype": "DocType", - "autoname": "field:expense_type", "document_type": "Master" }, { @@ -32,6 +32,7 @@ "create": 1, "doctype": "DocPerm", "write": 1, + "report": 1, "parenttype": "DocType", "permlevel": 0, "parentfield": "permissions" diff --git a/hr/doctype/grade/grade.txt b/hr/doctype/grade/grade.txt index df4a28b5903..339db8b0eb0 100644 --- a/hr/doctype/grade/grade.txt +++ b/hr/doctype/grade/grade.txt @@ -9,13 +9,13 @@ { "section_style": "Simple", "module": "HR", - "server_code_error": " ", - "allow_trash": 1, "doctype": "DocType", - "autoname": "field:grade_name", + "allow_trash": 1, "document_type": "Master", + "autoname": "field:grade_name", "name": "__common__", "colour": "White:FFF", + "server_code_error": " ", "show_in_menu": 0, "version": 7 }, @@ -27,14 +27,15 @@ "parentfield": "fields" }, { + "report": 1, "name": "__common__", "parent": "Grade", "read": 1, "create": 1, "doctype": "DocPerm", "write": 1, - "parenttype": "DocType", "cancel": 1, + "parenttype": "DocType", "permlevel": 0, "parentfield": "permissions" }, diff --git a/hr/doctype/holiday_list/holiday_list.txt b/hr/doctype/holiday_list/holiday_list.txt index a4060fae62d..ef83520e28f 100644 --- a/hr/doctype/holiday_list/holiday_list.txt +++ b/hr/doctype/holiday_list/holiday_list.txt @@ -9,12 +9,12 @@ { "section_style": "Simple", "module": "HR", - "server_code_error": " ", - "allow_trash": 1, "doctype": "DocType", + "allow_trash": 1, "document_type": "Master", "name": "__common__", "colour": "White:FFF", + "server_code_error": " ", "show_in_menu": 0, "version": 17 }, @@ -28,10 +28,11 @@ { "parent": "Holiday List", "read": 1, - "doctype": "DocPerm", + "report": 1, "cancel": 1, "name": "__common__", "create": 1, + "doctype": "DocPerm", "write": 1, "parenttype": "DocType", "role": "HR Manager", @@ -76,11 +77,11 @@ "doctype": "DocField", "label": "Fiscal Year", "oldfieldname": "fiscal_year", - "permlevel": 0, + "options": "link:Fiscal Year", "fieldname": "fiscal_year", "fieldtype": "Select", "reqd": 1, - "options": "link:Fiscal Year", + "permlevel": 0, "in_filter": 1 }, { @@ -88,10 +89,10 @@ "no_copy": 1, "doctype": "DocField", "label": "Weekly Off", - "permlevel": 0, + "options": "\nSunday\nMonday\nTuesday\nWednesday\nThursday\nFriday\nSaturday", "fieldname": "weekly_off", "fieldtype": "Select", - "options": "\nSunday\nMonday\nTuesday\nWednesday\nThursday\nFriday\nSaturday", + "permlevel": 0, "report_hide": 1 }, { @@ -107,11 +108,11 @@ "doctype": "DocField", "label": "Holidays", "oldfieldname": "holiday_list_details", - "permlevel": 0, + "options": "Holiday", "fieldname": "holiday_list_details", "fieldtype": "Table", "reqd": 0, - "options": "Holiday" + "permlevel": 0 }, { "doctype": "DocField", diff --git a/hr/doctype/leave_allocation/leave_allocation.txt b/hr/doctype/leave_allocation/leave_allocation.txt index 38463546b8c..ed94520b8b2 100644 --- a/hr/doctype/leave_allocation/leave_allocation.txt +++ b/hr/doctype/leave_allocation/leave_allocation.txt @@ -11,12 +11,12 @@ "is_submittable": 1, "search_fields": "employee,employee_name,leave_type,total_leaves_allocated,fiscal_year", "module": "HR", - "doctype": "DocType", "server_code_error": " ", "autoname": "LAL/.#####", + "_last_update": "1317365120", "name": "__common__", "colour": "White:FFF", - "_last_update": "1317365120", + "doctype": "DocType", "show_in_menu": 0, "version": 1 }, @@ -198,8 +198,9 @@ "doctype": "DocPerm", "submit": 1, "write": 1, - "role": "HR User", "cancel": 1, + "role": "HR User", + "report": 1, "permlevel": 0, "match": "owner" }, @@ -209,6 +210,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "HR Manager", "cancel": 1, "permlevel": 0 diff --git a/hr/doctype/leave_application/leave_application.txt b/hr/doctype/leave_application/leave_application.txt index 6af6529f8ef..033728c3e3f 100644 --- a/hr/doctype/leave_application/leave_application.txt +++ b/hr/doctype/leave_application/leave_application.txt @@ -7,13 +7,13 @@ "modified": "2013-01-01 15:13:51" }, { + "document_type": "Transaction", "is_submittable": 1, - "autoname": "LAP/.#####", "description": "Apply / Approve Leaves", - "search_fields": "employee,employee_name,leave_type,from_date,to_date,total_leave_days,fiscal_year", + "autoname": "LAP/.#####", "module": "HR", "doctype": "DocType", - "document_type": "Transaction", + "search_fields": "employee,employee_name,leave_type,from_date,to_date,total_leave_days,fiscal_year", "name": "__common__" }, { @@ -37,33 +37,33 @@ "doctype": "DocType" }, { + "permlevel": 2, "default": "Open", "doctype": "DocField", "label": "Status", "no_copy": 1, - "options": "Open\nApproved\nRejected", "fieldname": "status", "fieldtype": "Select", - "permlevel": 2 + "options": "Open\nApproved\nRejected" }, { "description": "Leave can be approved by users with Role, \"Leave Approver\"", "doctype": "DocField", "label": "Leave Approver", - "options": "link:Profile", + "permlevel": 0, "fieldname": "leave_approver", "fieldtype": "Select", - "permlevel": 0 + "options": "link:Profile" }, { "search_index": 1, "doctype": "DocField", "label": "Leave Type", - "options": "link:Leave Type", + "permlevel": 0, "fieldname": "leave_type", "fieldtype": "Select", "reqd": 1, - "permlevel": 0, + "options": "link:Leave Type", "in_filter": 1 }, { @@ -110,11 +110,11 @@ "search_index": 1, "doctype": "DocField", "label": "Employee", - "options": "Employee", + "permlevel": 0, "fieldname": "employee", "fieldtype": "Link", "reqd": 1, - "permlevel": 0, + "options": "Employee", "in_filter": 1 }, { @@ -167,11 +167,11 @@ "search_index": 0, "doctype": "DocField", "label": "Fiscal Year", - "options": "link:Fiscal Year", + "permlevel": 2, "fieldname": "fiscal_year", "fieldtype": "Select", "reqd": 1, - "permlevel": 2, + "options": "link:Fiscal Year", "in_filter": 1 }, { @@ -179,25 +179,26 @@ "print_hide": 1, "doctype": "DocField", "label": "Letter Head", - "options": "Letter Head", + "permlevel": 2, "fieldname": "letter_head", "fieldtype": "Link", - "permlevel": 2 + "options": "Letter Head" }, { "print_hide": 1, "no_copy": 1, "doctype": "DocField", "label": "Amended From", - "options": "Sales Invoice", + "permlevel": 1, "fieldname": "amended_from", "fieldtype": "Link", - "permlevel": 1 + "options": "Sales Invoice" }, { "create": 1, "doctype": "DocPerm", "role": "Employee", + "report": 1, "permlevel": 0, "match": "employee" }, @@ -206,6 +207,7 @@ "create": 1, "doctype": "DocPerm", "submit": 1, + "report": 1, "role": "HR User", "cancel": 1, "permlevel": 0 @@ -215,15 +217,16 @@ "create": 1, "doctype": "DocPerm", "submit": 1, - "role": "Leave Approver", "cancel": 1, + "role": "Leave Approver", + "report": 1, "permlevel": 0, "match": "leave_approver:user" }, { - "doctype": "DocPerm", "role": "HR User", - "permlevel": 2 + "permlevel": 2, + "doctype": "DocPerm" }, { "amend": 0, diff --git a/hr/doctype/leave_type/leave_type.txt b/hr/doctype/leave_type/leave_type.txt index a2988e6df30..d993760c8c5 100644 --- a/hr/doctype/leave_type/leave_type.txt +++ b/hr/doctype/leave_type/leave_type.txt @@ -9,13 +9,13 @@ { "section_style": "Simple", "module": "HR", - "server_code_error": " ", - "allow_trash": 1, "doctype": "DocType", - "autoname": "field:leave_type_name", + "allow_trash": 1, "document_type": "Master", + "autoname": "field:leave_type_name", "name": "__common__", "colour": "White:FFF", + "server_code_error": " ", "show_in_menu": 0, "version": 23 }, @@ -27,14 +27,15 @@ "parentfield": "fields" }, { + "report": 1, "name": "__common__", "parent": "Leave Type", "read": 1, "create": 1, "doctype": "DocPerm", "write": 1, - "parenttype": "DocType", "cancel": 1, + "parenttype": "DocType", "permlevel": 0, "parentfield": "permissions" }, diff --git a/hr/doctype/other_income_detail/other_income_detail.txt b/hr/doctype/other_income_detail/other_income_detail.txt index f5afa9ff6b0..6da3363ca2f 100644 --- a/hr/doctype/other_income_detail/other_income_detail.txt +++ b/hr/doctype/other_income_detail/other_income_detail.txt @@ -12,10 +12,10 @@ "name": "__common__", "colour": "White:FFF", "module": "HR", - "show_in_menu": 0, - "version": 6, "server_code_error": " ", - "doctype": "DocType" + "version": 6, + "doctype": "DocType", + "show_in_menu": 0 }, { "name": "__common__", @@ -39,6 +39,7 @@ }, { "write": 1, + "report": 1, "permlevel": 0, "doctype": "DocPerm" }, diff --git a/hr/doctype/salary_slip/salary_slip.txt b/hr/doctype/salary_slip/salary_slip.txt index ecab74f66cc..c03f84cd10d 100644 --- a/hr/doctype/salary_slip/salary_slip.txt +++ b/hr/doctype/salary_slip/salary_slip.txt @@ -9,8 +9,8 @@ { "is_submittable": 1, "name": "__common__", - "doctype": "DocType", - "module": "HR" + "module": "HR", + "doctype": "DocType" }, { "name": "__common__", @@ -45,12 +45,12 @@ "doctype": "DocField", "label": "Employee", "oldfieldname": "employee", - "permlevel": 0, + "options": "Employee", "fieldname": "employee", "fieldtype": "Link", "search_index": 1, "reqd": 1, - "options": "Employee", + "permlevel": 0, "in_filter": 1 }, { @@ -69,12 +69,12 @@ "doctype": "DocField", "label": "Department", "oldfieldname": "department", - "options": "Department", + "permlevel": 1, "fieldname": "department", "fieldtype": "Link", "search_index": 0, "reqd": 0, - "permlevel": 1, + "options": "Department", "in_filter": 1 }, { @@ -82,11 +82,11 @@ "doctype": "DocField", "label": "Designation", "oldfieldname": "designation", - "options": "Designation", + "permlevel": 1, "fieldname": "designation", "fieldtype": "Link", "search_index": 0, - "permlevel": 1, + "options": "Designation", "in_filter": 1 }, { @@ -94,11 +94,11 @@ "doctype": "DocField", "label": "Branch", "oldfieldname": "branch", - "options": "Branch", + "permlevel": 1, "fieldname": "branch", "fieldtype": "Link", "search_index": 0, - "permlevel": 1, + "options": "Branch", "in_filter": 1 }, { @@ -106,11 +106,11 @@ "doctype": "DocField", "label": "Grade", "oldfieldname": "grade", - "options": "Grade", + "permlevel": 1, "fieldname": "grade", "fieldtype": "Link", "search_index": 0, - "permlevel": 1, + "options": "Grade", "in_filter": 1 }, { @@ -133,10 +133,10 @@ }, { "doctype": "DocField", - "label": "Letter Head", "options": "Letter Head", "fieldname": "letter_head", "fieldtype": "Link", + "label": "Letter Head", "permlevel": 0 }, { @@ -153,22 +153,22 @@ "doctype": "DocField", "label": "Fiscal Year", "oldfieldname": "fiscal_year", - "permlevel": 0, + "options": "Fiscal Year", "fieldname": "fiscal_year", "fieldtype": "Link", "search_index": 0, "reqd": 1, - "options": "Fiscal Year", + "permlevel": 0, "in_filter": 1 }, { "doctype": "DocField", "label": "Company", - "options": "link:Company", + "permlevel": 0, "fieldname": "company", "fieldtype": "Select", "reqd": 1, - "permlevel": 0, + "options": "link:Company", "in_filter": 1 }, { @@ -300,10 +300,10 @@ "doctype": "DocField", "label": "Salary Structure Earnings", "oldfieldname": "earning_details", - "options": "Salary Slip Earning", + "permlevel": 0, "fieldname": "earning_details", "fieldtype": "Table", - "permlevel": 0 + "options": "Salary Slip Earning" }, { "oldfieldtype": "Column Break", @@ -320,10 +320,10 @@ "doctype": "DocField", "label": "Deductions", "oldfieldname": "deduction_details", - "options": "Salary Slip Deduction", + "permlevel": 0, "fieldname": "deduction_details", "fieldtype": "Table", - "permlevel": 0 + "options": "Salary Slip Deduction" }, { "oldfieldtype": "Section Break", @@ -421,6 +421,7 @@ "submit": 1, "write": 1, "role": "HR User", + "report": 1, "permlevel": 0 }, { @@ -429,18 +430,19 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "HR Manager", "cancel": 1, "permlevel": 0 }, { - "doctype": "DocPerm", "role": "HR User", - "permlevel": 1 + "permlevel": 1, + "doctype": "DocPerm" }, { - "doctype": "DocPerm", "role": "HR Manager", - "permlevel": 1 + "permlevel": 1, + "doctype": "DocPerm" } ] \ No newline at end of file diff --git a/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt b/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt index 2272aea77dc..0388ba9476a 100644 --- a/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt +++ b/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt @@ -12,10 +12,10 @@ "name": "__common__", "colour": "White:FFF", "module": "HR", - "show_in_menu": 0, - "version": 9, "server_code_error": " ", - "doctype": "DocType" + "version": 9, + "doctype": "DocType", + "show_in_menu": 0 }, { "name": "__common__", @@ -28,6 +28,7 @@ { "parent": "Salary Slip Deduction", "read": 1, + "report": 1, "name": "__common__", "create": 1, "doctype": "DocPerm", @@ -45,15 +46,15 @@ "doctype": "DocPerm" }, { - "permlevel": 0, "oldfieldtype": "Data", "doctype": "DocField", "label": "Type", "oldfieldname": "d_type", "width": "200px", + "options": "Deduction Type", "fieldname": "d_type", "fieldtype": "Link", - "options": "Deduction Type" + "permlevel": 0 }, { "oldfieldtype": "Currency", diff --git a/hr/doctype/salary_slip_earning/salary_slip_earning.txt b/hr/doctype/salary_slip_earning/salary_slip_earning.txt index b8ad5961ad0..6283d3d0f50 100644 --- a/hr/doctype/salary_slip_earning/salary_slip_earning.txt +++ b/hr/doctype/salary_slip_earning/salary_slip_earning.txt @@ -12,10 +12,10 @@ "name": "__common__", "colour": "White:FFF", "module": "HR", - "show_in_menu": 0, - "version": 7, "server_code_error": " ", - "doctype": "DocType" + "version": 7, + "doctype": "DocType", + "show_in_menu": 0 }, { "name": "__common__", @@ -27,6 +27,7 @@ { "parent": "Salary Slip Earning", "read": 1, + "report": 1, "name": "__common__", "create": 1, "doctype": "DocPerm", @@ -44,15 +45,15 @@ "doctype": "DocPerm" }, { - "permlevel": 0, "oldfieldtype": "Data", "doctype": "DocField", "label": "Type", "oldfieldname": "e_type", "width": "200px", + "options": "Earning Type", "fieldname": "e_type", "fieldtype": "Link", - "options": "Earning Type" + "permlevel": 0 }, { "oldfieldtype": "Currency", diff --git a/hr/doctype/salary_structure/salary_structure.txt b/hr/doctype/salary_structure/salary_structure.txt index f45d8736090..1a104ad003d 100644 --- a/hr/doctype/salary_structure/salary_structure.txt +++ b/hr/doctype/salary_structure/salary_structure.txt @@ -8,8 +8,8 @@ }, { "name": "__common__", - "doctype": "DocType", - "module": "HR" + "module": "HR", + "doctype": "DocType" }, { "name": "__common__", @@ -44,12 +44,12 @@ "doctype": "DocField", "label": "Employee", "oldfieldname": "employee", - "permlevel": 0, "trigger": "Client", "fieldname": "employee", "fieldtype": "Link", "reqd": 1, "options": "Employee", + "permlevel": 0, "in_filter": 1 }, { @@ -67,11 +67,11 @@ "doctype": "DocField", "label": "Branch", "oldfieldname": "branch", - "options": "link:Branch", + "permlevel": 1, "fieldname": "branch", "fieldtype": "Select", "reqd": 0, - "permlevel": 1, + "options": "link:Branch", "in_filter": 1 }, { @@ -80,11 +80,11 @@ "doctype": "DocField", "label": "Designation", "oldfieldname": "designation", - "options": "link:Designation", + "permlevel": 1, "fieldname": "designation", "fieldtype": "Select", "reqd": 0, - "permlevel": 1, + "options": "link:Designation", "in_filter": 1 }, { @@ -93,11 +93,11 @@ "doctype": "DocField", "label": "Department", "oldfieldname": "department", - "options": "link:Department", + "permlevel": 1, "fieldname": "department", "fieldtype": "Select", "reqd": 0, - "permlevel": 1, + "options": "link:Department", "in_filter": 1 }, { @@ -106,11 +106,11 @@ "doctype": "DocField", "label": "Grade", "oldfieldname": "grade", - "options": "link:Grade", + "permlevel": 1, "fieldname": "grade", "fieldtype": "Select", "reqd": 0, - "permlevel": 1, + "options": "link:Grade", "in_filter": 1 }, { @@ -127,11 +127,11 @@ "doctype": "DocField", "label": "Is Active", "oldfieldname": "is_active", - "permlevel": 0, + "options": "\nYes\nNo", "fieldname": "is_active", "fieldtype": "Select", "reqd": 1, - "options": "\nYes\nNo", + "permlevel": 0, "in_filter": 1 }, { @@ -169,11 +169,11 @@ { "doctype": "DocField", "label": "Company", - "options": "link:Company", + "permlevel": 0, "fieldname": "company", "fieldtype": "Select", "reqd": 1, - "permlevel": 0, + "options": "link:Company", "in_filter": 1 }, { @@ -204,11 +204,11 @@ "doctype": "DocField", "label": "Earning1", "oldfieldname": "earning_details", - "options": "Salary Structure Earning", + "permlevel": 0, "fieldname": "earning_details", "fieldtype": "Table", "hidden": 0, - "permlevel": 0 + "options": "Salary Structure Earning" }, { "oldfieldtype": "Column Break", @@ -228,18 +228,18 @@ "doctype": "DocField", "label": "Deduction1", "oldfieldname": "deduction_details", - "options": "Salary Structure Deduction", + "permlevel": 0, "fieldname": "deduction_details", "fieldtype": "Table", "hidden": 0, - "permlevel": 0 + "options": "Salary Structure Deduction" }, { "doctype": "DocField", - "options": "Simple", + "permlevel": 0, "fieldname": "section_break0", "fieldtype": "Section Break", - "permlevel": 0 + "options": "Simple" }, { "doctype": "DocField", @@ -281,16 +281,17 @@ "permlevel": 1 }, { - "doctype": "DocPerm", "write": 0, "role": "All", - "permlevel": 1 + "permlevel": 1, + "doctype": "DocPerm" }, { "create": 1, "doctype": "DocPerm", "write": 1, "role": "HR User", + "report": 1, "permlevel": 0 }, { @@ -298,16 +299,17 @@ "doctype": "DocPerm", "write": 1, "role": "HR Manager", + "report": 1, "permlevel": 0 }, { - "doctype": "DocPerm", "role": "HR Manager", - "permlevel": 1 + "permlevel": 1, + "doctype": "DocPerm" }, { - "doctype": "DocPerm", "role": "HR User", - "permlevel": 1 + "permlevel": 1, + "doctype": "DocPerm" } ] \ No newline at end of file diff --git a/manufacturing/doctype/bom/bom.txt b/manufacturing/doctype/bom/bom.txt index cd4916f233b..aa377829a21 100644 --- a/manufacturing/doctype/bom/bom.txt +++ b/manufacturing/doctype/bom/bom.txt @@ -12,15 +12,15 @@ "allow_print": 0, "search_fields": "item", "module": "Manufacturing", + "doctype": "DocType", + "issingle": 0, "document_type": "Master", "allow_attach": 0, "read_only": 0, "allow_email": 0, "hide_heading": 0, - "issingle": 0, "name": "__common__", "allow_rename": 0, - "doctype": "DocType", "is_submittable": 1, "hide_toolbar": 0, "allow_copy": 0 @@ -50,13 +50,13 @@ "doctype": "DocField", "label": "Item", "oldfieldname": "item", - "permlevel": 0, + "options": "Item", "fieldname": "item", "fieldtype": "Link", "search_index": 1, "reqd": 1, - "in_filter": 1, - "options": "Item" + "permlevel": 0, + "in_filter": 1 }, { "doctype": "DocField", @@ -101,21 +101,21 @@ "oldfieldtype": "Section Break", "doctype": "DocField", "label": "Operations", - "options": "Specify the operations, operating cost and give a unique Operation no to your operations.", + "permlevel": 0, "fieldname": "operations", "fieldtype": "Section Break", "depends_on": "with_operations", - "permlevel": 0 + "options": "Specify the operations, operating cost and give a unique Operation no to your operations." }, { "oldfieldtype": "Table", "doctype": "DocField", "label": "BOM Operations", "oldfieldname": "bom_operations", - "options": "BOM Operation", + "permlevel": 0, "fieldname": "bom_operations", "fieldtype": "Table", - "permlevel": 0 + "options": "BOM Operation" }, { "oldfieldtype": "Section Break", @@ -130,10 +130,10 @@ "doctype": "DocField", "label": "BOM Item", "oldfieldname": "bom_materials", - "options": "BOM Item", + "permlevel": 0, "fieldname": "bom_materials", "fieldtype": "Table", - "permlevel": 0 + "options": "BOM Item" }, { "oldfieldtype": "Section Break", @@ -145,10 +145,10 @@ }, { "doctype": "DocField", - "label": "Rate Of Materials Based On", "options": "Valuation Rate\nLast Purchase Rate", "fieldname": "rm_cost_as_per", "fieldtype": "Select", + "label": "Rate Of Materials Based On", "permlevel": 0 }, { @@ -199,10 +199,10 @@ }, { "doctype": "DocField", - "label": "Item UOM", "options": "link:UOM", "fieldname": "uom", "fieldtype": "Select", + "label": "Item UOM", "permlevel": 1 }, { @@ -216,10 +216,10 @@ "doctype": "DocField", "label": "Project Name", "oldfieldname": "project_name", - "options": "Project", + "permlevel": 0, "fieldname": "project_name", "fieldtype": "Link", - "permlevel": 0, + "options": "Project", "in_filter": 1 }, { @@ -234,10 +234,10 @@ "no_copy": 1, "doctype": "DocField", "label": "Amended From", - "options": "BOM", + "permlevel": 1, "fieldname": "amended_from", "fieldtype": "Link", - "permlevel": 1 + "options": "BOM" }, { "print_hide": 0, @@ -251,58 +251,61 @@ }, { "print_hide": 1, - "permlevel": 1, "no_copy": 1, "oldfieldtype": "Table", "doctype": "DocField", "label": "Materials Required (Exploded)", "oldfieldname": "flat_bom_details", "default": "No Toolbar", + "options": "BOM Explosion Item", "fieldname": "flat_bom_details", "fieldtype": "Table", "hidden": 0, - "options": "BOM Explosion Item" + "permlevel": 1 }, { "create": 1, "doctype": "DocPerm", "submit": 1, "write": 1, + "cancel": 1, "role": "System Manager", - "cancel": 1, + "report": 1, "permlevel": 0 }, { - "doctype": "DocPerm", "role": "System Manager", - "permlevel": 1 + "permlevel": 1, + "doctype": "DocPerm" }, { "create": 1, "doctype": "DocPerm", "submit": 1, "write": 1, - "role": "Manufacturing Manager", "cancel": 1, + "role": "Manufacturing Manager", + "report": 1, "permlevel": 0 }, { - "doctype": "DocPerm", "role": "Manufacturing Manager", - "permlevel": 1 + "permlevel": 1, + "doctype": "DocPerm" }, { "create": 1, "doctype": "DocPerm", "submit": 1, "write": 1, - "role": "Manufacturing User", "cancel": 1, + "role": "Manufacturing User", + "report": 1, "permlevel": 0 }, { - "doctype": "DocPerm", "role": "Manufacturing User", - "permlevel": 1 + "permlevel": 1, + "doctype": "DocPerm" } ] \ No newline at end of file diff --git a/manufacturing/doctype/bom_item/bom_item.txt b/manufacturing/doctype/bom_item/bom_item.txt index e9f9bd6679a..8a9dd18c1fd 100644 --- a/manufacturing/doctype/bom_item/bom_item.txt +++ b/manufacturing/doctype/bom_item/bom_item.txt @@ -9,8 +9,8 @@ { "istable": 1, "name": "__common__", - "doctype": "DocType", - "module": "Manufacturing" + "module": "Manufacturing", + "doctype": "DocType" }, { "name": "__common__", @@ -47,26 +47,26 @@ "doctype": "DocField", "label": "Item Code", "oldfieldname": "item_code", - "options": "Item", + "permlevel": 0, "fieldname": "item_code", "fieldtype": "Link", "search_index": 1, "reqd": 1, - "permlevel": 0, + "options": "Item", "in_filter": 1 }, { - "permlevel": 0, "oldfieldtype": "Link", "doctype": "DocField", "label": "BOM No", "oldfieldname": "bom_no", "width": "150px", + "options": "BOM", "fieldname": "bom_no", "fieldtype": "Link", "search_index": 1, "reqd": 0, - "options": "BOM", + "permlevel": 0, "in_filter": 1 }, { @@ -140,11 +140,12 @@ }, { "write": 1, - "doctype": "DocPerm", - "permlevel": 0 + "report": 1, + "permlevel": 0, + "doctype": "DocPerm" }, { - "doctype": "DocPerm", - "permlevel": 1 + "permlevel": 1, + "doctype": "DocPerm" } ] \ No newline at end of file diff --git a/manufacturing/doctype/bom_operation/bom_operation.txt b/manufacturing/doctype/bom_operation/bom_operation.txt index 6333dc5d9cd..d072ec39849 100644 --- a/manufacturing/doctype/bom_operation/bom_operation.txt +++ b/manufacturing/doctype/bom_operation/bom_operation.txt @@ -9,8 +9,8 @@ { "istable": 1, "name": "__common__", - "doctype": "DocType", - "module": "Manufacturing" + "module": "Manufacturing", + "doctype": "DocType" }, { "name": "__common__", @@ -91,11 +91,12 @@ }, { "write": 1, - "doctype": "DocPerm", - "permlevel": 0 + "report": 1, + "permlevel": 0, + "doctype": "DocPerm" }, { - "doctype": "DocPerm", - "permlevel": 1 + "permlevel": 1, + "doctype": "DocPerm" } ] \ No newline at end of file diff --git a/manufacturing/doctype/production_order/production_order.txt b/manufacturing/doctype/production_order/production_order.txt index 926608470bf..188622f1ed5 100644 --- a/manufacturing/doctype/production_order/production_order.txt +++ b/manufacturing/doctype/production_order/production_order.txt @@ -8,10 +8,10 @@ }, { "is_submittable": 1, - "autoname": "naming_series:", "in_create": 0, - "doctype": "DocType", + "autoname": "naming_series:", "module": "Manufacturing", + "doctype": "DocType", "name": "__common__" }, { @@ -25,15 +25,16 @@ { "parent": "Production Order", "read": 1, + "doctype": "DocPerm", "cancel": 1, "name": "__common__", "amend": 1, "create": 1, - "doctype": "DocPerm", "submit": 1, "write": 1, "parenttype": "DocType", "role": "Manufacturing User", + "report": 1, "permlevel": 0, "parentfield": "permissions" }, @@ -52,15 +53,15 @@ }, { "read_only": 1, - "depends_on": "eval:!doc.__islocal", + "doctype": "DocField", "no_copy": 1, "search_index": 1, - "doctype": "DocField", + "oldfieldtype": "Select", "label": "Status", "oldfieldname": "status", "fieldname": "status", "fieldtype": "Select", - "oldfieldtype": "Select", + "depends_on": "eval:!doc.__islocal", "reqd": 1, "options": "\nDraft\nSubmitted\nStopped\nIn Process\nCompleted\nCancelled", "in_filter": 1 diff --git a/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt b/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt index 8834180934e..9b326910356 100644 --- a/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt +++ b/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt @@ -8,10 +8,10 @@ }, { "istable": 1, - "autoname": "PP/.SO/.#####", "name": "__common__", - "doctype": "DocType", - "module": "Manufacturing" + "autoname": "PP/.SO/.#####", + "module": "Manufacturing", + "doctype": "DocType" }, { "name": "__common__", @@ -73,11 +73,12 @@ }, { "write": 1, - "doctype": "DocPerm", - "permlevel": 0 + "report": 1, + "permlevel": 0, + "doctype": "DocPerm" }, { - "doctype": "DocPerm", - "permlevel": 1 + "permlevel": 1, + "doctype": "DocPerm" } ] \ No newline at end of file diff --git a/manufacturing/doctype/workstation/workstation.txt b/manufacturing/doctype/workstation/workstation.txt index 873bf30ce07..4f967f1e08e 100644 --- a/manufacturing/doctype/workstation/workstation.txt +++ b/manufacturing/doctype/workstation/workstation.txt @@ -8,13 +8,13 @@ }, { "section_style": "Simple", - "module": "Manufacturing", "doctype": "DocType", - "allow_trash": 1, + "module": "Manufacturing", "server_code_error": " ", + "allow_trash": 1, + "autoname": "field:workstation_name", "document_type": "Master", "allow_email": 0, - "autoname": "field:workstation_name", "name": "__common__", "colour": "White:FFF", "_last_update": "1322125389", @@ -44,8 +44,9 @@ "create": 1, "doctype": "DocPerm", "write": 1, - "role": "System Manager", "cancel": 1, + "role": "System Manager", + "report": 1, "permlevel": 0 }, { @@ -57,16 +58,18 @@ "create": 1, "doctype": "DocPerm", "write": 1, - "role": "Manufacturing User", "cancel": 1, + "role": "Manufacturing User", + "report": 1, "permlevel": 0 }, { "create": 1, "doctype": "DocPerm", "write": 1, - "role": "Manufacturing User", "cancel": 1, + "role": "Manufacturing User", + "report": 1, "permlevel": 0 }, { @@ -103,11 +106,11 @@ "doctype": "DocField", "label": "Warehouse", "oldfieldname": "warehouse", - "permlevel": 0, + "options": "Warehouse", "fieldname": "warehouse", "fieldtype": "Link", "reqd": 1, - "options": "Warehouse" + "permlevel": 0 }, { "oldfieldtype": "Text", @@ -135,12 +138,12 @@ "doctype": "DocField", "label": "Capacity Units", "oldfieldname": "capacity_units", - "permlevel": 0, + "options": "\nUnits/Shifts\nUnits/Hour", "fieldname": "capacity_units", "fieldtype": "Select", "reqd": 0, "hidden": 1, - "options": "\nUnits/Shifts\nUnits/Hour" + "permlevel": 0 }, { "oldfieldtype": "Currency", diff --git a/projects/doctype/activity_type/activity_type.txt b/projects/doctype/activity_type/activity_type.txt index decb90d7d06..3bde64786b5 100644 --- a/projects/doctype/activity_type/activity_type.txt +++ b/projects/doctype/activity_type/activity_type.txt @@ -9,23 +9,23 @@ { "section_style": "Simple", "module": "Projects", + "server_code_error": " ", "in_dialog": 1, - "autoname": "field:activity_type", "document_type": "Master", + "autoname": "field:activity_type", "name": "__common__", "colour": "White:FFF", "doctype": "DocType", - "server_code_error": " ", "version": 1 }, { "parent": "Activity Type", "name": "__common__", "doctype": "DocField", + "reqd": 1, "parenttype": "DocType", "fieldname": "activity_type", "fieldtype": "Data", - "reqd": 1, "label": "Activity Type", "permlevel": 0, "parentfield": "fields" @@ -38,6 +38,7 @@ "doctype": "DocPerm", "write": 1, "parenttype": "DocType", + "report": 1, "permlevel": 0, "parentfield": "permissions" }, diff --git a/projects/doctype/project/project.txt b/projects/doctype/project/project.txt index 3c58f1a45a4..f822213d9e8 100644 --- a/projects/doctype/project/project.txt +++ b/projects/doctype/project/project.txt @@ -7,13 +7,13 @@ "modified": "2012-12-03 17:10:41" }, { - "autoname": "field:project_name", + "document_type": "Master", "allow_attach": 1, - "search_fields": "customer, status, priority, is_active", + "autoname": "field:project_name", "module": "Projects", "doctype": "DocType", "max_attachments": 4, - "document_type": "Master", + "search_fields": "customer, status, priority, is_active", "name": "__common__" }, { @@ -76,11 +76,11 @@ "doctype": "DocField", "label": "Is Active", "oldfieldname": "is_active", - "options": "Yes\nNo", + "permlevel": 0, "fieldname": "is_active", "fieldtype": "Select", "search_index": 0, - "permlevel": 0 + "options": "Yes\nNo" }, { "no_copy": 0, @@ -88,11 +88,11 @@ "doctype": "DocField", "label": "Priority", "oldfieldname": "priority", - "options": "Medium\nLow\nHigh", + "permlevel": 0, "fieldname": "priority", "fieldtype": "Select", "search_index": 0, - "permlevel": 0 + "options": "Medium\nLow\nHigh" }, { "doctype": "DocField", @@ -141,11 +141,11 @@ "doctype": "DocField", "label": "Project Type", "oldfieldname": "project_type", - "options": "Internal\nExternal\nOther", + "permlevel": 0, "fieldname": "project_type", "fieldtype": "Select", "search_index": 0, - "permlevel": 0 + "options": "Internal\nExternal\nOther" }, { "description": "Important dates and commitments in your project life cycle", @@ -165,11 +165,11 @@ "doctype": "DocField", "label": "Project Milestones", "oldfieldname": "project_milestones", - "permlevel": 0, + "options": "Project Milestone", "fieldname": "project_milestones", "fieldtype": "Table", "search_index": 0, - "options": "Project Milestone" + "permlevel": 0 }, { "description": "Tasks belonging to this Project.", @@ -191,10 +191,10 @@ "oldfieldtype": "Section Break", "doctype": "DocField", "label": "Project Details", - "options": "Simple", + "permlevel": 0, "fieldname": "section_break0", "fieldtype": "Section Break", - "permlevel": 0 + "options": "Simple" }, { "no_copy": 0, @@ -211,10 +211,10 @@ "oldfieldtype": "Section Break", "doctype": "DocField", "label": "Project Costing", - "options": "Simple", + "permlevel": 0, "fieldname": "project_details", "fieldtype": "Section Break", - "permlevel": 0 + "options": "Simple" }, { "no_copy": 0, @@ -297,8 +297,8 @@ "fieldtype": "Link", "search_index": 1, "reqd": 0, - "in_filter": 1, - "options": "Customer" + "options": "Customer", + "in_filter": 1 }, { "no_copy": 0, @@ -382,11 +382,11 @@ "doctype": "DocField", "label": "Customer Group", "oldfieldname": "customer_group", - "options": "Customer Group", + "permlevel": 1, "fieldname": "customer_group", "fieldtype": "Link", "search_index": 0, - "permlevel": 1 + "options": "Customer Group" }, { "print_hide": 1, @@ -419,13 +419,14 @@ "doctype": "DocPerm", "submit": 0, "write": 1, + "report": 1, "role": "Projects User", "cancel": 1, "permlevel": 0 }, { - "doctype": "DocPerm", "role": "All", - "permlevel": 1 + "permlevel": 1, + "doctype": "DocPerm" } ] \ No newline at end of file diff --git a/projects/doctype/timesheet/timesheet.txt b/projects/doctype/timesheet/timesheet.txt index 3e3e1851319..d9b65ba70bd 100644 --- a/projects/doctype/timesheet/timesheet.txt +++ b/projects/doctype/timesheet/timesheet.txt @@ -11,13 +11,13 @@ "is_submittable": 1, "search_fields": "status, owner, timesheet_date", "module": "Projects", - "server_code_error": " ", - "subject": "%(owner)s", "autoname": "TimeSheet.#####", + "show_in_menu": 0, + "subject": "%(owner)s", "name": "__common__", "colour": "White:FFF", "doctype": "DocType", - "show_in_menu": 0, + "server_code_error": " ", "version": 69 }, { @@ -45,6 +45,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Projects User", "cancel": 1, "permlevel": 0 @@ -60,6 +61,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "System Manager", "cancel": 1, "permlevel": 0 @@ -110,12 +112,12 @@ "doctype": "DocField", "label": "Timesheet By", "oldfieldname": "owner", - "options": "Profile", + "permlevel": 0, "fieldname": "owner", "fieldtype": "Link", "oldfieldtype": "Link", "reqd": 1, - "permlevel": 0, + "options": "Profile", "in_filter": 1 }, { @@ -155,19 +157,19 @@ }, { "doctype": "DocField", - "permlevel": 0, + "options": "Simple", "fieldname": "section_break0", "fieldtype": "Section Break", - "options": "Simple" + "permlevel": 0 }, { "oldfieldtype": "Table", "doctype": "DocField", "label": "Timesheet Details", "oldfieldname": "timesheet_details", - "permlevel": 0, + "options": "Timesheet Detail", "fieldname": "timesheet_details", "fieldtype": "Table", - "options": "Timesheet Detail" + "permlevel": 0 } ] \ No newline at end of file diff --git a/selling/doctype/campaign/campaign.txt b/selling/doctype/campaign/campaign.txt index e6e8ed82640..c45792830bf 100644 --- a/selling/doctype/campaign/campaign.txt +++ b/selling/doctype/campaign/campaign.txt @@ -10,14 +10,14 @@ "section_style": "Simple", "description": "Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ", "module": "Selling", - "doctype": "DocType", - "allow_trash": 1, "server_code_error": " ", - "document_type": "Master", + "allow_trash": 1, "autoname": "field:campaign_name", + "document_type": "Master", + "_last_update": "1326102553", "name": "__common__", "colour": "White:FFF", - "_last_update": "1326102553", + "doctype": "DocType", "show_in_menu": 0, "version": 1 }, @@ -32,8 +32,8 @@ "name": "__common__", "parent": "Campaign", "amend": 0, - "doctype": "DocPerm", "submit": 0, + "doctype": "DocPerm", "read": 1, "parenttype": "DocType", "parentfield": "permissions" @@ -54,6 +54,7 @@ "create": 0, "doctype": "DocPerm", "write": 0, + "report": 1, "role": "Sales Manager", "cancel": 0, "permlevel": 0 @@ -78,6 +79,7 @@ "create": 0, "doctype": "DocPerm", "write": 0, + "report": 1, "role": "Sales User", "cancel": 0, "permlevel": 0 @@ -86,6 +88,7 @@ "create": 1, "doctype": "DocPerm", "write": 1, + "report": 1, "role": "Sales Master Manager", "cancel": 1, "permlevel": 0 diff --git a/selling/doctype/customer/customer.txt b/selling/doctype/customer/customer.txt index 600693d4b20..236504560d6 100644 --- a/selling/doctype/customer/customer.txt +++ b/selling/doctype/customer/customer.txt @@ -7,14 +7,14 @@ "modified": "2012-12-27 14:02:01" }, { - "autoname": "naming_series:", + "document_type": "Master", "description": "Buyer of Goods and Services.", + "autoname": "naming_series:", "allow_rename": 1, "allow_print": 0, - "search_fields": "customer_name,customer_group,country,territory", "module": "Selling", "doctype": "DocType", - "document_type": "Master", + "search_fields": "customer_name,customer_group,country,territory", "name": "__common__" }, { @@ -67,21 +67,21 @@ "doctype": "DocField", "label": "Customer Type", "oldfieldname": "customer_type", - "options": "\nCompany\nIndividual", + "permlevel": 0, "fieldname": "customer_type", "fieldtype": "Select", "reqd": 1, - "permlevel": 0 + "options": "\nCompany\nIndividual" }, { "print_hide": 0, "no_copy": 1, "doctype": "DocField", "label": "Series", - "options": "\nCUST\nCUSTMUM", + "permlevel": 0, "fieldname": "naming_series", "fieldtype": "Select", - "permlevel": 0 + "options": "\nCUST\nCUSTMUM" }, { "print_hide": 1, @@ -95,9 +95,9 @@ "fieldname": "lead_name", "fieldtype": "Link", "hidden": 0, - "in_filter": 1, "options": "Lead", - "report_hide": 1 + "report_hide": 1, + "in_filter": 1 }, { "doctype": "DocField", @@ -119,8 +119,8 @@ "search_index": 1, "reqd": 1, "hidden": 0, - "in_filter": 1, - "options": "Customer Group" + "options": "Customer Group", + "in_filter": 1 }, { "print_hide": 1, @@ -129,11 +129,11 @@ "doctype": "DocField", "label": "Territory", "oldfieldname": "territory", - "options": "Territory", + "permlevel": 0, "fieldname": "territory", "fieldtype": "Link", "reqd": 1, - "permlevel": 0 + "options": "Territory" }, { "doctype": "DocField", @@ -146,10 +146,10 @@ "depends_on": "eval:doc.__islocal", "doctype": "DocField", "label": "Address Desc", - "options": "Addresses will appear only when you save the customer", + "permlevel": 0, "fieldname": "address_desc", "fieldtype": "HTML", - "permlevel": 0 + "options": "Addresses will appear only when you save the customer" }, { "doctype": "DocField", @@ -169,10 +169,10 @@ "depends_on": "eval:doc.__islocal", "doctype": "DocField", "label": "Contact Desc", - "options": "Contact Details will appear only when you save the customer", + "permlevel": 0, "fieldname": "contact_desc", "fieldtype": "HTML", - "permlevel": 0 + "options": "Contact Details will appear only when you save the customer" }, { "oldfieldtype": "HTML", @@ -216,20 +216,20 @@ "doctype": "DocField", "label": "Company", "oldfieldname": "company", - "permlevel": 0, + "options": "Company", "fieldname": "company", "fieldtype": "Link", "search_index": 1, "reqd": 1, - "in_filter": 1, - "options": "Company" + "permlevel": 0, + "in_filter": 1 }, { "doctype": "DocField", - "label": "Default Price List", "options": "Price List", "fieldname": "default_price_list", "fieldtype": "Link", + "label": "Default Price List", "permlevel": 0 }, { @@ -237,10 +237,10 @@ "no_copy": 1, "doctype": "DocField", "label": "Default Currency", - "options": "link:Currency", + "permlevel": 0, "fieldname": "default_currency", "fieldtype": "Select", - "permlevel": 0 + "options": "link:Currency" }, { "description": "Your Customer's TAX registration numbers (if applicable) or any general information", @@ -297,10 +297,10 @@ "doctype": "DocField", "label": "Default Sales Partner", "oldfieldname": "default_sales_partner", - "options": "Sales Partner", + "permlevel": 0, "fieldname": "default_sales_partner", "fieldtype": "Link", - "permlevel": 0 + "options": "Sales Partner" }, { "oldfieldtype": "Currency", @@ -316,10 +316,10 @@ "doctype": "DocField", "label": "Sales Team Details", "oldfieldname": "sales_team", - "options": "Sales Team", + "permlevel": 0, "fieldname": "sales_team", "fieldtype": "Table", - "permlevel": 0 + "options": "Sales Team" }, { "amend": 0, @@ -327,8 +327,8 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "cancel": 0, "role": "Sales Manager", + "cancel": 0, "permlevel": 1 }, { @@ -337,8 +337,9 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "cancel": 0, + "report": 1, "role": "Sales Manager", + "cancel": 0, "permlevel": 0 }, { @@ -347,8 +348,8 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "cancel": 0, "role": "Sales User", + "cancel": 0, "permlevel": 1 }, { @@ -357,8 +358,9 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "cancel": 0, + "report": 1, "role": "Sales User", + "cancel": 0, "permlevel": 0 }, { @@ -367,8 +369,9 @@ "doctype": "DocPerm", "submit": 0, "write": 1, + "report": 1, + "role": "Sales Master Manager", "cancel": 1, - "role": "Sales Master Manager", "permlevel": 0 }, { @@ -377,8 +380,8 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "cancel": 0, "role": "Sales Master Manager", + "cancel": 0, "permlevel": 1 }, { @@ -387,8 +390,9 @@ "doctype": "DocPerm", "submit": 0, "write": 1, - "cancel": 0, + "report": 1, "role": "Purchase User", + "cancel": 0, "permlevel": 0 }, { @@ -419,8 +423,9 @@ "create": 1, "doctype": "DocPerm", "write": 1, - "role": "Accounts Manager", "cancel": 1, + "role": "Accounts Manager", + "report": 1, "permlevel": 0 }, { diff --git a/selling/doctype/industry_type/industry_type.txt b/selling/doctype/industry_type/industry_type.txt index 81dd84a4676..39534d14145 100644 --- a/selling/doctype/industry_type/industry_type.txt +++ b/selling/doctype/industry_type/industry_type.txt @@ -9,21 +9,21 @@ { "section_style": "Simple", "name": "__common__", + "autoname": "field:industry", "colour": "White:FFF", "module": "Selling", "server_code_error": " ", "version": 4, "doctype": "DocType", - "autoname": "field:industry", "document_type": "Master" }, { "parent": "Industry Type", "oldfieldtype": "Data", + "doctype": "DocField", "oldfieldname": "industry", "reqd": 1, "name": "__common__", - "doctype": "DocField", "label": "Industry", "parenttype": "DocType", "fieldname": "industry", @@ -36,6 +36,7 @@ "parent": "Industry Type", "read": 1, "doctype": "DocPerm", + "report": 1, "parenttype": "DocType", "permlevel": 0, "parentfield": "permissions" diff --git a/selling/doctype/installation_note/installation_note.txt b/selling/doctype/installation_note/installation_note.txt index 0ab9bc54793..1a69087a2c6 100644 --- a/selling/doctype/installation_note/installation_note.txt +++ b/selling/doctype/installation_note/installation_note.txt @@ -10,13 +10,13 @@ "section_style": "Simple", "is_submittable": 1, "module": "Selling", - "doctype": "DocType", "server_code_error": " ", - "subject": "At %(customer_name)s on %(inst_date)s", "autoname": "IN/.####", + "subject": "At %(customer_name)s on %(inst_date)s", + "_last_update": "1306480044", "name": "__common__", "colour": "White:FFF", - "_last_update": "1306480044", + "doctype": "DocType", "show_in_menu": 0, "version": 98 }, @@ -45,6 +45,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "System Manager", "cancel": 1, "permlevel": 0 @@ -60,6 +61,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Sales User", "cancel": 1, "permlevel": 0 @@ -70,6 +72,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Sales Manager", "cancel": 1, "permlevel": 0 @@ -106,11 +109,11 @@ "doctype": "DocField", "label": "Series", "oldfieldname": "naming_series", - "permlevel": 0, + "options": "\nIN", "fieldname": "naming_series", "fieldtype": "Select", "reqd": 1, - "options": "\nIN" + "permlevel": 0 }, { "print_hide": 1, @@ -118,31 +121,31 @@ "doctype": "DocField", "label": "Customer", "oldfieldname": "customer", + "permlevel": 0, "trigger": "Client", "fieldname": "customer", "fieldtype": "Link", "oldfieldtype": "Link", "reqd": 1, - "options": "Customer", - "permlevel": 0 + "options": "Customer" }, { "print_hide": 1, "doctype": "DocField", "label": "Customer Address", - "options": "Address", + "permlevel": 0, "fieldname": "customer_address", "fieldtype": "Link", - "permlevel": 0 + "options": "Address" }, { "print_hide": 1, "doctype": "DocField", "label": "Contact Person", - "options": "Contact", + "permlevel": 0, "fieldname": "contact_person", "fieldtype": "Link", - "permlevel": 0 + "options": "Contact" }, { "search_index": 0, @@ -190,21 +193,21 @@ "search_index": 1, "doctype": "DocField", "label": "Territory", - "permlevel": 0, + "options": "Territory", "fieldname": "territory", "fieldtype": "Link", "reqd": 1, - "options": "Territory", + "permlevel": 0, "in_filter": 1 }, { "print_hide": 1, "doctype": "DocField", "label": "Customer Group", - "options": "Customer Group", + "permlevel": 0, "fieldname": "customer_group", "fieldtype": "Link", - "permlevel": 0 + "options": "Customer Group" }, { "oldfieldtype": "Column Break", @@ -236,17 +239,17 @@ }, { "print_hide": 1, + "permlevel": 1, "default": "Draft", "oldfieldtype": "Select", "doctype": "DocField", "label": "Status", "oldfieldname": "status", "no_copy": 1, - "options": "Draft\nSubmitted\nCancelled", "fieldname": "status", "fieldtype": "Select", "reqd": 1, - "permlevel": 1 + "options": "Draft\nSubmitted\nCancelled" }, { "print_hide": 1, @@ -271,11 +274,11 @@ "doctype": "DocField", "label": "Fiscal Year", "oldfieldname": "fiscal_year", - "options": "link:Fiscal Year", + "permlevel": 0, "fieldname": "fiscal_year", "fieldtype": "Select", "reqd": 1, - "permlevel": 0, + "options": "link:Fiscal Year", "in_filter": 1 }, { @@ -330,10 +333,10 @@ "oldfieldtype": "Section Break", "doctype": "DocField", "label": "Item Details", - "permlevel": 0, + "options": "Simple", "fieldname": "item_details", "fieldtype": "Section Break", - "options": "Simple" + "permlevel": 0 }, { "print_hide": 0, @@ -356,20 +359,20 @@ "oldfieldtype": "Button", "doctype": "DocField", "label": "Get Items", - "permlevel": 0, + "options": "pull_delivery_note_details", "fieldname": "get_items", "fieldtype": "Button", "hidden": 0, - "options": "pull_delivery_note_details" + "permlevel": 0 }, { "oldfieldtype": "Table", "doctype": "DocField", "label": "Installation Note Item", "oldfieldname": "installed_item_details", - "permlevel": 0, + "options": "Installation Note Item", "fieldname": "installed_item_details", "fieldtype": "Table", - "options": "Installation Note Item" + "permlevel": 0 } ] \ No newline at end of file diff --git a/selling/doctype/opportunity/opportunity.txt b/selling/doctype/opportunity/opportunity.txt index eafeff0dd3e..afa6fa81a37 100644 --- a/selling/doctype/opportunity/opportunity.txt +++ b/selling/doctype/opportunity/opportunity.txt @@ -7,13 +7,13 @@ "modified": "2012-12-03 17:10:41" }, { + "document_type": "Transaction", "is_submittable": 1, - "autoname": "naming_series:", "description": "Potential Sales Deal", - "search_fields": "status,transaction_date,customer,lead,enquiry_type,territory,company", + "autoname": "naming_series:", "module": "Selling", "doctype": "DocType", - "document_type": "Transaction", + "search_fields": "status,transaction_date,customer,lead,enquiry_type,territory,company", "name": "__common__" }, { @@ -43,11 +43,11 @@ "doctype": "DocField", "label": "Naming Series", "oldfieldname": "naming_series", - "permlevel": 0, + "options": "ENQUIRY\nENQ", "fieldname": "naming_series", "fieldtype": "Select", "reqd": 1, - "options": "ENQUIRY\nENQ" + "permlevel": 0 }, { "print_hide": 1, @@ -87,12 +87,12 @@ "doctype": "DocField", "label": "Lead", "oldfieldname": "lead", - "permlevel": 0, "trigger": "Client", "fieldname": "lead", "fieldtype": "Link", "hidden": 0, "options": "Lead", + "permlevel": 0, "in_filter": 1 }, { @@ -104,7 +104,6 @@ "permlevel": 0 }, { - "permlevel": 1, "no_copy": 1, "oldfieldtype": "Select", "colour": "White:FFF", @@ -112,10 +111,11 @@ "label": "Status", "oldfieldname": "status", "default": "Draft", + "options": "\nDraft\nSubmitted\nQuotation Sent\nOrder Confirmed\nOpportunity Lost\nCancelled", "fieldname": "status", "fieldtype": "Select", "reqd": 1, - "options": "\nDraft\nSubmitted\nQuotation Sent\nOrder Confirmed\nOpportunity Lost\nCancelled" + "permlevel": 1 }, { "oldfieldtype": "Select", @@ -123,11 +123,11 @@ "doctype": "DocField", "label": "Opportunity Type", "oldfieldname": "enquiry_type", - "options": "\nSales\nMaintenance", + "permlevel": 0, "fieldname": "enquiry_type", "fieldtype": "Select", "reqd": 1, - "permlevel": 0 + "options": "\nSales\nMaintenance" }, { "oldfieldtype": "Section Break", @@ -145,10 +145,10 @@ "doctype": "DocField", "label": "Opportunity Items", "oldfieldname": "enquiry_details", - "options": "Opportunity Item", + "permlevel": 0, "fieldname": "enquiry_details", "fieldtype": "Table", - "permlevel": 0 + "options": "Opportunity Item" }, { "description": "Keep a track of communication related to this enquiry which will help for future reference.", @@ -181,22 +181,22 @@ "print_hide": 1, "doctype": "DocField", "label": "Contact Person", + "permlevel": 0, "trigger": "Client", "fieldname": "contact_person", "fieldtype": "Link", "options": "Contact", - "permlevel": 0, "in_filter": 1 }, { "print_hide": 1, "doctype": "DocField", "label": "Customer Address", + "permlevel": 0, "trigger": "Client", "fieldname": "customer_address", "fieldtype": "Link", "options": "Address", - "permlevel": 0, "in_filter": 1 }, { @@ -256,22 +256,22 @@ }, { "print_hide": 1, - "depends_on": "eval:doc.enquiry_from==\"Customer\"", + "doctype": "DocField", "description": "To manage Territory, click here", "search_index": 1, "colour": "White:FFF", - "doctype": "DocField", + "oldfieldtype": "Link", "label": "Customer Group", "oldfieldname": "customer_group", "permlevel": 0, "trigger": "Client", "fieldname": "customer_group", "fieldtype": "Link", - "oldfieldtype": "Link", + "depends_on": "eval:doc.enquiry_from==\"Customer\"", "reqd": 0, "hidden": 0, - "in_filter": 1, - "options": "Customer Group" + "options": "Customer Group", + "in_filter": 1 }, { "print_hide": 1, @@ -285,8 +285,8 @@ "fieldname": "territory", "fieldtype": "Link", "reqd": 0, - "in_filter": 1, - "options": "Territory" + "options": "Territory", + "in_filter": 1 }, { "description": "Filing in Additional Information about the Opportunity will help you analyze your data better.", @@ -325,12 +325,12 @@ "doctype": "DocField", "label": "Fiscal Year", "oldfieldname": "fiscal_year", - "permlevel": 0, + "options": "link:Fiscal Year", "fieldname": "fiscal_year", "fieldtype": "Select", "search_index": 1, "reqd": 1, - "options": "link:Fiscal Year", + "permlevel": 0, "in_filter": 1 }, { @@ -338,10 +338,10 @@ "doctype": "DocField", "label": "Source", "oldfieldname": "source", - "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign\nWalk In", + "permlevel": 0, "fieldname": "source", "fieldtype": "Select", - "permlevel": 0 + "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign\nWalk In" }, { "description": "Enter name of campaign if source of enquiry is campaign", @@ -350,10 +350,10 @@ "doctype": "DocField", "label": "Campaign", "oldfieldname": "campaign", - "options": "Campaign", + "permlevel": 0, "fieldname": "campaign", "fieldtype": "Link", - "permlevel": 0 + "options": "Campaign" }, { "no_copy": 1, @@ -374,12 +374,12 @@ "doctype": "DocField", "label": "Company", "oldfieldname": "company", - "permlevel": 0, + "options": "Company", "fieldname": "company", "fieldtype": "Link", "search_index": 1, "reqd": 1, - "options": "Company", + "permlevel": 0, "in_filter": 1 }, { @@ -392,17 +392,17 @@ }, { "description": "Your sales person who will contact the customer in future", - "permlevel": 0, "oldfieldtype": "Link", "colour": "White:FFF", "doctype": "DocField", "label": "Next Contact By", "oldfieldname": "contact_by", "width": "75px", + "options": "Profile", "fieldname": "contact_by", "fieldtype": "Link", - "in_filter": 1, - "options": "Profile" + "permlevel": 0, + "in_filter": 1 }, { "description": "Your sales person will get a reminder on this date to contact the customer", @@ -470,8 +470,8 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "cancel": 0, "role": "Sales Manager", + "cancel": 0, "permlevel": 1 }, { @@ -480,14 +480,15 @@ "doctype": "DocPerm", "submit": 1, "write": 1, - "cancel": 1, + "report": 1, "role": "System Manager", + "cancel": 1, "permlevel": 0 }, { - "doctype": "DocPerm", "role": "System Manager", - "permlevel": 1 + "permlevel": 1, + "doctype": "DocPerm" }, { "amend": 1, @@ -495,8 +496,9 @@ "doctype": "DocPerm", "submit": 1, "write": 1, - "cancel": 1, + "report": 1, "role": "Sales User", + "cancel": 1, "permlevel": 0 }, { @@ -505,8 +507,8 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "cancel": 0, "role": "Sales User", + "cancel": 0, "permlevel": 1 }, { @@ -515,8 +517,9 @@ "doctype": "DocPerm", "submit": 1, "write": 1, - "cancel": 1, + "report": 1, "role": "Sales Manager", + "cancel": 1, "permlevel": 0 } ] \ No newline at end of file diff --git a/selling/doctype/quotation/quotation.txt b/selling/doctype/quotation/quotation.txt index 3ebdb80e945..a0e07137158 100644 --- a/selling/doctype/quotation/quotation.txt +++ b/selling/doctype/quotation/quotation.txt @@ -11,12 +11,12 @@ "allow_attach": 1, "search_fields": "status,transaction_date,customer,lead,order_type", "module": "Selling", + "doctype": "DocType", "read_only_onload": 1, + "autoname": "naming_series:", "document_type": "Transaction", "allow_email": 0, - "autoname": "naming_series:", "name": "__common__", - "doctype": "DocType", "max_attachments": 1, "hide_toolbar": 0 }, @@ -54,11 +54,11 @@ "doctype": "DocField", "label": "Naming Series", "oldfieldname": "naming_series", - "permlevel": 0, + "options": "QTN", "fieldname": "naming_series", "fieldtype": "Select", "reqd": 1, - "options": "QTN" + "permlevel": 0 }, { "print_hide": 1, @@ -66,11 +66,11 @@ "doctype": "DocField", "label": "Quotation To", "oldfieldname": "quotation_to", - "permlevel": 0, + "options": "\nLead\nCustomer", "fieldname": "quotation_to", "fieldtype": "Select", "reqd": 1, - "options": "\nLead\nCustomer", + "permlevel": 0, "report_hide": 0, "in_filter": 1 }, @@ -80,12 +80,12 @@ "doctype": "DocField", "label": "Customer", "oldfieldname": "customer", - "permlevel": 0, + "options": "Customer", "fieldname": "customer", "fieldtype": "Link", "search_index": 1, "hidden": 0, - "options": "Customer", + "permlevel": 0, "in_filter": 1 }, { @@ -94,11 +94,11 @@ "doctype": "DocField", "label": "Lead", "oldfieldname": "lead", - "options": "Lead", + "permlevel": 0, "fieldname": "lead", "fieldtype": "Link", "hidden": 0, - "permlevel": 0, + "options": "Lead", "in_filter": 1 }, { @@ -189,8 +189,8 @@ "fieldtype": "Date", "search_index": 1, "reqd": 1, - "in_filter": 1, - "permlevel": 0 + "permlevel": 0, + "in_filter": 1 }, { "print_hide": 1, @@ -218,23 +218,23 @@ "permlevel": 0 }, { + "permlevel": 0, "oldfieldtype": "Table", "allow_on_submit": 1, "doctype": "DocField", "label": "Quotation Items", "oldfieldname": "quotation_details", "width": "40px", - "options": "Quotation Item", "fieldname": "quotation_details", "fieldtype": "Table", - "permlevel": 0 + "options": "Quotation Item" }, { "doctype": "DocField", - "options": "Simple", + "permlevel": 0, "fieldname": "sec_break23", "fieldtype": "Section Break", - "permlevel": 0 + "options": "Simple" }, { "doctype": "DocField", @@ -285,9 +285,9 @@ "fieldtype": "Link", "search_index": 0, "hidden": 0, - "in_filter": 1, "options": "Opportunity", - "report_hide": 0 + "report_hide": 0, + "in_filter": 1 }, { "print_hide": 0, @@ -321,19 +321,19 @@ "fieldtype": "Select", "search_index": 0, "reqd": 1, - "in_filter": 1, - "options": "link:Price List" + "options": "link:Price List", + "in_filter": 1 }, { "print_hide": 1, "description": "Select the currency in which price list is maintained", "doctype": "DocField", "label": "Price List Currency", - "options": "link:Currency", + "permlevel": 0, "fieldname": "price_list_currency", "fieldtype": "Select", "reqd": 1, - "permlevel": 0 + "options": "link:Currency" }, { "print_hide": 1, @@ -365,8 +365,8 @@ "fieldtype": "Select", "search_index": 0, "reqd": 1, - "in_filter": 1, - "options": "link:Currency" + "options": "link:Currency", + "in_filter": 1 }, { "print_hide": 1, @@ -396,11 +396,11 @@ "doctype": "DocField", "label": "Sales Taxes and Charges", "oldfieldname": "charge", - "options": "Sales Taxes and Charges Master", + "permlevel": 0, "fieldname": "charge", "fieldtype": "Link", "hidden": 0, - "permlevel": 0 + "options": "Sales Taxes and Charges Master" }, { "print_hide": 1, @@ -417,10 +417,10 @@ "doctype": "DocField", "label": "Sales Taxes and Charges", "oldfieldname": "other_charges", - "options": "Sales Taxes and Charges", + "permlevel": 0, "fieldname": "other_charges", "fieldtype": "Table", - "permlevel": 0 + "options": "Sales Taxes and Charges" }, { "print_hide": 1, @@ -560,30 +560,30 @@ "doctype": "DocField", "label": "Select Terms and Conditions", "oldfieldname": "tc_name", - "options": "Terms and Conditions", + "permlevel": 0, "fieldname": "tc_name", "fieldtype": "Link", - "permlevel": 0, + "options": "Terms and Conditions", "report_hide": 1 }, { "oldfieldtype": "Button", "doctype": "DocField", "label": "Get Terms and Conditions", - "options": "get_tc_details", + "permlevel": 0, "fieldname": "get_terms", "fieldtype": "Button", - "permlevel": 0 + "options": "get_tc_details" }, { "print_hide": 1, "oldfieldtype": "HTML", "doctype": "DocField", "label": "Terms and Conditions HTML", - "options": "You can add Terms and Notes that will be printed in the Transaction", + "permlevel": 0, "fieldname": "terms_html", "fieldtype": "HTML", - "permlevel": 0 + "options": "You can add Terms and Notes that will be printed in the Transaction" }, { "oldfieldtype": "Text Editor", @@ -612,11 +612,11 @@ "print_hide": 1, "doctype": "DocField", "label": "Customer Address", - "options": "Address", + "permlevel": 0, "fieldname": "customer_address", "fieldtype": "Link", "hidden": 0, - "permlevel": 0, + "options": "Address", "in_filter": 1 }, { @@ -625,12 +625,12 @@ "doctype": "DocField", "label": "Contact Person", "oldfieldname": "contact_person", - "permlevel": 0, + "options": "Contact", "fieldname": "contact_person", "fieldtype": "Link", "reqd": 0, "hidden": 0, - "options": "Contact", + "permlevel": 0, "in_filter": 1 }, { @@ -646,13 +646,13 @@ "search_index": 0, "doctype": "DocField", "label": "Territory", - "permlevel": 0, + "options": "Territory", "fieldname": "territory", "fieldtype": "Link", "reqd": 1, "hidden": 0, - "in_filter": 1, - "options": "Territory" + "permlevel": 0, + "in_filter": 1 }, { "print_hide": 1, @@ -660,12 +660,12 @@ "doctype": "DocField", "label": "Customer Group", "oldfieldname": "customer_group", - "permlevel": 0, + "options": "Customer Group", "fieldname": "customer_group", "fieldtype": "Link", "search_index": 0, "reqd": 0, - "options": "Customer Group", + "permlevel": 0, "in_filter": 1 }, { @@ -685,10 +685,10 @@ "doctype": "DocField", "label": "Letter Head", "oldfieldname": "letter_head", - "options": "link:Letter Head", + "permlevel": 0, "fieldname": "letter_head", "fieldtype": "Select", - "permlevel": 0 + "options": "link:Letter Head" }, { "print_hide": 1, @@ -703,8 +703,8 @@ "fieldtype": "Link", "search_index": 0, "reqd": 1, - "in_filter": 1, - "options": "Company" + "options": "Company", + "in_filter": 1 }, { "print_hide": 1, @@ -713,11 +713,11 @@ "doctype": "DocField", "label": "Source", "oldfieldname": "source", - "permlevel": 0, + "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign", "fieldname": "source", "fieldtype": "Select", "hidden": 0, - "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign", + "permlevel": 0, "report_hide": 0 }, { @@ -726,12 +726,12 @@ "doctype": "DocField", "label": "Fiscal Year", "oldfieldname": "fiscal_year", - "permlevel": 0, + "options": "link:Fiscal Year", "fieldname": "fiscal_year", "fieldtype": "Select", "search_index": 0, "reqd": 1, - "options": "link:Fiscal Year", + "permlevel": 0, "in_filter": 1 }, { @@ -780,11 +780,11 @@ "doctype": "DocField", "label": "Campaign", "oldfieldname": "campaign", - "permlevel": 0, + "options": "Campaign", "fieldname": "campaign", "fieldtype": "Link", "hidden": 0, - "options": "Campaign", + "permlevel": 0, "report_hide": 0 }, { @@ -807,10 +807,10 @@ "doctype": "DocField", "label": "Select Print Heading", "oldfieldname": "select_print_heading", - "permlevel": 0, + "options": "Print Heading", "fieldname": "select_print_heading", "fieldtype": "Link", - "options": "Print Heading", + "permlevel": 0, "report_hide": 1 }, { @@ -876,8 +876,8 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "cancel": 0, "role": "Sales Manager", + "cancel": 0, "permlevel": 1 }, { @@ -886,8 +886,9 @@ "doctype": "DocPerm", "submit": 1, "write": 1, - "cancel": 1, + "report": 1, "role": "Sales Manager", + "cancel": 1, "permlevel": 0 }, { @@ -896,8 +897,9 @@ "doctype": "DocPerm", "submit": 1, "write": 1, - "cancel": 1, + "report": 1, "role": "Sales User", + "cancel": 1, "permlevel": 0 }, { @@ -906,8 +908,8 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "cancel": 0, "role": "Sales User", + "cancel": 0, "permlevel": 1 }, { @@ -916,8 +918,9 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "cancel": 0, + "report": 1, "role": "Customer", + "cancel": 0, "permlevel": 0 }, { @@ -926,8 +929,9 @@ "doctype": "DocPerm", "submit": 1, "write": 1, - "cancel": 1, + "report": 1, "role": "Maintenance Manager", + "cancel": 1, "permlevel": 0 }, { @@ -936,8 +940,8 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "cancel": 0, "role": "Maintenance Manager", + "cancel": 0, "permlevel": 1 }, { @@ -946,8 +950,9 @@ "doctype": "DocPerm", "submit": 1, "write": 1, - "cancel": 1, + "report": 1, "role": "Maintenance User", + "cancel": 1, "permlevel": 0 }, { @@ -956,8 +961,8 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "cancel": 0, "role": "Maintenance User", + "cancel": 0, "permlevel": 1 } ] \ No newline at end of file diff --git a/selling/doctype/sales_order/sales_order.txt b/selling/doctype/sales_order/sales_order.txt index ec208599d3c..984337ded98 100644 --- a/selling/doctype/sales_order/sales_order.txt +++ b/selling/doctype/sales_order/sales_order.txt @@ -12,9 +12,9 @@ "search_fields": "status,transaction_date,customer,customer_name, territory,order_type,company", "module": "Selling", "read_only_onload": 1, - "autoname": "naming_series:", "document_type": "Transaction", "issingle": 0, + "autoname": "naming_series:", "name": "__common__", "doctype": "DocType" }, @@ -76,8 +76,8 @@ "fieldtype": "Link", "search_index": 1, "reqd": 1, - "in_filter": 1, - "options": "Customer" + "options": "Customer", + "in_filter": 1 }, { "doctype": "DocField", @@ -128,11 +128,11 @@ "doctype": "DocField", "label": "Order Type", "oldfieldname": "order_type", - "permlevel": 0, + "options": "\nSales\nMaintenance", "fieldname": "order_type", "fieldtype": "Select", "reqd": 1, - "options": "\nSales\nMaintenance" + "permlevel": 0 }, { "oldfieldtype": "Column Break", @@ -156,21 +156,21 @@ "fieldtype": "Date", "search_index": 1, "reqd": 1, - "in_filter": 1, - "permlevel": 0 + "permlevel": 0, + "in_filter": 1 }, { "print_hide": 1, - "depends_on": "eval:doc.order_type == 'Sales'", + "doctype": "DocField", "search_index": 1, "colour": "White:FFF", - "doctype": "DocField", + "oldfieldtype": "Date", "label": "Expected Delivery Date", "oldfieldname": "delivery_date", "width": "160px", "fieldname": "delivery_date", "fieldtype": "Date", - "oldfieldtype": "Date", + "depends_on": "eval:doc.order_type == 'Sales'", "reqd": 0, "hidden": 0, "permlevel": 0, @@ -211,11 +211,11 @@ "colour": "White:FFF", "doctype": "DocField", "label": "Shipping Address Name", - "options": "Address", + "permlevel": 1, "fieldname": "shipping_address_name", "fieldtype": "Link", "hidden": 1, - "permlevel": 1, + "options": "Address", "in_filter": 1 }, { @@ -246,10 +246,10 @@ "doctype": "DocField", "label": "Sales Order Items", "oldfieldname": "sales_order_details", - "options": "Sales Order Item", + "permlevel": 0, "fieldname": "sales_order_details", "fieldtype": "Table", - "permlevel": 0 + "options": "Sales Order Item" }, { "doctype": "DocField", @@ -309,8 +309,8 @@ "fieldname": "quotation_no", "fieldtype": "Link", "search_index": 1, - "in_filter": 1, - "options": "Quotation" + "options": "Quotation", + "in_filter": 1 }, { "print_hide": 1, @@ -333,10 +333,10 @@ "oldfieldtype": "Button", "doctype": "DocField", "label": "Pull Quotation Items", - "options": "pull_quotation_details", + "permlevel": 0, "fieldname": "pull_quotation_details", "fieldtype": "Button", - "permlevel": 0 + "options": "pull_quotation_details" }, { "doctype": "DocField", @@ -366,11 +366,11 @@ "description": "Select the currency in which price list is maintained", "doctype": "DocField", "label": "Price List Currency", - "options": "link:Currency", + "permlevel": 0, "fieldname": "price_list_currency", "fieldtype": "Select", "reqd": 1, - "permlevel": 0 + "options": "link:Currency" }, { "print_hide": 1, @@ -437,10 +437,10 @@ "doctype": "DocField", "label": "Sales Taxes and Charges", "oldfieldname": "charge", - "options": "Sales Taxes and Charges Master", + "permlevel": 0, "fieldname": "charge", "fieldtype": "Link", - "permlevel": 0 + "options": "Sales Taxes and Charges Master" }, { "oldfieldtype": "Button", @@ -456,10 +456,10 @@ "doctype": "DocField", "label": "Sales Taxes and Charges", "oldfieldname": "other_charges", - "options": "Sales Taxes and Charges", + "permlevel": 0, "fieldname": "other_charges", "fieldtype": "Table", - "permlevel": 0 + "options": "Sales Taxes and Charges" }, { "print_hide": 0, @@ -597,31 +597,31 @@ "doctype": "DocField", "label": "Select Terms and Conditions", "oldfieldname": "tc_name", - "options": "Terms and Conditions", + "permlevel": 0, "fieldname": "tc_name", "fieldtype": "Link", "search_index": 0, - "permlevel": 0 + "options": "Terms and Conditions" }, { "print_hide": 1, "oldfieldtype": "Button", "doctype": "DocField", "label": "Get Terms and Conditions", - "options": "get_tc_details", + "permlevel": 0, "fieldname": "get_terms", "fieldtype": "Button", - "permlevel": 0 + "options": "get_tc_details" }, { "print_hide": 1, "oldfieldtype": "HTML", "doctype": "DocField", "label": "Terms and Conditions HTML", - "options": "You can add Terms and Notes that will be printed in the Transaction", + "permlevel": 0, "fieldname": "terms_html", "fieldtype": "HTML", - "permlevel": 0 + "options": "You can add Terms and Notes that will be printed in the Transaction" }, { "print_hide": 0, @@ -651,21 +651,21 @@ "print_hide": 1, "doctype": "DocField", "label": "Customer Address", - "options": "Address", + "permlevel": 0, "fieldname": "customer_address", "fieldtype": "Link", "hidden": 0, - "permlevel": 0, + "options": "Address", "in_filter": 1 }, { "print_hide": 1, "doctype": "DocField", "label": "Contact Person", - "options": "Contact", + "permlevel": 0, "fieldname": "contact_person", "fieldtype": "Link", - "permlevel": 0, + "options": "Contact", "in_filter": 1 }, { @@ -673,11 +673,11 @@ "search_index": 1, "doctype": "DocField", "label": "Territory", - "options": "Territory", + "permlevel": 0, "fieldname": "territory", "fieldtype": "Link", "reqd": 1, - "permlevel": 0, + "options": "Territory", "in_filter": 1 }, { @@ -694,12 +694,12 @@ "colour": "White:FFF", "doctype": "DocField", "label": "Customer Group", - "permlevel": 0, + "options": "Customer Group", "fieldname": "customer_group", "fieldtype": "Link", "reqd": 1, - "in_filter": 1, - "options": "Customer Group" + "permlevel": 0, + "in_filter": 1 }, { "print_hide": 1, @@ -723,15 +723,15 @@ }, { "print_hide": 1, - "allow_on_submit": 1, "oldfieldtype": "Select", + "allow_on_submit": 1, "doctype": "DocField", "label": "Letter Head", "oldfieldname": "letter_head", - "options": "link:Letter Head", + "permlevel": 0, "fieldname": "letter_head", "fieldtype": "Select", - "permlevel": 0 + "options": "link:Letter Head" }, { "print_hide": 1, @@ -755,11 +755,11 @@ "doctype": "DocField", "label": "Campaign", "oldfieldname": "campaign", - "options": "Campaign", + "permlevel": 0, "fieldname": "campaign", "fieldtype": "Link", "depends_on": "eval:doc.source == 'Campaign'", - "permlevel": 0 + "options": "Campaign" }, { "print_hide": 1, @@ -804,8 +804,8 @@ "fieldtype": "Link", "search_index": 1, "reqd": 1, - "in_filter": 1, - "options": "Company" + "options": "Company", + "in_filter": 1 }, { "print_hide": 1, @@ -827,14 +827,14 @@ "no_copy": 1, "depends_on": "eval:!doc.__islocal", "colour": "White:FFF", + "no_column": 0, "doctype": "DocField", "label": "Cancel Reason", "oldfieldname": "cancel_reason", - "permlevel": 1, "fieldname": "cancel_reason", "fieldtype": "Data", - "no_column": 0, - "oldfieldtype": "Data" + "oldfieldtype": "Data", + "permlevel": 1 }, { "print_hide": 1, @@ -852,10 +852,10 @@ "doctype": "DocField", "label": "Source", "oldfieldname": "source", - "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign", + "permlevel": 0, "fieldname": "source", "fieldtype": "Select", - "permlevel": 0 + "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign" }, { "description": "Track this Sales Order against any Project", @@ -869,8 +869,8 @@ "fieldname": "project_name", "fieldtype": "Link", "search_index": 1, - "in_filter": 1, - "options": "Project" + "options": "Project", + "in_filter": 1 }, { "print_hide": 1, @@ -902,8 +902,8 @@ "fieldname": "per_delivered", "fieldtype": "Currency", "depends_on": "eval:!doc.__islocal", - "in_filter": 1, - "permlevel": 1 + "permlevel": 1, + "in_filter": 1 }, { "print_hide": 1, @@ -918,32 +918,32 @@ "fieldname": "per_billed", "fieldtype": "Currency", "depends_on": "eval:!doc.__islocal", - "in_filter": 1, - "permlevel": 1 + "permlevel": 1, + "in_filter": 1 }, { "print_hide": 1, "no_copy": 1, "doctype": "DocField", "label": "Delivery Status", - "options": "Delivered\nNot Delivered\nPartly Delivered\nClosed\nNot Applicable", + "permlevel": 0, "fieldname": "delivery_status", "fieldtype": "Select", "no_column": 0, "hidden": 1, - "permlevel": 0 + "options": "Delivered\nNot Delivered\nPartly Delivered\nClosed\nNot Applicable" }, { "print_hide": 1, "no_copy": 1, "doctype": "DocField", "label": "Billing Status", - "options": "Billed\nNot Billed\nPartly Billed\nClosed", + "permlevel": 0, "fieldname": "billing_status", "fieldtype": "Select", "no_column": 0, "hidden": 1, - "permlevel": 0 + "options": "Billed\nNot Billed\nPartly Billed\nClosed" }, { "print_hide": 1, @@ -964,10 +964,10 @@ "doctype": "DocField", "label": "Packing Details", "oldfieldname": "packing_details", - "options": "Delivery Note Packing Item", + "permlevel": 1, "fieldname": "packing_details", "fieldtype": "Table", - "permlevel": 1 + "options": "Delivery Note Packing Item" }, { "print_hide": 1, @@ -1000,8 +1000,8 @@ "fieldname": "sales_partner", "fieldtype": "Link", "search_index": 1, - "in_filter": 1, - "options": "Sales Partner" + "options": "Sales Partner", + "in_filter": 1 }, { "print_hide": 1, @@ -1048,10 +1048,10 @@ "doctype": "DocField", "label": "Sales Team1", "oldfieldname": "sales_team", - "options": "Sales Team", + "permlevel": 0, "fieldname": "sales_team", "fieldtype": "Table", - "permlevel": 0 + "options": "Sales Team" }, { "print_hide": 1, @@ -1069,6 +1069,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Sales User", "cancel": 1, "permlevel": 0 @@ -1079,6 +1080,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Maintenance User", "cancel": 1, "permlevel": 0 @@ -1099,6 +1101,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Maintenance Manager", "cancel": 1, "permlevel": 0 @@ -1109,6 +1112,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Sales Manager", "cancel": 1, "permlevel": 0 @@ -1139,8 +1143,9 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "role": "Customer", "cancel": 0, + "role": "Customer", + "report": 1, "permlevel": 0, "match": "customer" }, diff --git a/selling/doctype/shipping_address/shipping_address.txt b/selling/doctype/shipping_address/shipping_address.txt index 74584037b99..16eff90071b 100755 --- a/selling/doctype/shipping_address/shipping_address.txt +++ b/selling/doctype/shipping_address/shipping_address.txt @@ -10,12 +10,12 @@ "section_style": "Simple", "search_fields": "customer, ship_to, shipping_address", "module": "Selling", - "doctype": "DocType", "allow_trash": 1, - "autoname": "SA.#####", "document_type": "Master", + "autoname": "SA.#####", "name": "__common__", "colour": "White:FFF", + "doctype": "DocType", "show_in_menu": 0, "version": 8 }, @@ -42,8 +42,9 @@ "create": 1, "doctype": "DocPerm", "write": 1, - "role": "Sales Master Manager", "cancel": 1, + "role": "Sales Master Manager", + "report": 1, "permlevel": 0 }, { @@ -55,8 +56,9 @@ "create": 1, "doctype": "DocPerm", "write": 1, - "role": "Sales Manager", "cancel": 1, + "role": "Sales Manager", + "report": 1, "permlevel": 0 }, { @@ -74,11 +76,11 @@ { "doctype": "DocField", "label": "Customer", - "options": "Customer", + "permlevel": 0, "fieldname": "customer", "fieldtype": "Link", "reqd": 1, - "permlevel": 0 + "options": "Customer" }, { "doctype": "DocField", diff --git a/setup/doctype/authorization_rule/authorization_rule.txt b/setup/doctype/authorization_rule/authorization_rule.txt index a7d024a56e9..c5949c0b385 100644 --- a/setup/doctype/authorization_rule/authorization_rule.txt +++ b/setup/doctype/authorization_rule/authorization_rule.txt @@ -7,12 +7,12 @@ "modified": "2012-12-17 17:59:54" }, { - "autoname": "AR.####", + "document_type": "Master", "name": "__common__", - "search_fields": "transaction,based_on,system_user,system_role,approving_user,approving_role", + "autoname": "AR.####", "module": "Setup", "doctype": "DocType", - "document_type": "Master" + "search_fields": "transaction,based_on,system_user,system_role,approving_user,approving_role" }, { "name": "__common__", @@ -32,6 +32,7 @@ "cancel": 1, "parenttype": "DocType", "role": "System Manager", + "report": 1, "permlevel": 0, "parentfield": "permissions" }, diff --git a/setup/doctype/brand/brand.txt b/setup/doctype/brand/brand.txt index f3078caa3ce..22646781c05 100644 --- a/setup/doctype/brand/brand.txt +++ b/setup/doctype/brand/brand.txt @@ -7,10 +7,10 @@ "modified": "2012-12-25 13:20:51" }, { - "autoname": "field:brand", "name": "__common__", - "doctype": "DocType", + "autoname": "field:brand", "module": "Setup", + "doctype": "DocType", "in_dialog": 1, "document_type": "Master" }, @@ -29,6 +29,7 @@ "read": 1, "doctype": "DocPerm", "parenttype": "DocType", + "report": 1, "permlevel": 0, "parentfield": "permissions" }, diff --git a/setup/doctype/company/company.txt b/setup/doctype/company/company.txt index 056508ac32f..e39a41696de 100644 --- a/setup/doctype/company/company.txt +++ b/setup/doctype/company/company.txt @@ -7,11 +7,11 @@ "modified": "2012-12-03 11:26:05" }, { - "autoname": "field:company_name", "description": "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.", + "autoname": "field:company_name", "allow_rename": 1, - "doctype": "DocType", "module": "Setup", + "doctype": "DocType", "document_type": "Master", "name": "__common__" }, @@ -85,11 +85,11 @@ { "doctype": "DocField", "label": "Default Currency", - "options": "link:Currency", + "permlevel": 0, "fieldname": "default_currency", "fieldtype": "Select", "reqd": 1, - "permlevel": 0 + "options": "link:Currency" }, { "no_copy": 1, @@ -97,12 +97,12 @@ "doctype": "DocField", "label": "Default Bank Account", "oldfieldname": "default_bank_account", + "permlevel": 0, "trigger": "Client", "fieldname": "default_bank_account", "fieldtype": "Link", "depends_on": "eval:!doc.__islocal", - "options": "Account", - "permlevel": 0 + "options": "Account" }, { "no_copy": 1, @@ -110,12 +110,12 @@ "doctype": "DocField", "label": "Receivables Group", "oldfieldname": "receivables_group", + "permlevel": 0, "trigger": "Client", "fieldname": "receivables_group", "fieldtype": "Link", "depends_on": "eval:!doc.__islocal", - "options": "Account", - "permlevel": 0 + "options": "Account" }, { "no_copy": 1, @@ -123,12 +123,12 @@ "doctype": "DocField", "label": "Payables Group", "oldfieldname": "payables_group", + "permlevel": 0, "trigger": "Client", "fieldname": "payables_group", "fieldtype": "Link", "depends_on": "eval:!doc.__islocal", - "options": "Account", - "permlevel": 0 + "options": "Account" }, { "oldfieldtype": "Column Break", @@ -164,22 +164,22 @@ "doctype": "DocField", "label": "If Yearly Budget Exceeded", "oldfieldname": "yearly_bgt_flag", - "options": "\nWarn\nIgnore\nStop", + "permlevel": 0, "fieldname": "yearly_bgt_flag", "fieldtype": "Select", "depends_on": "eval:!doc.__islocal", - "permlevel": 0 + "options": "\nWarn\nIgnore\nStop" }, { "oldfieldtype": "Select", "doctype": "DocField", "label": "If Monthly Budget Exceeded", "oldfieldname": "monthly_bgt_flag", - "options": "\nWarn\nIgnore\nStop", + "permlevel": 0, "fieldname": "monthly_bgt_flag", "fieldtype": "Select", "depends_on": "eval:!doc.__islocal", - "permlevel": 0 + "options": "\nWarn\nIgnore\nStop" }, { "description": "For reference only.", @@ -212,30 +212,30 @@ "doctype": "DocField", "label": "Phone No", "oldfieldname": "phone_no", - "options": "Phone", + "permlevel": 0, "fieldname": "phone_no", "fieldtype": "Data", - "permlevel": 0 + "options": "Phone" }, { "oldfieldtype": "Data", "doctype": "DocField", "label": "Fax", "oldfieldname": "fax", - "options": "Phone", + "permlevel": 0, "fieldname": "fax", "fieldtype": "Data", - "permlevel": 0 + "options": "Phone" }, { "oldfieldtype": "Data", "doctype": "DocField", "label": "Email", "oldfieldname": "email", - "options": "Email", + "permlevel": 0, "fieldname": "email", "fieldtype": "Data", - "permlevel": 0 + "options": "Email" }, { "oldfieldtype": "Data", @@ -284,6 +284,7 @@ "doctype": "DocPerm", "submit": 0, "write": 1, + "report": 1, "role": "System Manager", "cancel": 1, "permlevel": 0 @@ -294,14 +295,15 @@ "doctype": "DocPerm", "submit": 0, "write": 1, + "report": 1, "role": "System Manager", "cancel": 1, "permlevel": 0 }, { - "doctype": "DocPerm", - "role": "All", "cancel": 0, - "permlevel": 1 + "role": "All", + "permlevel": 1, + "doctype": "DocPerm" } ] \ No newline at end of file diff --git a/setup/doctype/country/country.txt b/setup/doctype/country/country.txt index 87a9d609cf9..fbf2db29733 100644 --- a/setup/doctype/country/country.txt +++ b/setup/doctype/country/country.txt @@ -8,10 +8,10 @@ }, { "read_only": 0, - "autoname": "field:country_name", "in_create": 0, - "doctype": "DocType", + "autoname": "field:country_name", "module": "Setup", + "doctype": "DocType", "document_type": "Master", "name": "__common__" }, @@ -31,6 +31,7 @@ "doctype": "DocPerm", "write": 1, "parenttype": "DocType", + "report": 1, "permlevel": 0, "parentfield": "permissions" }, @@ -49,22 +50,22 @@ }, { "doctype": "DocField", - "label": "Date Format", "fieldname": "date_format", - "fieldtype": "Data" + "fieldtype": "Data", + "label": "Date Format" }, { "doctype": "DocField", - "label": "Time Zones", "fieldname": "time_zones", - "fieldtype": "Text" + "fieldtype": "Text", + "label": "Time Zones" }, { "amend": 0, - "doctype": "DocPerm", - "submit": 0, + "cancel": 0, "role": "Sales Master Manager", - "cancel": 0 + "doctype": "DocPerm", + "submit": 0 }, { "role": "Purchase Master Manager", diff --git a/setup/doctype/customer_group/customer_group.txt b/setup/doctype/customer_group/customer_group.txt index dc5641cec60..3ba5c11da2e 100644 --- a/setup/doctype/customer_group/customer_group.txt +++ b/setup/doctype/customer_group/customer_group.txt @@ -7,15 +7,15 @@ "modified": "2012-12-06 10:28:54" }, { - "in_create": 1, - "search_fields": "name,parent_customer_group", - "module": "Setup", - "document_type": "Master", "read_only": 1, + "document_type": "Master", + "in_create": 1, "autoname": "field:customer_group_name", - "name": "__common__", "allow_rename": 1, - "doctype": "DocType" + "module": "Setup", + "doctype": "DocType", + "search_fields": "name,parent_customer_group", + "name": "__common__" }, { "name": "__common__", @@ -64,12 +64,12 @@ "doctype": "DocField", "label": "Parent Customer Group", "oldfieldname": "parent_customer_group", + "permlevel": 0, "trigger": "Client", "fieldname": "parent_customer_group", "fieldtype": "Link", "reqd": 1, - "options": "Customer Group", - "permlevel": 0 + "options": "Customer Group" }, { "description": "Only leaf nodes are allowed in transaction", @@ -78,11 +78,11 @@ "doctype": "DocField", "label": "Has Child Node", "oldfieldname": "is_group", - "options": "\nYes\nNo", + "permlevel": 0, "fieldname": "is_group", "fieldtype": "Select", "reqd": 1, - "permlevel": 0 + "options": "\nYes\nNo" }, { "doctype": "DocField", @@ -95,10 +95,10 @@ "colour": "White:FFF", "doctype": "DocField", "label": "Default Price List", - "options": "Price List", + "permlevel": 0, "fieldname": "default_price_list", "fieldtype": "Link", - "permlevel": 0 + "options": "Price List" }, { "print_hide": 1, @@ -135,11 +135,11 @@ "doctype": "DocField", "label": "old_parent", "oldfieldname": "old_parent", - "permlevel": 0, + "options": "Customer Group", "fieldname": "old_parent", "fieldtype": "Link", "hidden": 1, - "options": "Customer Group", + "permlevel": 0, "report_hide": 1 }, { @@ -154,6 +154,7 @@ "create": 0, "doctype": "DocPerm", "write": 0, + "report": 1, "role": "Sales Manager", "cancel": 0, "permlevel": 0 @@ -178,6 +179,7 @@ "create": 0, "doctype": "DocPerm", "write": 0, + "report": 1, "role": "Sales User", "cancel": 0, "permlevel": 0 @@ -186,6 +188,7 @@ "create": 1, "doctype": "DocPerm", "write": 1, + "report": 1, "role": "Sales Master Manager", "cancel": 1, "permlevel": 0 diff --git a/setup/doctype/email_digest/email_digest.txt b/setup/doctype/email_digest/email_digest.txt index f74f1ec4d43..ac5844abf42 100644 --- a/setup/doctype/email_digest/email_digest.txt +++ b/setup/doctype/email_digest/email_digest.txt @@ -11,11 +11,11 @@ "description": "Send regular summary reports via Email.", "module": "Setup", "doctype": "DocType", - "autoname": "Prompt", "document_type": "System", + "_last_update": "1324556758", + "autoname": "Prompt", "name": "__common__", "colour": "White:FFF", - "_last_update": "1324556758", "show_in_menu": 0, "version": 1 }, @@ -62,21 +62,21 @@ { "doctype": "DocField", "label": "For Company", - "options": "link:Company", + "permlevel": 0, "fieldname": "company", "fieldtype": "Select", "reqd": 1, - "permlevel": 0 + "options": "link:Company" }, { "allow_on_submit": 0, "doctype": "DocField", "label": "How frequently?", - "permlevel": 0, + "options": "Daily\nWeekly\nMonthly", "fieldname": "frequency", "fieldtype": "Select", "reqd": 1, - "options": "Daily\nWeekly\nMonthly" + "permlevel": 0 }, { "depends_on": "eval:doc.enabled", @@ -284,6 +284,7 @@ "doctype": "DocPerm", "write": 1, "cancel": 1, + "report": 1, "permlevel": 0 }, { diff --git a/setup/doctype/item_group/item_group.txt b/setup/doctype/item_group/item_group.txt index dec92a34ba3..2bc42f051fa 100644 --- a/setup/doctype/item_group/item_group.txt +++ b/setup/doctype/item_group/item_group.txt @@ -7,18 +7,18 @@ "modified": "2012-12-27 18:50:20" }, { - "in_create": 1, + "allow_attach": 1, "search_fields": "parent_item_group", "module": "Setup", + "doctype": "DocType", "autoname": "field:item_group_name", "document_type": "Master", - "allow_attach": 1, + "description": "Item Classification", "issingle": 0, "name": "__common__", "allow_rename": 1, - "description": "Item Classification", - "doctype": "DocType", - "max_attachments": 3 + "max_attachments": 3, + "in_create": 1 }, { "name": "__common__", @@ -59,9 +59,9 @@ "fieldtype": "Data" }, { - "doctype": "DocField", "fieldname": "cb0", - "fieldtype": "Column Break" + "fieldtype": "Column Break", + "doctype": "DocField" }, { "no_copy": 0, @@ -90,9 +90,9 @@ }, { "doctype": "DocField", - "label": "Website Settings", "fieldname": "sb9", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "Website Settings" }, { "description": "Check this if you want to show in website", @@ -177,8 +177,8 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "cancel": 0, "role": "Material Manager", + "cancel": 0, "permlevel": 1 }, { @@ -187,8 +187,9 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "cancel": 0, + "report": 1, "role": "Material Manager", + "cancel": 0, "permlevel": 0 }, { @@ -197,8 +198,8 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "cancel": 0, "role": "Material User", + "cancel": 0, "permlevel": 1 }, { @@ -207,24 +208,27 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "cancel": 0, + "report": 1, "role": "Material User", + "cancel": 0, "permlevel": 0 }, { "create": 1, "doctype": "DocPerm", "write": 1, + "cancel": 1, "role": "System Manager", - "cancel": 1, + "report": 1, "permlevel": 0 }, { "create": 1, "doctype": "DocPerm", "write": 1, - "role": "Material Master Manager", "cancel": 1, + "role": "Material Master Manager", + "report": 1, "permlevel": 0 } ] \ No newline at end of file diff --git a/setup/doctype/naming_series_options/naming_series_options.txt b/setup/doctype/naming_series_options/naming_series_options.txt index 64738bf83d0..61159715b9c 100644 --- a/setup/doctype/naming_series_options/naming_series_options.txt +++ b/setup/doctype/naming_series_options/naming_series_options.txt @@ -11,12 +11,12 @@ "in_create": 1, "module": "Setup", "doctype": "DocType", - "autoname": "__NSO.#####", - "show_in_menu": 0, "read_only": 0, + "autoname": "__NSO.#####", "name": "__common__", "colour": "White:FFF", "server_code_error": " ", + "show_in_menu": 0, "version": 5 }, { @@ -32,6 +32,7 @@ "read": 1, "name": "__common__", "doctype": "DocPerm", + "report": 1, "parenttype": "DocType", "role": "System Manager", "permlevel": 0, diff --git a/setup/doctype/price_list/price_list.txt b/setup/doctype/price_list/price_list.txt index 1e3f9f80409..1be614c1ed8 100644 --- a/setup/doctype/price_list/price_list.txt +++ b/setup/doctype/price_list/price_list.txt @@ -8,16 +8,16 @@ }, { "section_style": "Simple", + "doctype": "DocType", "allow_attach": 0, "allow_print": 1, "module": "Setup", - "doctype": "DocType", - "allow_trash": 1, "server_code_error": " ", + "allow_trash": 1, + "autoname": "field:price_list_name", "document_type": "Master", "description": "Price List Master", "allow_email": 1, - "autoname": "field:price_list_name", "name": "__common__", "colour": "White:FFF", "_last_update": "1303100817", @@ -38,8 +38,8 @@ "name": "__common__", "parent": "Price List", "amend": 0, - "doctype": "DocPerm", "submit": 0, + "doctype": "DocPerm", "read": 1, "parenttype": "DocType", "parentfield": "permissions" @@ -84,6 +84,7 @@ "create": 0, "doctype": "DocPerm", "write": 0, + "report": 1, "role": "Sales Manager", "cancel": 0, "permlevel": 0 @@ -100,6 +101,7 @@ "create": 0, "doctype": "DocPerm", "write": 0, + "report": 1, "role": "Sales User", "cancel": 0, "permlevel": 0 @@ -108,6 +110,7 @@ "create": 1, "doctype": "DocPerm", "write": 1, + "report": 1, "role": "Sales Master Manager", "cancel": 1, "permlevel": 0 diff --git a/setup/doctype/print_heading/print_heading.txt b/setup/doctype/print_heading/print_heading.txt index 825accb4a55..11929a0f84c 100644 --- a/setup/doctype/print_heading/print_heading.txt +++ b/setup/doctype/print_heading/print_heading.txt @@ -10,13 +10,13 @@ "section_style": "Simple", "search_fields": "print_heading", "module": "Setup", - "doctype": "DocType", "allow_trash": 1, - "document_type": "Master", "autoname": "field:print_heading", + "document_type": "Master", + "_last_update": "1294312215", "name": "__common__", "colour": "White:FFF", - "_last_update": "1294312215", + "doctype": "DocType", "server_code_error": " ", "version": 27 }, @@ -30,10 +30,11 @@ { "parent": "Print Heading", "read": 1, - "doctype": "DocPerm", + "report": 1, "cancel": 1, "name": "__common__", "create": 1, + "doctype": "DocPerm", "write": 1, "parenttype": "DocType", "role": "All", diff --git a/setup/doctype/quotation_lost_reason/quotation_lost_reason.txt b/setup/doctype/quotation_lost_reason/quotation_lost_reason.txt index 8554aeb376a..8cb6090ace1 100644 --- a/setup/doctype/quotation_lost_reason/quotation_lost_reason.txt +++ b/setup/doctype/quotation_lost_reason/quotation_lost_reason.txt @@ -9,13 +9,13 @@ { "section_style": "Simple", "module": "Setup", - "server_code_error": " ", - "allow_trash": 1, "doctype": "DocType", - "autoname": "field:order_lost_reason", + "allow_trash": 1, "document_type": "Master", + "autoname": "field:order_lost_reason", "name": "__common__", "colour": "White:FFF", + "server_code_error": " ", "show_in_menu": 0, "version": 4 }, @@ -35,6 +35,7 @@ "write": 1, "cancel": 1, "parenttype": "DocType", + "report": 1, "permlevel": 0, "parentfield": "permissions" }, diff --git a/setup/doctype/sales_partner/sales_partner.txt b/setup/doctype/sales_partner/sales_partner.txt index a0cfd16ddc1..59b4a494902 100644 --- a/setup/doctype/sales_partner/sales_partner.txt +++ b/setup/doctype/sales_partner/sales_partner.txt @@ -8,11 +8,11 @@ }, { "read_only": 0, - "autoname": "field:partner_name", "in_create": 0, + "autoname": "field:partner_name", "name": "__common__", - "doctype": "DocType", "module": "Setup", + "doctype": "DocType", "document_type": "Master", "description": "A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission." }, @@ -61,11 +61,11 @@ "doctype": "DocField", "label": "Partner Type", "oldfieldname": "partner_type", - "options": "\nChannel Partner\nDistributor\nDealer\nAgent\nRetailer\nImplementation Partner\nReseller", + "permlevel": 0, "fieldname": "partner_type", "fieldtype": "Select", "search_index": 0, - "permlevel": 0, + "options": "\nChannel Partner\nDistributor\nDealer\nAgent\nRetailer\nImplementation Partner\nReseller", "in_filter": 1 }, { @@ -89,11 +89,11 @@ { "doctype": "DocField", "label": "Territory", - "options": "Territory", + "permlevel": 0, "fieldname": "territory", "fieldtype": "Link", "reqd": 1, - "permlevel": 0 + "options": "Territory" }, { "doctype": "DocField", @@ -106,10 +106,10 @@ "depends_on": "eval:doc.__islocal", "doctype": "DocField", "label": "Address Desc", - "options": "Addresses will appear only when you save the customer", + "permlevel": 0, "fieldname": "address_desc", "fieldtype": "HTML", - "permlevel": 0 + "options": "Addresses will appear only when you save the customer" }, { "doctype": "DocField", @@ -128,10 +128,10 @@ "depends_on": "eval:doc.__islocal", "doctype": "DocField", "label": "Contact Desc", - "options": "Contact Details will appear only when you save the customer", + "permlevel": 0, "fieldname": "contact_desc", "fieldtype": "HTML", - "permlevel": 0 + "options": "Contact Details will appear only when you save the customer" }, { "doctype": "DocField", @@ -153,11 +153,11 @@ "doctype": "DocField", "label": "Partner Target Detail", "oldfieldname": "partner_target_details", - "options": "Target Detail", + "permlevel": 0, "fieldname": "partner_target_details", "fieldtype": "Table", "reqd": 0, - "permlevel": 0 + "options": "Target Detail" }, { "description": "Select Budget Distribution to unevenly distribute targets across months.", @@ -165,10 +165,10 @@ "doctype": "DocField", "label": "Target Distribution", "oldfieldname": "distribution_id", - "options": "Budget Distribution", + "permlevel": 0, "fieldname": "distribution_id", "fieldtype": "Link", - "permlevel": 0 + "options": "Budget Distribution" }, { "amend": 0, @@ -186,6 +186,7 @@ "doctype": "DocPerm", "submit": 0, "write": 0, + "report": 1, "role": "Sales Manager", "cancel": 0, "permlevel": 0 @@ -206,6 +207,7 @@ "doctype": "DocPerm", "submit": 0, "write": 0, + "report": 1, "role": "Sales User", "cancel": 0, "permlevel": 0 @@ -216,6 +218,7 @@ "doctype": "DocPerm", "submit": 0, "write": 1, + "report": 1, "role": "Sales Master Manager", "cancel": 1, "permlevel": 0 @@ -234,8 +237,9 @@ "create": 1, "doctype": "DocPerm", "write": 1, + "cancel": 1, "role": "System Manager", - "cancel": 1, + "report": 1, "permlevel": 0 }, { diff --git a/setup/doctype/sales_person/sales_person.txt b/setup/doctype/sales_person/sales_person.txt index d036565e4ea..b46cd49c065 100644 --- a/setup/doctype/sales_person/sales_person.txt +++ b/setup/doctype/sales_person/sales_person.txt @@ -7,14 +7,14 @@ "modified": "2012-12-06 10:30:15" }, { - "autoname": "field:sales_person_name", + "document_type": "Master", "in_create": 1, - "name": "__common__", + "autoname": "field:sales_person_name", "allow_rename": 1, - "search_fields": "name,parent_sales_person", + "name": "__common__", "module": "Setup", "doctype": "DocType", - "document_type": "Master", + "search_fields": "name,parent_sales_person", "description": "All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets." }, { @@ -66,23 +66,23 @@ "doctype": "DocField", "label": "Parent Sales Person", "oldfieldname": "parent_sales_person", - "permlevel": 0, "trigger": "Client", "fieldname": "parent_sales_person", "fieldtype": "Link", "reqd": 1, - "options": "Sales Person" + "options": "Sales Person", + "permlevel": 0 }, { "oldfieldtype": "Select", "doctype": "DocField", "label": "Has Child Node", "oldfieldname": "is_group", - "options": "\nYes\nNo", + "permlevel": 0, "fieldname": "is_group", "fieldtype": "Select", "reqd": 1, - "permlevel": 0 + "options": "\nYes\nNo" }, { "doctype": "DocField", @@ -92,10 +92,10 @@ }, { "doctype": "DocField", - "label": "Employee", "options": "Employee", "fieldname": "employee", "fieldtype": "Link", + "label": "Employee", "permlevel": 0 }, { @@ -153,10 +153,10 @@ "doctype": "DocField", "label": "Target Details1", "oldfieldname": "target_details", - "options": "Target Detail", + "permlevel": 0, "fieldname": "target_details", "fieldtype": "Table", - "permlevel": 0 + "options": "Target Detail" }, { "description": "Select Budget Distribution to unevenly distribute targets across months.", @@ -165,11 +165,11 @@ "doctype": "DocField", "label": "Target Distribution", "oldfieldname": "distribution_id", - "options": "Budget Distribution", + "permlevel": 0, "fieldname": "distribution_id", "fieldtype": "Link", "search_index": 0, - "permlevel": 0 + "options": "Budget Distribution" }, { "create": 0, @@ -183,6 +183,7 @@ "create": 0, "doctype": "DocPerm", "write": 0, + "report": 1, "role": "Sales Manager", "cancel": 0, "permlevel": 0 @@ -199,6 +200,7 @@ "create": 0, "doctype": "DocPerm", "write": 0, + "report": 1, "role": "Sales User", "cancel": 0, "permlevel": 0 @@ -207,6 +209,7 @@ "create": 1, "doctype": "DocPerm", "write": 1, + "report": 1, "role": "Sales Master Manager", "cancel": 1, "permlevel": 0 diff --git a/setup/doctype/state/state.txt b/setup/doctype/state/state.txt index 8e25d94d626..2433cf96740 100644 --- a/setup/doctype/state/state.txt +++ b/setup/doctype/state/state.txt @@ -7,25 +7,25 @@ "modified": "2012-03-27 14:36:25" }, { + "show_in_menu": 0, "section_style": "Simple", "in_create": 0, "module": "Setup", - "server_code_error": " ", + "autoname": "field:state_name", "document_type": "Master", "read_only": 0, - "autoname": "field:state_name", "name": "__common__", "colour": "White:FFF", "doctype": "DocType", - "show_in_menu": 0, + "server_code_error": " ", "version": 14 }, { "name": "__common__", "parent": "State", "doctype": "DocField", - "reqd": 1, "parenttype": "DocType", + "reqd": 1, "permlevel": 0, "parentfield": "fields" }, @@ -36,6 +36,7 @@ "create": 1, "doctype": "DocPerm", "write": 1, + "report": 1, "parenttype": "DocType", "permlevel": 0, "parentfield": "permissions" diff --git a/setup/doctype/supplier_type/supplier_type.txt b/setup/doctype/supplier_type/supplier_type.txt index 96de4a2e784..44b46516b45 100644 --- a/setup/doctype/supplier_type/supplier_type.txt +++ b/setup/doctype/supplier_type/supplier_type.txt @@ -7,11 +7,11 @@ "modified": "2012-12-06 10:29:04" }, { - "autoname": "field:supplier_type", "name": "__common__", + "autoname": "field:supplier_type", "allow_rename": 1, - "doctype": "DocType", "module": "Setup", + "doctype": "DocType", "document_type": "Master" }, { @@ -25,8 +25,8 @@ "name": "__common__", "parent": "Supplier Type", "amend": 0, - "doctype": "DocPerm", "submit": 0, + "doctype": "DocPerm", "read": 1, "parenttype": "DocType", "parentfield": "permissions" @@ -66,6 +66,7 @@ "create": 0, "doctype": "DocPerm", "write": 0, + "report": 1, "role": "Purchase Manager", "cancel": 0, "permlevel": 0 @@ -82,6 +83,7 @@ "create": 0, "doctype": "DocPerm", "write": 0, + "report": 1, "role": "Purchase User", "cancel": 0, "permlevel": 0 @@ -90,6 +92,7 @@ "create": 1, "doctype": "DocPerm", "write": 1, + "report": 1, "role": "Purchase Master Manager", "cancel": 1, "permlevel": 0 diff --git a/setup/doctype/terms_and_conditions/terms_and_conditions.txt b/setup/doctype/terms_and_conditions/terms_and_conditions.txt index d4057c6306f..da319bbcb82 100644 --- a/setup/doctype/terms_and_conditions/terms_and_conditions.txt +++ b/setup/doctype/terms_and_conditions/terms_and_conditions.txt @@ -10,14 +10,14 @@ "section_style": "Simple", "description": "Standard Terms and Conditions that can be added to Sales and Purchases.\n\nExamples:\n\n1. Validity of the offer.\n1. Payment Terms (In Advance, On Credit, part advance etc).\n1. What is extra (or payable by the Customer).\n1. Safety / usage warning.\n1. Warranty if any.\n1. Returns Policy.\n1. Terms of shipping, if applicable.\n1. Ways of addressing disputes, indemnity, liability, etc.\n1. Address and Contact of your Company.", "module": "Setup", - "doctype": "DocType", - "allow_trash": 1, "server_code_error": " ", - "document_type": "Master", + "allow_trash": 1, "autoname": "field:title", + "document_type": "Master", + "_last_update": "1322549700", "name": "__common__", "colour": "White:FFF", - "_last_update": "1322549700", + "doctype": "DocType", "show_in_menu": 0, "version": 1 }, @@ -56,6 +56,7 @@ "doctype": "DocPerm", "submit": 0, "write": 1, + "report": 1, "role": "Sales Master Manager", "cancel": 1, "permlevel": 0 @@ -76,6 +77,7 @@ "doctype": "DocPerm", "submit": 0, "write": 0, + "report": 1, "role": "Sales User", "cancel": 0, "permlevel": 0 @@ -89,16 +91,18 @@ "create": 1, "doctype": "DocPerm", "write": 1, - "role": "System Manager", "cancel": 1, + "role": "System Manager", + "report": 1, "permlevel": 0 }, { "create": 1, "doctype": "DocPerm", "write": 1, - "role": "Accounts User", "cancel": 1, + "role": "Accounts User", + "report": 1, "permlevel": 0 }, { diff --git a/setup/doctype/territory/territory.txt b/setup/doctype/territory/territory.txt index e431eb2e8dc..220d832b2fa 100644 --- a/setup/doctype/territory/territory.txt +++ b/setup/doctype/territory/territory.txt @@ -7,11 +7,11 @@ "modified": "2012-12-06 10:29:39" }, { - "in_create": 1, + "description": "Classification of Customers by region", "search_fields": "name,parent_territory,territory_manager", "module": "Setup", "document_type": "Master", - "description": "Classification of Customers by region", + "in_create": 1, "read_only": 1, "autoname": "field:territory_name", "name": "__common__", @@ -65,12 +65,12 @@ "doctype": "DocField", "label": "Parent Territory", "oldfieldname": "parent_territory", + "permlevel": 0, "trigger": "Client", "fieldname": "parent_territory", "fieldtype": "Link", "reqd": 1, - "options": "Territory", - "permlevel": 0 + "options": "Territory" }, { "description": "Only leaf nodes are allowed in transaction", @@ -79,11 +79,11 @@ "doctype": "DocField", "label": "Has Child Node", "oldfieldname": "is_group", - "options": "\nYes\nNo", + "permlevel": 0, "fieldname": "is_group", "fieldtype": "Select", "reqd": 1, - "permlevel": 0 + "options": "\nYes\nNo" }, { "doctype": "DocField", @@ -98,12 +98,12 @@ "doctype": "DocField", "label": "Territory Manager", "oldfieldname": "territory_manager", - "permlevel": 0, + "options": "Sales Person", "fieldname": "territory_manager", "fieldtype": "Link", "search_index": 1, - "in_filter": 1, - "options": "Sales Person" + "permlevel": 0, + "in_filter": 1 }, { "print_hide": 1, @@ -142,11 +142,11 @@ "doctype": "DocField", "label": "old_parent", "oldfieldname": "old_parent", - "permlevel": 0, + "options": "Territory", "fieldname": "old_parent", "fieldtype": "Link", "hidden": 1, - "options": "Territory", + "permlevel": 0, "report_hide": 1 }, { @@ -164,10 +164,10 @@ "doctype": "DocField", "label": "Target Details", "oldfieldname": "target_details", - "options": "Target Detail", + "permlevel": 0, "fieldname": "target_details", "fieldtype": "Table", - "permlevel": 0 + "options": "Target Detail" }, { "description": "Select Budget Distribution to unevenly distribute targets across months.", @@ -176,57 +176,60 @@ "doctype": "DocField", "label": "Target Distribution", "oldfieldname": "distribution_id", - "options": "Budget Distribution", + "permlevel": 0, "fieldname": "distribution_id", "fieldtype": "Link", - "permlevel": 0 + "options": "Budget Distribution" }, { "create": 0, "doctype": "DocPerm", "write": 0, - "cancel": 0, "role": "Sales Manager", + "cancel": 0, "permlevel": 1 }, { "create": 0, "doctype": "DocPerm", "write": 0, - "cancel": 0, + "report": 1, "role": "Sales Manager", + "cancel": 0, "permlevel": 0 }, { "create": 0, "doctype": "DocPerm", "write": 0, - "cancel": 0, "role": "Sales Master Manager", + "cancel": 0, "permlevel": 1 }, { "create": 0, "doctype": "DocPerm", "write": 0, - "cancel": 0, "role": "Sales User", + "cancel": 0, "permlevel": 1 }, { "create": 0, "doctype": "DocPerm", "write": 0, - "cancel": 0, + "report": 1, "role": "Sales User", + "cancel": 0, "permlevel": 0 }, { "create": 1, "doctype": "DocPerm", "write": 1, - "cancel": 1, + "report": 1, "role": "Sales Master Manager", + "cancel": 1, "permlevel": 0 } ] \ No newline at end of file diff --git a/setup/doctype/uom/uom.txt b/setup/doctype/uom/uom.txt index beb3868e4b2..45ab99e7381 100644 --- a/setup/doctype/uom/uom.txt +++ b/setup/doctype/uom/uom.txt @@ -9,14 +9,14 @@ { "section_style": "Tabbed", "module": "Setup", - "doctype": "DocType", - "allow_trash": 1, "server_code_error": " ", - "document_type": "Master", + "allow_trash": 1, "autoname": "field:uom_name", + "document_type": "Master", + "_last_update": "1307707462", "name": "__common__", "colour": "White:FFF", - "_last_update": "1307707462", + "doctype": "DocType", "show_in_menu": 0, "version": 5 }, @@ -31,8 +31,8 @@ "name": "__common__", "parent": "UOM", "read": 1, - "doctype": "DocPerm", "submit": 0, + "doctype": "DocPerm", "amend": 0, "parenttype": "DocType", "parentfield": "permissions" @@ -45,6 +45,7 @@ "create": 1, "doctype": "DocPerm", "write": 1, + "report": 1, "role": "Material Master Manager", "cancel": 1, "permlevel": 0 @@ -61,6 +62,7 @@ "create": 0, "doctype": "DocPerm", "write": 0, + "report": 1, "role": "Material Manager", "cancel": 0, "permlevel": 0 @@ -77,6 +79,7 @@ "create": 0, "doctype": "DocPerm", "write": 0, + "report": 1, "role": "Material User", "cancel": 0, "permlevel": 0 diff --git a/setup/doctype/warehouse_type/warehouse_type.txt b/setup/doctype/warehouse_type/warehouse_type.txt index e5c5422f583..522b555896b 100644 --- a/setup/doctype/warehouse_type/warehouse_type.txt +++ b/setup/doctype/warehouse_type/warehouse_type.txt @@ -13,10 +13,10 @@ "doctype": "DocType", "allow_trash": 1, "autoname": "field:warehouse_type", - "show_in_menu": 0, "name": "__common__", "colour": "White:FFF", "server_code_error": " ", + "show_in_menu": 0, "version": 6 }, { @@ -30,8 +30,8 @@ "name": "__common__", "parent": "Warehouse Type", "read": 1, - "doctype": "DocPerm", "submit": 0, + "doctype": "DocPerm", "amend": 0, "parenttype": "DocType", "parentfield": "permissions" @@ -44,6 +44,7 @@ "create": 1, "doctype": "DocPerm", "write": 1, + "report": 1, "role": "Material Master Manager", "cancel": 1, "permlevel": 0 @@ -60,6 +61,7 @@ "create": 0, "doctype": "DocPerm", "write": 0, + "report": 1, "role": "Material Manager", "cancel": 0, "permlevel": 0 @@ -76,6 +78,7 @@ "create": 0, "doctype": "DocPerm", "write": 0, + "report": 1, "role": "Material User", "cancel": 0, "permlevel": 0 diff --git a/setup/doctype/workflow_rule/workflow_rule.txt b/setup/doctype/workflow_rule/workflow_rule.txt index dfa555f6b86..5ff0a4f2529 100644 --- a/setup/doctype/workflow_rule/workflow_rule.txt +++ b/setup/doctype/workflow_rule/workflow_rule.txt @@ -10,12 +10,12 @@ "section_style": "Tray", "search_fields": "select_form,rule_status", "module": "Setup", - "server_code_error": " ", "doctype": "DocType", - "autoname": "field:rule_name", "document_type": "Master", + "autoname": "field:rule_name", "name": "__common__", "colour": "White:FFF", + "server_code_error": " ", "show_in_menu": 0, "version": 31 }, @@ -30,6 +30,7 @@ { "parent": "Workflow Rule", "read": 1, + "report": 1, "name": "__common__", "create": 1, "doctype": "DocPerm", diff --git a/stock/doctype/batch/batch.txt b/stock/doctype/batch/batch.txt index 8579cf985a1..51206a50817 100644 --- a/stock/doctype/batch/batch.txt +++ b/stock/doctype/batch/batch.txt @@ -9,13 +9,13 @@ { "section_style": "Simple", "module": "Stock", - "server_code_error": " ", - "allow_trash": 1, "doctype": "DocType", - "autoname": "field:batch_id", + "allow_trash": 1, "document_type": "Master", + "autoname": "field:batch_id", "name": "__common__", "colour": "White:FFF", + "server_code_error": " ", "version": 12 }, { @@ -43,6 +43,7 @@ "doctype": "DocPerm", "write": 1, "cancel": 1, + "report": 1, "permlevel": 0 }, { @@ -111,10 +112,10 @@ "doctype": "DocField", "label": "Item", "oldfieldname": "item", - "permlevel": 0, + "options": "Item", "fieldname": "item", "fieldtype": "Link", "reqd": 1, - "options": "Item" + "permlevel": 0 } ] \ No newline at end of file diff --git a/stock/doctype/bin/bin.txt b/stock/doctype/bin/bin.txt index d284738c9fb..a4ecad38128 100644 --- a/stock/doctype/bin/bin.txt +++ b/stock/doctype/bin/bin.txt @@ -12,9 +12,9 @@ "search_fields": "item_code,warehouse", "module": "Stock", "server_code_error": " ", + "autoname": "BIN/.#######", "read_only": 0, "_last_update": "1322549701", - "autoname": "BIN/.#######", "name": "__common__", "colour": "White:FFF", "doctype": "DocType", @@ -36,6 +36,7 @@ "read": 1, "doctype": "DocPerm", "parenttype": "DocType", + "report": 1, "permlevel": 0, "parentfield": "permissions" }, diff --git a/stock/doctype/delivery_note/delivery_note.txt b/stock/doctype/delivery_note/delivery_note.txt index 215dd41b623..1e54b428749 100644 --- a/stock/doctype/delivery_note/delivery_note.txt +++ b/stock/doctype/delivery_note/delivery_note.txt @@ -88,10 +88,10 @@ "depends_on": "customer", "doctype": "DocField", "label": "Select Shipping Address", - "options": "Address", + "permlevel": 0, "fieldname": "customer_address", "fieldtype": "Link", - "permlevel": 0, + "options": "Address", "in_filter": 1 }, { @@ -149,8 +149,8 @@ "fieldtype": "Date", "search_index": 1, "reqd": 1, - "in_filter": 1, - "width": "100px" + "width": "100px", + "in_filter": 1 }, { "print_hide": 1, @@ -219,10 +219,10 @@ "doctype": "DocField", "label": "Delivery Note Items", "oldfieldname": "delivery_note_details", - "permlevel": 0, + "options": "Delivery Note Item", "fieldname": "delivery_note_details", "fieldtype": "Table", - "options": "Delivery Note Item" + "permlevel": 0 }, { "print_hide": 1, @@ -234,10 +234,10 @@ }, { "doctype": "DocField", - "options": "Simple", + "permlevel": 0, "fieldname": "section_break0", "fieldtype": "Section Break", - "permlevel": 0 + "options": "Simple" }, { "doctype": "DocField", @@ -281,21 +281,21 @@ "doctype": "DocField", "label": "Sales Order No", "oldfieldname": "sales_order_no", - "permlevel": 0, + "options": "Sales Order", "fieldname": "sales_order_no", "fieldtype": "Link", - "options": "Sales Order" + "permlevel": 0 }, { "print_hide": 1, "oldfieldtype": "Button", "doctype": "DocField", "label": "Get Items", - "options": "pull_sales_order_details", + "permlevel": 0, "fieldname": "get_items", "fieldtype": "Button", "hidden": 0, - "permlevel": 0 + "options": "pull_sales_order_details" }, { "doctype": "DocField", @@ -317,22 +317,22 @@ "doctype": "DocField", "label": "Price List", "oldfieldname": "price_list_name", - "permlevel": 0, + "options": "link:Price List", "fieldname": "price_list_name", "fieldtype": "Select", "reqd": 1, - "options": "link:Price List" + "permlevel": 0 }, { "print_hide": 1, "description": "Select the currency in which price list is maintained", "doctype": "DocField", "label": "Price List Currency", - "options": "link:Currency", + "permlevel": 0, "fieldname": "price_list_currency", "fieldtype": "Select", "reqd": 1, - "permlevel": 0 + "options": "link:Currency" }, { "print_hide": 1, @@ -359,11 +359,11 @@ "doctype": "DocField", "label": "Currency", "oldfieldname": "currency", - "permlevel": 0, + "options": "link:Currency", "fieldname": "currency", "fieldtype": "Select", "reqd": 1, - "options": "link:Currency" + "permlevel": 0 }, { "print_hide": 1, @@ -394,10 +394,10 @@ "doctype": "DocField", "label": "Taxes and Charges", "oldfieldname": "charge", - "options": "Sales Taxes and Charges Master", + "permlevel": 0, "fieldname": "charge", "fieldtype": "Link", - "permlevel": 0 + "options": "Sales Taxes and Charges Master" }, { "print_hide": 1, @@ -414,10 +414,10 @@ "doctype": "DocField", "label": "Sales Taxes and Charges", "oldfieldname": "other_charges", - "options": "Sales Taxes and Charges", + "permlevel": 0, "fieldname": "other_charges", "fieldtype": "Table", - "permlevel": 0 + "options": "Sales Taxes and Charges" }, { "print_hide": 1, @@ -560,30 +560,30 @@ "doctype": "DocField", "label": "Select Terms and Conditions", "oldfieldname": "tc_name", - "options": "Terms and Conditions", + "permlevel": 0, "fieldname": "tc_name", "fieldtype": "Link", - "permlevel": 0 + "options": "Terms and Conditions" }, { "print_hide": 1, "oldfieldtype": "Button", "doctype": "DocField", "label": "Get Terms and Conditions", - "options": "get_tc_details", + "permlevel": 0, "fieldname": "get_terms", "fieldtype": "Button", - "permlevel": 0 + "options": "get_tc_details" }, { "print_hide": 1, "oldfieldtype": "HTML", "doctype": "DocField", "label": "Terms and Conditions HTML", - "options": "You can add Terms and Notes that will be printed in the Transaction", + "permlevel": 0, "fieldname": "terms_html", "fieldtype": "HTML", - "permlevel": 0 + "options": "You can add Terms and Notes that will be printed in the Transaction" }, { "oldfieldtype": "Text Editor", @@ -682,10 +682,10 @@ "print_hide": 1, "doctype": "DocField", "label": "Contact Person", - "options": "Contact", + "permlevel": 0, "fieldname": "contact_person", "fieldtype": "Link", - "permlevel": 0, + "options": "Contact", "in_filter": 1 }, { @@ -701,12 +701,12 @@ "search_index": 1, "doctype": "DocField", "label": "Territory", - "permlevel": 0, + "options": "Territory", "fieldname": "territory", "fieldtype": "Link", "reqd": 1, "hidden": 0, - "options": "Territory", + "permlevel": 0, "in_filter": 1 }, { @@ -714,10 +714,10 @@ "search_index": 1, "doctype": "DocField", "label": "Customer Group", - "options": "Customer Group", + "permlevel": 0, "fieldname": "customer_group", "fieldtype": "Link", - "permlevel": 0, + "options": "Customer Group", "in_filter": 1 }, { @@ -743,8 +743,8 @@ "fieldtype": "Time", "search_index": 0, "reqd": 1, - "in_filter": 0, - "permlevel": 0 + "permlevel": 0, + "in_filter": 0 }, { "print_hide": 1, @@ -771,10 +771,10 @@ "doctype": "DocField", "label": "Letter Head", "oldfieldname": "letter_head", - "options": "link:Letter Head", + "permlevel": 0, "fieldname": "letter_head", "fieldtype": "Select", - "permlevel": 0 + "options": "link:Letter Head" }, { "print_hide": 1, @@ -796,12 +796,12 @@ "doctype": "DocField", "label": "Project Name", "oldfieldname": "project_name", - "permlevel": 0, + "options": "Project", "fieldname": "project_name", "fieldtype": "Link", "search_index": 1, - "in_filter": 1, - "options": "Project" + "permlevel": 0, + "in_filter": 1 }, { "print_hide": 1, @@ -809,10 +809,10 @@ "doctype": "DocField", "label": "Source", "oldfieldname": "source", - "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign", + "permlevel": 0, "fieldname": "source", "fieldtype": "Select", - "permlevel": 0 + "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign" }, { "print_hide": 1, @@ -820,11 +820,11 @@ "doctype": "DocField", "label": "Campaign", "oldfieldname": "campaign", - "options": "Campaign", + "permlevel": 0, "fieldname": "campaign", "fieldtype": "Link", "depends_on": "eval:doc.source == 'Campaign'", - "permlevel": 0 + "options": "Campaign" }, { "print_hide": 1, @@ -849,44 +849,44 @@ }, { "print_hide": 1, - "depends_on": "eval:!doc.__islocal", + "doctype": "DocField", "description": "% of materials billed against this Delivery Note", "no_copy": 1, "search_index": 1, - "doctype": "DocField", + "oldfieldtype": "Currency", "label": "% Amount Billed", "oldfieldname": "per_billed", "fieldname": "per_billed", "fieldtype": "Currency", - "oldfieldtype": "Currency", - "in_filter": 1, - "permlevel": 1 + "depends_on": "eval:!doc.__islocal", + "permlevel": 1, + "in_filter": 1 }, { "print_hide": 1, "no_copy": 1, "doctype": "DocField", "label": "Billing Status", - "options": "\nNot Billed\nPartly Billed\nFully Billed", + "permlevel": 0, "fieldname": "billing_status", "fieldtype": "Select", "hidden": 1, - "permlevel": 0 + "options": "\nNot Billed\nPartly Billed\nFully Billed" }, { "print_hide": 1, - "depends_on": "eval:!doc.__islocal", + "doctype": "DocField", "description": "% of materials delivered against this Delivery Note", "no_copy": 1, "search_index": 1, - "doctype": "DocField", + "oldfieldtype": "Currency", "label": "% Installed", "oldfieldname": "per_installed", "fieldname": "per_installed", "fieldtype": "Currency", - "oldfieldtype": "Currency", - "in_filter": 1, - "permlevel": 1 + "depends_on": "eval:!doc.__islocal", + "permlevel": 1, + "in_filter": 1 }, { "print_hide": 1, @@ -973,8 +973,8 @@ "fieldtype": "Link", "search_index": 1, "reqd": 1, - "in_filter": 1, - "options": "Company" + "options": "Company", + "in_filter": 1 }, { "print_hide": 1, @@ -1020,10 +1020,10 @@ "doctype": "DocField", "label": "Packing Details", "oldfieldname": "packing_details", - "options": "Delivery Note Packing Item", + "permlevel": 1, "fieldname": "packing_details", "fieldtype": "Table", - "permlevel": 1 + "options": "Delivery Note Packing Item" }, { "print_hide": 1, @@ -1104,10 +1104,10 @@ "doctype": "DocField", "label": "Sales Team1", "oldfieldname": "sales_team", - "options": "Sales Team", + "permlevel": 0, "fieldname": "sales_team", "fieldtype": "Table", - "permlevel": 0 + "options": "Sales Team" }, { "print_hide": 1, @@ -1124,8 +1124,9 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "role": "Accounts User", "cancel": 0, + "role": "Accounts User", + "report": 1, "permlevel": 0 }, { @@ -1143,6 +1144,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Sales User", "cancel": 1, "permlevel": 0 @@ -1160,6 +1162,7 @@ { "doctype": "DocPerm", "role": "Customer", + "report": 1, "permlevel": 0, "match": "customer_name" }, @@ -1189,6 +1192,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Material Manager", "cancel": 1, "permlevel": 0 @@ -1209,6 +1213,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Material User", "cancel": 1, "permlevel": 0 diff --git a/stock/doctype/landed_cost_master/landed_cost_master.txt b/stock/doctype/landed_cost_master/landed_cost_master.txt index 0ee22ba1743..09f1f5d6dae 100644 --- a/stock/doctype/landed_cost_master/landed_cost_master.txt +++ b/stock/doctype/landed_cost_master/landed_cost_master.txt @@ -10,11 +10,11 @@ "section_style": "Simple", "module": "Stock", "doctype": "DocType", - "autoname": "field:title", "document_type": "Master", + "_last_update": "1309508838", + "autoname": "field:title", "name": "__common__", "colour": "White:FFF", - "_last_update": "1309508838", "server_code_error": " ", "version": 1 }, @@ -68,16 +68,17 @@ "doctype": "DocField", "label": "Landed Cost", "oldfieldname": "landed_cost", - "permlevel": 0, + "options": "Landed Cost Master Detail", "fieldname": "landed_cost", "fieldtype": "Table", - "options": "Landed Cost Master Detail" + "permlevel": 0 }, { "create": 1, "doctype": "DocPerm", "write": 1, "role": "Purchase Manager", + "report": 1, "permlevel": 0 }, { @@ -85,6 +86,7 @@ "doctype": "DocPerm", "write": 1, "role": "System Manager", + "report": 1, "permlevel": 0 }, { @@ -92,6 +94,7 @@ "doctype": "DocPerm", "write": 1, "role": "Purchase User", + "report": 1, "permlevel": 0 }, { diff --git a/stock/doctype/packing_slip/packing_slip.txt b/stock/doctype/packing_slip/packing_slip.txt index 31dc8810f20..a706228945c 100644 --- a/stock/doctype/packing_slip/packing_slip.txt +++ b/stock/doctype/packing_slip/packing_slip.txt @@ -8,19 +8,19 @@ }, { "section_style": "Simple", - "description": "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.", "is_submittable": 1, + "description": "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.", "search_fields": "delivery_note", "module": "Stock", - "doctype": "DocType", "read_only_onload": 1, + "autoname": "PS.#######", "document_type": "Transaction", "subject": "[%(delivery_note)s] Case Nos: %(from_case_no)s - %(to_case_no)s | Net Weight: %(net_weight_pkg)s %(net_weight_uom)s | Gross Weight: %(gross_weight_pkg)s %(gross_weight_uom)s", - "autoname": "PS.#######", + "_last_update": "1328091392", "name": "__common__", "colour": "White:FFF", "is_transaction_doc": 1, - "_last_update": "1328091392", + "doctype": "DocType", "show_in_menu": 0, "version": 1 }, @@ -49,6 +49,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Material User", "cancel": 1, "permlevel": 0 @@ -59,6 +60,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Sales User", "cancel": 1, "permlevel": 0 @@ -69,6 +71,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Material Master Manager", "cancel": 1, "permlevel": 0 @@ -79,6 +82,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Material Manager", "cancel": 1, "permlevel": 0 @@ -89,6 +93,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Sales Manager", "cancel": 1, "permlevel": 0 @@ -116,11 +121,11 @@ "colour": "White:FFF", "doctype": "DocField", "label": "Delivery Note", - "permlevel": 0, + "options": "Delivery Note", "fieldname": "delivery_note", "fieldtype": "Link", "reqd": 1, - "options": "Delivery Note" + "permlevel": 0 }, { "doctype": "DocField", @@ -133,11 +138,11 @@ "no_copy": 0, "doctype": "DocField", "label": "Series", - "permlevel": 0, + "options": "PS", "fieldname": "naming_series", "fieldtype": "Select", "reqd": 1, - "options": "PS" + "permlevel": 0 }, { "colour": "White:FFF", @@ -243,10 +248,10 @@ "colour": "White:FFF", "doctype": "DocField", "label": "Gross Weight UOM", - "permlevel": 0, + "options": "UOM", "fieldname": "gross_weight_uom", "fieldtype": "Link", - "options": "UOM" + "permlevel": 0 }, { "colour": "White:FFF", @@ -261,10 +266,10 @@ "no_copy": 1, "doctype": "DocField", "label": "Amended From", - "permlevel": 1, + "options": "Packing Slip", "fieldname": "amended_from", "fieldtype": "Link", - "options": "Packing Slip" + "permlevel": 1 }, { "print_hide": 1, diff --git a/stock/doctype/purchase_receipt/purchase_receipt.txt b/stock/doctype/purchase_receipt/purchase_receipt.txt index 81bc70c89f0..4d5f2e97fa7 100755 --- a/stock/doctype/purchase_receipt/purchase_receipt.txt +++ b/stock/doctype/purchase_receipt/purchase_receipt.txt @@ -7,14 +7,14 @@ "modified": "2013-01-18 13:25:36" }, { - "autoname": "naming_series:", - "allow_attach": 1, + "document_type": "Transaction", "is_submittable": 1, - "search_fields": "status, posting_date, supplier", + "allow_attach": 1, + "autoname": "naming_series:", "module": "Stock", "doctype": "DocType", "read_only_onload": 1, - "document_type": "Transaction", + "search_fields": "status, posting_date, supplier", "name": "__common__" }, { @@ -53,11 +53,11 @@ "doctype": "DocField", "label": "Series", "oldfieldname": "naming_series", - "permlevel": 0, + "options": "\nGRN", "fieldname": "naming_series", "fieldtype": "Select", "reqd": 1, - "options": "\nGRN" + "permlevel": 0 }, { "print_hide": 1, @@ -140,8 +140,8 @@ "fieldtype": "Date", "search_index": 1, "reqd": 1, - "in_filter": 1, - "permlevel": 0 + "permlevel": 0, + "in_filter": 1 }, { "print_hide": 1, @@ -157,8 +157,8 @@ "fieldtype": "Time", "search_index": 0, "reqd": 1, - "in_filter": 0, - "permlevel": 0 + "permlevel": 0, + "in_filter": 0 }, { "print_hide": 0, @@ -205,11 +205,11 @@ "doctype": "DocField", "label": "Purchase Receipt Items", "oldfieldname": "purchase_receipt_details", - "options": "Purchase Receipt Item", + "permlevel": 0, "fieldname": "purchase_receipt_details", "fieldtype": "Table", "reqd": 0, - "permlevel": 0 + "options": "Purchase Receipt Item" }, { "oldfieldtype": "Section Break", @@ -224,10 +224,10 @@ "oldfieldtype": "Button", "doctype": "DocField", "label": "Get Current Stock", - "options": "get_current_stock", + "permlevel": 0, "fieldname": "get_current_stock", "fieldtype": "Button", - "permlevel": 0 + "options": "get_current_stock" }, { "doctype": "DocField", @@ -257,20 +257,20 @@ "doctype": "DocField", "label": "Purchase Order", "oldfieldname": "purchase_order_no", - "options": "Purchase Order", + "permlevel": 0, "fieldname": "purchase_order_no", "fieldtype": "Link", - "permlevel": 0 + "options": "Purchase Order" }, { "print_hide": 1, "oldfieldtype": "Button", "doctype": "DocField", "label": "Pull Purchase Order Details", - "options": "get_po_details", + "permlevel": 0, "fieldname": "pull_purchase_order_details", "fieldtype": "Button", - "permlevel": 0 + "options": "get_po_details" }, { "doctype": "DocField", @@ -286,11 +286,11 @@ "doctype": "DocField", "label": "Currency", "oldfieldname": "currency", - "options": "link:Currency", + "permlevel": 0, "fieldname": "currency", "fieldtype": "Select", "reqd": 1, - "permlevel": 0 + "options": "link:Currency" }, { "print_hide": 1, @@ -319,21 +319,21 @@ "description": "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)", "doctype": "DocField", "label": "Price List", - "options": "Price List", + "permlevel": 0, "fieldname": "price_list_name", "fieldtype": "Link", - "permlevel": 0 + "options": "Price List" }, { "print_hide": 1, "depends_on": "price_list_name", "doctype": "DocField", "label": "Price List Currency", - "options": "Currency", + "permlevel": 0, "fieldname": "price_list_currency", "fieldtype": "Link", "hidden": 0, - "permlevel": 0 + "options": "Currency" }, { "print_hide": 1, @@ -360,30 +360,30 @@ "doctype": "DocField", "label": "Purchase Taxes and Charges", "oldfieldname": "purchase_other_charges", - "options": "Purchase Taxes and Charges Master", + "permlevel": 0, "fieldname": "purchase_other_charges", "fieldtype": "Link", - "permlevel": 0 + "options": "Purchase Taxes and Charges Master" }, { "print_hide": 1, "oldfieldtype": "Button", "doctype": "DocField", "label": "Get Tax Detail", - "options": "get_purchase_tax_details", + "permlevel": 0, "fieldname": "get_tax_detail", "fieldtype": "Button", - "permlevel": 0 + "options": "get_purchase_tax_details" }, { "oldfieldtype": "Table", "doctype": "DocField", "label": "Purchase Taxes and Charges", "oldfieldname": "purchase_tax_details", - "options": "Purchase Taxes and Charges", + "permlevel": 0, "fieldname": "purchase_tax_details", "fieldtype": "Table", - "permlevel": 0 + "options": "Purchase Taxes and Charges" }, { "print_hide": 1, @@ -559,29 +559,29 @@ "doctype": "DocField", "label": "Select Terms and Conditions", "oldfieldname": "tc_name", - "options": "Terms and Conditions", + "permlevel": 0, "fieldname": "tc_name", "fieldtype": "Link", - "permlevel": 0 + "options": "Terms and Conditions" }, { "oldfieldtype": "Button", "doctype": "DocField", "label": "Get Terms and Conditions", - "options": "get_tc_details", + "permlevel": 0, "fieldname": "get_terms", "fieldtype": "Button", - "permlevel": 0 + "options": "get_tc_details" }, { "print_hide": 1, "oldfieldtype": "HTML", "doctype": "DocField", "label": "Terms and Conditions HTML", - "options": "You can add Terms and Notes that will be printed in the Transaction", + "permlevel": 0, "fieldname": "terms_html", "fieldtype": "HTML", - "permlevel": 0 + "options": "You can add Terms and Notes that will be printed in the Transaction" }, { "oldfieldtype": "Text Editor", @@ -603,10 +603,10 @@ "print_hide": 1, "doctype": "DocField", "label": "Supplier Address", - "options": "Address", + "permlevel": 0, "fieldname": "supplier_address", "fieldtype": "Link", - "permlevel": 0 + "options": "Address" }, { "doctype": "DocField", @@ -618,10 +618,10 @@ "print_hide": 1, "doctype": "DocField", "label": "Contact Person", - "options": "Contact", + "permlevel": 0, "fieldname": "contact_person", "fieldtype": "Link", - "permlevel": 0 + "options": "Contact" }, { "description": "Filing in Additional Information about the Purchase Receipt will help you analyze your data better.", @@ -670,10 +670,10 @@ "doctype": "DocField", "label": "Is Subcontracted", "oldfieldname": "is_subcontracted", - "options": "\nYes\nNo", + "permlevel": 0, "fieldname": "is_subcontracted", "fieldtype": "Select", - "permlevel": 0 + "options": "\nYes\nNo" }, { "print_hide": 1, @@ -731,10 +731,10 @@ "doctype": "DocField", "label": "Select Print Heading", "oldfieldname": "select_print_heading", - "permlevel": 0, + "options": "Print Heading", "fieldname": "select_print_heading", "fieldtype": "Link", - "options": "Print Heading", + "permlevel": 0, "report_hide": 1 }, { @@ -753,8 +753,8 @@ "search_index": 1, "reqd": 1, "hidden": 0, - "in_filter": 1, - "options": "Company" + "options": "Company", + "in_filter": 1 }, { "print_hide": 1, @@ -785,16 +785,16 @@ { "print_hide": 1, "print_width": "30%", - "permlevel": 0, "oldfieldtype": "HTML", "doctype": "DocField", "label": "Other Details", "width": "30%", + "options": "
Other Details
", "fieldname": "other_details", "fieldtype": "HTML", "reqd": 0, "hidden": 1, - "options": "
Other Details
" + "permlevel": 0 }, { "print_hide": 1, @@ -804,11 +804,11 @@ "doctype": "DocField", "label": "Rejected Warehouse", "oldfieldname": "rejected_warehouse", - "permlevel": 0, + "options": "Warehouse", "fieldname": "rejected_warehouse", "fieldtype": "Link", "reqd": 0, - "options": "Warehouse" + "permlevel": 0 }, { "print_hide": 1, @@ -924,10 +924,10 @@ "doctype": "DocField", "label": "Purchase Receipt Item Supplieds", "oldfieldname": "pr_raw_material_details", - "options": "Purchase Receipt Item Supplied", + "permlevel": 1, "fieldname": "pr_raw_material_details", "fieldtype": "Table", - "permlevel": 1 + "options": "Purchase Receipt Item Supplied" }, { "print_hide": 1, @@ -945,26 +945,28 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Purchase User", "cancel": 1, "permlevel": 0 }, { - "doctype": "DocPerm", "role": "Purchase User", - "permlevel": 1 + "permlevel": 1, + "doctype": "DocPerm" }, { "doctype": "DocPerm", "role": "Supplier", + "report": 1, "permlevel": 0, "match": "supplier" }, { - "doctype": "DocPerm", "write": 1, "role": "All", - "permlevel": 2 + "permlevel": 2, + "doctype": "DocPerm" }, { "amend": 0, @@ -982,6 +984,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Material Manager", "cancel": 1, "permlevel": 0 @@ -1002,6 +1005,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Material User", "cancel": 1, "permlevel": 0 diff --git a/stock/doctype/sales_bom/sales_bom.txt b/stock/doctype/sales_bom/sales_bom.txt index 29a70b8ef34..d7b62256c30 100644 --- a/stock/doctype/sales_bom/sales_bom.txt +++ b/stock/doctype/sales_bom/sales_bom.txt @@ -8,16 +8,16 @@ }, { "section_style": "Simple", - "description": "Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. \n\nThe package **Item** will have \"Is Stock Item\" as \"No\" and \"Is Sales Item\" as \"Yes\".\n\nFor Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.\n\nNote: BOM = Bill of Materials", "is_submittable": 0, + "description": "Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. \n\nThe package **Item** will have \"Is Stock Item\" as \"No\" and \"Is Sales Item\" as \"Yes\".\n\nFor Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.\n\nNote: BOM = Bill of Materials", "module": "Stock", - "doctype": "DocType", - "allow_trash": 1, "server_code_error": " ", + "allow_trash": 1, "document_type": "Master", + "_last_update": "1322549701", "name": "__common__", "colour": "White:FFF", - "_last_update": "1322549701", + "doctype": "DocType", "show_in_menu": 0, "version": 1 }, @@ -33,8 +33,8 @@ "name": "__common__", "parent": "Sales BOM", "read": 1, - "doctype": "DocPerm", "submit": 0, + "doctype": "DocPerm", "amend": 0, "parenttype": "DocType", "parentfield": "permissions" @@ -55,6 +55,7 @@ "create": 1, "doctype": "DocPerm", "write": 1, + "report": 1, "role": "Material Manager", "cancel": 1, "permlevel": 0 @@ -71,6 +72,7 @@ "create": 0, "doctype": "DocPerm", "write": 0, + "report": 1, "role": "Material User", "cancel": 0, "permlevel": 0 @@ -79,6 +81,7 @@ "create": 1, "doctype": "DocPerm", "write": 1, + "report": 1, "role": "Sales User", "cancel": 1, "permlevel": 0 diff --git a/stock/doctype/serial_no/serial_no.txt b/stock/doctype/serial_no/serial_no.txt index 5a9f415dfee..5018f8209e7 100644 --- a/stock/doctype/serial_no/serial_no.txt +++ b/stock/doctype/serial_no/serial_no.txt @@ -7,15 +7,15 @@ "modified": "2012-12-03 11:39:34" }, { - "allow_attach": 1, - "search_fields": "item_code,status", - "module": "Stock", "document_type": "Master", "description": "Distinct unit of an Item", "autoname": "field:serial_no", - "name": "__common__", "allow_rename": 1, - "doctype": "DocType" + "name": "__common__", + "module": "Stock", + "doctype": "DocType", + "search_fields": "item_code,status", + "allow_attach": 1 }, { "name": "__common__", @@ -123,12 +123,12 @@ "doctype": "DocField", "label": "Item Group", "oldfieldname": "item_group", - "options": "Item Group", + "permlevel": 1, "fieldname": "item_group", "fieldtype": "Link", "search_index": 0, "reqd": 1, - "permlevel": 1, + "options": "Item Group", "in_filter": 0 }, { @@ -136,12 +136,12 @@ "doctype": "DocField", "label": "Brand", "oldfieldname": "brand", - "options": "Brand", + "permlevel": 1, "fieldname": "brand", "fieldtype": "Link", "search_index": 0, "reqd": 0, - "permlevel": 1, + "options": "Brand", "in_filter": 0 }, { @@ -162,10 +162,10 @@ "no_copy": 1, "doctype": "DocField", "label": "Purchase Document Type", - "options": "\nPurchase Receipt\nStock Entry", + "permlevel": 0, "fieldname": "purchase_document_type", "fieldtype": "Select", - "permlevel": 0 + "options": "\nPurchase Receipt\nStock Entry" }, { "no_copy": 1, @@ -226,22 +226,22 @@ "doctype": "DocField", "label": "Warehouse", "oldfieldname": "warehouse", - "permlevel": 0, + "options": "Warehouse", "fieldname": "warehouse", "fieldtype": "Link", "search_index": 1, "reqd": 0, - "options": "Warehouse", + "permlevel": 0, "in_filter": 1 }, { "no_copy": 1, "doctype": "DocField", "label": "Supplier", - "options": "Supplier", + "permlevel": 0, "fieldname": "supplier", "fieldtype": "Link", - "permlevel": 0, + "options": "Supplier", "in_filter": 1 }, { @@ -280,10 +280,10 @@ "no_copy": 1, "doctype": "DocField", "label": "Delivery Document Type", - "options": "\nDelivery Note\nSales Invoice\nStock Entry", + "permlevel": 1, "fieldname": "delivery_document_type", "fieldtype": "Select", - "permlevel": 1, + "options": "\nDelivery Note\nSales Invoice\nStock Entry", "in_filter": 1 }, { @@ -328,11 +328,11 @@ "doctype": "DocField", "label": "Is Cancelled", "oldfieldname": "is_cancelled", - "options": "\nYes\nNo", + "permlevel": 0, "fieldname": "is_cancelled", "fieldtype": "Select", "hidden": 1, - "permlevel": 0, + "options": "\nYes\nNo", "report_hide": 1 }, { @@ -385,10 +385,10 @@ "doctype": "DocField", "label": "Territory", "oldfieldname": "territory", - "permlevel": 1, + "options": "Territory", "fieldname": "territory", "fieldtype": "Link", - "options": "Territory", + "permlevel": 1, "report_hide": 0, "in_filter": 1 }, @@ -407,17 +407,17 @@ "permlevel": 0 }, { - "permlevel": 0, "no_copy": 0, "oldfieldtype": "Select", "doctype": "DocField", "label": "Maintenance Status", "oldfieldname": "maintenance_status", "width": "150px", + "options": "\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC", "fieldname": "maintenance_status", "fieldtype": "Select", "search_index": 1, - "options": "\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC", + "permlevel": 0, "in_filter": 1 }, { @@ -480,22 +480,22 @@ "search_index": 1, "doctype": "DocField", "label": "Company", - "options": "link:Company", + "permlevel": 0, "fieldname": "company", "fieldtype": "Select", "reqd": 1, - "permlevel": 0, + "options": "link:Company", "in_filter": 1 }, { "search_index": 1, "doctype": "DocField", "label": "Fiscal Year", - "options": "link:Fiscal Year", + "permlevel": 0, "fieldname": "fiscal_year", "fieldtype": "Select", "reqd": 1, - "permlevel": 0, + "options": "link:Fiscal Year", "in_filter": 1 }, { @@ -544,6 +544,7 @@ "doctype": "DocPerm", "submit": 0, "write": 0, + "report": 1, "role": "Material Manager", "cancel": 0, "permlevel": 0 @@ -564,6 +565,7 @@ "doctype": "DocPerm", "submit": 0, "write": 0, + "report": 1, "role": "Material User", "cancel": 0, "permlevel": 0 @@ -572,26 +574,28 @@ "create": 1, "doctype": "DocPerm", "write": 1, - "role": "System Manager", "cancel": 1, + "role": "System Manager", + "report": 1, "permlevel": 0 }, { "create": 1, "doctype": "DocPerm", "write": 1, - "role": "Material Master Manager", "cancel": 1, + "role": "Material Master Manager", + "report": 1, "permlevel": 0 }, { - "doctype": "DocPerm", "role": "System Manager", - "permlevel": 1 + "permlevel": 1, + "doctype": "DocPerm" }, { - "doctype": "DocPerm", "role": "Sales Master Manager", - "permlevel": 1 + "permlevel": 1, + "doctype": "DocPerm" } ] \ No newline at end of file diff --git a/stock/doctype/stock_entry/stock_entry.txt b/stock/doctype/stock_entry/stock_entry.txt index 76a8d42da49..be6eb88f1d9 100644 --- a/stock/doctype/stock_entry/stock_entry.txt +++ b/stock/doctype/stock_entry/stock_entry.txt @@ -7,20 +7,20 @@ "modified": "2013-01-11 11:54:51" }, { - "in_create": 0, "is_submittable": 1, + "in_create": 0, "allow_print": 0, "search_fields": "transfer_date, from_warehouse, to_warehouse, purpose, remarks", "module": "Stock", - "doctype": "DocType", + "autoname": "naming_series:", "read_only_onload": 0, + "doctype": "DocType", "in_dialog": 0, - "issingle": 0, "allow_attach": 0, "read_only": 0, "allow_email": 0, "hide_heading": 0, - "autoname": "naming_series:", + "issingle": 0, "name": "__common__", "allow_rename": 0, "max_attachments": 0, @@ -70,9 +70,9 @@ "search_index": 0, "reqd": 1, "hidden": 0, - "in_filter": 0, "options": "\nSTE", - "report_hide": 0 + "report_hide": 0, + "in_filter": 0 }, { "print_hide": 0, @@ -105,21 +105,21 @@ { "print_hide": 1, "description": "The date at which current entry will get or has actually executed.", - "default": "Today", + "no_copy": 1, "oldfieldtype": "Date", "allow_on_submit": 0, "doctype": "DocField", "label": "Posting Date", "oldfieldname": "posting_date", - "no_copy": 1, + "default": "Today", "fieldname": "posting_date", "fieldtype": "Date", "search_index": 1, "reqd": 1, "hidden": 0, - "in_filter": 1, "permlevel": 0, - "report_hide": 0 + "report_hide": 0, + "in_filter": 1 }, { "print_hide": 1, @@ -190,10 +190,10 @@ }, { "doctype": "DocField", - "options": "Simple", + "permlevel": 0, "fieldname": "sb0", "fieldtype": "Section Break", - "permlevel": 0 + "options": "Simple" }, { "print_hide": 0, @@ -219,10 +219,10 @@ "oldfieldtype": "Button", "doctype": "DocField", "label": "Get Stock and Rate", - "options": "get_stock_and_rate", + "permlevel": 0, "fieldname": "get_stock_and_rate", "fieldtype": "Button", - "permlevel": 0 + "options": "get_stock_and_rate" }, { "doctype": "DocField", @@ -233,17 +233,17 @@ }, { "print_hide": 1, - "depends_on": "eval:inList([\"Material Transfer\", \"Manufacture/Repack\"], doc.purpose)", + "doctype": "DocField", "no_copy": 0, "search_index": 1, "allow_on_submit": 0, - "doctype": "DocField", + "oldfieldtype": "Link", "label": "Production Order", "oldfieldname": "production_order", "permlevel": 0, "fieldname": "production_order", "fieldtype": "Link", - "oldfieldtype": "Link", + "depends_on": "eval:inList([\"Material Transfer\", \"Manufacture/Repack\"], doc.purpose)", "reqd": 0, "hidden": 1, "options": "Production Order", @@ -254,43 +254,43 @@ "depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)", "doctype": "DocField", "label": "BOM No", - "options": "BOM", + "permlevel": 0, "fieldname": "bom_no", "fieldtype": "Link", - "permlevel": 0 + "options": "BOM" }, { "print_hide": 1, - "depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)", + "doctype": "DocField", "description": "As per Stock UOM", "no_copy": 0, "search_index": 0, "allow_on_submit": 0, - "doctype": "DocField", + "oldfieldtype": "Currency", "label": "Manufacturing Quantity", "oldfieldname": "fg_completed_qty", "fieldname": "fg_completed_qty", "fieldtype": "Currency", - "oldfieldtype": "Currency", + "depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)", "reqd": 0, "hidden": 0, - "in_filter": 0, "permlevel": 0, - "report_hide": 0 + "report_hide": 0, + "in_filter": 0 }, { "print_hide": 1, - "depends_on": "eval:doc.purpose==\"Sales Return\"", + "doctype": "DocField", "no_copy": 1, "search_index": 1, "allow_on_submit": 0, - "doctype": "DocField", + "oldfieldtype": "Link", "label": "Delivery Note No", "oldfieldname": "delivery_note_no", "permlevel": 0, "fieldname": "delivery_note_no", "fieldtype": "Link", - "oldfieldtype": "Link", + "depends_on": "eval:doc.purpose==\"Sales Return\"", "reqd": 0, "hidden": 1, "options": "Delivery Note", @@ -299,17 +299,17 @@ }, { "print_hide": 1, - "depends_on": "eval:doc.purpose==\"Purchase Return\"", + "doctype": "DocField", "no_copy": 1, "search_index": 1, "allow_on_submit": 0, - "doctype": "DocField", + "oldfieldtype": "Link", "label": "Purchase Receipt No", "oldfieldname": "purchase_receipt_no", "permlevel": 0, "fieldname": "purchase_receipt_no", "fieldtype": "Link", - "oldfieldtype": "Link", + "depends_on": "eval:doc.purpose==\"Purchase Return\"", "reqd": 0, "hidden": 1, "options": "Purchase Receipt", @@ -334,15 +334,15 @@ }, { "print_hide": 1, - "depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)", + "doctype": "DocField", "no_copy": 0, "search_index": 0, "allow_on_submit": 0, - "doctype": "DocField", + "oldfieldtype": "Button", "label": "Get Items", "fieldname": "get_items", "fieldtype": "Button", - "oldfieldtype": "Button", + "depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)", "reqd": 0, "hidden": 0, "permlevel": 0, @@ -355,11 +355,11 @@ "depends_on": "eval:doc.purpose==\"Sales Return\"", "doctype": "DocField", "label": "Sales Invoice No", - "options": "Sales Invoice", + "permlevel": 0, "fieldname": "sales_invoice_no", "fieldtype": "Link", "hidden": 1, - "permlevel": 0 + "options": "Sales Invoice" }, { "depends_on": "eval:(doc.purpose==\"Sales Return\" || doc.purpose==\"Purchase Return\")", @@ -371,17 +371,17 @@ }, { "print_hide": 1, - "depends_on": "eval:doc.purpose==\"Purchase Return\"", + "doctype": "DocField", "no_copy": 1, "search_index": 0, "allow_on_submit": 0, - "doctype": "DocField", + "oldfieldtype": "Link", "label": "Supplier", "oldfieldname": "supplier", "permlevel": 0, "fieldname": "supplier", "fieldtype": "Link", - "oldfieldtype": "Link", + "depends_on": "eval:doc.purpose==\"Purchase Return\"", "reqd": 0, "hidden": 0, "options": "Supplier", @@ -390,16 +390,16 @@ }, { "print_hide": 0, - "depends_on": "eval:doc.purpose==\"Purchase Return\"", + "doctype": "DocField", "no_copy": 1, "search_index": 0, "allow_on_submit": 0, - "doctype": "DocField", + "oldfieldtype": "Data", "label": "Supplier Name", "oldfieldname": "supplier_name", "fieldname": "supplier_name", "fieldtype": "Data", - "oldfieldtype": "Data", + "depends_on": "eval:doc.purpose==\"Purchase Return\"", "reqd": 0, "hidden": 0, "permlevel": 1, @@ -408,16 +408,16 @@ }, { "print_hide": 0, - "depends_on": "eval:doc.purpose==\"Purchase Return\"", + "doctype": "DocField", "no_copy": 1, "search_index": 0, "allow_on_submit": 0, - "doctype": "DocField", + "oldfieldtype": "Small Text", "label": "Supplier Address", "oldfieldname": "supplier_address", "fieldname": "supplier_address", "fieldtype": "Small Text", - "oldfieldtype": "Small Text", + "depends_on": "eval:doc.purpose==\"Purchase Return\"", "reqd": 0, "hidden": 0, "permlevel": 0, @@ -426,17 +426,17 @@ }, { "print_hide": 1, - "depends_on": "eval:doc.purpose==\"Sales Return\"", + "doctype": "DocField", "no_copy": 1, "search_index": 0, "allow_on_submit": 0, - "doctype": "DocField", + "oldfieldtype": "Link", "label": "Customer", "oldfieldname": "customer", "permlevel": 0, "fieldname": "customer", "fieldtype": "Link", - "oldfieldtype": "Link", + "depends_on": "eval:doc.purpose==\"Sales Return\"", "reqd": 0, "hidden": 0, "options": "Customer", @@ -445,16 +445,16 @@ }, { "print_hide": 0, - "depends_on": "eval:doc.purpose==\"Sales Return\"", + "doctype": "DocField", "no_copy": 1, "search_index": 0, "allow_on_submit": 0, - "doctype": "DocField", + "oldfieldtype": "Data", "label": "Customer Name", "oldfieldname": "customer_name", "fieldname": "customer_name", "fieldtype": "Data", - "oldfieldtype": "Data", + "depends_on": "eval:doc.purpose==\"Sales Return\"", "reqd": 0, "hidden": 0, "permlevel": 1, @@ -463,16 +463,16 @@ }, { "print_hide": 0, - "depends_on": "eval:doc.purpose==\"Sales Return\"", + "doctype": "DocField", "no_copy": 1, "search_index": 0, "allow_on_submit": 0, - "doctype": "DocField", + "oldfieldtype": "Small Text", "label": "Customer Address", "oldfieldname": "customer_address", "fieldname": "customer_address", "fieldtype": "Small Text", - "oldfieldtype": "Small Text", + "depends_on": "eval:doc.purpose==\"Sales Return\"", "reqd": 0, "hidden": 0, "permlevel": 0, @@ -500,10 +500,10 @@ "doctype": "DocField", "label": "Project Name", "oldfieldname": "project_name", - "options": "Project", + "permlevel": 0, "fieldname": "project_name", "fieldtype": "Link", - "permlevel": 0, + "options": "Project", "in_filter": 1 }, { @@ -591,6 +591,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Material User", "cancel": 1, "permlevel": 0 @@ -631,6 +632,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Manufacturing User", "cancel": 1, "permlevel": 0 @@ -650,6 +652,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Manufacturing Manager", "cancel": 1, "permlevel": 0 @@ -679,6 +682,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Material Manager", "cancel": 1, "permlevel": 0 diff --git a/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt b/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt index 988ad33784d..f56f63a25db 100644 --- a/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt +++ b/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt @@ -32,6 +32,7 @@ "parent": "Stock Ledger Entry", "read": 1, "doctype": "DocPerm", + "report": 1, "parenttype": "DocType", "permlevel": 0, "parentfield": "permissions" @@ -271,8 +272,8 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "cancel": 0, - "role": "Sales User" + "role": "Sales User", + "cancel": 0 }, { "amend": 0, @@ -280,8 +281,8 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "cancel": 0, - "role": "Material User" + "role": "Material User", + "cancel": 0 }, { "role": "Accounts Manager", diff --git a/stock/doctype/warehouse/warehouse.txt b/stock/doctype/warehouse/warehouse.txt index 21afd03029c..294c2d3ea68 100644 --- a/stock/doctype/warehouse/warehouse.txt +++ b/stock/doctype/warehouse/warehouse.txt @@ -7,13 +7,13 @@ "modified": "2012-12-03 11:24:31" }, { - "autoname": "field:warehouse_name", + "document_type": "Master", "description": "A logical Warehouse against which stock entries are made.", + "autoname": "field:warehouse_name", "allow_rename": 1, - "search_fields": "warehouse_type", "module": "Stock", "doctype": "DocType", - "document_type": "Master", + "search_fields": "warehouse_type", "name": "__common__" }, { @@ -59,11 +59,11 @@ "doctype": "DocField", "label": "Warehouse Type", "oldfieldname": "warehouse_type", - "options": "Warehouse Type", + "permlevel": 0, "fieldname": "warehouse_type", "fieldtype": "Link", "reqd": 1, - "permlevel": 0 + "options": "Warehouse Type" }, { "oldfieldtype": "Link", @@ -71,11 +71,11 @@ "doctype": "DocField", "label": "Company", "oldfieldname": "company", - "options": "Company", + "permlevel": 0, "fieldname": "company", "fieldtype": "Link", "search_index": 1, - "permlevel": 0, + "options": "Company", "in_filter": 1 }, { @@ -103,20 +103,20 @@ "doctype": "DocField", "label": "Phone No", "oldfieldname": "phone_no", - "options": "Phone", + "permlevel": 0, "fieldname": "phone_no", "fieldtype": "Data", - "permlevel": 0 + "options": "Phone" }, { "oldfieldtype": "Int", "doctype": "DocField", "label": "Mobile No", "oldfieldname": "mobile_no", - "options": "Phone", + "permlevel": 0, "fieldname": "mobile_no", "fieldtype": "Data", - "permlevel": 0 + "options": "Phone" }, { "oldfieldtype": "Column Break", @@ -159,10 +159,10 @@ "doctype": "DocField", "label": "State", "oldfieldname": "state", - "options": "Suggest", + "permlevel": 0, "fieldname": "state", "fieldtype": "Data", - "permlevel": 0 + "options": "Suggest" }, { "oldfieldtype": "Int", @@ -184,10 +184,10 @@ }, { "doctype": "DocField", - "label": "Merge With", "options": "Warehouse", "fieldname": "merge_with", "fieldtype": "Link", + "label": "Merge With", "permlevel": 2 }, { @@ -203,8 +203,8 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "cancel": 0, "role": "Material User", + "cancel": 0, "permlevel": 2 }, { @@ -213,8 +213,9 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "cancel": 0, + "report": 1, "role": "Material User", + "cancel": 0, "permlevel": 0 }, { @@ -223,8 +224,8 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "cancel": 0, "role": "Material User", + "cancel": 0, "permlevel": 1 }, { @@ -233,8 +234,8 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "cancel": 0, "role": "Material Manager", + "cancel": 0, "permlevel": 2 }, { @@ -243,8 +244,9 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "cancel": 0, + "report": 1, "role": "Material Manager", + "cancel": 0, "permlevel": 0 }, { @@ -253,14 +255,14 @@ "doctype": "DocPerm", "submit": 0, "write": 0, - "cancel": 0, "role": "Material Manager", + "cancel": 0, "permlevel": 1 }, { - "doctype": "DocPerm", "role": "All", - "permlevel": 1 + "permlevel": 1, + "doctype": "DocPerm" }, { "amend": 0, @@ -268,21 +270,23 @@ "doctype": "DocPerm", "submit": 0, "write": 1, - "cancel": 1, + "report": 1, "role": "Material Master Manager", + "cancel": 1, "permlevel": 0 }, { - "doctype": "DocPerm", "role": "Material Master Manager", - "permlevel": 1 + "permlevel": 1, + "doctype": "DocPerm" }, { "create": 1, "doctype": "DocPerm", "write": 1, - "role": "System Manager", "cancel": 1, + "role": "System Manager", + "report": 1, "permlevel": 0 }, { diff --git a/support/doctype/maintenance_schedule/maintenance_schedule.txt b/support/doctype/maintenance_schedule/maintenance_schedule.txt index 9af7d2c0696..a97c9077a85 100644 --- a/support/doctype/maintenance_schedule/maintenance_schedule.txt +++ b/support/doctype/maintenance_schedule/maintenance_schedule.txt @@ -11,12 +11,12 @@ "is_submittable": 1, "search_fields": "status,customer,customer_name, sales_order_no", "module": "Support", - "doctype": "DocType", "server_code_error": " ", "autoname": "MS.#####", + "_last_update": "1322549701", "name": "__common__", "colour": "White:FFF", - "_last_update": "1322549701", + "doctype": "DocType", "show_in_menu": 0, "version": 156 }, @@ -45,6 +45,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "System Manager", "cancel": 1, "permlevel": 0 @@ -60,6 +61,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Maintenance Manager", "cancel": 1, "permlevel": 0 @@ -73,10 +75,10 @@ "oldfieldtype": "Section Break", "doctype": "DocField", "label": "Customer Details", - "permlevel": 0, + "options": "Simple", "fieldname": "customer_details", "fieldtype": "Section Break", - "options": "Simple" + "permlevel": 0 }, { "oldfieldtype": "Column Break", @@ -104,19 +106,19 @@ "print_hide": 1, "doctype": "DocField", "label": "Customer Address", - "options": "Address", + "permlevel": 0, "fieldname": "customer_address", "fieldtype": "Link", - "permlevel": 0 + "options": "Address" }, { "print_hide": 1, "doctype": "DocField", "label": "Contact Person", - "options": "Contact", + "permlevel": 0, "fieldname": "contact_person", "fieldtype": "Link", - "permlevel": 0 + "options": "Contact" }, { "search_index": 0, @@ -224,12 +226,12 @@ "doctype": "DocField", "label": "Company", "oldfieldname": "company", - "options": "Company", + "permlevel": 0, "fieldname": "company", "fieldtype": "Link", "oldfieldtype": "Link", "reqd": 1, - "permlevel": 0, + "options": "Company", "in_filter": 1 }, { @@ -237,31 +239,31 @@ "doctype": "DocField", "label": "Territory", "oldfieldname": "territory", - "options": "Territory", + "permlevel": 0, "fieldname": "territory", "fieldtype": "Link", "oldfieldtype": "Link", "reqd": 1, - "permlevel": 0, + "options": "Territory", "in_filter": 1 }, { "doctype": "DocField", "label": "Customer Group", - "options": "Customer Group", + "permlevel": 0, "fieldname": "customer_group", "fieldtype": "Link", "reqd": 1, - "permlevel": 0 + "options": "Customer Group" }, { "oldfieldtype": "Section Break", "doctype": "DocField", "label": "Items", - "permlevel": 0, + "options": "Simple", "fieldname": "items", "fieldtype": "Section Break", - "options": "Simple" + "permlevel": 0 }, { "search_index": 1, @@ -269,22 +271,22 @@ "doctype": "DocField", "label": "Sales Order No", "oldfieldname": "sales_order_no", + "permlevel": 0, "trigger": "Client", "fieldname": "sales_order_no", "fieldtype": "Link", "oldfieldtype": "Link", "options": "Sales Order", - "permlevel": 0, "in_filter": 1 }, { "oldfieldtype": "Button", "doctype": "DocField", "label": "Get Items", - "permlevel": 0, + "options": "pull_sales_order_detail", "fieldname": "get_items", "fieldtype": "Button", - "options": "pull_sales_order_detail", + "permlevel": 0, "report_hide": 1 }, { @@ -292,19 +294,19 @@ "doctype": "DocField", "label": "Maintenance Schedule Item", "oldfieldname": "item_maintenance_detail", - "permlevel": 0, + "options": "Maintenance Schedule Item", "fieldname": "item_maintenance_detail", "fieldtype": "Table", - "options": "Maintenance Schedule Item" + "permlevel": 0 }, { "oldfieldtype": "Section Break", "doctype": "DocField", "label": "Schedule", - "permlevel": 0, + "options": "Simple", "fieldname": "schedule", "fieldtype": "Section Break", - "options": "Simple" + "permlevel": 0 }, { "oldfieldtype": "Button", @@ -321,9 +323,9 @@ "doctype": "DocField", "label": "Maintenance Schedule Detail", "oldfieldname": "maintenance_schedule_detail", - "permlevel": 1, + "options": "Maintenance Schedule Detail", "fieldname": "maintenance_schedule_detail", "fieldtype": "Table", - "options": "Maintenance Schedule Detail" + "permlevel": 1 } ] \ No newline at end of file diff --git a/support/doctype/maintenance_visit/maintenance_visit.txt b/support/doctype/maintenance_visit/maintenance_visit.txt index 2e58e174657..fbbfdd71b53 100644 --- a/support/doctype/maintenance_visit/maintenance_visit.txt +++ b/support/doctype/maintenance_visit/maintenance_visit.txt @@ -8,17 +8,17 @@ }, { "section_style": "Simple", - "tag_fields": "completion_status,maintenance_type", "is_submittable": 1, + "tag_fields": "completion_status,maintenance_type", "search_fields": "status,maintenance_type,customer,customer_name, address,mntc_date,company,fiscal_year", "module": "Support", - "doctype": "DocType", "server_code_error": " ", - "subject": "To %(customer_name)s on %(mntc_date)s", "autoname": "MV.#####", + "subject": "To %(customer_name)s on %(mntc_date)s", + "_last_update": "1322549701", "name": "__common__", "colour": "White:FFF", - "_last_update": "1322549701", + "doctype": "DocType", "show_in_menu": 0, "version": 1 }, @@ -47,6 +47,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "System Manager", "cancel": 1, "permlevel": 0 @@ -62,6 +63,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Maintenance Manager", "cancel": 1, "permlevel": 0 @@ -77,6 +79,7 @@ "doctype": "DocPerm", "submit": 1, "write": 1, + "report": 1, "role": "Maintenance User", "cancel": 1, "permlevel": 0 @@ -90,10 +93,10 @@ "oldfieldtype": "Section Break", "doctype": "DocField", "label": "Customer Details", - "permlevel": 0, + "options": "Simple", "fieldname": "customer_details", "fieldtype": "Section Break", - "options": "Simple" + "permlevel": 0 }, { "oldfieldtype": "Column Break", @@ -191,21 +194,21 @@ "oldfieldtype": "Section Break", "doctype": "DocField", "label": "Maintenance Details", - "permlevel": 0, + "options": "Simple", "fieldname": "maintenance_details", "fieldtype": "Section Break", - "options": "Simple" + "permlevel": 0 }, { "oldfieldtype": "Select", "doctype": "DocField", "label": "Completion Status", "oldfieldname": "completion_status", - "permlevel": 0, + "options": "\nPartially Completed\nFully Completed", "fieldname": "completion_status", "fieldtype": "Select", "reqd": 1, - "options": "\nPartially Completed\nFully Completed" + "permlevel": 0 }, { "default": "Unscheduled", @@ -236,12 +239,12 @@ "doctype": "DocField", "label": "Sales Order No", "oldfieldname": "sales_order_no", + "permlevel": 0, "trigger": "Client", "fieldname": "sales_order_no", "fieldtype": "Link", "oldfieldtype": "Link", "options": "Sales Order", - "permlevel": 0, "in_filter": 1 }, { @@ -250,12 +253,12 @@ "doctype": "DocField", "label": "Customer Issue No", "oldfieldname": "customer_issue_no", + "permlevel": 0, "trigger": "Client", "fieldname": "customer_issue_no", "fieldtype": "Link", "oldfieldtype": "Link", "options": "Customer Issue", - "permlevel": 0, "in_filter": 1 }, { @@ -272,10 +275,10 @@ "oldfieldtype": "Button", "doctype": "DocField", "label": "Get Items", - "permlevel": 0, + "options": "fetch_items", "fieldname": "get_items", "fieldtype": "Button", - "options": "fetch_items", + "permlevel": 0, "report_hide": 1 }, { @@ -291,10 +294,10 @@ "doctype": "DocField", "label": "Maintenance Visit Purpose", "oldfieldname": "maintenance_visit_details", - "permlevel": 0, + "options": "Maintenance Visit Purpose", "fieldname": "maintenance_visit_details", "fieldtype": "Table", - "options": "Maintenance Visit Purpose" + "permlevel": 0 }, { "oldfieldtype": "Section Break", @@ -320,6 +323,7 @@ "permlevel": 0 }, { + "permlevel": 1, "default": "Draft", "oldfieldtype": "Data", "colour": "White:FFF", @@ -327,11 +331,10 @@ "label": "Status", "oldfieldname": "status", "no_copy": 1, - "options": "\nDraft\nCancelled\nSubmitted", "fieldname": "status", "fieldtype": "Data", "reqd": 1, - "permlevel": 1 + "options": "\nDraft\nCancelled\nSubmitted" }, { "print_hide": 1, @@ -363,12 +366,12 @@ "doctype": "DocField", "label": "Company", "oldfieldname": "company", - "options": "link:Company", + "permlevel": 0, "fieldname": "company", "fieldtype": "Select", "search_index": 0, "reqd": 1, - "permlevel": 0, + "options": "link:Company", "in_filter": 1 }, { @@ -377,12 +380,12 @@ "doctype": "DocField", "label": "Fiscal Year", "oldfieldname": "fiscal_year", - "options": "link:Fiscal Year", + "permlevel": 0, "fieldname": "fiscal_year", "fieldtype": "Select", "search_index": 0, "reqd": 1, - "permlevel": 0, + "options": "link:Fiscal Year", "in_filter": 1 }, { @@ -396,19 +399,19 @@ "print_hide": 1, "doctype": "DocField", "label": "Customer Address", - "options": "Address", + "permlevel": 0, "fieldname": "customer_address", "fieldtype": "Link", - "permlevel": 0 + "options": "Address" }, { "print_hide": 1, "doctype": "DocField", "label": "Contact Person", - "options": "Contact", + "permlevel": 0, "fieldname": "contact_person", "fieldtype": "Link", - "permlevel": 0 + "options": "Contact" }, { "doctype": "DocField", @@ -420,18 +423,18 @@ "print_hide": 1, "doctype": "DocField", "label": "Territory", - "options": "Territory", + "permlevel": 0, "fieldname": "territory", "fieldtype": "Link", - "permlevel": 0 + "options": "Territory" }, { "print_hide": 1, "doctype": "DocField", "label": "Customer Group", - "options": "Customer Group", + "permlevel": 0, "fieldname": "customer_group", "fieldtype": "Link", - "permlevel": 0 + "options": "Customer Group" } ] \ No newline at end of file diff --git a/support/doctype/newsletter/newsletter.txt b/support/doctype/newsletter/newsletter.txt index 04701e86e5f..020c0315b6d 100644 --- a/support/doctype/newsletter/newsletter.txt +++ b/support/doctype/newsletter/newsletter.txt @@ -7,10 +7,10 @@ "modified": "2013-01-02 13:47:36" }, { - "autoname": "naming_series:", "description": "Create and Send Newsletters", - "doctype": "DocType", + "autoname": "naming_series:", "module": "Support", + "doctype": "DocType", "document_type": "Other", "name": "__common__" }, @@ -45,11 +45,11 @@ "default": "NL-", "doctype": "DocField", "label": "Naming Series", - "options": "NL-", + "permlevel": 0, "fieldname": "naming_series", "fieldtype": "Select", "reqd": 1, - "permlevel": 0 + "options": "NL-" }, { "doctype": "DocField", @@ -150,10 +150,10 @@ }, { "doctype": "DocField", - "label": "Test", "options": "test_send", "fieldname": "test_send", "fieldtype": "Button", + "label": "Test", "permlevel": 0 }, { @@ -175,26 +175,28 @@ "create": 1, "doctype": "DocPerm", "write": 1, - "role": "Sales Manager", "cancel": 1, + "role": "Sales Manager", + "report": 1, "permlevel": 0 }, { "create": 1, "doctype": "DocPerm", "write": 1, - "role": "Support Manager", "cancel": 1, + "role": "Support Manager", + "report": 1, "permlevel": 0 }, { - "doctype": "DocPerm", "role": "Sales Manager", - "permlevel": 1 + "permlevel": 1, + "doctype": "DocPerm" }, { - "doctype": "DocPerm", "role": "Support Manager", - "permlevel": 1 + "permlevel": 1, + "doctype": "DocPerm" } ] \ No newline at end of file diff --git a/utilities/doctype/address/address.txt b/utilities/doctype/address/address.txt index 8ab6431948a..4eeb2115be1 100644 --- a/utilities/doctype/address/address.txt +++ b/utilities/doctype/address/address.txt @@ -7,12 +7,12 @@ "modified": "2012-12-27 18:08:55" }, { + "document_type": "Master", "name": "__common__", - "search_fields": "customer, supplier, sales_partner, country, state", "module": "Utilities", "doctype": "DocType", "in_dialog": 0, - "document_type": "Master" + "search_fields": "customer, supplier, sales_partner, country, state" }, { "name": "__common__", @@ -96,21 +96,21 @@ "search_index": 1, "doctype": "DocField", "label": "Country", - "options": "link:Country", + "permlevel": 0, "fieldname": "country", "fieldtype": "Select", "reqd": 1, - "permlevel": 0, + "options": "link:Country", "in_filter": 1 }, { "search_index": 0, "doctype": "DocField", "label": "State", - "options": "Suggest", + "permlevel": 0, "fieldname": "state", "fieldtype": "Data", - "permlevel": 0, + "options": "Suggest", "in_filter": 1 }, { @@ -173,10 +173,10 @@ "depends_on": "eval:!doc.supplier && !doc.sales_partner", "doctype": "DocField", "label": "Customer", - "options": "Customer", + "permlevel": 0, "fieldname": "customer", "fieldtype": "Link", - "permlevel": 0 + "options": "Customer" }, { "depends_on": "eval:!doc.supplier && !doc.sales_partner", @@ -191,10 +191,10 @@ "depends_on": "eval:!doc.customer && !doc.sales_partner", "doctype": "DocField", "label": "Supplier", - "options": "Supplier", + "permlevel": 0, "fieldname": "supplier", "fieldtype": "Link", - "permlevel": 0 + "options": "Supplier" }, { "depends_on": "eval:!doc.customer && !doc.sales_partner", @@ -210,16 +210,17 @@ "depends_on": "eval:!doc.customer && !doc.supplier", "doctype": "DocField", "label": "Sales Partner", - "options": "Sales Partner", + "permlevel": 0, "fieldname": "sales_partner", "fieldtype": "Link", - "permlevel": 0 + "options": "Sales Partner" }, { "create": 1, "doctype": "DocPerm", "write": 1, "role": "Sales User", + "report": 1, "permlevel": 0 }, { @@ -227,6 +228,7 @@ "doctype": "DocPerm", "write": 1, "role": "Purchase User", + "report": 1, "permlevel": 0 }, { @@ -234,6 +236,7 @@ "doctype": "DocPerm", "write": 1, "role": "Maintenance User", + "report": 1, "permlevel": 0 }, { @@ -241,6 +244,7 @@ "doctype": "DocPerm", "write": 1, "role": "Accounts User", + "report": 1, "permlevel": 0 }, { diff --git a/utilities/doctype/answer/answer.txt b/utilities/doctype/answer/answer.txt index 80d50778a34..081df83d5c1 100644 --- a/utilities/doctype/answer/answer.txt +++ b/utilities/doctype/answer/answer.txt @@ -8,17 +8,17 @@ }, { "section_style": "Simple", - "allow_attach": 0, + "in_create": 1, "module": "Utilities", "allow_trash": 1, - "server_code_error": " ", - "in_create": 1, - "read_only": 1, "autoname": "_ANS.#######", + "show_in_menu": 0, + "allow_attach": 0, + "read_only": 1, "name": "__common__", "colour": "White:FFF", "doctype": "DocType", - "show_in_menu": 0, + "server_code_error": " ", "version": 3 }, { @@ -32,10 +32,11 @@ { "parent": "Answer", "read": 1, - "doctype": "DocPerm", + "report": 1, "cancel": 1, "name": "__common__", "create": 1, + "doctype": "DocPerm", "write": 1, "parenttype": "DocType", "role": "All", diff --git a/utilities/doctype/contact/contact.txt b/utilities/doctype/contact/contact.txt index 6eb59c6c1eb..400c73b0254 100644 --- a/utilities/doctype/contact/contact.txt +++ b/utilities/doctype/contact/contact.txt @@ -8,8 +8,8 @@ }, { "in_create": 0, - "doctype": "DocType", "module": "Utilities", + "doctype": "DocType", "in_dialog": 0, "document_type": "Master", "name": "__common__" @@ -107,12 +107,12 @@ "doctype": "DocField", "label": "Customer", "oldfieldname": "customer", - "permlevel": 0, "trigger": "Client", "fieldname": "customer", "fieldtype": "Link", "depends_on": "eval:!doc.supplier && !doc.sales_partner", - "options": "Customer" + "options": "Customer", + "permlevel": 0 }, { "depends_on": "eval:!doc.supplier && !doc.sales_partner", @@ -128,16 +128,16 @@ "colour": "White:FFF", "doctype": "DocField", "label": "Supplier", + "permlevel": 0, "trigger": "Client", "fieldname": "supplier", "fieldtype": "Link", - "options": "Supplier", - "permlevel": 0 + "options": "Supplier" }, { - "allow_on_submit": 0, "depends_on": "eval:!doc.customer && !doc.sales_partner", "colour": "White:FFF", + "allow_on_submit": 0, "doctype": "DocField", "label": "Supplier Name", "fieldname": "supplier_name", @@ -149,10 +149,10 @@ "colour": "White:FFF", "doctype": "DocField", "label": "Sales Partner", - "options": "Sales Partner", + "permlevel": 0, "fieldname": "sales_partner", "fieldtype": "Link", - "permlevel": 0 + "options": "Sales Partner" }, { "default": "0", @@ -188,20 +188,20 @@ "colour": "White:FFF", "doctype": "DocField", "label": "Department", - "options": "Suggest", + "permlevel": 0, "fieldname": "department", "fieldtype": "Data", - "permlevel": 0 + "options": "Suggest" }, { "description": "Enter designation of this Contact", "colour": "White:FFF", "doctype": "DocField", "label": "Designation", - "options": "Suggest", + "permlevel": 0, "fieldname": "designation", "fieldtype": "Data", - "permlevel": 0 + "options": "Suggest" }, { "doctype": "DocField", @@ -223,8 +223,9 @@ "create": 1, "doctype": "DocPerm", "write": 1, - "role": "System Manager", "cancel": 1, + "role": "System Manager", + "report": 1, "permlevel": 0 }, { @@ -233,6 +234,7 @@ "doctype": "DocPerm", "submit": 0, "write": 1, + "report": 1, "role": "Sales Master Manager", "cancel": 1, "permlevel": 0 @@ -241,8 +243,9 @@ "create": 1, "doctype": "DocPerm", "write": 1, - "role": "Purchase Master Manager", "cancel": 1, + "role": "Purchase Master Manager", + "report": 1, "permlevel": 0 }, { @@ -250,6 +253,7 @@ "doctype": "DocPerm", "write": 1, "role": "Sales Manager", + "report": 1, "permlevel": 0 }, { @@ -257,6 +261,7 @@ "doctype": "DocPerm", "write": 1, "role": "Purchase Manager", + "report": 1, "permlevel": 0 }, { @@ -264,6 +269,7 @@ "doctype": "DocPerm", "write": 1, "role": "Maintenance Manager", + "report": 1, "permlevel": 0 }, { @@ -271,6 +277,7 @@ "doctype": "DocPerm", "write": 1, "role": "Accounts Manager", + "report": 1, "permlevel": 0 }, { @@ -278,6 +285,7 @@ "doctype": "DocPerm", "write": 1, "role": "Sales User", + "report": 1, "permlevel": 0 }, { @@ -285,6 +293,7 @@ "doctype": "DocPerm", "write": 1, "role": "Purchase User", + "report": 1, "permlevel": 0 }, { @@ -292,6 +301,7 @@ "doctype": "DocPerm", "write": 1, "role": "Maintenance User", + "report": 1, "permlevel": 0 }, { @@ -299,11 +309,12 @@ "doctype": "DocPerm", "write": 1, "role": "Accounts User", + "report": 1, "permlevel": 0 }, { - "doctype": "DocPerm", "role": "All", - "permlevel": 1 + "permlevel": 1, + "doctype": "DocPerm" } ] \ No newline at end of file diff --git a/utilities/doctype/gl_mapper/gl_mapper.txt b/utilities/doctype/gl_mapper/gl_mapper.txt index 3cd26b1bcdf..75846c635fc 100644 --- a/utilities/doctype/gl_mapper/gl_mapper.txt +++ b/utilities/doctype/gl_mapper/gl_mapper.txt @@ -10,12 +10,12 @@ "section_style": "Simple", "module": "Utilities", "doctype": "DocType", + "server_code_error": " ", "autoname": "field:doc_type", - "show_in_menu": 0, "name": "__common__", "colour": "White:FFF", "_last_update": "1305006361", - "server_code_error": " ", + "show_in_menu": 0, "version": 1 }, { @@ -33,6 +33,7 @@ "create": 0, "doctype": "DocPerm", "parenttype": "DocType", + "report": 1, "permlevel": 0, "parentfield": "permissions" }, diff --git a/utilities/doctype/question/question.txt b/utilities/doctype/question/question.txt index ef9d7d3d1ca..b064e331054 100644 --- a/utilities/doctype/question/question.txt +++ b/utilities/doctype/question/question.txt @@ -8,11 +8,11 @@ }, { "read_only": 1, - "autoname": "QUES.#######", "in_create": 1, + "autoname": "QUES.#######", "name": "__common__", - "doctype": "DocType", "module": "Utilities", + "doctype": "DocType", "allow_attach": 0 }, { @@ -26,6 +26,7 @@ { "parent": "Question", "read": 1, + "report": 1, "cancel": 1, "name": "__common__", "create": 1, @@ -72,9 +73,9 @@ }, { "doctype": "DocField", - "label": "Users Voted", "fieldname": "_users_voted", - "fieldtype": "Text" + "fieldtype": "Text", + "label": "Users Voted" }, { "oldfieldtype": "Text", diff --git a/utilities/doctype/sms_log/sms_log.txt b/utilities/doctype/sms_log/sms_log.txt index 455cfefba6b..01d9e4a60d4 100644 --- a/utilities/doctype/sms_log/sms_log.txt +++ b/utilities/doctype/sms_log/sms_log.txt @@ -9,11 +9,11 @@ { "section_style": "Simple", "name": "__common__", + "autoname": "SMSLOG/.########", "colour": "White:FFF", "module": "Utilities", "doctype": "DocType", "version": 3, - "autoname": "SMSLOG/.########", "show_in_menu": 0 }, { @@ -27,6 +27,7 @@ { "parent": "SMS Log", "read": 1, + "report": 1, "name": "__common__", "create": 0, "doctype": "DocPerm", diff --git a/website/doctype/blog/blog.txt b/website/doctype/blog/blog.txt index 962d8889bf4..cd0c40e1d3d 100644 --- a/website/doctype/blog/blog.txt +++ b/website/doctype/blog/blog.txt @@ -8,8 +8,8 @@ }, { "allow_attach": 1, - "doctype": "DocType", "module": "Website", + "doctype": "DocType", "max_attachments": 5, "name": "__common__" }, @@ -25,6 +25,7 @@ "parent": "Blog", "read": 1, "doctype": "DocPerm", + "report": 1, "parenttype": "DocType", "permlevel": 0, "parentfield": "permissions" @@ -83,16 +84,16 @@ "permlevel": 0 }, { - "create": 1, - "doctype": "DocPerm", "write": 1, - "role": "Website Manager" + "create": 1, + "role": "Website Manager", + "doctype": "DocPerm" }, { - "create": 1, - "doctype": "DocPerm", "write": 1, - "role": "Blogger" + "create": 1, + "role": "Blogger", + "doctype": "DocPerm" }, { "write": 0, diff --git a/website/doctype/web_page/web_page.txt b/website/doctype/web_page/web_page.txt index 56c73443222..8237ea4b687 100644 --- a/website/doctype/web_page/web_page.txt +++ b/website/doctype/web_page/web_page.txt @@ -7,13 +7,13 @@ "modified": "2012-12-25 17:04:19" }, { - "allow_attach": 1, - "doctype": "DocType", - "module": "Website", + "description": "Page to show on the website\n", "name": "__common__", + "module": "Website", + "doctype": "DocType", "max_attachments": 20, "document_type": "Transaction", - "description": "Page to show on the website\n" + "allow_attach": 1 }, { "name": "__common__", @@ -78,10 +78,10 @@ "description": "Begin this page with a slideshow of images", "doctype": "DocField", "label": "Slideshow", - "options": "Website Slideshow", + "permlevel": 0, "fieldname": "slideshow", "fieldtype": "Link", - "permlevel": 0 + "options": "Website Slideshow" }, { "description": "Content in markdown format that appears on the main side of your page", @@ -101,10 +101,10 @@ }, { "doctype": "DocField", - "label": "Text Align", "options": "Left\nCenter\nRight", "fieldname": "text_align", "fieldtype": "Select", + "label": "Text Align", "permlevel": 0 }, { @@ -117,10 +117,10 @@ }, { "doctype": "DocField", - "label": "Javascript", "options": "Javascript", "fieldname": "javascript", "fieldtype": "Code", + "label": "Javascript", "permlevel": 0 }, { @@ -132,10 +132,10 @@ }, { "doctype": "DocField", - "label": "CSS", "options": "CSS", "fieldname": "css", "fieldtype": "Code", + "label": "CSS", "permlevel": 0 }, { @@ -152,10 +152,11 @@ "create": 1, "doctype": "DocPerm", "write": 1, + "report": 1, "permlevel": 0 }, { - "doctype": "DocPerm", - "permlevel": 1 + "permlevel": 1, + "doctype": "DocPerm" } ] \ No newline at end of file diff --git a/website/doctype/website_slideshow/website_slideshow.txt b/website/doctype/website_slideshow/website_slideshow.txt index 0097665a8e1..4caa617f311 100644 --- a/website/doctype/website_slideshow/website_slideshow.txt +++ b/website/doctype/website_slideshow/website_slideshow.txt @@ -7,11 +7,11 @@ "modified": "2012-12-25 16:56:34" }, { - "autoname": "field:slideshow_name", "allow_attach": 1, + "autoname": "field:slideshow_name", "name": "__common__", - "doctype": "DocType", "module": "Website", + "doctype": "DocType", "max_attachments": 10, "document_type": "Transaction", "description": "Slideshow like display for the website" @@ -27,6 +27,7 @@ { "parent": "Website Slideshow", "read": 1, + "report": 1, "cancel": 1, "name": "__common__", "create": 1, From 4e03ce2107bfd15110e83be7b9d39b9d66219bc1 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 21 Jan 2013 16:28:37 +0530 Subject: [PATCH 12/20] added number formatter --- setup/doctype/country/country.txt | 62 +++++++++++++++---------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/setup/doctype/country/country.txt b/setup/doctype/country/country.txt index fbf2db29733..e4bb408b5f8 100644 --- a/setup/doctype/country/country.txt +++ b/setup/doctype/country/country.txt @@ -1,51 +1,52 @@ [ { - "owner": "Administrator", + "creation": "2013-01-19 10:23:30", "docstatus": 0, - "creation": "2013-01-17 17:02:24", + "modified": "2013-01-21 15:56:50", "modified_by": "Administrator", - "modified": "2013-01-17 17:04:08" + "owner": "Administrator" }, { - "read_only": 0, - "in_create": 0, "autoname": "field:country_name", - "module": "Setup", "doctype": "DocType", "document_type": "Master", - "name": "__common__" + "in_create": 0, + "module": "Setup", + "name": "__common__", + "read_only": 0 }, { - "name": "__common__", - "parent": "Country", "doctype": "DocField", - "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" - }, - { "name": "__common__", "parent": "Country", - "read": 1, + "parentfield": "fields", + "parenttype": "DocType", + "permlevel": 0 + }, + { "create": 1, "doctype": "DocPerm", - "write": 1, + "name": "__common__", + "parent": "Country", + "parentfield": "permissions", "parenttype": "DocType", - "report": 1, "permlevel": 0, - "parentfield": "permissions" + "read": 1, + "report": 1, + "submit": 0, + "write": 1 }, { - "name": "Country", - "doctype": "DocType" + "doctype": "DocType", + "name": "Country" }, { - "oldfieldtype": "Data", "doctype": "DocField", - "label": "Country Name", - "oldfieldname": "country_name", "fieldname": "country_name", "fieldtype": "Data", + "label": "Country Name", + "oldfieldname": "country_name", + "oldfieldtype": "Data", "reqd": 1 }, { @@ -63,20 +64,19 @@ { "amend": 0, "cancel": 0, - "role": "Sales Master Manager", "doctype": "DocPerm", - "submit": 0 + "role": "Sales Master Manager" }, { - "role": "Purchase Master Manager", - "doctype": "DocPerm" + "doctype": "DocPerm", + "role": "Purchase Master Manager" }, { - "role": "HR User", - "doctype": "DocPerm" + "doctype": "DocPerm", + "role": "HR User" }, { - "role": "HR Manager", - "doctype": "DocPerm" + "doctype": "DocPerm", + "role": "HR Manager" } ] \ No newline at end of file From a1e8e07fdeada9237afe4ef9674ddd294f8309e7 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 21 Jan 2013 16:39:24 +0530 Subject: [PATCH 13/20] added number format to global defaults --- home/page/latest_updates/latest_updates.js | 3 + .../global_defaults/global_defaults.py | 25 +- .../global_defaults/global_defaults.txt | 231 +++++++++--------- 3 files changed, 131 insertions(+), 128 deletions(-) diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js index 8cdc2b78976..26ffe2fc521 100644 --- a/home/page/latest_updates/latest_updates.js +++ b/home/page/latest_updates/latest_updates.js @@ -1,4 +1,7 @@ erpnext.updates = [ + ["21st January, 2013", [ + "Number Formatting: Added Number Format to Global Defaults & Currency", + ]], ["18th January, 2013", [ "Buying: Added Price List to purchase cycle", ]], diff --git a/setup/doctype/global_defaults/global_defaults.py b/setup/doctype/global_defaults/global_defaults.py index 1d93e241d63..042b9a35651 100644 --- a/setup/doctype/global_defaults/global_defaults.py +++ b/setup/doctype/global_defaults/global_defaults.py @@ -21,20 +21,21 @@ from webnotes.utils import cint keydict = { "fiscal_year": "current_fiscal_year", - 'company': 'default_company', - 'currency': 'default_currency', - 'price_list_name': 'default_price_list', + 'company': 'default_company', + 'currency': 'default_currency', + 'price_list_name': 'default_price_list', 'price_list_currency': 'default_price_list_currency', - 'item_group': 'default_item_group', - 'customer_group': 'default_customer_group', - 'cust_master_name': 'cust_master_name', - 'supplier_type': 'default_supplier_type', - 'supp_master_name': 'supp_master_name', - 'territory': 'default_territory', - 'stock_uom': 'default_stock_uom', - 'fraction_currency': 'default_currency_fraction', - 'valuation_method': 'default_valuation_method', + 'item_group': 'default_item_group', + 'customer_group': 'default_customer_group', + 'cust_master_name': 'cust_master_name', + 'supplier_type': 'default_supplier_type', + 'supp_master_name': 'supp_master_name', + 'territory': 'default_territory', + 'stock_uom': 'default_stock_uom', + 'fraction_currency': 'default_currency_fraction', + 'valuation_method': 'default_valuation_method', 'date_format': 'date_format', + 'number_format': 'number_format', 'currency_format':'default_currency_format', 'account_url':'account_url', 'allow_negative_stock' : 'allow_negative_stock', diff --git a/setup/doctype/global_defaults/global_defaults.txt b/setup/doctype/global_defaults/global_defaults.txt index e4b36a9abc1..6854fc723a5 100644 --- a/setup/doctype/global_defaults/global_defaults.txt +++ b/setup/doctype/global_defaults/global_defaults.txt @@ -1,228 +1,237 @@ [ { - "owner": "Administrator", + "creation": "2013-01-10 16:34:23", "docstatus": 0, - "creation": "2012-10-26 16:49:40", + "modified": "2013-01-21 16:32:30", "modified_by": "Administrator", - "modified": "2012-12-12 14:13:31" + "owner": "Administrator" }, { - "in_create": 1, - "allow_print": 1, - "module": "Setup", - "read_only": 1, + "allow_copy": 1, "allow_email": 1, - "issingle": 1, - "name": "__common__", + "allow_print": 1, "doctype": "DocType", "hide_toolbar": 0, - "allow_copy": 1 + "in_create": 1, + "issingle": 1, + "module": "Setup", + "name": "__common__", + "read_only": 1 }, { - "name": "__common__", - "parent": "Global Defaults", "doctype": "DocField", - "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" - }, - { "name": "__common__", "parent": "Global Defaults", - "read": 1, + "parentfield": "fields", + "parenttype": "DocType", + "permlevel": 0 + }, + { "doctype": "DocPerm", + "name": "__common__", + "parent": "Global Defaults", + "parentfield": "permissions", "parenttype": "DocType", - "parentfield": "permissions" + "read": 1, + "report": 0, + "submit": 0 }, { - "name": "Global Defaults", - "doctype": "DocType" + "doctype": "DocType", + "name": "Global Defaults" }, { "doctype": "DocField", - "label": "General", "fieldname": "general", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "General" }, { "description": "Session Expiry in Hours e.g. 06:00", "doctype": "DocField", - "label": "Session Expiry", "fieldname": "session_expiry", - "fieldtype": "Data" + "fieldtype": "Data", + "label": "Session Expiry" }, { "doctype": "DocField", - "label": "Company", "fieldname": "company", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "Company" }, { "doctype": "DocField", - "label": "Default Company", "fieldname": "default_company", "fieldtype": "Link", - "reqd": 0, - "options": "Company" + "label": "Default Company", + "options": "Company", + "reqd": 0 }, { "doctype": "DocField", - "label": "Current Fiscal Year", "fieldname": "current_fiscal_year", "fieldtype": "Link", - "reqd": 1, - "options": "Fiscal Year" + "label": "Current Fiscal Year", + "options": "Fiscal Year", + "reqd": 1 }, { "doctype": "DocField", - "label": "Date Format", "fieldname": "date_format", "fieldtype": "Select", + "label": "Date Format", "options": "yyyy-mm-dd\ndd-mm-yyyy\ndd/mm/yyyy\nmm/dd/yyyy\nmm-dd-yyyy" }, { "doctype": "DocField", - "width": "50%", + "fieldname": "number_format", + "fieldtype": "Select", + "label": "Number Format", + "options": "\n#,###.##\n#.###,##\n# ###.##\n#,##,###.##\n######" + }, + { + "doctype": "DocField", "fieldname": "column_break1", - "fieldtype": "Column Break" + "fieldtype": "Column Break", + "width": "50%" }, { "default": "INR", "doctype": "DocField", - "label": "Default Currency", "fieldname": "default_currency", "fieldtype": "Select", - "reqd": 1, - "options": "link:Currency" + "label": "Default Currency", + "options": "link:Currency", + "reqd": 1 }, { "doctype": "DocField", - "label": "Default Currency Format", "fieldname": "default_currency_format", "fieldtype": "Select", + "label": "Default Currency Format", "options": "Lacs\nMillions" }, { "doctype": "DocField", - "label": "Default Currency Fraction", "fieldname": "default_currency_fraction", - "fieldtype": "Data" + "fieldtype": "Data", + "label": "Default Currency Fraction" }, { "doctype": "DocField", - "label": "Stock", "fieldname": "stock", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "Stock" }, { "doctype": "DocField", - "width": "50%", "fieldname": "column_break2", - "fieldtype": "Column Break" + "fieldtype": "Column Break", + "width": "50%" }, { "doctype": "DocField", - "label": "Default Item Group", "fieldname": "default_item_group", "fieldtype": "Link", + "label": "Default Item Group", "options": "Item Group" }, { "doctype": "DocField", - "label": "IGHelp", "fieldname": "ighelp", "fieldtype": "HTML", + "label": "IGHelp", "options": "To manage Item Groups, click here" }, { "doctype": "DocField", - "label": "Default Stock UOM", "fieldname": "default_stock_uom", "fieldtype": "Link", + "label": "Default Stock UOM", "options": "UOM" }, { "doctype": "DocField", - "label": "Default Valuation Method", "fieldname": "default_valuation_method", "fieldtype": "Select", + "label": "Default Valuation Method", "options": "FIFO\nMoving Average" }, { "description": "Applicable only if valuation method is moving average", "doctype": "DocField", - "label": "Allow Negative Stock", "fieldname": "allow_negative_stock", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Allow Negative Stock" }, { "doctype": "DocField", - "label": "Default Warehouse Type", "fieldname": "default_warehouse_type", "fieldtype": "Link", + "label": "Default Warehouse Type", "options": "Warehouse Type" }, { "doctype": "DocField", - "label": "Raise Purchase Request when stock reaches re-order level", "fieldname": "auto_indent", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Raise Purchase Request when stock reaches re-order level" }, { "default": "1", "doctype": "DocField", - "width": "50%", "fieldname": "column_break3", - "fieldtype": "Column Break" + "fieldtype": "Column Break", + "width": "50%" }, { "description": "Percentage you are allowed to receive or deliver more against the quantity ordered.

For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units

", "doctype": "DocField", - "label": "Allowance Percent", "fieldname": "tolerance", - "fieldtype": "Currency" + "fieldtype": "Currency", + "label": "Allowance Percent" }, { "description": "Stock level frozen up to this date, nobody can do / modify entry except authorized person", "doctype": "DocField", - "label": "Stock Frozen Upto", "fieldname": "stock_frozen_upto", - "fieldtype": "Date" + "fieldtype": "Date", + "label": "Stock Frozen Upto" }, { "description": "Users with this role are allowed to do / modify stock entry before frozen date", "doctype": "DocField", - "label": "Authorized Role (Frozen Entry)", "fieldname": "stock_auth_role", "fieldtype": "Link", + "label": "Authorized Role (Frozen Entry)", "options": "Role" }, { "doctype": "DocField", - "label": "Accounts", "fieldname": "accounts", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "Accounts" }, { "description": "Accounting entry frozen up to this date, nobody can do / modify entry except authorized person", "doctype": "DocField", - "label": "Accounts Frozen Upto", "fieldname": "acc_frozen_upto", - "fieldtype": "Date" + "fieldtype": "Date", + "label": "Accounts Frozen Upto" }, { "description": "Users with this role are allowed to do / modify accounting entry before frozen date", "doctype": "DocField", - "label": "Authourized Role (Frozen Entry)", "fieldname": "bde_auth_role", "fieldtype": "Link", + "label": "Authourized Role (Frozen Entry)", "options": "Role" }, { "doctype": "DocField", - "label": "Credit Controller", "fieldname": "credit_controller", "fieldtype": "Link", + "label": "Credit Controller", "options": "Role" }, { @@ -232,197 +241,187 @@ }, { "doctype": "DocField", - "label": "Account Info", "fieldname": "account_info", "fieldtype": "HTML", + "label": "Account Info", "options": "
For more accounting defaults, Open Company
" }, { "doctype": "DocField", - "label": "Selling", "fieldname": "selling", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "Selling" }, { "default": "Customer Name", "doctype": "DocField", - "label": "Customer Master created by ", "fieldname": "cust_master_name", "fieldtype": "Select", + "label": "Customer Master created by ", "options": "Customer Name\nNaming Series" }, { "doctype": "DocField", - "label": "Default Customer Group", "fieldname": "default_customer_group", "fieldtype": "Link", + "label": "Default Customer Group", "options": "Customer Group" }, { "doctype": "DocField", - "label": "CGHelp", "fieldname": "cghelp", "fieldtype": "HTML", + "label": "CGHelp", "options": "To manage Customer Groups, click here" }, { "doctype": "DocField", - "label": "Default Territory", "fieldname": "default_territory", "fieldtype": "Link", + "label": "Default Territory", "options": "Territory" }, { "doctype": "DocField", - "label": "TerritoryHelp", "fieldname": "territoryhelp", "fieldtype": "HTML", + "label": "TerritoryHelp", "options": "To manage Territory, click here" }, { "doctype": "DocField", - "width": "50%", "fieldname": "column_break5", - "fieldtype": "Column Break" + "fieldtype": "Column Break", + "width": "50%" }, { "doctype": "DocField", - "label": "Default Price List", "fieldname": "default_price_list", "fieldtype": "Link", + "label": "Default Price List", "options": "Price List" }, { "doctype": "DocField", - "label": "Default Price List Currency", "fieldname": "default_price_list_currency", "fieldtype": "Link", + "label": "Default Price List Currency", "options": "Currency" }, { "default": "No", "doctype": "DocField", - "label": "Sales Order Required", "fieldname": "so_required", "fieldtype": "Select", + "label": "Sales Order Required", "options": "No\nYes" }, { "default": "No", "doctype": "DocField", - "label": "Delivery Note Required", "fieldname": "dn_required", "fieldtype": "Select", + "label": "Delivery Note Required", "options": "No\nYes" }, { "doctype": "DocField", - "label": "Buying", "fieldname": "buying", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "Buying" }, { "doctype": "DocField", - "label": "Default Supplier Type", "fieldname": "default_supplier_type", "fieldtype": "Link", + "label": "Default Supplier Type", "options": "Supplier Type" }, { "default": "Supplier Name", "doctype": "DocField", - "label": "Supplier Master created by ", "fieldname": "supp_master_name", "fieldtype": "Select", + "label": "Supplier Master created by ", "options": "Supplier Name\nNaming Series" }, { "doctype": "DocField", - "width": "50%", "fieldname": "column_break6", - "fieldtype": "Column Break" + "fieldtype": "Column Break", + "width": "50%" }, { "default": "No", "doctype": "DocField", - "label": "Purchase Order Required", "fieldname": "po_required", "fieldtype": "Select", + "label": "Purchase Order Required", "options": "No\nYes" }, { "default": "No", "doctype": "DocField", - "label": "Purchase Receipt Required", "fieldname": "pr_required", "fieldtype": "Select", + "label": "Purchase Receipt Required", "options": "No\nYes" }, { "doctype": "DocField", - "label": "Maintain same rate throughout purchase cycle", "fieldname": "maintain_same_rate", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Maintain same rate throughout purchase cycle" }, { "doctype": "DocField", - "label": "HR", "fieldname": "hr", "fieldtype": "Section Break", + "label": "HR", "options": "
HR
" }, { "description": "Employee record is created using selected field. ", "doctype": "DocField", - "label": "Employee Records to be created by ", "fieldname": "emp_created_by", "fieldtype": "Select", + "label": "Employee Records to be created by ", "options": "\nNaming Series\nEmployee Number" }, { "doctype": "DocField", - "label": "System", "fieldname": "system", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "System" }, { "doctype": "DocField", - "label": "SMS Sender Name", "fieldname": "sms_sender_name", - "fieldtype": "Data" - }, - { - "amend": 0, - "create": 1, - "doctype": "DocPerm", - "submit": 0, - "write": 1, - "role": "System Manager", - "cancel": 0, - "permlevel": 0 + "fieldtype": "Data", + "label": "SMS Sender Name" }, { "create": 1, "doctype": "DocPerm", - "write": 1, + "permlevel": 0, "role": "System Manager", - "permlevel": 0 + "write": 1 }, { "doctype": "DocPerm", - "write": 1, + "permlevel": 1, "role": "System Manager", - "permlevel": 1 + "write": 1 }, { "doctype": "DocPerm", - "role": "All", - "permlevel": 1 + "permlevel": 1, + "role": "All" }, { "doctype": "DocPerm", - "write": 1, + "permlevel": 2, "role": "System Manager", - "permlevel": 2 + "write": 1 } ] \ No newline at end of file From d707e2b6b68f5bebafe62e21523b0239115bbc79 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 21 Jan 2013 17:44:14 +0530 Subject: [PATCH 14/20] fixes in division by zero in discount calculation --- buying/doctype/purchase_common/purchase_common.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/buying/doctype/purchase_common/purchase_common.js b/buying/doctype/purchase_common/purchase_common.js index 549ec48bde5..fcb0b6ab3d1 100644 --- a/buying/doctype/purchase_common/purchase_common.js +++ b/buying/doctype/purchase_common/purchase_common.js @@ -482,7 +482,10 @@ cur_frm.cscript.calc_amount = function(doc, n) { if(n == 1){ set_multiple(tname, cl[i].name, {'purchase_ref_rate':flt(cl[i].import_ref_rate)*flt(doc.conversion_rate)}, fname); - set_multiple(tname, cl[i].name, {'discount_rate': flt(flt( flt( flt(cl[i].import_ref_rate) - flt(cl[i].import_rate) ) * 100 )/flt(cl[i].import_ref_rate)) }, fname); + set_multiple(tname, cl[i].name, { + 'discount_rate': flt(cl[i].import_ref_rate) ? + flt(flt( flt( flt(cl[i].import_ref_rate) - flt(cl[i].import_rate) ) * 100 )/ + flt(cl[i].import_ref_rate)) : 0 }, fname); tmp[rate_fld] = flt(doc.conversion_rate) * flt(cl[i].import_rate); set_multiple(tname, cl[i].name, tmp, fname); @@ -491,7 +494,10 @@ cur_frm.cscript.calc_amount = function(doc, n) { }else if(n == 2){ set_multiple(tname, cl[i].name, {'purchase_ref_rate':flt(cl[i].import_ref_rate)*flt(doc.conversion_rate)}, fname); - set_multiple(tname, cl[i].name, {'discount_rate': flt(flt( flt( flt(cl[i].purchase_ref_rate) - flt(cl[i][rate_fld]) ) * 100 )/flt(cl[i].purchase_ref_rate)) }, fname); + set_multiple(tname, cl[i].name, { + 'discount_rate': flt(cl[i].purchase_ref_rate) ? + flt(flt( flt( flt(cl[i].purchase_ref_rate) - flt(cl[i][rate_fld]) ) * 100 )/ + flt(cl[i].purchase_ref_rate)) : 0 }, fname); set_multiple(tname, cl[i].name, {'amount': flt(flt(cl[i].qty) * flt(cl[i][rate_fld])),}, fname); set_multiple(tname, cl[i].name, {'import_rate': flt(flt(cl[i][rate_fld]) / flt(doc.conversion_rate)) }, fname); set_multiple(tname, cl[i].name, {'import_amount': flt(flt(cl[i].qty) * flt(cl[i][rate_fld]) / flt(doc.conversion_rate))}, fname); From 70d4fbb7ea2f8c916c5083c712a1ae6ee47f1463 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 21 Jan 2013 18:19:52 +0530 Subject: [PATCH 15/20] changed item from select to link in stock ledger and stock level --- stock/page/stock_ledger/stock_ledger.js | 4 ++-- stock/page/stock_level/stock_level.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stock/page/stock_ledger/stock_ledger.js b/stock/page/stock_ledger/stock_ledger.js index b6b536d5ff9..27e62723b88 100644 --- a/stock/page/stock_ledger/stock_ledger.js +++ b/stock/page/stock_ledger/stock_ledger.js @@ -79,9 +79,9 @@ erpnext.StockLedger = erpnext.StockGridReport.extend({ default_value: "Select Warehouse...", filter: function(val, item, opts) { return item.warehouse == val || val == opts.default_value; }}, - {fieldtype:"Select", label: "Item Code", link:"Item", default_value: "Select Item...", + {fieldtype:"Link", label: "Item Code", link:"Item", default_value: "Select Item...", filter: function(val, item, opts) { - return item.item_code == val || val == opts.default_value; + return item.item_code == val || !val; }}, {fieldtype:"Select", label: "Brand", link:"Brand", default_value: "Select Brand...", filter: function(val, item, opts) { diff --git a/stock/page/stock_level/stock_level.js b/stock/page/stock_level/stock_level.js index 9c755ef806c..33448113801 100644 --- a/stock/page/stock_level/stock_level.js +++ b/stock/page/stock_level/stock_level.js @@ -98,9 +98,9 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({ }, filters: [ - {fieldtype:"Select", label: "Item Code", link:"Item", default_value: "Select Item...", + {fieldtype:"Link", label: "Item Code", link:"Item", default_value: "Select Item...", filter: function(val, item, opts) { - return item.item_code == val || val == opts.default_value; + return item.item_code == val || !val; }}, {fieldtype:"Select", label: "Warehouse", link:"Warehouse", From 6dd9d4583d168c85e91c7a7f557f89c589b9371c Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 21 Jan 2013 18:44:43 +0530 Subject: [PATCH 16/20] updated payment receipt voucher format --- .../Payment Receipt Voucher.txt | 16 ++++++++-------- patches/patch_list.py | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/accounts/Print Format/Payment Receipt Voucher/Payment Receipt Voucher.txt b/accounts/Print Format/Payment Receipt Voucher/Payment Receipt Voucher.txt index bd9a52e0951..73bc63b7902 100755 --- a/accounts/Print Format/Payment Receipt Voucher/Payment Receipt Voucher.txt +++ b/accounts/Print Format/Payment Receipt Voucher/Payment Receipt Voucher.txt @@ -1,21 +1,21 @@ [ { - "owner": "Administrator", + "creation": "2012-05-01 12:46:31", "docstatus": 0, - "creation": "2012-04-11 13:16:56", + "modified": "2013-01-21 18:40:20", "modified_by": "Administrator", - "modified": "2012-04-13 12:24:59" + "owner": "Administrator" }, { "doc_type": "Journal Voucher", - "name": "__common__", - "module": "Accounts", "doctype": "Print Format", - "html": "
\n

\n

\n\n\n\n\n\n\n\n\n\n\n \n\n\n\n\n\n\n\n\n
Receipt No.:
Date :
Remark:
Received From:
\n
\n\n

\n

\n
This receipt is issued subject to realization of the Cheque
\n\n
\n\n\n\n\n

For ,


(Authorised Signatory)
", + "html": "

\n\n\n\n\n\n\n\n\n\n \n\n\n\n\n\n\n\n\n
Receipt No.:
Date :
Remark:
Received From:
\n
\n\n

\n

\n
\n\n\n\n\n

For ,


(Authorised Signatory)
", + "module": "Accounts", + "name": "__common__", "standard": "Yes" }, { - "name": "Payment Receipt Voucher", - "doctype": "Print Format" + "doctype": "Print Format", + "name": "Payment Receipt Voucher" } ] \ No newline at end of file diff --git a/patches/patch_list.py b/patches/patch_list.py index 278809361c1..dda35247a44 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -153,4 +153,5 @@ patch_list = [ "patches.january_2013.remove_tds_entry_from_gl_mapper", "patches.january_2013.update_number_format", "patches.january_2013.purchase_price_list", + "execute:webnotes.reload_doc('accounts','Print Format','Payment Receipt Voucher')", ] \ No newline at end of file From a495b86848448364d4bd92cc4efc9f97a489c646 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 21 Jan 2013 18:48:26 +0530 Subject: [PATCH 17/20] description in stock level --- stock/page/stock_level/stock_level.js | 1 + 1 file changed, 1 insertion(+) diff --git a/stock/page/stock_level/stock_level.js b/stock/page/stock_level/stock_level.js index 33448113801..df63d9b0810 100644 --- a/stock/page/stock_level/stock_level.js +++ b/stock/page/stock_level/stock_level.js @@ -200,6 +200,7 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({ var row = { item_code: item_code, warehouse: warehouse, + description: item.description, brand: item.brand, item_name: item.item_name || item.name, uom: item.stock_uom, From f6f8ddac304ab12e4526ef776be1395c53303904 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 21 Jan 2013 18:50:03 +0530 Subject: [PATCH 18/20] contact us cache refresh issue --- website/doctype/contact_us_settings/contact_us_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/doctype/contact_us_settings/contact_us_settings.py b/website/doctype/contact_us_settings/contact_us_settings.py index 0dda32b75aa..8e6ef294746 100644 --- a/website/doctype/contact_us_settings/contact_us_settings.py +++ b/website/doctype/contact_us_settings/contact_us_settings.py @@ -18,4 +18,4 @@ class DocType: def on_update(self): from website.utils import clear_cache - clear_cache("about") \ No newline at end of file + clear_cache("contact") \ No newline at end of file From d98b65386e376fa0cac8e7aa8ace0701f9e1e7f8 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 21 Jan 2013 18:54:01 +0530 Subject: [PATCH 19/20] pull item_tax from item master while selecting item in purchase cycle --- buying/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buying/utils.py b/buying/utils.py index d623020987f..97efbc73333 100644 --- a/buying/utils.py +++ b/buying/utils.py @@ -56,7 +56,7 @@ def get_item_details(args): "conversion_factor": 1, "warehouse": args.warehouse or item.default_warehouse, "item_tax_rate": json.dumps(dict(([d.tax_type, d.tax_rate] for d in - item_wrapper.doclist.get({"parentfield": "ref_rate_details"})))), + item_wrapper.doclist.get({"parentfield": "item_tax"})))), "batch_no": None, "expense_head": item.purchase_account, "cost_center": item.cost_center From fc36e57233534a68ce9d8e66ffa6e972c98f926b Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 21 Jan 2013 19:02:58 +0530 Subject: [PATCH 20/20] fixes in setup control and website contact helper --- setup/doctype/setup_control/setup_control.py | 2 +- website/helpers/contact.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup/doctype/setup_control/setup_control.py b/setup/doctype/setup_control/setup_control.py index 4bc36481d58..86cdc8e82e9 100644 --- a/setup/doctype/setup_control/setup_control.py +++ b/setup/doctype/setup_control/setup_control.py @@ -236,7 +236,7 @@ class DocType: on duplicate key update `password`=password(%s)""", (user_email, pwd, pwd)) - self.add_all_roles_to(pr.name) + add_all_roles_to(pr.name) def add_all_roles_to(name): profile = webnotes.doc("Profile", name) diff --git a/website/helpers/contact.py b/website/helpers/contact.py index a9499abb790..0ec279ecad5 100644 --- a/website/helpers/contact.py +++ b/website/helpers/contact.py @@ -36,7 +36,7 @@ def send_message(subject="Website Query", message="", sender="", status="Open"): name = webnotes.conn.get_value("Lead", {"email_id": sender}, "name") if name: lead = webnotes.model_wrapper("Lead", name) - lead.doc.status = "Open" + lead.doc.status = status lead.ignore_permissions = True lead.save() else: @@ -44,7 +44,7 @@ def send_message(subject="Website Query", message="", sender="", status="Open"): "doctype":"Lead", "lead_name": sender, "email_id": sender, - "status": "Open", + "status": status, "source": "Website" }) lead.ignore_permissions = True