diff --git a/accounts/doctype/budget_control/budget_control.txt b/accounts/doctype/budget_control/budget_control.txt index b27e65f6ce..e86fef8b5b 100644 --- a/accounts/doctype/budget_control/budget_control.txt +++ b/accounts/doctype/budget_control/budget_control.txt @@ -1,24 +1,22 @@ [ { - "owner": "nabin@webnotestech.com", - "docstatus": 0, "creation": "2012-03-27 14:35:41", + "docstatus": 0, + "modified": "2012-03-27 14:35:41", "modified_by": "Administrator", - "modified": "2012-03-27 14:35:41" + "owner": "nabin@webnotestech.com" }, { - "section_style": "Simple", - "name": "__common__", - "colour": "White:FFF", - "module": "Accounts", - "show_in_menu": 0, - "version": 23, - "server_code_error": " ", "doctype": "DocType", - "issingle": 1 + "issingle": 1, + "module": "Accounts", + "name": "__common__", + "section_style": "Simple", + "show_in_menu": 0, + "version": 23 }, { - "name": "Budget Control", - "doctype": "DocType" + "doctype": "DocType", + "name": "Budget Control" } ] \ No newline at end of file diff --git a/accounts/doctype/mis_control/mis_control.txt b/accounts/doctype/mis_control/mis_control.txt index 1936fb6b81..5d42bdef83 100644 --- a/accounts/doctype/mis_control/mis_control.txt +++ b/accounts/doctype/mis_control/mis_control.txt @@ -1,24 +1,22 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:35:49", + "docstatus": 0, + "modified": "2012-03-27 14:35:49", "modified_by": "Administrator", - "modified": "2012-03-27 14:35:49" + "owner": "Administrator" }, { - "section_style": "Simple", - "name": "__common__", - "colour": "White:FFF", - "module": "Accounts", - "show_in_menu": 0, - "version": 120, - "server_code_error": " ", "doctype": "DocType", - "issingle": 1 + "issingle": 1, + "module": "Accounts", + "name": "__common__", + "section_style": "Simple", + "show_in_menu": 0, + "version": 120 }, { - "name": "MIS Control", - "doctype": "DocType" + "doctype": "DocType", + "name": "MIS Control" } ] \ No newline at end of file diff --git a/accounts/doctype/mode_of_payment/mode_of_payment.txt b/accounts/doctype/mode_of_payment/mode_of_payment.txt index 902ab37cc3..2d019964fc 100644 --- a/accounts/doctype/mode_of_payment/mode_of_payment.txt +++ b/accounts/doctype/mode_of_payment/mode_of_payment.txt @@ -59,7 +59,6 @@ }, { "description": "Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.", - "colour": "White:FFF", "doctype": "DocField", "label": "Default Account", "fieldname": "default_account", diff --git a/accounts/doctype/multi_ledger_report_detail/multi_ledger_report_detail.txt b/accounts/doctype/multi_ledger_report_detail/multi_ledger_report_detail.txt index aee2b90c85..df91e1c7b7 100755 --- a/accounts/doctype/multi_ledger_report_detail/multi_ledger_report_detail.txt +++ b/accounts/doctype/multi_ledger_report_detail/multi_ledger_report_detail.txt @@ -1,38 +1,37 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:35:44", + "docstatus": 0, + "modified": "2012-03-27 14:35:44", "modified_by": "Administrator", - "modified": "2012-03-27 14:35:44" + "owner": "Administrator" }, { - "section_style": "Simple", - "istable": 1, - "name": "__common__", - "colour": "White:FFF", - "module": "Accounts", "doctype": "DocType", - "version": 3, - "show_in_menu": 0 + "istable": 1, + "module": "Accounts", + "name": "__common__", + "section_style": "Simple", + "show_in_menu": 0, + "version": 3 }, { - "parent": "Multi Ledger Report Detail", - "reqd": 1, - "name": "__common__", "doctype": "DocField", - "label": "Account", - "width": "300px", - "parenttype": "DocType", - "options": "Account", "fieldname": "account", "fieldtype": "Link", + "label": "Account", + "name": "__common__", + "options": "Account", + "parent": "Multi Ledger Report Detail", + "parentfield": "fields", + "parenttype": "DocType", "permlevel": 0, - "parentfield": "fields" + "reqd": 1, + "width": "300px" }, { - "name": "Multi Ledger Report Detail", - "doctype": "DocType" + "doctype": "DocType", + "name": "Multi Ledger Report Detail" }, { "doctype": "DocField" diff --git a/accounts/doctype/sales_invoice/sales_invoice.py b/accounts/doctype/sales_invoice/sales_invoice.py index e5e53f2511..6ca804e7bc 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.py +++ b/accounts/doctype/sales_invoice/sales_invoice.py @@ -17,7 +17,8 @@ from __future__ import unicode_literals import webnotes -from webnotes.utils import add_days, cint, cstr, date_diff, flt, getdate, nowdate, sendmail +from webnotes.utils import add_days, cint, cstr, date_diff, flt, getdate, nowdate +from webnotes.utils.email_lib import sendmail from webnotes.utils import comma_and from webnotes.model.doc import make_autoname from webnotes.model.bean import getlist diff --git a/accounts/doctype/trend_analyzer_control/trend_analyzer_control.txt b/accounts/doctype/trend_analyzer_control/trend_analyzer_control.txt index 092cd6eaef..67c91ee29e 100755 --- a/accounts/doctype/trend_analyzer_control/trend_analyzer_control.txt +++ b/accounts/doctype/trend_analyzer_control/trend_analyzer_control.txt @@ -1,25 +1,23 @@ [ { - "owner": "saumil@webnotestech.com", - "docstatus": 0, "creation": "2012-03-27 14:35:49", + "docstatus": 0, + "modified": "2012-03-27 14:35:49", "modified_by": "Administrator", - "modified": "2012-03-27 14:35:49" + "owner": "saumil@webnotestech.com" }, { - "section_style": "Simple", - "in_create": 1, - "module": "Accounts", - "server_code_error": " ", "doctype": "DocType", + "in_create": 1, "issingle": 1, - "read_only": 1, + "module": "Accounts", "name": "__common__", - "colour": "White:FFF", + "read_only": 1, + "section_style": "Simple", "version": 11 }, { - "name": "Trend Analyzer Control", - "doctype": "DocType" + "doctype": "DocType", + "name": "Trend Analyzer Control" } ] \ No newline at end of file diff --git a/accounts/page/voucher_import_tool/voucher_import_tool.py b/accounts/page/voucher_import_tool/voucher_import_tool.py index 1819e07705..2d7cd25fd1 100644 --- a/accounts/page/voucher_import_tool/voucher_import_tool.py +++ b/accounts/page/voucher_import_tool/voucher_import_tool.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals import webnotes -from webnotes.utils import flt +from webnotes.utils import flt, comma_and @webnotes.whitelist() def get_template(): @@ -231,6 +231,14 @@ def get_data(rows, company_abbr): if r[0]=="--------Data----------": start_row = i+2 + + # check for empty columns + empty_columns = [i+1 for i, c in enumerate(rows[i+1]) if not c] + if empty_columns: + raise Exception, """Column No(s). %s %s empty. \ + Please remove them and try again.""" % (comma_and(empty_columns), + len(empty_columns)==1 and "is" or "are") + columns = [c.replace(" ", "_").lower() for c in rows[i+1] if not c.endswith(" - " + company_abbr)] accounts = [c for c in rows[i+1] if c.endswith(" - " + company_abbr)] diff --git a/buying/doctype/purchase_common/purchase_common.txt b/buying/doctype/purchase_common/purchase_common.txt index 2d38c7eb32..15ef5743f3 100644 --- a/buying/doctype/purchase_common/purchase_common.txt +++ b/buying/doctype/purchase_common/purchase_common.txt @@ -1,24 +1,22 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:35:51", + "docstatus": 0, + "modified": "2012-03-27 14:35:51", "modified_by": "Administrator", - "modified": "2012-03-27 14:35:51" + "owner": "Administrator" }, { - "section_style": "Simple", - "name": "__common__", - "colour": "White:FFF", - "module": "Buying", - "show_in_menu": 0, - "version": 187, - "server_code_error": " ", "doctype": "DocType", - "issingle": 1 + "issingle": 1, + "module": "Buying", + "name": "__common__", + "section_style": "Simple", + "show_in_menu": 0, + "version": 187 }, { - "name": "Purchase Common", - "doctype": "DocType" + "doctype": "DocType", + "name": "Purchase Common" } ] \ No newline at end of file diff --git a/buying/doctype/quality_inspection_reading/quality_inspection_reading.txt b/buying/doctype/quality_inspection_reading/quality_inspection_reading.txt index 4f5480cd7a..c9f6b2d7b8 100644 --- a/buying/doctype/quality_inspection_reading/quality_inspection_reading.txt +++ b/buying/doctype/quality_inspection_reading/quality_inspection_reading.txt @@ -1,140 +1,138 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:35:52", + "docstatus": 0, + "modified": "2012-03-27 14:35:52", "modified_by": "Administrator", - "modified": "2012-03-27 14:35:52" + "owner": "Administrator" }, { - "section_style": "Tray", + "autoname": "QASD/.#####", + "doctype": "DocType", "istable": 1, "module": "Buying", - "server_code_error": " ", - "doctype": "DocType", - "autoname": "QASD/.#####", "name": "__common__", - "colour": "White:FFF", + "section_style": "Tray", "show_in_menu": 0, "version": 2 }, { + "doctype": "DocField", "name": "__common__", "parent": "Quality Inspection Reading", - "doctype": "DocField", + "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "name": "Quality Inspection Reading", - "doctype": "DocType" + "doctype": "DocType", + "name": "Quality Inspection Reading" }, { - "oldfieldtype": "Data", "doctype": "DocField", - "label": "Parameter", - "oldfieldname": "specification", "fieldname": "specification", "fieldtype": "Data", + "label": "Parameter", + "oldfieldname": "specification", + "oldfieldtype": "Data", "reqd": 1 }, { - "oldfieldtype": "Data", "doctype": "DocField", + "fieldname": "value", + "fieldtype": "Data", "label": "Acceptance Criteria", "oldfieldname": "value", - "fieldname": "value", - "fieldtype": "Data" + "oldfieldtype": "Data" }, { - "oldfieldtype": "Data", "doctype": "DocField", + "fieldname": "reading_1", + "fieldtype": "Data", "label": "Reading 1", "oldfieldname": "reading_1", - "fieldname": "reading_1", - "fieldtype": "Data" + "oldfieldtype": "Data" }, { - "oldfieldtype": "Data", "doctype": "DocField", + "fieldname": "reading_2", + "fieldtype": "Data", "label": "Reading 2", "oldfieldname": "reading_2", - "fieldname": "reading_2", - "fieldtype": "Data" + "oldfieldtype": "Data" }, { - "oldfieldtype": "Data", "doctype": "DocField", + "fieldname": "reading_3", + "fieldtype": "Data", "label": "Reading 3", "oldfieldname": "reading_3", - "fieldname": "reading_3", - "fieldtype": "Data" + "oldfieldtype": "Data" }, { - "oldfieldtype": "Data", "doctype": "DocField", + "fieldname": "reading_4", + "fieldtype": "Data", "label": "Reading 4", "oldfieldname": "reading_4", - "fieldname": "reading_4", - "fieldtype": "Data" + "oldfieldtype": "Data" }, { - "oldfieldtype": "Data", "doctype": "DocField", + "fieldname": "reading_5", + "fieldtype": "Data", "label": "Reading 5", "oldfieldname": "reading_5", - "fieldname": "reading_5", - "fieldtype": "Data" + "oldfieldtype": "Data" }, { - "oldfieldtype": "Data", "doctype": "DocField", + "fieldname": "reading_6", + "fieldtype": "Data", "label": "Reading 6", "oldfieldname": "reading_6", - "fieldname": "reading_6", - "fieldtype": "Data" + "oldfieldtype": "Data" }, { - "oldfieldtype": "Data", "doctype": "DocField", + "fieldname": "reading_7", + "fieldtype": "Data", "label": "Reading 7", "oldfieldname": "reading_7", - "fieldname": "reading_7", - "fieldtype": "Data" + "oldfieldtype": "Data" }, { - "oldfieldtype": "Data", "doctype": "DocField", + "fieldname": "reading_8", + "fieldtype": "Data", "label": "Reading 8", "oldfieldname": "reading_8", - "fieldname": "reading_8", - "fieldtype": "Data" + "oldfieldtype": "Data" }, { - "oldfieldtype": "Data", "doctype": "DocField", + "fieldname": "reading_9", + "fieldtype": "Data", "label": "Reading 9", "oldfieldname": "reading_9", - "fieldname": "reading_9", - "fieldtype": "Data" + "oldfieldtype": "Data" }, { - "oldfieldtype": "Data", "doctype": "DocField", + "fieldname": "reading_10", + "fieldtype": "Data", "label": "Reading 10", "oldfieldname": "reading_10", - "fieldname": "reading_10", - "fieldtype": "Data" + "oldfieldtype": "Data" }, { "default": "Accepted", - "oldfieldtype": "Select", "doctype": "DocField", - "label": "Status", - "oldfieldname": "status", "fieldname": "status", "fieldtype": "Select", + "label": "Status", + "oldfieldname": "status", + "oldfieldtype": "Select", "options": "Accepted\nRejected" } ] \ No newline at end of file diff --git a/home/doctype/feed/feed.txt b/home/doctype/feed/feed.txt index 4383bd7825..5767181436 100644 --- a/home/doctype/feed/feed.txt +++ b/home/doctype/feed/feed.txt @@ -1,43 +1,42 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-07-03 13:29:42", + "docstatus": 0, + "modified": "2012-10-15 15:23:02", "modified_by": "Administrator", - "modified": "2012-10-15 15:23:02" + "owner": "Administrator" }, { - "section_style": "Simple", - "name": "__common__", "autoname": "_FEED.#####", - "colour": "White:FFF", - "module": "Home", "doctype": "DocType", - "version": 1, - "show_in_menu": 0 + "module": "Home", + "name": "__common__", + "section_style": "Simple", + "show_in_menu": 0, + "version": 1 }, { - "name": "__common__", - "parent": "Feed", "doctype": "DocField", - "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" - }, - { - "parent": "Feed", - "read": 1, "name": "__common__", - "doctype": "DocPerm", - "report": 1, + "parent": "Feed", + "parentfield": "fields", "parenttype": "DocType", - "role": "System Manager", - "permlevel": 0, - "parentfield": "permissions" + "permlevel": 0 }, { - "name": "Feed", - "doctype": "DocType" + "doctype": "DocPerm", + "name": "__common__", + "parent": "Feed", + "parentfield": "permissions", + "parenttype": "DocType", + "permlevel": 0, + "read": 1, + "report": 1, + "role": "System Manager" + }, + { + "doctype": "DocType", + "name": "Feed" }, { "doctype": "DocField", diff --git a/hr/doctype/employee_education/employee_education.txt b/hr/doctype/employee_education/employee_education.txt index aa759550e7..dd07df8895 100644 --- a/hr/doctype/employee_education/employee_education.txt +++ b/hr/doctype/employee_education/employee_education.txt @@ -1,82 +1,80 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:35:54", + "docstatus": 0, + "modified": "2012-03-27 14:35:54", "modified_by": "Administrator", - "modified": "2012-03-27 14:35:54" + "owner": "Administrator" }, { - "section_style": "Simple", + "doctype": "DocType", "istable": 1, - "name": "__common__", - "colour": "White:FFF", "module": "HR", + "name": "__common__", + "section_style": "Simple", "show_in_menu": 0, - "version": 5, - "server_code_error": " ", - "doctype": "DocType" + "version": 5 }, { + "doctype": "DocField", "name": "__common__", "parent": "Employee Education", - "doctype": "DocField", + "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "name": "Employee Education", - "doctype": "DocType" + "doctype": "DocType", + "name": "Employee Education" }, { - "oldfieldtype": "Small Text", "doctype": "DocField", + "fieldname": "school_univ", + "fieldtype": "Small Text", "label": "School/University", "oldfieldname": "school_univ", - "fieldname": "school_univ", - "fieldtype": "Small Text" + "oldfieldtype": "Small Text" }, { - "oldfieldtype": "Data", "doctype": "DocField", + "fieldname": "qualification", + "fieldtype": "Data", "label": "Qualification", "oldfieldname": "qualification", - "width": "100px", - "fieldname": "qualification", - "fieldtype": "Data" + "oldfieldtype": "Data", + "width": "100px" }, { - "oldfieldtype": "Select", "doctype": "DocField", - "label": "Level", - "oldfieldname": "level", "fieldname": "level", "fieldtype": "Select", + "label": "Level", + "oldfieldname": "level", + "oldfieldtype": "Select", "options": "Graduate\nPost Graduate\nUnder Graduate" }, { - "oldfieldtype": "Int", "doctype": "DocField", + "fieldname": "year_of_passing", + "fieldtype": "Int", "label": "Year of Passing", "oldfieldname": "year_of_passing", - "fieldname": "year_of_passing", - "fieldtype": "Int" + "oldfieldtype": "Int" }, { - "oldfieldtype": "Data", "doctype": "DocField", + "fieldname": "class_per", + "fieldtype": "Data", "label": "Class / Percentage", "oldfieldname": "class_per", - "fieldname": "class_per", - "fieldtype": "Data" + "oldfieldtype": "Data" }, { - "oldfieldtype": "Text", "doctype": "DocField", + "fieldname": "maj_opt_subj", + "fieldtype": "Text", "label": "Major/Optional Subjects", "oldfieldname": "maj_opt_subj", - "fieldname": "maj_opt_subj", - "fieldtype": "Text" + "oldfieldtype": "Text" } ] \ No newline at end of file diff --git a/hr/doctype/employee_internal_work_history/employee_internal_work_history.txt b/hr/doctype/employee_internal_work_history/employee_internal_work_history.txt index d16eb22ca7..dd1c11f104 100644 --- a/hr/doctype/employee_internal_work_history/employee_internal_work_history.txt +++ b/hr/doctype/employee_internal_work_history/employee_internal_work_history.txt @@ -1,83 +1,82 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:35:57", + "docstatus": 0, + "modified": "2012-03-27 14:35:57", "modified_by": "Administrator", - "modified": "2012-03-27 14:35:57" + "owner": "Administrator" }, { - "section_style": "Simple", - "istable": 1, - "name": "__common__", - "colour": "White:FFF", - "module": "HR", "doctype": "DocType", - "version": 6, - "show_in_menu": 0 + "istable": 1, + "module": "HR", + "name": "__common__", + "section_style": "Simple", + "show_in_menu": 0, + "version": 6 }, { + "doctype": "DocField", "name": "__common__", "parent": "Employee Internal Work History", - "doctype": "DocField", + "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "name": "Employee Internal Work History", - "doctype": "DocType" + "doctype": "DocType", + "name": "Employee Internal Work History" }, { - "oldfieldtype": "Select", "doctype": "DocField", - "label": "Branch", - "oldfieldname": "branch", "fieldname": "branch", "fieldtype": "Select", + "label": "Branch", + "oldfieldname": "branch", + "oldfieldtype": "Select", "options": "link:Branch" }, { - "oldfieldtype": "Select", "doctype": "DocField", - "label": "Department", - "oldfieldname": "department", "fieldname": "department", "fieldtype": "Select", + "label": "Department", + "oldfieldname": "department", + "oldfieldtype": "Select", "options": "link:Department" }, { - "oldfieldtype": "Select", "doctype": "DocField", - "label": "Designation", - "oldfieldname": "designation", "fieldname": "designation", "fieldtype": "Select", + "label": "Designation", + "oldfieldname": "designation", + "oldfieldtype": "Select", "options": "link:Designation" }, { - "oldfieldtype": "Select", "doctype": "DocField", - "label": "Grade", - "oldfieldname": "grade", "fieldname": "grade", "fieldtype": "Select", + "label": "Grade", + "oldfieldname": "grade", + "oldfieldtype": "Select", "options": "link:Grade" }, { - "oldfieldtype": "Date", "doctype": "DocField", + "fieldname": "from_date", + "fieldtype": "Date", "label": "From Date", "oldfieldname": "from_date", - "fieldname": "from_date", - "fieldtype": "Date" + "oldfieldtype": "Date" }, { - "oldfieldtype": "Date", "doctype": "DocField", + "fieldname": "to_date", + "fieldtype": "Date", "label": "To Date", "oldfieldname": "to_date", - "fieldname": "to_date", - "fieldtype": "Date" + "oldfieldtype": "Date" } ] \ No newline at end of file diff --git a/hr/doctype/employee_training/employee_training.txt b/hr/doctype/employee_training/employee_training.txt index fef26f369e..256a99e13e 100644 --- a/hr/doctype/employee_training/employee_training.txt +++ b/hr/doctype/employee_training/employee_training.txt @@ -1,76 +1,74 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:35:59", + "docstatus": 0, + "modified": "2012-03-27 14:35:59", "modified_by": "Administrator", - "modified": "2012-03-27 14:35:59" + "owner": "Administrator" }, { - "section_style": "Simple", + "doctype": "DocType", "istable": 1, - "name": "__common__", - "colour": "White:FFF", "module": "HR", + "name": "__common__", + "section_style": "Simple", "show_in_menu": 0, - "version": 5, - "server_code_error": " ", - "doctype": "DocType" + "version": 5 }, { + "doctype": "DocField", "name": "__common__", "parent": "Employee Training", - "doctype": "DocField", + "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "name": "Employee Training", - "doctype": "DocType" + "doctype": "DocType", + "name": "Employee Training" }, { - "oldfieldtype": "Small Text", "doctype": "DocField", - "label": "Institute / Conducted By", - "oldfieldname": "institute", "fieldname": "institute", "fieldtype": "Small Text", + "label": "Institute / Conducted By", + "oldfieldname": "institute", + "oldfieldtype": "Small Text", "reqd": 1 }, { - "oldfieldtype": "Small Text", "doctype": "DocField", - "label": "Program / Seminar Title", - "oldfieldname": "nature_of_training", "fieldname": "nature_of_training", "fieldtype": "Small Text", + "label": "Program / Seminar Title", + "oldfieldname": "nature_of_training", + "oldfieldtype": "Small Text", "reqd": 1 }, { - "oldfieldtype": "Data", "doctype": "DocField", - "label": "Duration", - "oldfieldname": "duration", "fieldname": "duration", "fieldtype": "Data", + "label": "Duration", + "oldfieldname": "duration", + "oldfieldtype": "Data", "reqd": 0 }, { - "oldfieldtype": "Data", "doctype": "DocField", - "label": "Location", - "oldfieldname": "loc", "fieldname": "loc", "fieldtype": "Data", + "label": "Location", + "oldfieldname": "loc", + "oldfieldtype": "Data", "reqd": 0 }, { - "oldfieldtype": "Small Text", "doctype": "DocField", + "fieldname": "certificate", + "fieldtype": "Small Text", "label": "Certificate", "oldfieldname": "certificate", - "fieldname": "certificate", - "fieldtype": "Small Text" + "oldfieldtype": "Small Text" } ] \ 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 9a0236fd87..3f59e6695b 100644 --- a/hr/doctype/expense_claim_type/expense_claim_type.txt +++ b/hr/doctype/expense_claim_type/expense_claim_type.txt @@ -1,76 +1,74 @@ [ { - "owner": "harshada@webnotestech.com", - "docstatus": 0, "creation": "2012-03-27 14:35:55", + "docstatus": 0, + "modified": "2012-03-27 14:35:55", "modified_by": "Administrator", - "modified": "2012-03-27 14:35:55" + "owner": "harshada@webnotestech.com" }, { - "section_style": "Simple", - "name": "__common__", "autoname": "field:expense_type", - "colour": "White:FFF", - "module": "HR", - "server_code_error": " ", - "version": 5, "doctype": "DocType", - "document_type": "Master" + "document_type": "Master", + "module": "HR", + "name": "__common__", + "section_style": "Simple", + "version": 5 }, { - "name": "__common__", - "parent": "Expense Claim Type", "doctype": "DocField", - "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" - }, - { "name": "__common__", "parent": "Expense Claim Type", - "read": 1, + "parentfield": "fields", + "parenttype": "DocType", + "permlevel": 0 + }, + { "create": 1, "doctype": "DocPerm", - "write": 1, - "report": 1, + "name": "__common__", + "parent": "Expense Claim Type", + "parentfield": "permissions", "parenttype": "DocType", "permlevel": 0, - "parentfield": "permissions" + "read": 1, + "report": 1, + "write": 1 }, { - "name": "Expense Claim Type", - "doctype": "DocType" + "doctype": "DocType", + "name": "Expense Claim Type" }, { - "role": "System Manager", - "doctype": "DocPerm" + "doctype": "DocPerm", + "role": "System Manager" }, { - "role": "HR Manager", - "doctype": "DocPerm" + "doctype": "DocPerm", + "role": "HR Manager" }, { - "role": "System Manager", - "doctype": "DocPerm" + "doctype": "DocPerm", + "role": "System Manager" }, { - "search_index": 0, "doctype": "DocField", - "label": "Expense Claim Type", - "oldfieldname": "expense_type", "fieldname": "expense_type", "fieldtype": "Data", + "in_filter": 0, + "label": "Expense Claim Type", + "oldfieldname": "expense_type", "oldfieldtype": "Data", "reqd": 1, - "in_filter": 0 + "search_index": 0 }, { - "oldfieldtype": "Small Text", "doctype": "DocField", + "fieldname": "description", + "fieldtype": "Small Text", "label": "Description", "oldfieldname": "description", - "width": "300px", - "fieldname": "description", - "fieldtype": "Small Text" + "oldfieldtype": "Small Text", + "width": "300px" } ] \ No newline at end of file diff --git a/hr/doctype/holiday/holiday.txt b/hr/doctype/holiday/holiday.txt index 612a47a276..734b970fa1 100644 --- a/hr/doctype/holiday/holiday.txt +++ b/hr/doctype/holiday/holiday.txt @@ -1,47 +1,45 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:35:57", + "docstatus": 0, + "modified": "2012-03-27 14:35:57", "modified_by": "Administrator", - "modified": "2012-03-27 14:35:57" + "owner": "Administrator" }, { - "section_style": "Simple", + "doctype": "DocType", "istable": 1, - "name": "__common__", - "colour": "White:FFF", "module": "HR", + "name": "__common__", + "section_style": "Simple", "show_in_menu": 0, - "version": 2, - "server_code_error": " ", - "doctype": "DocType" + "version": 2 }, { + "doctype": "DocField", "name": "__common__", "parent": "Holiday", - "doctype": "DocField", + "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "name": "Holiday", - "doctype": "DocType" + "doctype": "DocType", + "name": "Holiday" }, { "doctype": "DocField", - "label": "Description", - "width": "300px", "fieldname": "description", - "fieldtype": "Small Text" + "fieldtype": "Small Text", + "label": "Description", + "width": "300px" }, { - "oldfieldtype": "Date", "doctype": "DocField", + "fieldname": "holiday_date", + "fieldtype": "Date", "label": "Date", "oldfieldname": "holiday_date", - "fieldname": "holiday_date", - "fieldtype": "Date" + "oldfieldtype": "Date" } ] \ No newline at end of file diff --git a/hr/doctype/salary_manager/salary_manager.txt b/hr/doctype/salary_manager/salary_manager.txt index 173af8abe8..081b156d80 100644 --- a/hr/doctype/salary_manager/salary_manager.txt +++ b/hr/doctype/salary_manager/salary_manager.txt @@ -1,202 +1,194 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:35:59", + "docstatus": 0, + "modified": "2012-03-27 14:35:59", "modified_by": "Administrator", - "modified": "2012-03-27 14:35:59" + "owner": "Administrator" }, { - "section_style": "Simple", + "_last_update": "1314253977", + "allow_copy": 1, + "allow_email": 1, "allow_print": 1, - "module": "HR", "doctype": "DocType", "document_type": "Other", - "allow_email": 1, "issingle": 1, + "module": "HR", "name": "__common__", - "colour": "White:FFF", - "_last_update": "1314253977", + "section_style": "Simple", "show_in_menu": 1, - "version": 30, - "allow_copy": 1 + "version": 30 }, { - "name": "__common__", - "parent": "Salary Manager", "doctype": "DocField", - "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" - }, - { "name": "__common__", "parent": "Salary Manager", - "read": 1, + "parentfield": "fields", + "parenttype": "DocType", + "permlevel": 0 + }, + { "create": 1, "doctype": "DocPerm", - "write": 1, + "name": "__common__", + "parent": "Salary Manager", + "parentfield": "permissions", "parenttype": "DocType", "permlevel": 0, - "parentfield": "permissions" + "read": 1, + "write": 1 }, { - "name": "Salary Manager", - "doctype": "DocType" + "doctype": "DocType", + "name": "Salary Manager" }, { - "role": "System Manager", - "doctype": "DocPerm" + "doctype": "DocPerm", + "role": "System Manager" }, { - "role": "HR User", - "doctype": "DocPerm" + "doctype": "DocPerm", + "role": "HR User" }, { - "role": "HR Manager", - "doctype": "DocPerm" + "doctype": "DocPerm", + "role": "HR Manager" }, { - "colour": "White:FFF", "doctype": "DocField", - "label": "Document Description", "fieldname": "document_description", "fieldtype": "HTML", + "label": "Document Description", "options": "
You can generate multiple salary slips based on the selected criteria, submit and mail those to the employee directly from here
" }, { + "doctype": "DocField", "fieldname": "section_break0", - "fieldtype": "Section Break", - "doctype": "DocField" + "fieldtype": "Section Break" }, { - "width": "50%", + "doctype": "DocField", "fieldname": "column_break0", "fieldtype": "Column Break", - "doctype": "DocField" + "width": "50%" }, { "doctype": "DocField", - "label": "Company", "fieldname": "company", "fieldtype": "Select", - "reqd": 1, - "options": "link:Company" + "label": "Company", + "options": "link:Company", + "reqd": 1 }, { "doctype": "DocField", - "label": "Branch", "fieldname": "branch", "fieldtype": "Link", + "label": "Branch", "options": "Branch" }, { "doctype": "DocField", - "label": "Department", "fieldname": "department", "fieldtype": "Link", + "label": "Department", "options": "Department" }, { "doctype": "DocField", - "label": "Designation", "fieldname": "designation", "fieldtype": "Link", + "label": "Designation", "options": "Designation" }, { - "width": "50%", + "doctype": "DocField", "fieldname": "column_break1", "fieldtype": "Column Break", - "doctype": "DocField" + "width": "50%" }, { "doctype": "DocField", - "label": "Grade", "fieldname": "grade", "fieldtype": "Select", + "label": "Grade", "options": "link:Grade" }, { - "colour": "White:FFF", "doctype": "DocField", - "label": "Fiscal Year", "fieldname": "fiscal_year", "fieldtype": "Select", - "reqd": 1, - "options": "link:Fiscal Year" + "label": "Fiscal Year", + "options": "link:Fiscal Year", + "reqd": 1 }, { - "colour": "White:FFF", "doctype": "DocField", - "label": "Month", "fieldname": "month", "fieldtype": "Select", - "reqd": 1, - "options": "\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12" + "label": "Month", + "options": "\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12", + "reqd": 1 }, { "description": "Check if you want to send salary slip in mail to each employee while submitting salary slip", - "colour": "White:FFF", "doctype": "DocField", - "label": "Send Email", "fieldname": "send_email", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Send Email" }, { + "doctype": "DocField", "fieldname": "section_break1", - "fieldtype": "Section Break", - "doctype": "DocField" + "fieldtype": "Section Break" }, { - "width": "50%", + "doctype": "DocField", "fieldname": "column_break2", "fieldtype": "Column Break", - "doctype": "DocField" + "width": "50%" }, { "description": "Creates salary slip for above mentioned criteria.", - "colour": "White:FFF", "doctype": "DocField", - "label": "Create Salary Slip", - "trigger": "Client", "fieldname": "create_salary_slip", - "fieldtype": "Button" + "fieldtype": "Button", + "label": "Create Salary Slip", + "trigger": "Client" }, { - "width": "25%", + "doctype": "DocField", "fieldname": "column_break3", "fieldtype": "Column Break", - "doctype": "DocField" + "width": "25%" }, { "description": "Submit all salary slips for the above selected criteria", - "colour": "White:FFF", "doctype": "DocField", - "label": "Submit Salary Slip", - "trigger": "Client", "fieldname": "submit_salary_slip", - "fieldtype": "Button" + "fieldtype": "Button", + "label": "Submit Salary Slip", + "trigger": "Client" }, { - "width": "25%", + "doctype": "DocField", "fieldname": "column_break4", "fieldtype": "Column Break", - "doctype": "DocField" + "width": "25%" }, { "description": "Create Bank Voucher for the total salary paid for the above selected criteria", - "colour": "White:FFF", "doctype": "DocField", - "label": "Make Bank Voucher", - "trigger": "Client", "fieldname": "make_bank_voucher", - "fieldtype": "Button" + "fieldtype": "Button", + "label": "Make Bank Voucher", + "trigger": "Client" }, { + "doctype": "DocField", "fieldname": "section_break2", - "fieldtype": "Section Break", - "doctype": "DocField" + "fieldtype": "Section Break" }, { "doctype": "DocField", diff --git a/patches/patch_list.py b/patches/patch_list.py index dd7ff06e64..ed4e82e964 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -204,5 +204,6 @@ patch_list = [ "patches.march_2013.update_po_prevdoc_doctype", "patches.february_2013.p09_timesheets", "execute:(not webnotes.conn.exists('UOM', 'Hour')) and webnotes.doc({'uom_name': 'Hour', 'doctype': 'UOM', 'name': 'Hour'}).insert()", - "patches.march_2013.p01_c_form" + "patches.march_2013.p01_c_form", + "execute:webnotes.conn.sql('update tabDocPerm set `submit`=1, `cancel`=1, `amend`=1 where parent=\"Time Log\"')" ] \ No newline at end of file diff --git a/projects/doctype/activity_type/activity_type.txt b/projects/doctype/activity_type/activity_type.txt index 3bde64786b..028db2bd4d 100644 --- a/projects/doctype/activity_type/activity_type.txt +++ b/projects/doctype/activity_type/activity_type.txt @@ -1,60 +1,56 @@ [ { - "owner": "Administrator", + "creation": "2013-03-05 12:53:23", "docstatus": 0, - "creation": "2012-07-03 13:30:51", + "modified": "2013-03-05 12:54:22", "modified_by": "Administrator", - "modified": "2012-11-16 12:14:21" + "owner": "Administrator" }, { - "section_style": "Simple", - "module": "Projects", - "server_code_error": " ", - "in_dialog": 1, - "document_type": "Master", "autoname": "field:activity_type", - "name": "__common__", - "colour": "White:FFF", "doctype": "DocType", - "version": 1 + "document_type": "Master", + "in_dialog": 1, + "module": "Projects", + "name": "__common__" }, { - "parent": "Activity Type", - "name": "__common__", "doctype": "DocField", - "reqd": 1, - "parenttype": "DocType", "fieldname": "activity_type", "fieldtype": "Data", "label": "Activity Type", - "permlevel": 0, - "parentfield": "fields" - }, - { "name": "__common__", "parent": "Activity Type", - "read": 1, - "create": 1, - "doctype": "DocPerm", - "write": 1, + "parentfield": "fields", "parenttype": "DocType", - "report": 1, "permlevel": 0, - "parentfield": "permissions" + "reqd": 1 }, { - "name": "Activity Type", - "doctype": "DocType" + "create": 1, + "doctype": "DocPerm", + "name": "__common__", + "parent": "Activity Type", + "parentfield": "permissions", + "parenttype": "DocType", + "permlevel": 0, + "read": 1, + "report": 1, + "write": 1 + }, + { + "doctype": "DocType", + "name": "Activity Type" }, { "doctype": "DocField" }, { - "role": "System Manager", - "doctype": "DocPerm" + "doctype": "DocPerm", + "role": "System Manager" }, { - "role": "Projects User", - "doctype": "DocPerm" + "doctype": "DocPerm", + "role": "Projects User" } ] \ No newline at end of file diff --git a/projects/doctype/project_milestone/project_milestone.txt b/projects/doctype/project_milestone/project_milestone.txt index 29ea15b7a5..4641b5d3bb 100644 --- a/projects/doctype/project_milestone/project_milestone.txt +++ b/projects/doctype/project_milestone/project_milestone.txt @@ -1,58 +1,56 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:36:06", + "docstatus": 0, + "modified": "2012-03-27 14:36:06", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:06" + "owner": "Administrator" }, { - "section_style": "Simple", - "istable": 1, - "name": "__common__", - "colour": "White:FFF", - "module": "Projects", "doctype": "DocType", - "version": 4, - "server_code_error": " " + "istable": 1, + "module": "Projects", + "name": "__common__", + "section_style": "Simple", + "version": 4 }, { + "doctype": "DocField", "name": "__common__", "parent": "Project Milestone", - "doctype": "DocField", + "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "name": "Project Milestone", - "doctype": "DocType" + "doctype": "DocType", + "name": "Project Milestone" }, { - "oldfieldtype": "Date", "doctype": "DocField", + "fieldname": "milestone_date", + "fieldtype": "Date", "label": "Milestone Date", "oldfieldname": "milestone_date", - "fieldname": "milestone_date", - "fieldtype": "Date" + "oldfieldtype": "Date" }, { - "oldfieldtype": "Text", "doctype": "DocField", + "fieldname": "milestone", + "fieldtype": "Text", "label": "Milestone", "oldfieldname": "milestone", - "width": "300px", - "fieldname": "milestone", - "fieldtype": "Text" + "oldfieldtype": "Text", + "width": "300px" }, { - "no_copy": 1, - "oldfieldtype": "Select", "doctype": "DocField", - "label": "Status", - "oldfieldname": "status", "fieldname": "status", "fieldtype": "Select", + "label": "Status", + "no_copy": 1, + "oldfieldname": "status", + "oldfieldtype": "Select", "options": "Pending\nCompleted" } ] \ No newline at end of file diff --git a/projects/doctype/time_log/time_log.txt b/projects/doctype/time_log/time_log.txt index cf815db57f..838d3f178a 100644 --- a/projects/doctype/time_log/time_log.txt +++ b/projects/doctype/time_log/time_log.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-03-04 02:39:45", + "creation": "2013-03-05 10:52:02", "docstatus": 0, - "modified": "2013-03-04 02:48:12", + "modified": "2013-03-05 10:54:07", "modified_by": "Administrator", "owner": "Administrator" }, @@ -24,6 +24,8 @@ "parenttype": "DocType" }, { + "amend": 1, + "cancel": 1, "doctype": "DocPerm", "name": "__common__", "parent": "Time Log", @@ -31,6 +33,8 @@ "parenttype": "DocType", "permlevel": 0, "read": 1, + "report": 1, + "submit": 1, "write": 1 }, { diff --git a/selling/Print Format/Quotation Classic/Quotation Classic.txt b/selling/Print Format/Quotation Classic/Quotation Classic.txt index ca950a21ad..e6ea84d2ff 100644 --- a/selling/Print Format/Quotation Classic/Quotation Classic.txt +++ b/selling/Print Format/Quotation Classic/Quotation Classic.txt @@ -1,15 +1,15 @@ [ { - "creation": "2012-04-17 11:29:12", + "creation": "2013-02-19 16:00:58", "docstatus": 0, - "modified": "2013-02-19 15:44:56", + "modified": "2013-03-05 11:57:20", "modified_by": "Administrator", "owner": "Administrator" }, { "doc_type": "Quotation", "doctype": "Print Format", - "html": "\n\n\n\n\n\n\n\n\n\n\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\t\n\t\t\t

\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
Name
Address
Contact
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t
Quotation Date
\n
\n
\n\t\n\t\n
\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\tTerms, Conditions & Other Information:
\n\t\t\t\t\t\n\t\t\t\t		\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
Net Total
Grand Total
Rounded Total
\n\t\t\t\t\t
In Words
\n\t\t\t\t\t\n\t\t\t\t
\n
\n", + "html": "\n\n\n\n\n\n\n\n\n\n\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\t\n\t\t\t

\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n \n \t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
Name
Address
Contact
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t
Quotation Date
\n
\n
\n\t\n\t\n
\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\tTerms, Conditions & Other Information:
\n\t\t\t\t\t\n\t\t\t\t		\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
Net Total
Grand Total
Rounded Total
\n\t\t\t\t\t
In Words
\n\t\t\t\t\t\n\t\t\t\t
\n
\n", "module": "Selling", "name": "__common__", "standard": "Yes" diff --git a/selling/Print Format/Quotation Modern/Quotation Modern.txt b/selling/Print Format/Quotation Modern/Quotation Modern.txt index a323fbf829..1919b93add 100644 --- a/selling/Print Format/Quotation Modern/Quotation Modern.txt +++ b/selling/Print Format/Quotation Modern/Quotation Modern.txt @@ -1,15 +1,15 @@ [ { - "creation": "2012-04-17 11:29:12", + "creation": "2013-02-19 16:23:17", "docstatus": 0, - "modified": "2013-02-19 15:44:22", + "modified": "2013-03-05 11:57:53", "modified_by": "Administrator", "owner": "Administrator" }, { "doc_type": "Quotation", "doctype": "Print Format", - "html": "\n\n\n\n\n\n\n\n\n\n\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
Name
Address
Contact
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t
Quotation No.
Quotation Date
\n
\n
\n\t\n\t\n
\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\n\t
\n\t\t\t\t\tTerms, Conditions & Other Information:
\n\t\t\t\t\t\n\t\t\t\t		\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
Net Total
Grand Total
Rounded Total
\n\t\t\t\t\t
In Words
\n\t\t\t\t\t\n\t\t\t\t
\n
\n", + "html": "\n\n\n\n\n\n\n\n\n\n\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n \n \t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
Name
Address
Contact
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t
Quotation No.
Quotation Date
\n
\n
\n\t\n\t\n
\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\n\t
\n\t\t\t\t\tTerms, Conditions & Other Information:
\n\t\t\t\t\t\n\t\t\t\t		\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
Net Total
Grand Total
Rounded Total
\n\t\t\t\t\t
In Words
\n\t\t\t\t\t\n\t\t\t\t
\n
\n", "module": "Selling", "name": "__common__", "standard": "Yes" diff --git a/selling/Print Format/Quotation Spartan/Quotation Spartan.txt b/selling/Print Format/Quotation Spartan/Quotation Spartan.txt index d2e04dda8d..461bc0b7b1 100644 --- a/selling/Print Format/Quotation Spartan/Quotation Spartan.txt +++ b/selling/Print Format/Quotation Spartan/Quotation Spartan.txt @@ -1,15 +1,15 @@ [ { - "creation": "2012-04-17 11:29:12", + "creation": "2013-02-19 16:23:17", "docstatus": 0, - "modified": "2013-02-19 15:45:22", + "modified": "2013-03-05 11:56:50", "modified_by": "Administrator", "owner": "Administrator" }, { "doc_type": "Quotation", "doctype": "Print Format", - "html": "\n\n\n\n\n\n\n\n\n\n\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t

\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
Name
Address
Contact
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t
Quotation Date
\n
\n
\n\t\n\t\n
\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\tTerms, Conditions & Other Information:
\n\t\t\t\t\t\n\t\t\t\t		\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
Net Total
Grand Total
Rounded Total
\n\t\t\t\t\t
In Words
\n\t\t\t\t\t\n\t\t\t\t
\n
\n", + "html": "\n\n\n\n\n\n\n\n\n\n\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t

\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n \n \t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
Name
Address
Contact
\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t
Quotation Date
\n
\n
\n\t\n\t\n
\n
\n\t\n\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t
\n\t\t\t\t\tTerms, Conditions & Other Information:
\n\t\t\t\t\t\n\t\t\t\t		\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
Net Total
Grand Total
Rounded Total
\n\t\t\t\t\t
In Words
\n\t\t\t\t\t\n\t\t\t\t
\n
\n", "module": "Selling", "name": "__common__", "standard": "Yes" diff --git a/selling/doctype/industry_type/industry_type.txt b/selling/doctype/industry_type/industry_type.txt index 39534d1414..329a040e06 100644 --- a/selling/doctype/industry_type/industry_type.txt +++ b/selling/doctype/industry_type/industry_type.txt @@ -1,65 +1,63 @@ [ { - "owner": "harshada@webnotestech.com", - "docstatus": 0, "creation": "2012-03-27 14:36:09", + "docstatus": 0, + "modified": "2012-03-27 14:36:09", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:09" + "owner": "harshada@webnotestech.com" }, { - "section_style": "Simple", - "name": "__common__", "autoname": "field:industry", - "colour": "White:FFF", - "module": "Selling", - "server_code_error": " ", - "version": 4, "doctype": "DocType", - "document_type": "Master" + "document_type": "Master", + "module": "Selling", + "name": "__common__", + "section_style": "Simple", + "version": 4 }, { - "parent": "Industry Type", - "oldfieldtype": "Data", "doctype": "DocField", - "oldfieldname": "industry", - "reqd": 1, - "name": "__common__", - "label": "Industry", - "parenttype": "DocType", "fieldname": "industry", "fieldtype": "Data", - "permlevel": 0, - "parentfield": "fields" - }, - { + "label": "Industry", "name": "__common__", + "oldfieldname": "industry", + "oldfieldtype": "Data", "parent": "Industry Type", - "read": 1, - "doctype": "DocPerm", - "report": 1, + "parentfield": "fields", "parenttype": "DocType", "permlevel": 0, - "parentfield": "permissions" + "reqd": 1 }, { - "name": "Industry Type", - "doctype": "DocType" + "doctype": "DocPerm", + "name": "__common__", + "parent": "Industry Type", + "parentfield": "permissions", + "parenttype": "DocType", + "permlevel": 0, + "read": 1, + "report": 1 + }, + { + "doctype": "DocType", + "name": "Industry Type" }, { - "write": 1, "create": 1, + "doctype": "DocPerm", "role": "Sales Manager", - "doctype": "DocPerm" + "write": 1 }, { - "role": "Sales User", - "doctype": "DocPerm" + "doctype": "DocPerm", + "role": "Sales User" }, { - "write": 1, "create": 1, + "doctype": "DocPerm", "role": "Sales Master Manager", - "doctype": "DocPerm" + "write": 1 }, { "doctype": "DocField" diff --git a/selling/doctype/sales_common/sales_common.txt b/selling/doctype/sales_common/sales_common.txt index ccfd0046fc..4d00b5146a 100644 --- a/selling/doctype/sales_common/sales_common.txt +++ b/selling/doctype/sales_common/sales_common.txt @@ -1,24 +1,22 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:36:14", + "docstatus": 0, + "modified": "2012-03-27 14:36:14", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:14" + "owner": "Administrator" }, { - "section_style": "Simple", - "name": "__common__", - "colour": "White:FFF", - "module": "Selling", - "show_in_menu": 0, - "version": 290, - "server_code_error": " ", "doctype": "DocType", - "issingle": 1 + "issingle": 1, + "module": "Selling", + "name": "__common__", + "section_style": "Simple", + "show_in_menu": 0, + "version": 290 }, { - "name": "Sales Common", - "doctype": "DocType" + "doctype": "DocType", + "name": "Sales Common" } ] \ No newline at end of file diff --git a/setup/doctype/authorization_control/authorization_control.txt b/setup/doctype/authorization_control/authorization_control.txt index 5cf6ce7db5..601381ec31 100644 --- a/setup/doctype/authorization_control/authorization_control.txt +++ b/setup/doctype/authorization_control/authorization_control.txt @@ -1,23 +1,21 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:36:18", + "docstatus": 0, + "modified": "2012-03-27 14:36:18", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:18" + "owner": "Administrator" }, { - "section_style": "Tabbed", - "name": "__common__", - "colour": "White:FFF", - "module": "Setup", "doctype": "DocType", - "version": 216, - "server_code_error": " ", - "issingle": 1 + "issingle": 1, + "module": "Setup", + "name": "__common__", + "section_style": "Tabbed", + "version": 216 }, { - "name": "Authorization Control", - "doctype": "DocType" + "doctype": "DocType", + "name": "Authorization Control" } ] \ No newline at end of file diff --git a/setup/doctype/contact_control/contact_control.txt b/setup/doctype/contact_control/contact_control.txt index 453ca6e20d..9fab367591 100644 --- a/setup/doctype/contact_control/contact_control.txt +++ b/setup/doctype/contact_control/contact_control.txt @@ -1,65 +1,63 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:36:19", + "docstatus": 0, + "modified": "2012-03-27 14:36:19", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:19" + "owner": "Administrator" }, { - "section_style": "Simple", - "in_create": 1, - "module": "Setup", "doctype": "DocType", - "server_code_error": " ", + "in_create": 1, "issingle": 1, - "read_only": 1, + "module": "Setup", "name": "__common__", - "colour": "White:FFF", + "read_only": 1, + "section_style": "Simple", "show_in_menu": 0, "version": 25 }, { + "doctype": "DocField", + "fieldtype": "Text", "name": "__common__", "parent": "Contact Control", - "doctype": "DocField", + "parentfield": "fields", "parenttype": "DocType", - "fieldtype": "Text", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "parent": "Contact Control", - "read": 1, - "name": "__common__", "create": 0, "doctype": "DocPerm", - "write": 1, + "name": "__common__", + "parent": "Contact Control", + "parentfield": "permissions", "parenttype": "DocType", - "role": "System Manager", "permlevel": 0, - "parentfield": "permissions" + "read": 1, + "role": "System Manager", + "write": 1 }, { - "name": "Contact Control", - "doctype": "DocType" + "doctype": "DocType", + "name": "Contact Control" }, { "doctype": "DocPerm" }, { - "fieldname": "header", "doctype": "DocField", + "fieldname": "header", "label": "Header" }, { - "fieldname": "customer_intro", "doctype": "DocField", + "fieldname": "customer_intro", "label": "Customer Intro" }, { - "fieldname": "supplier_intro", "doctype": "DocField", + "fieldname": "supplier_intro", "label": "Supplier Intro" } ] \ No newline at end of file diff --git a/setup/doctype/email_settings/email_settings.txt b/setup/doctype/email_settings/email_settings.txt index 1a2051cf99..994d4c9100 100644 --- a/setup/doctype/email_settings/email_settings.txt +++ b/setup/doctype/email_settings/email_settings.txt @@ -1,50 +1,48 @@ [ { - "owner": "harshada@webnotestech.com", - "docstatus": 0, "creation": "2012-07-03 13:30:55", + "docstatus": 0, + "modified": "2012-07-12 16:16:27", "modified_by": "Administrator", - "modified": "2012-07-12 16:16:27" + "owner": "harshada@webnotestech.com" }, { - "section_style": "Simple", - "description": "Email Settings for Outgoing and Incoming Emails.", + "_last_update": "1325570647", + "allow_copy": 1, + "allow_email": 1, "allow_print": 1, - "module": "Setup", + "description": "Email Settings for Outgoing and Incoming Emails.", "doctype": "DocType", "in_create": 1, - "allow_email": 1, "issingle": 1, + "module": "Setup", "name": "__common__", - "colour": "White:FFF", - "_last_update": "1325570647", - "server_code_error": " ", - "version": 1, - "allow_copy": 1 + "section_style": "Simple", + "version": 1 }, { - "name": "__common__", - "parent": "Email Settings", "doctype": "DocField", - "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" - }, - { "name": "__common__", "parent": "Email Settings", - "read": 1, + "parentfield": "fields", + "parenttype": "DocType", + "permlevel": 0 + }, + { "create": 1, "doctype": "DocPerm", - "write": 1, + "name": "__common__", + "parent": "Email Settings", + "parentfield": "permissions", "parenttype": "DocType", - "role": "System Manager", "permlevel": 0, - "parentfield": "permissions" + "read": 1, + "role": "System Manager", + "write": 1 }, { - "name": "Email Settings", - "doctype": "DocType" + "doctype": "DocType", + "name": "Email Settings" }, { "doctype": "DocPerm" @@ -54,19 +52,17 @@ }, { "description": "Set your outgoing mail SMTP settings here. All system generated notifications, emails will go from this mail server. If you are not sure, leave this blank to use ERPNext servers (emails will still be sent from your email id) or contact your email provider.", - "colour": "White:FFF", "doctype": "DocField", - "label": "Outgoing Mails", "fieldname": "outgoing_mails", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "Outgoing Mails" }, { "description": "SMTP Server (e.g. smtp.gmail.com)", - "colour": "White:FFF", "doctype": "DocField", - "label": "Outgoing Mail Server", "fieldname": "outgoing_mail_server", - "fieldtype": "Data" + "fieldtype": "Data", + "label": "Outgoing Mail Server" }, { "doctype": "DocField", @@ -76,24 +72,22 @@ }, { "description": "If non standard port (e.g. 587)", - "colour": "White:FFF", "doctype": "DocField", - "label": "Mail Port", "fieldname": "mail_port", - "fieldtype": "Int" + "fieldtype": "Int", + "label": "Mail Port" }, { + "doctype": "DocField", "fieldname": "cb0", - "fieldtype": "Column Break", - "doctype": "DocField" + "fieldtype": "Column Break" }, { "description": "Set Login and Password if authentication is required.", - "colour": "White:FFF", "doctype": "DocField", - "label": "Login Id", "fieldname": "mail_login", - "fieldtype": "Data" + "fieldtype": "Data", + "label": "Login Id" }, { "doctype": "DocField", @@ -103,50 +97,45 @@ }, { "description": "System generated mails will be sent from this email id.", - "colour": "White:FFF", "doctype": "DocField", - "label": "Auto Email Id", "fieldname": "auto_email_id", - "fieldtype": "Data" + "fieldtype": "Data", + "label": "Auto Email Id" }, { "description": "Set the POP3 email settings to pull emails directly from a mailbox and create Support Tickets", "doctype": "DocField", - "label": "Support Ticket Mail Settings", "fieldname": "support_ticket_mail_settings", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "Support Ticket Mail Settings" }, { "description": "To automatically create Support Tickets from your incoming mail, set your POP3 settings here. You must ideally create a separate email id for the erp system so that all emails will be synced into the system from that mail id. If you are not sure, please contact your EMail Provider.", - "colour": "White:FFF", "doctype": "DocField", - "label": "Incoming Mail Setting", "fieldname": "section_break0", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "Incoming Mail Setting" }, { "description": "Check this to pull emails from your mailbox", - "colour": "White:FFF", "doctype": "DocField", - "label": "Sync Support Mails", "fieldname": "sync_support_mails", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Sync Support Mails" }, { "description": "Your support email id - must be a valid email - this is where your emails will come!", - "colour": "White:FFF", "doctype": "DocField", - "label": "Support Email", "fieldname": "support_email", - "fieldtype": "Data" + "fieldtype": "Data", + "label": "Support Email" }, { "description": "POP3 mail server (e.g. pop.gmail.com)", - "colour": "White:FFF", "doctype": "DocField", - "label": "POP3 Mail Server", "fieldname": "support_host", - "fieldtype": "Data" + "fieldtype": "Data", + "label": "POP3 Mail Server" }, { "doctype": "DocField", @@ -167,32 +156,29 @@ "label": "Support Password" }, { + "doctype": "DocField", "fieldname": "cb1", - "fieldtype": "Column Break", - "doctype": "DocField" + "fieldtype": "Column Break" }, { "description": "Signature to be appended at the end of every email", - "colour": "White:FFF", "doctype": "DocField", - "label": "Signature", "fieldname": "support_signature", - "fieldtype": "Text" + "fieldtype": "Text", + "label": "Signature" }, { "default": "1", - "colour": "White:FFF", "doctype": "DocField", - "label": "Send Autoreply", "fieldname": "send_autoreply", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Send Autoreply" }, { "description": "Autoreply when a new mail is received", - "colour": "White:FFF", "doctype": "DocField", - "label": "Custom Autoreply Message", "fieldname": "support_autoreply", - "fieldtype": "Text" + "fieldtype": "Text", + "label": "Custom Autoreply Message" } ] \ 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 61159715b9..c95af3d41e 100644 --- a/setup/doctype/naming_series_options/naming_series_options.txt +++ b/setup/doctype/naming_series_options/naming_series_options.txt @@ -1,65 +1,63 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:36:21", + "docstatus": 0, + "modified": "2012-03-27 14:36:21", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:21" + "owner": "Administrator" }, { - "section_style": "Simple", + "autoname": "__NSO.#####", + "doctype": "DocType", "in_create": 1, "module": "Setup", - "doctype": "DocType", - "read_only": 0, - "autoname": "__NSO.#####", "name": "__common__", - "colour": "White:FFF", - "server_code_error": " ", + "read_only": 0, + "section_style": "Simple", "show_in_menu": 0, "version": 5 }, { - "name": "__common__", - "parent": "Naming Series Options", "doctype": "DocField", - "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" - }, - { - "parent": "Naming Series Options", - "read": 1, "name": "__common__", - "doctype": "DocPerm", - "report": 1, + "parent": "Naming Series Options", + "parentfield": "fields", "parenttype": "DocType", - "role": "System Manager", - "permlevel": 0, - "parentfield": "permissions" + "permlevel": 0 }, { - "name": "Naming Series Options", - "doctype": "DocType" + "doctype": "DocPerm", + "name": "__common__", + "parent": "Naming Series Options", + "parentfield": "permissions", + "parenttype": "DocType", + "permlevel": 0, + "read": 1, + "report": 1, + "role": "System Manager" + }, + { + "doctype": "DocType", + "name": "Naming Series Options" }, { "doctype": "DocPerm" }, { - "oldfieldtype": "Data", "doctype": "DocField", - "label": "Doc Type", - "oldfieldname": "doc_type", "fieldname": "doc_type", "fieldtype": "Data", + "label": "Doc Type", + "oldfieldname": "doc_type", + "oldfieldtype": "Data", "search_index": 1 }, { - "oldfieldtype": "Text", "doctype": "DocField", + "fieldname": "series_options", + "fieldtype": "Text", "label": "Series Options", "oldfieldname": "series_options", - "fieldname": "series_options", - "fieldtype": "Text" + "oldfieldtype": "Text" } ] \ No newline at end of file diff --git a/setup/doctype/sales_browser_control/sales_browser_control.txt b/setup/doctype/sales_browser_control/sales_browser_control.txt index 801b2e02e0..6083a31abb 100644 --- a/setup/doctype/sales_browser_control/sales_browser_control.txt +++ b/setup/doctype/sales_browser_control/sales_browser_control.txt @@ -1,23 +1,21 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:36:23", + "docstatus": 0, + "modified": "2012-03-27 14:36:23", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:23" + "owner": "Administrator" }, { - "section_style": "Simple", - "name": "__common__", - "colour": "White:FFF", - "module": "Setup", "doctype": "DocType", - "version": 159, - "server_code_error": " ", - "issingle": 1 + "issingle": 1, + "module": "Setup", + "name": "__common__", + "section_style": "Simple", + "version": 159 }, { - "name": "Sales Browser Control", - "doctype": "DocType" + "doctype": "DocType", + "name": "Sales Browser Control" } ] \ No newline at end of file diff --git a/setup/doctype/series_detail/series_detail.txt b/setup/doctype/series_detail/series_detail.txt index c0e9ba4fd4..19ef3fbf35 100644 --- a/setup/doctype/series_detail/series_detail.txt +++ b/setup/doctype/series_detail/series_detail.txt @@ -1,48 +1,47 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:36:25", + "docstatus": 0, + "modified": "2012-03-27 14:36:25", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:25" + "owner": "Administrator" }, { - "section_style": "Tray", - "istable": 1, - "name": "__common__", - "colour": "White:FFF", - "module": "Setup", "doctype": "DocType", - "version": 3, - "show_in_menu": 0 + "istable": 1, + "module": "Setup", + "name": "__common__", + "section_style": "Tray", + "show_in_menu": 0, + "version": 3 }, { + "doctype": "DocField", "name": "__common__", "parent": "Series Detail", - "doctype": "DocField", + "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "name": "Series Detail", - "doctype": "DocType" + "doctype": "DocType", + "name": "Series Detail" }, { - "oldfieldtype": "Read Only", "doctype": "DocField", + "fieldname": "series", + "fieldtype": "Read Only", "label": "Series", "oldfieldname": "series", - "fieldname": "series", - "fieldtype": "Read Only" + "oldfieldtype": "Read Only" }, { - "oldfieldtype": "Check", "doctype": "DocField", + "fieldname": "remove", + "fieldtype": "Check", "label": "Remove", "oldfieldname": "remove", - "trigger": "Client", - "fieldname": "remove", - "fieldtype": "Check" + "oldfieldtype": "Check", + "trigger": "Client" } ] \ No newline at end of file diff --git a/setup/doctype/setup_control/setup_control.txt b/setup/doctype/setup_control/setup_control.txt index e62f84edb8..7ebed3e4a1 100644 --- a/setup/doctype/setup_control/setup_control.txt +++ b/setup/doctype/setup_control/setup_control.txt @@ -1,26 +1,24 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:36:25", + "docstatus": 0, + "modified": "2012-03-27 14:36:25", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:25" + "owner": "Administrator" }, { - "section_style": "Simple", - "istable": 0, - "in_create": 1, - "module": "Setup", "doctype": "DocType", + "in_create": 1, "issingle": 1, - "read_only": 1, + "istable": 0, + "module": "Setup", "name": "__common__", - "colour": "White:FFF", - "server_code_error": " ", + "read_only": 1, + "section_style": "Simple", "version": 73 }, { - "name": "Setup Control", - "doctype": "DocType" + "doctype": "DocType", + "name": "Setup Control" } ] \ No newline at end of file diff --git a/setup/doctype/sms_parameter/sms_parameter.txt b/setup/doctype/sms_parameter/sms_parameter.txt index c60c1db38f..55f90be161 100755 --- a/setup/doctype/sms_parameter/sms_parameter.txt +++ b/setup/doctype/sms_parameter/sms_parameter.txt @@ -1,44 +1,43 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:36:25", + "docstatus": 0, + "modified": "2012-03-27 14:36:25", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:25" + "owner": "Administrator" }, { - "section_style": "Simple", - "istable": 1, - "name": "__common__", - "colour": "White:FFF", - "module": "Setup", "doctype": "DocType", - "version": 4, - "show_in_menu": 0 + "istable": 1, + "module": "Setup", + "name": "__common__", + "section_style": "Simple", + "show_in_menu": 0, + "version": 4 }, { + "doctype": "DocField", + "fieldtype": "Data", "name": "__common__", "parent": "SMS Parameter", - "width": "150px", - "doctype": "DocField", - "reqd": 1, + "parentfield": "fields", "parenttype": "DocType", - "fieldtype": "Data", "permlevel": 0, - "parentfield": "fields" + "reqd": 1, + "width": "150px" }, { - "name": "SMS Parameter", - "doctype": "DocType" + "doctype": "DocType", + "name": "SMS Parameter" }, { - "fieldname": "parameter", "doctype": "DocField", + "fieldname": "parameter", "label": "Parameter" }, { - "fieldname": "value", "doctype": "DocField", + "fieldname": "value", "label": "Value" } ] \ No newline at end of file diff --git a/setup/doctype/state/state.txt b/setup/doctype/state/state.txt index 2433cf9674..464622ac8d 100644 --- a/setup/doctype/state/state.txt +++ b/setup/doctype/state/state.txt @@ -1,80 +1,78 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:36:25", + "docstatus": 0, + "modified": "2012-03-27 14:36:25", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:25" + "owner": "Administrator" }, { - "show_in_menu": 0, - "section_style": "Simple", + "autoname": "field:state_name", + "doctype": "DocType", + "document_type": "Master", "in_create": 0, "module": "Setup", - "autoname": "field:state_name", - "document_type": "Master", - "read_only": 0, "name": "__common__", - "colour": "White:FFF", - "doctype": "DocType", - "server_code_error": " ", + "read_only": 0, + "section_style": "Simple", + "show_in_menu": 0, "version": 14 }, { + "doctype": "DocField", "name": "__common__", "parent": "State", - "doctype": "DocField", + "parentfield": "fields", "parenttype": "DocType", - "reqd": 1, "permlevel": 0, - "parentfield": "fields" + "reqd": 1 }, { - "name": "__common__", - "parent": "State", - "read": 1, "create": 1, "doctype": "DocPerm", - "write": 1, - "report": 1, + "name": "__common__", + "parent": "State", + "parentfield": "permissions", "parenttype": "DocType", "permlevel": 0, - "parentfield": "permissions" + "read": 1, + "report": 1, + "write": 1 }, { - "name": "State", - "doctype": "DocType" + "doctype": "DocType", + "name": "State" }, { - "role": "System Manager", - "doctype": "DocPerm" + "doctype": "DocPerm", + "role": "System Manager" }, { "amend": 0, "cancel": 0, - "role": "Sales Master Manager", "doctype": "DocPerm", + "role": "Sales Master Manager", "submit": 0 }, { - "role": "Purchase Master Manager", - "doctype": "DocPerm" + "doctype": "DocPerm", + "role": "Purchase Master Manager" }, { - "oldfieldtype": "Data", "doctype": "DocField", + "fieldname": "state_name", + "fieldtype": "Data", "label": "State Name", "oldfieldname": "state_name", - "fieldname": "state_name", - "fieldtype": "Data" + "oldfieldtype": "Data" }, { - "oldfieldtype": "Select", "doctype": "DocField", - "label": "Country", - "oldfieldname": "country", "fieldname": "country", "fieldtype": "Select", + "label": "Country", + "oldfieldname": "country", + "oldfieldtype": "Select", "options": "link:Country" } ] \ No newline at end of file diff --git a/setup/doctype/workflow_action_detail/workflow_action_detail.txt b/setup/doctype/workflow_action_detail/workflow_action_detail.txt index 95e0d4ff64..2ef95fd314 100644 --- a/setup/doctype/workflow_action_detail/workflow_action_detail.txt +++ b/setup/doctype/workflow_action_detail/workflow_action_detail.txt @@ -1,48 +1,47 @@ [ { - "owner": "swarnalata@webnotestech.com", - "docstatus": 0, "creation": "2012-03-27 14:36:26", + "docstatus": 0, + "modified": "2012-03-27 14:36:26", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:26" + "owner": "swarnalata@webnotestech.com" }, { - "section_style": "Simple", - "istable": 1, - "name": "__common__", - "colour": "White:FFF", - "module": "Setup", "doctype": "DocType", - "version": 5, - "show_in_menu": 0 + "istable": 1, + "module": "Setup", + "name": "__common__", + "section_style": "Simple", + "show_in_menu": 0, + "version": 5 }, { + "doctype": "DocField", "name": "__common__", "parent": "Workflow Action Detail", - "doctype": "DocField", - "width": "200px", + "parentfield": "fields", "parenttype": "DocType", "permlevel": 0, - "parentfield": "fields" + "width": "200px" }, { - "name": "Workflow Action Detail", - "doctype": "DocType" + "doctype": "DocType", + "name": "Workflow Action Detail" }, { - "oldfieldtype": "Select", "doctype": "DocField", + "fieldname": "action_field", + "fieldtype": "Select", "label": "Field", "oldfieldname": "action_field", - "fieldname": "action_field", - "fieldtype": "Select" + "oldfieldtype": "Select" }, { - "oldfieldtype": "Data", "doctype": "DocField", + "fieldname": "action_value", + "fieldtype": "Data", "label": "Value", "oldfieldname": "action_value", - "fieldname": "action_value", - "fieldtype": "Data" + "oldfieldtype": "Data" } ] \ No newline at end of file diff --git a/setup/doctype/workflow_engine/workflow_engine.txt b/setup/doctype/workflow_engine/workflow_engine.txt index efb9dabb2e..7103bbf42d 100644 --- a/setup/doctype/workflow_engine/workflow_engine.txt +++ b/setup/doctype/workflow_engine/workflow_engine.txt @@ -1,24 +1,22 @@ [ { - "owner": "swarnalata@webnotestech.com", - "docstatus": 0, "creation": "2012-03-27 14:36:26", + "docstatus": 0, + "modified": "2012-03-27 14:36:26", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:26" + "owner": "swarnalata@webnotestech.com" }, { - "section_style": "Simple", - "name": "__common__", - "colour": "White:FFF", - "module": "Setup", - "show_in_menu": 0, - "version": 4, - "server_code_error": " ", "doctype": "DocType", - "issingle": 1 + "issingle": 1, + "module": "Setup", + "name": "__common__", + "section_style": "Simple", + "show_in_menu": 0, + "version": 4 }, { - "name": "Workflow Engine", - "doctype": "DocType" + "doctype": "DocType", + "name": "Workflow Engine" } ] \ No newline at end of file diff --git a/setup/doctype/workflow_rule/workflow_rule.txt b/setup/doctype/workflow_rule/workflow_rule.txt index 5ff0a4f252..0c1257f729 100644 --- a/setup/doctype/workflow_rule/workflow_rule.txt +++ b/setup/doctype/workflow_rule/workflow_rule.txt @@ -1,205 +1,195 @@ [ { - "owner": "swarnalata@webnotestech.com", - "docstatus": 0, "creation": "2012-03-27 14:36:26", + "docstatus": 0, + "modified": "2012-03-27 14:36:26", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:26" + "owner": "swarnalata@webnotestech.com" }, { - "section_style": "Tray", - "search_fields": "select_form,rule_status", - "module": "Setup", + "autoname": "field:rule_name", "doctype": "DocType", "document_type": "Master", - "autoname": "field:rule_name", + "module": "Setup", "name": "__common__", - "colour": "White:FFF", - "server_code_error": " ", + "search_fields": "select_form,rule_status", + "section_style": "Tray", "show_in_menu": 0, "version": 31 }, { + "doctype": "DocField", "name": "__common__", "parent": "Workflow Rule", - "doctype": "DocField", + "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "parent": "Workflow Rule", - "read": 1, - "report": 1, - "name": "__common__", "create": 1, "doctype": "DocPerm", - "write": 1, + "name": "__common__", + "parent": "Workflow Rule", + "parentfield": "permissions", "parenttype": "DocType", - "role": "System Manager", "permlevel": 0, - "parentfield": "permissions" + "read": 1, + "report": 1, + "role": "System Manager", + "write": 1 }, { - "name": "Workflow Rule", - "doctype": "DocType" + "doctype": "DocType", + "name": "Workflow Rule" }, { "doctype": "DocPerm" }, { - "oldfieldtype": "Section Break", "doctype": "DocField", - "label": "Rule Definition", "fieldname": "rule_definition", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "Rule Definition", + "oldfieldtype": "Section Break" }, { - "oldfieldtype": "HTML", "doctype": "DocField", - "label": "Intro HTML", "fieldname": "intro_html", "fieldtype": "HTML", + "label": "Intro HTML", + "oldfieldtype": "HTML", "options": "Select form for which you want to define rules,set priority & status." }, { - "oldfieldtype": "Data", "doctype": "DocField", - "label": "Rule Name", - "oldfieldname": "rule_name", "fieldname": "rule_name", "fieldtype": "Data", + "label": "Rule Name", + "oldfieldname": "rule_name", + "oldfieldtype": "Data", "reqd": 1 }, { - "search_index": 0, - "colour": "White:FFF", "doctype": "DocField", - "label": "Rule Status", - "oldfieldname": "rule_status", "fieldname": "rule_status", "fieldtype": "Select", + "in_filter": 1, + "label": "Rule Status", + "oldfieldname": "rule_status", "oldfieldtype": "Select", - "reqd": 1, "options": "\nActive\nInactive", - "in_filter": 1 + "reqd": 1, + "search_index": 0 }, { - "oldfieldtype": "Link", - "colour": "White:FFF", "doctype": "DocField", - "label": "Select Form", - "oldfieldname": "select_form", - "trigger": "Client", "fieldname": "select_form", "fieldtype": "Link", - "search_index": 1, - "reqd": 1, + "in_filter": 1, + "label": "Select Form", + "oldfieldname": "select_form", + "oldfieldtype": "Link", "options": "DocType", - "in_filter": 1 + "reqd": 1, + "search_index": 1, + "trigger": "Client" }, { - "oldfieldtype": "Int", "doctype": "DocField", - "label": "Rule Priority", - "oldfieldname": "rule_priority", "fieldname": "rule_priority", "fieldtype": "Int", + "label": "Rule Priority", + "oldfieldname": "rule_priority", + "oldfieldtype": "Int", "reqd": 0 }, { - "oldfieldtype": "Section Break", - "colour": "White:FFF", "doctype": "DocField", - "label": "Define Rule", "fieldname": "define_rule", "fieldtype": "Section Break", + "label": "Define Rule", + "oldfieldtype": "Section Break", "options": "Simple" }, { - "oldfieldtype": "Table", "doctype": "DocField", - "label": "Workflow Rule Details", - "oldfieldname": "workflow_rule_details", - "width": "100px", "fieldname": "workflow_rule_details", "fieldtype": "Table", - "options": "Workflow Rule Detail" + "label": "Workflow Rule Details", + "oldfieldname": "workflow_rule_details", + "oldfieldtype": "Table", + "options": "Workflow Rule Detail", + "width": "100px" }, { - "print_hide": 1, - "oldfieldtype": "Code", - "colour": "White:FFF", "doctype": "DocField", - "label": "Extra Condition", - "oldfieldname": "extra_condition", "fieldname": "extra_condition", "fieldtype": "Code", - "hidden": 1 + "hidden": 1, + "label": "Extra Condition", + "oldfieldname": "extra_condition", + "oldfieldtype": "Code", + "print_hide": 1 }, { - "oldfieldtype": "Section Break", - "colour": "White:FFF", "doctype": "DocField", - "label": "Action Detail", "fieldname": "action_detail", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "Action Detail", + "oldfieldtype": "Section Break" }, { - "oldfieldtype": "HTML", "doctype": "DocField", - "label": "Action html", "fieldname": "action_html", "fieldtype": "HTML", + "label": "Action html", + "oldfieldtype": "HTML", "options": "Specify actions to be taken when conditions hold satisfied" }, { - "oldfieldtype": "Table", "doctype": "DocField", - "label": "Workflow Action Details", - "oldfieldname": "workflow_action_details", "fieldname": "workflow_action_details", "fieldtype": "Table", + "label": "Workflow Action Details", + "oldfieldname": "workflow_action_details", + "oldfieldtype": "Table", "options": "Workflow Action Detail" }, { - "print_hide": 1, - "no_copy": 1, - "oldfieldtype": "HTML", - "colour": "White:FFF", "doctype": "DocField", - "label": "Reject HTML", "fieldname": "reject_html", "fieldtype": "HTML", "hidden": 1, + "label": "Reject HTML", + "no_copy": 1, + "oldfieldtype": "HTML", "options": "If any condition holds false the following message will be displayed . If you wish to stop rule engine when condition holds false then set 'Raise Exception' as 'Yes' otherwise keep this field blank or 'No'.", + "print_hide": 1, "report_hide": 1 }, { - "print_hide": 1, - "no_copy": 1, - "oldfieldtype": "Text", - "colour": "White:FFF", "doctype": "DocField", - "label": "Enter message", - "oldfieldname": "message", "fieldname": "message", "fieldtype": "Text", "hidden": 1, + "label": "Enter message", + "no_copy": 1, + "oldfieldname": "message", + "oldfieldtype": "Text", + "print_hide": 1, "report_hide": 1 }, { - "print_hide": 1, - "no_copy": 1, - "oldfieldtype": "Select", - "colour": "White:FFF", "doctype": "DocField", - "label": "Raise Exception", - "oldfieldname": "raise_exception", "fieldname": "raise_exception", "fieldtype": "Select", "hidden": 1, + "label": "Raise Exception", + "no_copy": 1, + "oldfieldname": "raise_exception", + "oldfieldtype": "Select", "options": "\nYes\nNo", + "print_hide": 1, "report_hide": 1 } ] \ No newline at end of file diff --git a/setup/doctype/workflow_rule_detail/workflow_rule_detail.txt b/setup/doctype/workflow_rule_detail/workflow_rule_detail.txt index f6cb5581aa..73c1cf3d8b 100644 --- a/setup/doctype/workflow_rule_detail/workflow_rule_detail.txt +++ b/setup/doctype/workflow_rule_detail/workflow_rule_detail.txt @@ -1,85 +1,84 @@ [ { - "owner": "swarnalata@webnotestech.com", - "docstatus": 0, "creation": "2012-03-27 14:36:26", + "docstatus": 0, + "modified": "2012-03-27 14:36:26", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:26" + "owner": "swarnalata@webnotestech.com" }, { - "section_style": "Simple", - "istable": 1, - "name": "__common__", - "colour": "White:FFF", - "module": "Setup", "doctype": "DocType", - "version": 9, - "show_in_menu": 0 + "istable": 1, + "module": "Setup", + "name": "__common__", + "section_style": "Simple", + "show_in_menu": 0, + "version": 9 }, { + "doctype": "DocField", "name": "__common__", "parent": "Workflow Rule Detail", - "doctype": "DocField", + "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "name": "Workflow Rule Detail", - "doctype": "DocType" + "doctype": "DocType", + "name": "Workflow Rule Detail" }, { - "oldfieldtype": "Select", "doctype": "DocField", - "label": "Field", - "oldfieldname": "rule_field", - "width": "200px", "fieldname": "rule_field", "fieldtype": "Select", - "options": "[]" + "label": "Field", + "oldfieldname": "rule_field", + "oldfieldtype": "Select", + "options": "[]", + "width": "200px" }, { - "oldfieldtype": "Select", "doctype": "DocField", - "label": "Operator", - "oldfieldname": "operator", "fieldname": "operator", "fieldtype": "Select", + "label": "Operator", + "oldfieldname": "operator", + "oldfieldtype": "Select", "options": "\nequal\nnot equal\ngreater than\ngreater than equal\nless than\nless than equal" }, { - "oldfieldtype": "Data", "doctype": "DocField", + "fieldname": "value", + "fieldtype": "Data", "label": "Value", "oldfieldname": "value", - "width": "100px", - "fieldname": "value", - "fieldtype": "Data" + "oldfieldtype": "Data", + "width": "100px" }, { - "oldfieldtype": "Select", "doctype": "DocField", + "fieldname": "comparing_field", + "fieldtype": "Select", "label": "Field from other forms", "oldfieldname": "comparing_field", - "fieldname": "comparing_field", - "fieldtype": "Select" + "oldfieldtype": "Select" }, { - "oldfieldtype": "Data", "doctype": "DocField", + "fieldname": "message", + "fieldtype": "Data", "label": "Message when Cond. False", "oldfieldname": "message", - "width": "200px", - "fieldname": "message", - "fieldtype": "Data" + "oldfieldtype": "Data", + "width": "200px" }, { - "oldfieldtype": "Select", "doctype": "DocField", - "label": "Raise Exception", - "oldfieldname": "exception", "fieldname": "exception", "fieldtype": "Select", + "label": "Raise Exception", + "oldfieldname": "exception", + "oldfieldtype": "Select", "options": "\nYes\nNo" } ] \ No newline at end of file diff --git a/startup/install.py b/startup/install.py index f584769beb..5ddbf094c8 100644 --- a/startup/install.py +++ b/startup/install.py @@ -162,7 +162,6 @@ def import_defaults(): # UOM {'uom_name': 'Unit', 'doctype': 'UOM', 'name': 'Unit'}, - {'uom_name': 'Unit', 'doctype': 'UOM', 'name': 'Hour'}, {'uom_name': 'Box', 'doctype': 'UOM', 'name': 'Box'}, {'uom_name': 'Ft', 'doctype': 'UOM', 'name': 'Ft'}, {'uom_name': 'Kg', 'doctype': 'UOM', 'name': 'Kg'}, diff --git a/stock/doctype/item_customer_detail/item_customer_detail.txt b/stock/doctype/item_customer_detail/item_customer_detail.txt index e0e93d1306..8535f16976 100644 --- a/stock/doctype/item_customer_detail/item_customer_detail.txt +++ b/stock/doctype/item_customer_detail/item_customer_detail.txt @@ -1,58 +1,56 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:36:33", + "docstatus": 0, + "modified": "2012-03-27 14:36:33", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:33" + "owner": "Administrator" }, { - "section_style": "Tray", - "istable": 1, - "description": "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes", - "module": "Stock", - "server_code_error": " ", - "in_create": 1, - "read_only": 0, "autoname": "ITEMCUST/.#####", - "name": "__common__", - "colour": "White:FFF", + "description": "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes", "doctype": "DocType", + "in_create": 1, + "istable": 1, + "module": "Stock", + "name": "__common__", + "read_only": 0, + "section_style": "Tray", "show_in_menu": 0, "version": 7 }, { + "doctype": "DocField", + "in_filter": 1, "name": "__common__", "parent": "Item Customer Detail", - "search_index": 1, - "doctype": "DocField", - "reqd": 1, - "parenttype": "DocType", "parentfield": "fields", + "parenttype": "DocType", "permlevel": 0, - "in_filter": 1 + "reqd": 1, + "search_index": 1 }, { - "name": "Item Customer Detail", - "doctype": "DocType" + "doctype": "DocType", + "name": "Item Customer Detail" }, { - "oldfieldtype": "Select", "doctype": "DocField", - "label": "Customer Name", - "oldfieldname": "price_list_name", - "width": "180px", "fieldname": "customer_name", "fieldtype": "Link", - "options": "Customer" + "label": "Customer Name", + "oldfieldname": "price_list_name", + "oldfieldtype": "Select", + "options": "Customer", + "width": "180px" }, { - "oldfieldtype": "Currency", "doctype": "DocField", + "fieldname": "ref_code", + "fieldtype": "Data", "label": "Ref Code", "oldfieldname": "ref_rate", - "width": "120px", - "fieldname": "ref_code", - "fieldtype": "Data" + "oldfieldtype": "Currency", + "width": "120px" } ] \ No newline at end of file diff --git a/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.txt b/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.txt index 24734efaa2..be9f99b92f 100644 --- a/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.txt +++ b/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.txt @@ -1,51 +1,49 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:36:33", + "docstatus": 0, + "modified": "2012-03-27 14:36:33", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:33" + "owner": "Administrator" }, { - "section_style": "Simple", + "autoname": "IISD/.#####", + "doctype": "DocType", "istable": 1, "module": "Stock", - "server_code_error": " ", - "doctype": "DocType", - "autoname": "IISD/.#####", "name": "__common__", - "colour": "White:FFF", + "section_style": "Simple", "show_in_menu": 0, "version": 1 }, { - "name": "__common__", - "parent": "Item Quality Inspection Parameter", - "oldfieldtype": "Data", "doctype": "DocField", - "parenttype": "DocType", "fieldtype": "Data", - "permlevel": 0, - "parentfield": "fields" + "name": "__common__", + "oldfieldtype": "Data", + "parent": "Item Quality Inspection Parameter", + "parentfield": "fields", + "parenttype": "DocType", + "permlevel": 0 }, { - "name": "Item Quality Inspection Parameter", - "doctype": "DocType" + "doctype": "DocType", + "name": "Item Quality Inspection Parameter" }, { - "search_index": 0, "doctype": "DocField", + "fieldname": "specification", + "in_filter": 0, "label": "Parameter", "oldfieldname": "specification", - "width": "200px", - "fieldname": "specification", "reqd": 1, - "in_filter": 0 + "search_index": 0, + "width": "200px" }, { - "oldfieldname": "value", - "fieldname": "value", "doctype": "DocField", - "label": "Acceptance Criteria" + "fieldname": "value", + "label": "Acceptance Criteria", + "oldfieldname": "value" } ] \ No newline at end of file diff --git a/stock/doctype/item_supplier/item_supplier.txt b/stock/doctype/item_supplier/item_supplier.txt index 96d6d31952..3569d25c68 100644 --- a/stock/doctype/item_supplier/item_supplier.txt +++ b/stock/doctype/item_supplier/item_supplier.txt @@ -1,45 +1,44 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:36:33", + "docstatus": 0, + "modified": "2012-03-27 14:36:33", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:33" + "owner": "Administrator" }, { - "section_style": "Simple", - "istable": 1, - "name": "__common__", - "colour": "White:FFF", - "module": "Stock", "doctype": "DocType", - "version": 3, - "show_in_menu": 0 + "istable": 1, + "module": "Stock", + "name": "__common__", + "section_style": "Simple", + "show_in_menu": 0, + "version": 3 }, { + "doctype": "DocField", "name": "__common__", "parent": "Item Supplier", - "doctype": "DocField", + "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "name": "Item Supplier", - "doctype": "DocType" + "doctype": "DocType", + "name": "Item Supplier" }, { "doctype": "DocField", - "label": "Supplier", "fieldname": "supplier", "fieldtype": "Link", + "label": "Supplier", "options": "Supplier" }, { "doctype": "DocField", - "label": "Supplier Part Number", - "width": "200px", "fieldname": "supplier_part_no", - "fieldtype": "Data" + "fieldtype": "Data", + "label": "Supplier Part Number", + "width": "200px" } ] \ No newline at end of file diff --git a/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.txt b/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.txt index 678d9a9abf..993c4f4c6d 100644 --- a/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.txt +++ b/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.txt @@ -1,51 +1,49 @@ [ { - "owner": "wasim@webnotestech.com", - "docstatus": 0, "creation": "2012-03-27 14:36:34", + "docstatus": 0, + "modified": "2012-03-27 14:36:34", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:34" + "owner": "wasim@webnotestech.com" }, { - "section_style": "Simple", + "doctype": "DocType", "istable": 1, - "name": "__common__", - "colour": "White:FFF", "module": "Stock", + "name": "__common__", + "section_style": "Simple", "show_in_menu": 0, - "version": 5, - "server_code_error": " ", - "doctype": "DocType" + "version": 5 }, { + "doctype": "DocField", "name": "__common__", "parent": "Landed Cost Purchase Receipt", - "doctype": "DocField", + "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "name": "Landed Cost Purchase Receipt", - "doctype": "DocType" + "doctype": "DocType", + "name": "Landed Cost Purchase Receipt" }, { - "oldfieldtype": "Link", "doctype": "DocField", - "label": "Purchase Receipt", - "oldfieldname": "purchase_receipt_no", - "width": "220px", "fieldname": "purchase_receipt", "fieldtype": "Link", - "options": "Purchase Receipt" + "label": "Purchase Receipt", + "oldfieldname": "purchase_receipt_no", + "oldfieldtype": "Link", + "options": "Purchase Receipt", + "width": "220px" }, { - "oldfieldtype": "Check", "doctype": "DocField", + "fieldname": "select_pr", + "fieldtype": "Check", "label": "Select PR", "oldfieldname": "include_in_landed_cost", - "width": "120px", - "fieldname": "select_pr", - "fieldtype": "Check" + "oldfieldtype": "Check", + "width": "120px" } ] \ No newline at end of file diff --git a/stock/doctype/material_request/test_material_request.py b/stock/doctype/material_request/test_material_request.py index ae40858564..44f82d2cf1 100644 --- a/stock/doctype/material_request/test_material_request.py +++ b/stock/doctype/material_request/test_material_request.py @@ -16,6 +16,43 @@ class TestMaterialRequest(unittest.TestCase): "warehouse": "_Test Warehouse"}, "indented_qty")), qty1) self.assertEqual(flt(webnotes.conn.get_value("Bin", {"item_code": "_Test Item Home Desktop 200", "warehouse": "_Test Warehouse"}, "indented_qty")), qty2) + + def _insert_stock_entry(self, qty1, qty2): + se = webnotes.bean([ + { + "company": "_Test Company", + "doctype": "Stock Entry", + "posting_date": "2013-03-01", + "posting_time": "00:00:00", + "purpose": "Material Receipt" + }, + { + "conversion_factor": 1.0, + "doctype": "Stock Entry Detail", + "item_code": "_Test Item Home Desktop 100", + "parentfield": "mtn_details", + "incoming_rate": 100, + "qty": qty1, + "stock_uom": "_Test UOM", + "transfer_qty": qty1, + "uom": "_Test UOM", + "t_warehouse": "_Test Warehouse 1", + }, + { + "conversion_factor": 1.0, + "doctype": "Stock Entry Detail", + "item_code": "_Test Item Home Desktop 200", + "parentfield": "mtn_details", + "incoming_rate": 100, + "qty": qty2, + "stock_uom": "_Test UOM", + "transfer_qty": qty2, + "uom": "_Test UOM", + "t_warehouse": "_Test Warehouse 1", + }, + ]) + se.insert() + se.submit() def test_completed_qty_for_purchase(self): webnotes.conn.sql("""delete from `tabBin`""") @@ -70,6 +107,7 @@ class TestMaterialRequest(unittest.TestCase): def test_completed_qty_for_transfer(self): webnotes.conn.sql("""delete from `tabBin`""") + webnotes.conn.sql("""delete from `tabStock Ledger Entry`""") # submit material request of type Purchase mr = webnotes.bean(copy=test_records[0]) @@ -87,7 +125,7 @@ class TestMaterialRequest(unittest.TestCase): ["Material Request Item", "Stock Entry Detail"]], mr.doc.name) se_doclist[0].fields.update({ "posting_date": "2013-03-01", - "posting_time": "00:00" + "posting_time": "01:00" }) se_doclist[1].fields.update({ "qty": 27.0, @@ -102,6 +140,9 @@ class TestMaterialRequest(unittest.TestCase): "incoming_rate": 1.0 }) + # make available the qty in _Test Warehouse 1 before transfer + self._insert_stock_entry(27.0, 1.5) + # check for stopped status of Material Request se = webnotes.bean(copy=se_doclist) se.insert() @@ -127,6 +168,7 @@ class TestMaterialRequest(unittest.TestCase): def test_completed_qty_for_over_transfer(self): webnotes.conn.sql("""delete from `tabBin`""") + webnotes.conn.sql("""delete from `tabStock Ledger Entry`""") # submit material request of type Purchase mr = webnotes.bean(copy=test_records[0]) @@ -158,6 +200,9 @@ class TestMaterialRequest(unittest.TestCase): "s_warehouse": "_Test Warehouse 1", "incoming_rate": 1.0 }) + + # make available the qty in _Test Warehouse 1 before transfer + self._insert_stock_entry(60.0, 3.0) # check for stopped status of Material Request se = webnotes.bean(copy=se_doclist) @@ -245,5 +290,5 @@ test_records = [ "uom": "_Test UOM", "warehouse": "_Test Warehouse" } - ] + ], ] \ No newline at end of file diff --git a/stock/doctype/stock_entry/stock_entry.py b/stock/doctype/stock_entry/stock_entry.py index 05d7460773..278c283284 100644 --- a/stock/doctype/stock_entry/stock_entry.py +++ b/stock/doctype/stock_entry/stock_entry.py @@ -207,9 +207,8 @@ class DocType(TransactionBase): def validate_incoming_rate(self): for d in getlist(self.doclist, 'mtn_details'): - if not flt(d.incoming_rate) and d.t_warehouse: - msgprint("Rate is mandatory for Item: %s at row %s" % (d.item_code, d.idx), - raise_exception=1) + if d.t_warehouse: + self.validate_value("incoming_rate", ">", 0, d) def validate_bom(self): for d in getlist(self.doclist, 'mtn_details'): diff --git a/stock/doctype/uom_conversion_detail/uom_conversion_detail.txt b/stock/doctype/uom_conversion_detail/uom_conversion_detail.txt index 0d7971dfba..f0edf03f7a 100644 --- a/stock/doctype/uom_conversion_detail/uom_conversion_detail.txt +++ b/stock/doctype/uom_conversion_detail/uom_conversion_detail.txt @@ -1,50 +1,48 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:36:40", + "docstatus": 0, + "modified": "2012-03-27 14:36:40", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:40" + "owner": "Administrator" }, { - "section_style": "Tray", + "autoname": "UCDD/.#####", + "doctype": "DocType", "istable": 1, "module": "Stock", - "server_code_error": " ", - "doctype": "DocType", - "autoname": "UCDD/.#####", "name": "__common__", - "colour": "White:FFF", + "section_style": "Tray", "show_in_menu": 0, "version": 1 }, { + "doctype": "DocField", "name": "__common__", "parent": "UOM Conversion Detail", - "doctype": "DocField", + "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "name": "UOM Conversion Detail", - "doctype": "DocType" + "doctype": "DocType", + "name": "UOM Conversion Detail" }, { - "oldfieldtype": "Link", "doctype": "DocField", - "label": "UOM", - "oldfieldname": "uom", "fieldname": "uom", "fieldtype": "Link", + "label": "UOM", + "oldfieldname": "uom", + "oldfieldtype": "Link", "options": "UOM" }, { - "oldfieldtype": "Float", "doctype": "DocField", + "fieldname": "conversion_factor", + "fieldtype": "Float", "label": "Conversion Factor", "oldfieldname": "conversion_factor", - "fieldname": "conversion_factor", - "fieldtype": "Float" + "oldfieldtype": "Float" } ] \ No newline at end of file diff --git a/utilities/doctype/answer/answer.txt b/utilities/doctype/answer/answer.txt index 081df83d5c..58f0ba351b 100644 --- a/utilities/doctype/answer/answer.txt +++ b/utilities/doctype/answer/answer.txt @@ -1,69 +1,67 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:36:01", + "docstatus": 0, + "modified": "2012-03-27 14:36:01", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:01" + "owner": "Administrator" }, { - "section_style": "Simple", - "in_create": 1, - "module": "Utilities", + "allow_attach": 0, "allow_trash": 1, "autoname": "_ANS.#######", - "show_in_menu": 0, - "allow_attach": 0, - "read_only": 1, - "name": "__common__", - "colour": "White:FFF", "doctype": "DocType", - "server_code_error": " ", + "in_create": 1, + "module": "Utilities", + "name": "__common__", + "read_only": 1, + "section_style": "Simple", + "show_in_menu": 0, "version": 3 }, { + "doctype": "DocField", "name": "__common__", "parent": "Answer", - "doctype": "DocField", + "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "parent": "Answer", - "read": 1, - "report": 1, "cancel": 1, - "name": "__common__", "create": 1, "doctype": "DocPerm", - "write": 1, + "name": "__common__", + "parent": "Answer", + "parentfield": "permissions", "parenttype": "DocType", - "role": "All", "permlevel": 0, - "parentfield": "permissions" + "read": 1, + "report": 1, + "role": "All", + "write": 1 }, { - "name": "Answer", - "doctype": "DocType" + "doctype": "DocType", + "name": "Answer" }, { "doctype": "DocPerm" }, { "doctype": "DocField", - "label": "Question", "fieldname": "question", "fieldtype": "Link", + "label": "Question", "options": "Question" }, { - "oldfieldtype": "Text", "doctype": "DocField", + "fieldname": "answer", + "fieldtype": "Text", "label": "Answer", "oldfieldname": "question", - "fieldname": "answer", - "fieldtype": "Text" + "oldfieldtype": "Text" }, { "doctype": "DocField", @@ -72,11 +70,11 @@ "label": "Points" }, { - "print_hide": 1, "doctype": "DocField", - "label": "Users Voted", "fieldname": "_users_voted", "fieldtype": "Text", - "hidden": 1 + "hidden": 1, + "label": "Users Voted", + "print_hide": 1 } ] \ 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 75846c635f..2059186f15 100644 --- a/utilities/doctype/gl_mapper/gl_mapper.txt +++ b/utilities/doctype/gl_mapper/gl_mapper.txt @@ -1,75 +1,73 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-04-13 11:56:40", + "docstatus": 0, + "modified": "2012-04-23 12:27:38", "modified_by": "Administrator", - "modified": "2012-04-23 12:27:38" + "owner": "Administrator" }, { - "section_style": "Simple", - "module": "Utilities", - "doctype": "DocType", - "server_code_error": " ", - "autoname": "field:doc_type", - "name": "__common__", - "colour": "White:FFF", "_last_update": "1305006361", + "autoname": "field:doc_type", + "doctype": "DocType", + "module": "Utilities", + "name": "__common__", + "section_style": "Simple", "show_in_menu": 0, "version": 1 }, { + "doctype": "DocField", "name": "__common__", "parent": "GL Mapper", - "doctype": "DocField", + "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "name": "__common__", - "parent": "GL Mapper", - "read": 1, "create": 0, "doctype": "DocPerm", + "name": "__common__", + "parent": "GL Mapper", + "parentfield": "permissions", "parenttype": "DocType", - "report": 1, "permlevel": 0, - "parentfield": "permissions" + "read": 1, + "report": 1 }, { - "name": "GL Mapper", - "doctype": "DocType" + "doctype": "DocType", + "name": "GL Mapper" }, { "amend": 0, + "cancel": 0, "doctype": "DocPerm", - "submit": 0, - "write": 0, "role": "Accounts User", - "cancel": 0 + "submit": 0, + "write": 0 }, { - "write": 1, + "doctype": "DocPerm", "role": "System Manager", - "doctype": "DocPerm" + "write": 1 }, { - "oldfieldtype": "Link", "doctype": "DocField", - "label": "Doc Type", - "oldfieldname": "doc_type", "fieldname": "doc_type", "fieldtype": "Data", + "label": "Doc Type", + "oldfieldname": "doc_type", + "oldfieldtype": "Link", "reqd": 1 }, { - "oldfieldtype": "Table", "doctype": "DocField", - "label": "Fields", - "oldfieldname": "fields", "fieldname": "fields", "fieldtype": "Table", + "label": "Fields", + "oldfieldname": "fields", + "oldfieldtype": "Table", "options": "GL Mapper Detail" } ] \ No newline at end of file diff --git a/utilities/doctype/gl_mapper_detail/gl_mapper_detail.txt b/utilities/doctype/gl_mapper_detail/gl_mapper_detail.txt index 653154461d..bd1ecd6498 100644 --- a/utilities/doctype/gl_mapper_detail/gl_mapper_detail.txt +++ b/utilities/doctype/gl_mapper_detail/gl_mapper_detail.txt @@ -1,162 +1,160 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:36:46", + "docstatus": 0, + "modified": "2012-03-27 14:36:46", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:46" + "owner": "Administrator" }, { - "section_style": "Tray", + "autoname": "GLMDetail.#####", + "doctype": "DocType", "istable": 1, "module": "Utilities", - "server_code_error": " ", - "doctype": "DocType", - "autoname": "GLMDetail.#####", "name": "__common__", - "colour": "White:FFF", + "section_style": "Tray", "show_in_menu": 0, "version": 4 }, { - "name": "__common__", - "parent": "GL Mapper Detail", - "oldfieldtype": "Data", "doctype": "DocField", - "parenttype": "DocType", "fieldtype": "Data", - "permlevel": 0, - "parentfield": "fields" + "name": "__common__", + "oldfieldtype": "Data", + "parent": "GL Mapper Detail", + "parentfield": "fields", + "parenttype": "DocType", + "permlevel": 0 }, { - "name": "GL Mapper Detail", - "doctype": "DocType" + "doctype": "DocType", + "name": "GL Mapper Detail" }, { - "oldfieldname": "table_field", + "doctype": "DocField", "fieldname": "table_field", - "doctype": "DocField", - "label": "Table Field" + "label": "Table Field", + "oldfieldname": "table_field" }, { "doctype": "DocField", + "fieldname": "account", "label": "Account", "oldfieldname": "account", - "fieldname": "account", "reqd": 1 }, { "doctype": "DocField", + "fieldname": "debit", "label": "Debit", "oldfieldname": "debit", - "fieldname": "debit", "reqd": 1 }, { "doctype": "DocField", + "fieldname": "credit", "label": "Credit", "oldfieldname": "credit", - "fieldname": "credit", "reqd": 1 }, { "doctype": "DocField", + "fieldname": "cost_center", "label": "Cost Center", "oldfieldname": "cost_center", - "fieldname": "cost_center", "reqd": 0 }, { "doctype": "DocField", + "fieldname": "against", "label": "Against", "oldfieldname": "against", - "fieldname": "against", "reqd": 1 }, { - "no_copy": 1, "doctype": "DocField", - "label": "Remarks", - "oldfieldname": "remarks", "fieldname": "remarks", + "label": "Remarks", + "no_copy": 1, + "oldfieldname": "remarks", "reqd": 1 }, { "doctype": "DocField", + "fieldname": "voucher_type", "label": "Voucher Type", "oldfieldname": "voucher_type", - "fieldname": "voucher_type", "reqd": 1 }, { "doctype": "DocField", + "fieldname": "voucher_no", "label": "Voucher No", "oldfieldname": "voucher_no", - "fieldname": "voucher_no", "reqd": 1 }, { "description": "The date at which current entry will get or has actually executed.", "doctype": "DocField", + "fieldname": "posting_date", "label": "Posting Date", "oldfieldname": "posting_date", - "fieldname": "posting_date", "reqd": 1 }, { "description": "The date at which current entry is made in system.", "doctype": "DocField", + "fieldname": "transaction_date", "label": "Transaction Date", "oldfieldname": "transaction_date", - "fieldname": "transaction_date", "reqd": 1 }, { "doctype": "DocField", + "fieldname": "aging_date", "label": "Aging Date", "oldfieldname": "aging_date", - "fieldname": "aging_date", "reqd": 1 }, { - "search_index": 0, "doctype": "DocField", + "fieldname": "fiscal_year", + "in_filter": 1, "label": "Fiscal Year", "oldfieldname": "fiscal_year", - "fieldname": "fiscal_year", "reqd": 1, - "in_filter": 1 + "search_index": 0 }, { - "oldfieldname": "against_voucher", + "doctype": "DocField", "fieldname": "against_voucher", - "doctype": "DocField", - "label": "Against Voucher" + "label": "Against Voucher", + "oldfieldname": "against_voucher" }, { - "oldfieldname": "against_voucher_type", + "doctype": "DocField", "fieldname": "against_voucher_type", - "doctype": "DocField", - "label": "Against Voucher Type" + "label": "Against Voucher Type", + "oldfieldname": "against_voucher_type" }, { - "search_index": 0, "doctype": "DocField", + "fieldname": "company", + "in_filter": 1, "label": "Company", "oldfieldname": "company", - "fieldname": "company", - "in_filter": 1 + "search_index": 0 }, { - "oldfieldname": "is_opening", + "doctype": "DocField", "fieldname": "is_opening", - "doctype": "DocField", - "label": "Is Opening" + "label": "Is Opening", + "oldfieldname": "is_opening" }, { - "oldfieldname": "is_advance", - "fieldname": "is_advance", "doctype": "DocField", - "label": "Is Advance" + "fieldname": "is_advance", + "label": "Is Advance", + "oldfieldname": "is_advance" } ] \ No newline at end of file diff --git a/utilities/doctype/profile_control/profile_control.txt b/utilities/doctype/profile_control/profile_control.txt index 7eaff7f282..e0904cd9dc 100644 --- a/utilities/doctype/profile_control/profile_control.txt +++ b/utilities/doctype/profile_control/profile_control.txt @@ -1,24 +1,22 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:36:47", + "docstatus": 0, + "modified": "2012-03-27 14:36:47", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:47" + "owner": "Administrator" }, { - "section_style": "Simple", - "name": "__common__", - "colour": "White:FFF", - "module": "Utilities", - "show_in_menu": 0, - "version": 12, - "server_code_error": " ", "doctype": "DocType", - "issingle": 1 + "issingle": 1, + "module": "Utilities", + "name": "__common__", + "section_style": "Simple", + "show_in_menu": 0, + "version": 12 }, { - "name": "Profile Control", - "doctype": "DocType" + "doctype": "DocType", + "name": "Profile Control" } ] \ No newline at end of file diff --git a/utilities/doctype/sms_log/sms_log.txt b/utilities/doctype/sms_log/sms_log.txt index 01d9e4a60d..37ca4c6f1a 100644 --- a/utilities/doctype/sms_log/sms_log.txt +++ b/utilities/doctype/sms_log/sms_log.txt @@ -1,54 +1,53 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:36:47", + "docstatus": 0, + "modified": "2012-03-27 14:36:47", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:47" + "owner": "Administrator" }, { - "section_style": "Simple", - "name": "__common__", "autoname": "SMSLOG/.########", - "colour": "White:FFF", - "module": "Utilities", "doctype": "DocType", - "version": 3, - "show_in_menu": 0 + "module": "Utilities", + "name": "__common__", + "section_style": "Simple", + "show_in_menu": 0, + "version": 3 }, { - "name": "__common__", - "parent": "SMS Log", "doctype": "DocField", + "name": "__common__", + "parent": "SMS Log", + "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "parent": "SMS Log", - "read": 1, - "report": 1, - "name": "__common__", "create": 0, "doctype": "DocPerm", - "write": 0, + "name": "__common__", + "parent": "SMS Log", + "parentfield": "permissions", "parenttype": "DocType", - "role": "System Manager", "permlevel": 0, - "parentfield": "permissions" + "read": 1, + "report": 1, + "role": "System Manager", + "write": 0 }, { - "name": "SMS Log", - "doctype": "DocType" + "doctype": "DocType", + "name": "SMS Log" }, { "doctype": "DocPerm" }, { - "width": "50%", + "doctype": "DocField", "fieldname": "column_break0", "fieldtype": "Column Break", - "doctype": "DocField" + "width": "50%" }, { "doctype": "DocField", @@ -69,10 +68,10 @@ "label": "Receiver List" }, { - "width": "50%", + "doctype": "DocField", "fieldname": "column_break1", "fieldtype": "Column Break", - "doctype": "DocField" + "width": "50%" }, { "doctype": "DocField", diff --git a/utilities/doctype/sms_receiver/sms_receiver.txt b/utilities/doctype/sms_receiver/sms_receiver.txt index 8bf9352f61..4e0831c928 100644 --- a/utilities/doctype/sms_receiver/sms_receiver.txt +++ b/utilities/doctype/sms_receiver/sms_receiver.txt @@ -1,54 +1,52 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:36:47", + "docstatus": 0, + "modified": "2012-03-27 14:36:47", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:47" + "owner": "Administrator" }, { - "section_style": "Tray", - "istable": 1, - "name": "__common__", - "colour": "White:FFF", - "module": "Utilities", "doctype": "DocType", - "version": 2, - "server_code_error": " " - }, - { + "istable": 1, + "module": "Utilities", "name": "__common__", - "parent": "SMS Receiver", - "oldfieldtype": "Data", + "section_style": "Tray", + "version": 2 + }, + { "doctype": "DocField", - "parenttype": "DocType", "fieldtype": "Data", - "permlevel": 0, - "parentfield": "fields" + "name": "__common__", + "oldfieldtype": "Data", + "parent": "SMS Receiver", + "parentfield": "fields", + "parenttype": "DocType", + "permlevel": 0 }, { - "name": "SMS Receiver", - "doctype": "DocType" + "doctype": "DocType", + "name": "SMS Receiver" }, { - "oldfieldname": "customer_name", + "doctype": "DocField", "fieldname": "customer_name", - "doctype": "DocField", - "label": "Customer Name" + "label": "Customer Name", + "oldfieldname": "customer_name" }, { "doctype": "DocField", + "fieldname": "receiver_name", "label": "Receiver Name", "oldfieldname": "receiver_name", - "width": "350px", - "fieldname": "receiver_name" + "width": "350px" }, { "doctype": "DocField", + "fieldname": "mobile_no", "label": "Mobile No", "oldfieldname": "mobile_no", - "width": "200px", - "fieldname": "mobile_no", - "reqd": 1 + "reqd": 1, + "width": "200px" } ] \ No newline at end of file diff --git a/utilities/doctype/trash_control/trash_control.txt b/utilities/doctype/trash_control/trash_control.txt index 1ecf9bcd7f..412e38d10f 100644 --- a/utilities/doctype/trash_control/trash_control.txt +++ b/utilities/doctype/trash_control/trash_control.txt @@ -1,25 +1,23 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:36:47", + "docstatus": 0, + "modified": "2012-03-27 14:36:47", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:47" + "owner": "Administrator" }, { - "section_style": "Simple", - "in_create": 1, - "module": "Utilities", - "server_code_error": " ", "doctype": "DocType", + "in_create": 1, "issingle": 1, - "read_only": 1, + "module": "Utilities", "name": "__common__", - "colour": "White:FFF", + "read_only": 1, + "section_style": "Simple", "version": 35 }, { - "name": "Trash Control", - "doctype": "DocType" + "doctype": "DocType", + "name": "Trash Control" } ] \ No newline at end of file diff --git a/website/doctype/related_page/related_page.txt b/website/doctype/related_page/related_page.txt index 66c63779a9..a4a0983c48 100644 --- a/website/doctype/related_page/related_page.txt +++ b/website/doctype/related_page/related_page.txt @@ -1,36 +1,35 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-27 14:36:48", + "docstatus": 0, + "modified": "2012-03-27 14:36:48", "modified_by": "Administrator", - "modified": "2012-03-27 14:36:48" + "owner": "Administrator" }, { - "section_style": "Simple", - "istable": 1, - "name": "__common__", - "colour": "White:FFF", - "module": "Website", "doctype": "DocType", - "version": 3, - "show_in_menu": 0 + "istable": 1, + "module": "Website", + "name": "__common__", + "section_style": "Simple", + "show_in_menu": 0, + "version": 3 }, { - "parent": "Related Page", - "name": "__common__", "doctype": "DocField", - "permlevel": 0, - "parenttype": "DocType", "fieldname": "page", "fieldtype": "Link", "label": "Page", + "name": "__common__", "options": "Page", - "parentfield": "fields" + "parent": "Related Page", + "parentfield": "fields", + "parenttype": "DocType", + "permlevel": 0 }, { - "name": "Related Page", - "doctype": "DocType" + "doctype": "DocType", + "name": "Related Page" }, { "doctype": "DocField" diff --git a/website/doctype/top_bar_item/top_bar_item.txt b/website/doctype/top_bar_item/top_bar_item.txt index 6a4597e8ba..bc78928515 100644 --- a/website/doctype/top_bar_item/top_bar_item.txt +++ b/website/doctype/top_bar_item/top_bar_item.txt @@ -1,52 +1,51 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-04-02 16:02:43", + "docstatus": 0, + "modified": "2012-05-07 15:21:00", "modified_by": "Administrator", - "modified": "2012-05-07 15:21:00" + "owner": "Administrator" }, { - "section_style": "Simple", - "istable": 1, - "name": "__common__", - "colour": "White:FFF", - "module": "Website", "doctype": "DocType", - "version": 1, - "show_in_menu": 0 + "istable": 1, + "module": "Website", + "name": "__common__", + "section_style": "Simple", + "show_in_menu": 0, + "version": 1 }, { + "doctype": "DocField", "name": "__common__", "parent": "Top Bar Item", - "doctype": "DocField", + "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "name": "Top Bar Item", - "doctype": "DocType" + "doctype": "DocType", + "name": "Top Bar Item" }, { "doctype": "DocField", - "label": "Label", - "width": "120px", "fieldname": "label", - "fieldtype": "Data" + "fieldtype": "Data", + "label": "Label", + "width": "120px" }, { "doctype": "DocField", - "label": "URL", - "width": "200px", "fieldname": "url", - "fieldtype": "Data" + "fieldtype": "Data", + "label": "URL", + "width": "200px" }, { "doctype": "DocField", - "label": "Target", "fieldname": "target", "fieldtype": "Select", + "label": "Target", "options": "\ntarget = \"_blank\"" }, {