diff --git a/accounts/doctype/account/account.txt b/accounts/doctype/account/account.txt index e515b34f3f0..7a6ebf8dace 100644 --- a/accounts/doctype/account/account.txt +++ b/accounts/doctype/account/account.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-30 12:49:46", "docstatus": 0, - "modified": "2013-02-05 15:38:32", + "modified": "2013-07-05 14:23:30", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "description": "Heads (or groups) against which Accounting Entries are made and balances are maintained.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-money", "in_create": 1, "module": "Accounts", "name": "__common__", diff --git a/accounts/doctype/accounts_settings/accounts_settings.txt b/accounts/doctype/accounts_settings/accounts_settings.txt index d10f63946ab..b8be1614277 100644 --- a/accounts/doctype/accounts_settings/accounts_settings.txt +++ b/accounts/doctype/accounts_settings/accounts_settings.txt @@ -2,13 +2,14 @@ { "creation": "2013-06-24 15:49:57", "docstatus": 0, - "modified": "2013-06-24 16:12:29", + "modified": "2013-07-05 14:23:40", "modified_by": "Administrator", "owner": "Administrator" }, { "description": "Settings for Accounts", "doctype": "DocType", + "icon": "icon-cog", "issingle": 1, "module": "Accounts", "name": "__common__" diff --git a/accounts/doctype/bank_reconciliation/bank_reconciliation.js b/accounts/doctype/bank_reconciliation/bank_reconciliation.js index 51e62cccb21..793db62d072 100644 --- a/accounts/doctype/bank_reconciliation/bank_reconciliation.js +++ b/accounts/doctype/bank_reconciliation/bank_reconciliation.js @@ -17,4 +17,6 @@ cur_frm.add_fetch("bank_account", "company", "company"); cur_frm.cscript.onload = function(doc, cdt, cdn){ + cur_frm.set_intro(' ' + + wn._("Update clearance date of Journal Entries marked as 'Bank Vouchers'")) } diff --git a/accounts/doctype/bank_reconciliation/bank_reconciliation.txt b/accounts/doctype/bank_reconciliation/bank_reconciliation.txt index 194cc4257f6..3cd385b4939 100644 --- a/accounts/doctype/bank_reconciliation/bank_reconciliation.txt +++ b/accounts/doctype/bank_reconciliation/bank_reconciliation.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:05", "docstatus": 0, - "modified": "2013-01-29 16:27:50", + "modified": "2013-07-05 14:26:22", "modified_by": "Administrator", "owner": "Administrator" }, @@ -13,6 +13,7 @@ "doctype": "DocType", "hide_heading": 1, "hide_toolbar": 1, + "icon": "icon-check", "issingle": 1, "module": "Accounts", "name": "__common__", diff --git a/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt b/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt index d814ad863c1..11481d7dc86 100644 --- a/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt +++ b/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-22 01:27:37", "docstatus": 0, - "modified": "2013-03-07 07:03:18", + "modified": "2013-07-05 11:05:59", "modified_by": "Administrator", "owner": "Administrator" }, @@ -54,6 +54,14 @@ "oldfieldtype": "Date", "read_only": 1 }, + { + "doctype": "DocField", + "fieldname": "clearance_date", + "fieldtype": "Date", + "label": "Clearance Date", + "oldfieldname": "clearance_date", + "oldfieldtype": "Date" + }, { "doctype": "DocField", "fieldname": "cheque_number", @@ -91,13 +99,5 @@ "oldfieldtype": "Currency", "options": "Company:company:default_currency", "read_only": 1 - }, - { - "doctype": "DocField", - "fieldname": "clearance_date", - "fieldtype": "Date", - "label": "Clearance Date", - "oldfieldname": "clearance_date", - "oldfieldtype": "Date" } ] \ No newline at end of file diff --git a/accounts/doctype/budget_distribution/budget_distribution.txt b/accounts/doctype/budget_distribution/budget_distribution.txt index d2b9cbe0cda..70ef717f921 100644 --- a/accounts/doctype/budget_distribution/budget_distribution.txt +++ b/accounts/doctype/budget_distribution/budget_distribution.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:05", "docstatus": 0, - "modified": "2013-01-22 14:55:58", + "modified": "2013-07-05 14:29:23", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "field:distribution_id", "description": "**Budget Distribution** helps you distribute your budget across months if you have seasonality in your business.\n\nTo distribute a budget using this distribution, set this **Budget Distribution** in the **Cost Center**", "doctype": "DocType", + "icon": "icon-bar-chart", "module": "Accounts", "name": "__common__", "name_case": "Title Case" diff --git a/accounts/doctype/c_form/c_form.txt b/accounts/doctype/c_form/c_form.txt index 79556abaa6e..248f413c0ee 100644 --- a/accounts/doctype/c_form/c_form.txt +++ b/accounts/doctype/c_form/c_form.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-07 11:55:06", "docstatus": 0, - "modified": "2013-06-11 12:10:33", + "modified": "2013-07-05 14:29:48", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "allow_attach": 1, "autoname": "naming_series:", "doctype": "DocType", + "icon": "icon-file-text", "is_submittable": 1, "max_attachments": 3, "module": "Accounts", diff --git a/accounts/doctype/cost_center/cost_center.txt b/accounts/doctype/cost_center/cost_center.txt index 5fbc43b9401..7f5fe24c7b7 100644 --- a/accounts/doctype/cost_center/cost_center.txt +++ b/accounts/doctype/cost_center/cost_center.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-23 19:57:17", "docstatus": 0, - "modified": "2013-01-25 15:04:03", + "modified": "2013-07-05 14:33:05", "modified_by": "Administrator", "owner": "Administrator" }, @@ -13,6 +13,7 @@ "description": "Track separate Income and Expense for product verticals or divisions.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-money", "in_create": 1, "module": "Accounts", "name": "__common__", diff --git a/accounts/doctype/fiscal_year/fiscal_year.txt b/accounts/doctype/fiscal_year/fiscal_year.txt index 935b76f16f4..511adf55715 100644 --- a/accounts/doctype/fiscal_year/fiscal_year.txt +++ b/accounts/doctype/fiscal_year/fiscal_year.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-22 16:50:25", "docstatus": 0, - "modified": "2013-03-13 12:29:40", + "modified": "2013-07-05 14:38:22", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "description": "**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-calendar", "module": "Accounts", "name": "__common__" }, diff --git a/accounts/doctype/gl_entry/gl_entry.txt b/accounts/doctype/gl_entry/gl_entry.txt index 84d9eee5a9e..2f20a350a48 100644 --- a/accounts/doctype/gl_entry/gl_entry.txt +++ b/accounts/doctype/gl_entry/gl_entry.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-10 16:34:06", "docstatus": 0, - "modified": "2013-01-29 16:27:50", + "modified": "2013-07-05 14:39:07", "modified_by": "Administrator", "owner": "Administrator" }, { "autoname": "GL.#######", "doctype": "DocType", + "icon": "icon-list", "in_create": 1, "module": "Accounts", "name": "__common__", diff --git a/accounts/doctype/journal_voucher/journal_voucher.txt b/accounts/doctype/journal_voucher/journal_voucher.txt index 603eb99fc04..355242c5ac5 100644 --- a/accounts/doctype/journal_voucher/journal_voucher.txt +++ b/accounts/doctype/journal_voucher/journal_voucher.txt @@ -2,13 +2,14 @@ { "creation": "2013-03-25 10:53:52", "docstatus": 0, - "modified": "2013-06-28 14:27:11", + "modified": "2013-07-05 14:43:51", "modified_by": "Administrator", "owner": "Administrator" }, { "autoname": "naming_series:", "doctype": "DocType", + "icon": "icon-file-text", "is_submittable": 1, "module": "Accounts", "name": "__common__", @@ -37,6 +38,13 @@ "doctype": "DocType", "name": "Journal Voucher" }, + { + "doctype": "DocField", + "fieldname": "voucher_type_and_date", + "fieldtype": "Section Break", + "label": "Voucher Type and Date", + "options": "icon-flag" + }, { "doctype": "DocField", "fieldname": "column_break0", @@ -102,7 +110,7 @@ "fieldtype": "Section Break", "label": "Journal Entries", "oldfieldtype": "Section Break", - "options": "Simple", + "options": "icon-table", "read_only": 0 }, { @@ -121,7 +129,6 @@ "doctype": "DocField", "fieldname": "section_break99", "fieldtype": "Section Break", - "options": "Simple", "read_only": 0 }, { @@ -180,6 +187,7 @@ "fieldname": "reference", "fieldtype": "Section Break", "label": "Reference", + "options": "icon-pushpin", "read_only": 0 }, { @@ -286,6 +294,7 @@ "fieldtype": "Section Break", "label": "More Info", "oldfieldtype": "Section Break", + "options": "icon-file-text", "read_only": 0 }, { diff --git a/accounts/doctype/mis_control/mis_control.py b/accounts/doctype/mis_control/mis_control.py index 17971fe1848..35d2bc2cbf6 100644 --- a/accounts/doctype/mis_control/mis_control.py +++ b/accounts/doctype/mis_control/mis_control.py @@ -35,8 +35,6 @@ class DocType: self.account_list = [] self.ac_details = {} # key: account id, values: debit_or_credit, lft, rgt - self.roles = webnotes.user.get_roles() - self.period_list = [] self.period_start_date = {} self.period_end_date = {} @@ -44,7 +42,7 @@ class DocType: self.fs_list = [] self.root_bal = [] self.flag = 0 - + # Get defaults on load of MIS, MIS - Comparison Report and Financial statements # ---------------------------------------------------- def get_comp(self): @@ -75,6 +73,7 @@ class DocType: ret['month'] = mon # ------------------------ get MIS Type on basis of roles of session user ------------------------------------------ + self.roles = webnotes.user.get_roles() if has_common(self.roles, ['Sales Manager']): type.append('Sales') if has_common(self.roles, ['Purchase Manager']): diff --git a/accounts/doctype/mode_of_payment/mode_of_payment.txt b/accounts/doctype/mode_of_payment/mode_of_payment.txt index 0841af0dae5..5d004e34222 100644 --- a/accounts/doctype/mode_of_payment/mode_of_payment.txt +++ b/accounts/doctype/mode_of_payment/mode_of_payment.txt @@ -2,7 +2,7 @@ { "creation": "2012-12-04 17:49:20", "docstatus": 0, - "modified": "2013-04-19 10:59:05", + "modified": "2013-07-05 14:46:28", "modified_by": "Administrator", "owner": "harshada@webnotestech.com" }, @@ -11,6 +11,7 @@ "autoname": "field:mode_of_payment", "doctype": "DocType", "document_type": "Master", + "icon": "icon-credit-card", "module": "Accounts", "name": "__common__" }, diff --git a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt index fc84d364298..235188ebf28 100644 --- a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt +++ b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-30 12:49:46", "docstatus": 0, - "modified": "2013-02-01 14:05:56", + "modified": "2013-07-05 14:48:10", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "doctype": "DocType", "document_type": "Other", "hide_toolbar": 1, + "icon": "icon-magic", "issingle": 1, "module": "Accounts", "name": "__common__" diff --git a/accounts/doctype/period_closing_voucher/period_closing_voucher.txt b/accounts/doctype/period_closing_voucher/period_closing_voucher.txt index ac4b71db289..77d55dca185 100644 --- a/accounts/doctype/period_closing_voucher/period_closing_voucher.txt +++ b/accounts/doctype/period_closing_voucher/period_closing_voucher.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-10 16:34:07", "docstatus": 0, - "modified": "2013-06-11 16:04:45", + "modified": "2013-07-05 14:50:27", "modified_by": "Administrator", "owner": "jai@webnotestech.com" }, { "autoname": "PCE/.###", "doctype": "DocType", + "icon": "icon-file-text", "is_submittable": 1, "module": "Accounts", "name": "__common__", diff --git a/accounts/doctype/pos_setting/pos_setting.txt b/accounts/doctype/pos_setting/pos_setting.txt index accb29e3510..44549737e28 100755 --- a/accounts/doctype/pos_setting/pos_setting.txt +++ b/accounts/doctype/pos_setting/pos_setting.txt @@ -2,13 +2,14 @@ { "creation": "2013-05-24 12:15:51", "docstatus": 0, - "modified": "2013-05-30 12:09:39", + "modified": "2013-07-05 14:50:33", "modified_by": "Administrator", "owner": "Administrator" }, { "autoname": "POS/.####", "doctype": "DocType", + "icon": "icon-cog", "module": "Accounts", "name": "__common__" }, diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.txt b/accounts/doctype/purchase_invoice/purchase_invoice.txt index 424770bd6ad..6c1e24d7886 100755 --- a/accounts/doctype/purchase_invoice/purchase_invoice.txt +++ b/accounts/doctype/purchase_invoice/purchase_invoice.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-21 16:16:39", "docstatus": 0, - "modified": "2013-07-05 14:40:59", + "modified": "2013-07-05 14:51:53", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "allow_attach": 1, "autoname": "naming_series:", "doctype": "DocType", + "icon": "icon-file-text", "is_submittable": 1, "module": "Accounts", "name": "__common__", @@ -37,6 +38,13 @@ "doctype": "DocType", "name": "Purchase Invoice" }, + { + "doctype": "DocField", + "fieldname": "supplier_section", + "fieldtype": "Section Break", + "label": "Supplier", + "options": "icon-user" + }, { "doctype": "DocField", "fieldname": "column_break0", @@ -100,38 +108,34 @@ "read_only": 1 }, { - "depends_on": "supplier", "doctype": "DocField", "fieldname": "address_display", "fieldtype": "Small Text", - "hidden": 0, + "hidden": 1, "label": "Address", "read_only": 1 }, { - "depends_on": "supplier", "doctype": "DocField", "fieldname": "contact_display", "fieldtype": "Small Text", - "hidden": 0, + "hidden": 1, "label": "Contact", "read_only": 1 }, { - "depends_on": "supplier", "doctype": "DocField", "fieldname": "contact_mobile", "fieldtype": "Text", - "hidden": 0, + "hidden": 1, "label": "Mobile No", "read_only": 1 }, { - "depends_on": "supplier", "doctype": "DocField", "fieldname": "contact_email", "fieldtype": "Text", - "hidden": 0, + "hidden": 1, "label": "Contact Email", "print_hide": 1, "read_only": 1 @@ -194,6 +198,7 @@ "fieldtype": "Section Break", "label": "Items", "oldfieldtype": "Section Break", + "options": "icon-shopping-cart", "read_only": 0 }, { @@ -225,7 +230,6 @@ "doctype": "DocField", "fieldname": "section_break_17", "fieldtype": "Section Break", - "options": "Simple", "read_only": 0 }, { @@ -265,6 +269,7 @@ "fieldname": "currency_price_list", "fieldtype": "Section Break", "label": "Currency & Price List", + "options": "icon-tag", "read_only": 0 }, { @@ -332,6 +337,7 @@ "fieldtype": "Section Break", "label": "Taxes", "oldfieldtype": "Section Break", + "options": "icon-money", "read_only": 0 }, { @@ -400,6 +406,7 @@ "fieldname": "contact_section", "fieldtype": "Section Break", "label": "Contact Info", + "options": "icon-bullhorn", "read_only": 0 }, { @@ -432,6 +439,7 @@ "fieldtype": "Section Break", "label": "Totals", "oldfieldtype": "Section Break", + "options": "icon-money", "read_only": 0 }, { @@ -645,6 +653,7 @@ "fieldtype": "Section Break", "label": "Advances", "oldfieldtype": "Section Break", + "options": "icon-money", "print_hide": 1, "read_only": 0 }, @@ -674,7 +683,8 @@ "doctype": "DocField", "fieldname": "terms_section_break", "fieldtype": "Section Break", - "label": "Terms and Conditions" + "label": "Terms and Conditions", + "options": "icon-legal" }, { "doctype": "DocField", @@ -702,6 +712,7 @@ "fieldtype": "Section Break", "label": "More Info", "oldfieldtype": "Section Break", + "options": "icon-file-text", "print_hide": 1, "read_only": 0 }, diff --git a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt b/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt index 8751a6faea8..cd366f6bd6d 100644 --- a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt +++ b/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:08", "docstatus": 0, - "modified": "2013-01-22 14:57:21", + "modified": "2013-07-05 14:52:17", "modified_by": "Administrator", "owner": "wasim@webnotestech.com" }, @@ -11,6 +11,7 @@ "description": "Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like \"Shipping\", \"Insurance\", \"Handling\" etc.\n\n#### Note\n\nThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.\n\n#### Description of Columns\n\n1. Calculation Type: \n - This can be on **Net Total** (that is the sum of basic amount).\n - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.\n - **Actual** (as mentioned).\n2. Account Head: The Account ledger under which this tax will be booked\n3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.\n4. Description: Description of the tax (that will be printed in invoices / quotes).\n5. Rate: Tax rate.\n6. Amount: Tax amount.\n7. Total: Cumulative total to this point.\n8. Enter Row: If based on \"Previous Row Total\" you can select the row number which will be taken as a base for this calculation (default is the previous row).\n9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.\n10. Add or Deduct: Whether you want to add or deduct the tax.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-money", "module": "Accounts", "name": "__common__" }, diff --git a/accounts/doctype/sales_invoice/sales_invoice.js b/accounts/doctype/sales_invoice/sales_invoice.js index 0ac1b5e4e54..6989ad274bd 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.js +++ b/accounts/doctype/sales_invoice/sales_invoice.js @@ -43,6 +43,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte this._super(); cur_frm.cscript.is_opening(doc, dt, dn); + cur_frm.dashboard.reset(); if(doc.docstatus==1) { cur_frm.add_custom_button('View Ledger', function() { @@ -53,6 +54,8 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte }; wn.set_route("general-ledger"); }); + + cur_frm.dashboard.add_progress() cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); diff --git a/accounts/doctype/sales_invoice/sales_invoice.txt b/accounts/doctype/sales_invoice/sales_invoice.txt index 81b078528e1..7dc68917934 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.txt +++ b/accounts/doctype/sales_invoice/sales_invoice.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-24 19:29:05", "docstatus": 0, - "modified": "2013-06-27 11:35:29", + "modified": "2013-07-05 14:54:19", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "naming_series:", "doctype": "DocType", "document_type": "Transaction", + "icon": "icon-file-text", "is_submittable": 1, "module": "Accounts", "name": "__common__", @@ -39,6 +40,13 @@ "doctype": "DocType", "name": "Sales Invoice" }, + { + "doctype": "DocField", + "fieldname": "customer_section", + "fieldtype": "Section Break", + "label": "Customer", + "options": "icon-user" + }, { "description": "To manage multiple series please go to Setup > Manage Series", "doctype": "DocField", @@ -94,38 +102,34 @@ "read_only": 1 }, { - "depends_on": "customer", "doctype": "DocField", "fieldname": "address_display", "fieldtype": "Small Text", - "hidden": 0, + "hidden": 1, "label": "Address", "read_only": 1 }, { - "depends_on": "customer", "doctype": "DocField", "fieldname": "contact_display", "fieldtype": "Small Text", - "hidden": 0, + "hidden": 1, "label": "Contact", "read_only": 1 }, { - "depends_on": "customer", "doctype": "DocField", "fieldname": "contact_mobile", "fieldtype": "Text", - "hidden": 0, + "hidden": 1, "label": "Mobile No", "read_only": 1 }, { - "depends_on": "customer", "doctype": "DocField", "fieldname": "contact_email", "fieldtype": "Text", - "hidden": 0, + "hidden": 1, "label": "Contact Email", "print_hide": 1, "read_only": 1 @@ -137,6 +141,16 @@ "oldfieldtype": "Column Break", "read_only": 0 }, + { + "doctype": "DocField", + "fieldname": "is_pos", + "fieldtype": "Check", + "label": "Is POS", + "oldfieldname": "is_pos", + "oldfieldtype": "Check", + "print_hide": 1, + "read_only": 0 + }, { "doctype": "DocField", "fieldname": "amended_from", @@ -205,31 +219,12 @@ "options": "link:Mode of Payment", "read_only": 0 }, - { - "doctype": "DocField", - "fieldname": "is_pos", - "fieldtype": "Check", - "label": "Is POS", - "oldfieldname": "is_pos", - "oldfieldtype": "Check", - "print_hide": 1, - "read_only": 0 - }, - { - "doctype": "DocField", - "fieldname": "update_stock", - "fieldtype": "Check", - "label": "Update Stock", - "oldfieldname": "update_stock", - "oldfieldtype": "Check", - "print_hide": 1, - "read_only": 0 - }, { "doctype": "DocField", "fieldname": "currency_section", "fieldtype": "Section Break", "label": "Price List and Currency", + "options": "icon-tag", "read_only": 0 }, { @@ -304,6 +299,17 @@ "fieldtype": "Section Break", "label": "Items", "oldfieldtype": "Section Break", + "options": "icon-shopping-cart", + "read_only": 0 + }, + { + "doctype": "DocField", + "fieldname": "update_stock", + "fieldtype": "Check", + "label": "Update Stock", + "oldfieldname": "update_stock", + "oldfieldtype": "Check", + "print_hide": 1, "read_only": 0 }, { @@ -323,6 +329,7 @@ "fieldname": "packing_list", "fieldtype": "Section Break", "label": "Packing List", + "options": "icon-suitcase", "print_hide": 1, "read_only": 0 }, @@ -347,7 +354,6 @@ "doctype": "DocField", "fieldname": "section_break0", "fieldtype": "Section Break", - "options": "Simple", "read_only": 0 }, { @@ -426,6 +432,7 @@ "fieldtype": "Section Break", "label": "Taxes and Charges", "oldfieldtype": "Section Break", + "options": "icon-money", "read_only": 0 }, { @@ -524,6 +531,7 @@ "fieldtype": "Section Break", "label": "Totals", "oldfieldtype": "Section Break", + "options": "icon-money", "print_hide": 1, "read_only": 0 }, @@ -657,6 +665,7 @@ "fieldtype": "Section Break", "label": "Advances", "oldfieldtype": "Section Break", + "options": "icon-money", "print_hide": 1, "read_only": 0 }, @@ -686,6 +695,7 @@ "fieldname": "payments_section", "fieldtype": "Section Break", "label": "Payments", + "options": "icon-money", "read_only": 0 }, { @@ -765,6 +775,7 @@ "fieldtype": "Section Break", "label": "Terms and Conditions", "oldfieldtype": "Section Break", + "options": "icon-legal", "read_only": 0 }, { @@ -813,6 +824,7 @@ "fieldtype": "Section Break", "hidden": 0, "label": "Contact Info", + "options": "icon-bullhorn", "read_only": 0 }, { @@ -869,6 +881,7 @@ "fieldtype": "Section Break", "label": "More Info", "oldfieldtype": "Section Break", + "options": "icon-file-text", "print_hide": 1, "read_only": 0 }, @@ -1033,6 +1046,7 @@ "fieldtype": "Section Break", "label": "Sales Team", "oldfieldtype": "Section Break", + "options": "icon-group", "print_hide": 1, "read_only": 0 }, @@ -1091,7 +1105,6 @@ "doctype": "DocField", "fieldname": "section_break2", "fieldtype": "Section Break", - "options": "Simple", "print_hide": 1, "read_only": 0 }, @@ -1112,6 +1125,7 @@ "fieldname": "recurring_invoice", "fieldtype": "Section Break", "label": "Recurring Invoice", + "options": "icon-time", "print_hide": 1, "read_only": 0 }, diff --git a/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt b/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt index 9aa70536610..0ffc27d091a 100644 --- a/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt +++ b/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:09", "docstatus": 0, - "modified": "2013-06-25 12:06:45", + "modified": "2013-07-05 14:54:37", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "description": "Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like \"Shipping\", \"Insurance\", \"Handling\" etc.\n\n#### Note\n\nThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.\n\n#### Description of Columns\n\n1. Calculation Type: \n - This can be on **Net Total** (that is the sum of basic amount).\n - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.\n - **Actual** (as mentioned).\n2. Account Head: The Account ledger under which this tax will be booked\n3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.\n4. Description: Description of the tax (that will be printed in invoices / quotes).\n5. Rate: Tax rate.\n6. Amount: Tax amount.\n7. Total: Cumulative total to this point.\n8. Enter Row: If based on \"Previous Row Total\" you can select the row number which will be taken as a base for this calculation (default is the previous row).\n9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-money", "module": "Accounts", "name": "__common__" }, @@ -30,7 +31,8 @@ "parenttype": "DocType", "permlevel": 0, "read": 1, - "report": 1 + "report": 1, + "submit": 0 }, { "doctype": "DocType", @@ -100,20 +102,21 @@ "create": 0, "doctype": "DocPerm", "role": "Sales User", - "submit": 0, "write": 0 }, - { - "doctype": "DocPerm", - "role": "Accounts User" - }, { "amend": 0, "cancel": 1, "create": 1, "doctype": "DocPerm", "role": "Accounts Manager", - "submit": 0, + "write": 1 + }, + { + "cancel": 1, + "create": 1, + "doctype": "DocPerm", + "role": "System Manager", "write": 1 }, { @@ -122,7 +125,6 @@ "create": 1, "doctype": "DocPerm", "role": "Sales Master Manager", - "submit": 0, "write": 1 } ] \ No newline at end of file diff --git a/accounts/doctype/shipping_rule/shipping_rule.txt b/accounts/doctype/shipping_rule/shipping_rule.txt index 99886cac290..43589b49a3c 100644 --- a/accounts/doctype/shipping_rule/shipping_rule.txt +++ b/accounts/doctype/shipping_rule/shipping_rule.txt @@ -2,7 +2,7 @@ { "creation": "2013-06-25 11:48:03", "docstatus": 0, - "modified": "2013-07-04 16:28:42", + "modified": "2013-07-05 14:55:00", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "Prompt", "description": "Specify conditions to calculate shipping amount", "doctype": "DocType", + "icon": "icon-truck", "module": "Accounts", "name": "__common__" }, diff --git a/buying/doctype/buying_settings/buying_settings.txt b/buying/doctype/buying_settings/buying_settings.txt index eb0da1d2af3..eec7260405a 100644 --- a/buying/doctype/buying_settings/buying_settings.txt +++ b/buying/doctype/buying_settings/buying_settings.txt @@ -2,7 +2,7 @@ { "creation": "2013-06-25 11:04:03", "docstatus": 0, - "modified": "2013-06-25 11:43:08", + "modified": "2013-07-05 14:29:41", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "description": "Settings for Buying Module", "doctype": "DocType", "document_type": "Other", + "icon": "icon-cog", "issingle": 1, "module": "Buying", "name": "__common__" diff --git a/buying/doctype/purchase_order/purchase_order.txt b/buying/doctype/purchase_order/purchase_order.txt index 882de57e8ca..d72fc58dcf5 100644 --- a/buying/doctype/purchase_order/purchase_order.txt +++ b/buying/doctype/purchase_order/purchase_order.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-21 16:16:39", "docstatus": 0, - "modified": "2013-07-05 13:02:52", + "modified": "2013-07-05 14:51:59", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "naming_series:", "doctype": "DocType", "document_type": "Transaction", + "icon": "icon-file-text", "is_submittable": 1, "module": "Buying", "name": "__common__", @@ -31,6 +32,7 @@ "parent": "Purchase Order", "parentfield": "permissions", "parenttype": "DocType", + "permlevel": 0, "read": 1, "report": 1 }, @@ -787,37 +789,15 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", - "permlevel": 1, "role": "Material User", "submit": 0, "write": 0 }, - { - "amend": 0, - "cancel": 0, - "create": 0, - "doctype": "DocPerm", - "permlevel": 0, - "role": "Material User", - "submit": 0, - "write": 0 - }, - { - "amend": 0, - "cancel": 0, - "create": 0, - "doctype": "DocPerm", - "permlevel": 1, - "role": "Purchase Manager", - "submit": 0, - "write": 0 - }, { "amend": 1, "cancel": 1, "create": 1, "doctype": "DocPerm", - "permlevel": 0, "role": "Purchase Manager", "submit": 1, "write": 1 @@ -827,24 +807,13 @@ "cancel": 1, "create": 1, "doctype": "DocPerm", - "permlevel": 0, "role": "Purchase User", "submit": 1, "write": 1 }, - { - "amend": 0, - "cancel": 0, - "create": 0, - "doctype": "DocPerm", - "permlevel": 1, - "role": "All", - "submit": 0 - }, { "doctype": "DocPerm", "match": "supplier", - "permlevel": 0, "role": "Supplier" } ] \ No newline at end of file diff --git a/buying/doctype/quality_inspection/quality_inspection.txt b/buying/doctype/quality_inspection/quality_inspection.txt index 10177534403..66baddf19d8 100644 --- a/buying/doctype/quality_inspection/quality_inspection.txt +++ b/buying/doctype/quality_inspection/quality_inspection.txt @@ -2,13 +2,14 @@ { "creation": "2013-04-30 13:13:03", "docstatus": 0, - "modified": "2013-06-11 16:05:29", + "modified": "2013-07-05 14:52:20", "modified_by": "Administrator", "owner": "Administrator" }, { "autoname": "naming_series:", "doctype": "DocType", + "icon": "icon-search", "is_submittable": 1, "module": "Buying", "name": "__common__", diff --git a/buying/doctype/supplier/supplier.txt b/buying/doctype/supplier/supplier.txt index 3d71e1d1db2..ebb650514c2 100644 --- a/buying/doctype/supplier/supplier.txt +++ b/buying/doctype/supplier/supplier.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:11", "docstatus": 0, - "modified": "2013-07-04 10:13:19", + "modified": "2013-07-05 14:57:04", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "description": "Supplier of Goods or Services.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-user", "module": "Buying", "name": "__common__", "search_fields": "supplier_name,supplier_type" diff --git a/buying/doctype/supplier_quotation/supplier_quotation.txt b/buying/doctype/supplier_quotation/supplier_quotation.txt index 5f2e95ee8cf..95fe364d01a 100644 --- a/buying/doctype/supplier_quotation/supplier_quotation.txt +++ b/buying/doctype/supplier_quotation/supplier_quotation.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-21 16:16:45", "docstatus": 0, - "modified": "2013-07-04 18:47:51", + "modified": "2013-07-05 14:57:12", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "naming_series:", "doctype": "DocType", "document_type": "Transaction", + "icon": "icon-shopping-cart", "is_submittable": 1, "module": "Buying", "name": "__common__", @@ -31,6 +32,7 @@ "parent": "Supplier Quotation", "parentfield": "permissions", "parenttype": "DocType", + "permlevel": 0, "read": 1, "report": 1 }, @@ -642,7 +644,6 @@ "cancel": 1, "create": 1, "doctype": "DocPerm", - "permlevel": 0, "role": "Manufacturing Manager", "submit": 1, "write": 1 @@ -652,7 +653,6 @@ "cancel": 1, "create": 1, "doctype": "DocPerm", - "permlevel": 0, "role": "Purchase Manager", "submit": 1, "write": 1 @@ -662,7 +662,6 @@ "cancel": 0, "create": 1, "doctype": "DocPerm", - "permlevel": 0, "role": "Purchase User", "submit": 0, "write": 1 @@ -672,7 +671,6 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", - "permlevel": 0, "role": "Material User", "submit": 0, "write": 0 @@ -682,19 +680,8 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", - "permlevel": 0, "role": "Supplier", "submit": 0, "write": 0 - }, - { - "amend": 0, - "cancel": 0, - "create": 0, - "doctype": "DocPerm", - "permlevel": 1, - "role": "All", - "submit": 0, - "write": 0 } ] \ No newline at end of file diff --git a/buying/doctype/supplier_quotation/test_supplier_quotation.py b/buying/doctype/supplier_quotation/test_supplier_quotation.py new file mode 100644 index 00000000000..0210b7fdc8a --- /dev/null +++ b/buying/doctype/supplier_quotation/test_supplier_quotation.py @@ -0,0 +1,69 @@ +# ERPNext - web based ERP (http://erpnext.com) +# Copyright (C) 2012 Web Notes Technologies Pvt Ltd +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +from __future__ import unicode_literals +import unittest +import webnotes +import webnotes.defaults + +class TestPurchaseOrder(unittest.TestCase): + def test_make_purchase_order(self): + from buying.doctype.supplier_quotation.supplier_quotation import make_purchase_order + + sq = webnotes.bean(copy=test_records[0]).insert() + + self.assertRaises(webnotes.ValidationError, make_purchase_order, + sq.doc.name) + + sq = webnotes.bean("Supplier Quotation", sq.doc.name) + sq.submit() + po = make_purchase_order(sq.doc.name) + + self.assertEquals(po[0]["doctype"], "Purchase Order") + self.assertEquals(len(po), len(sq.doclist)) + +test_records = [ + [ + { + "company": "_Test Company", + "conversion_rate": 1.0, + "currency": "INR", + "doctype": "Supplier Quotation", + "fiscal_year": "_Test Fiscal Year 2013", + "transaction_date": "2013-02-12", + "is_subcontracted": "Yes", + "supplier": "_Test Supplier", + "supplier_name": "_Test Supplier", + "net_total": 5000.0, + "grand_total": 5000.0, + "grand_total_import": 5000.0, + + }, + { + "description": "_Test FG Item", + "doctype": "Supplier Quotation Item", + "item_code": "_Test FG Item", + "item_name": "_Test FG Item", + "parentfield": "quotation_items", + "qty": 10.0, + "import_rate": 500.0, + "amount": 5000.0, + "warehouse": "_Test Warehouse", + "uom": "_Test UOM", + } + ], +] \ No newline at end of file diff --git a/home/doctype/feed/feed.txt b/home/doctype/feed/feed.txt index 57671814360..c80e24c857a 100644 --- a/home/doctype/feed/feed.txt +++ b/home/doctype/feed/feed.txt @@ -2,18 +2,16 @@ { "creation": "2012-07-03 13:29:42", "docstatus": 0, - "modified": "2012-10-15 15:23:02", + "modified": "2013-07-05 14:38:06", "modified_by": "Administrator", "owner": "Administrator" }, { "autoname": "_FEED.#####", "doctype": "DocType", + "icon": "icon-rss", "module": "Home", - "name": "__common__", - "section_style": "Simple", - "show_in_menu": 0, - "version": 1 + "name": "__common__" }, { "doctype": "DocField", diff --git a/hr/doctype/appraisal/appraisal.txt b/hr/doctype/appraisal/appraisal.txt index 436434b18aa..8aaa7e109c4 100644 --- a/hr/doctype/appraisal/appraisal.txt +++ b/hr/doctype/appraisal/appraisal.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-10 16:34:12", "docstatus": 0, - "modified": "2013-06-11 16:06:06", + "modified": "2013-07-05 14:24:59", "modified_by": "Administrator", "owner": "ashwini@webnotestech.com" }, { "autoname": "APRSL.#####", "doctype": "DocType", + "icon": "icon-thumbs-up", "is_submittable": 1, "module": "HR", "name": "__common__", diff --git a/hr/doctype/appraisal_template/appraisal_template.txt b/hr/doctype/appraisal_template/appraisal_template.txt index c208ea601cb..63c14f08893 100644 --- a/hr/doctype/appraisal_template/appraisal_template.txt +++ b/hr/doctype/appraisal_template/appraisal_template.txt @@ -1,69 +1,70 @@ [ { - "owner": "ashwini@webnotestech.com", - "docstatus": 0, "creation": "2012-07-03 13:30:39", + "docstatus": 0, + "modified": "2013-07-05 14:25:14", "modified_by": "Administrator", - "modified": "2013-01-07 17:16:25" + "owner": "ashwini@webnotestech.com" }, { - "name": "__common__", "autoname": "field:kra_title", - "module": "HR", "doctype": "DocType", - "document_type": "Master" + "document_type": "Master", + "icon": "icon-file-text", + "module": "HR", + "name": "__common__" }, { - "name": "__common__", - "parent": "Appraisal Template", "doctype": "DocField", + "name": "__common__", + "parent": "Appraisal Template", + "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "parent": "Appraisal Template", - "read": 1, - "report": 1, - "name": "__common__", "create": 1, "doctype": "DocPerm", - "write": 1, + "name": "__common__", + "parent": "Appraisal Template", + "parentfield": "permissions", "parenttype": "DocType", - "role": "HR User", "permlevel": 0, - "parentfield": "permissions" + "read": 1, + "report": 1, + "role": "HR User", + "write": 1 }, { - "name": "Appraisal Template", - "doctype": "DocType" + "doctype": "DocType", + "name": "Appraisal Template" }, { - "oldfieldtype": "Data", "doctype": "DocField", - "label": "Appraisal Template Title", - "oldfieldname": "kra_title", "fieldname": "kra_title", "fieldtype": "Data", + "label": "Appraisal Template Title", + "oldfieldname": "kra_title", + "oldfieldtype": "Data", "reqd": 1 }, { - "print_width": "300px", - "oldfieldtype": "Small Text", "doctype": "DocField", + "fieldname": "description", + "fieldtype": "Small Text", "label": "Description", "oldfieldname": "description", - "width": "300px", - "fieldname": "description", - "fieldtype": "Small Text" + "oldfieldtype": "Small Text", + "print_width": "300px", + "width": "300px" }, { - "oldfieldtype": "Table", "doctype": "DocField", - "label": "Appraisal Template Goal", - "oldfieldname": "kra_sheet", "fieldname": "kra_sheet", "fieldtype": "Table", + "label": "Appraisal Template Goal", + "oldfieldname": "kra_sheet", + "oldfieldtype": "Table", "options": "Appraisal Template Goal" }, { diff --git a/hr/doctype/attendance/attendance.txt b/hr/doctype/attendance/attendance.txt index 05a1ab1b0bf..aa917ed7bd8 100644 --- a/hr/doctype/attendance/attendance.txt +++ b/hr/doctype/attendance/attendance.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:13", "docstatus": 0, - "modified": "2013-06-11 16:06:17", + "modified": "2013-07-05 14:25:19", "modified_by": "Administrator", "owner": "ashwini@webnotestech.com" }, @@ -10,6 +10,7 @@ "autoname": "naming_series:", "doctype": "DocType", "document_type": "Master", + "icon": "icon-ok", "is_submittable": 1, "module": "HR", "name": "__common__", diff --git a/hr/doctype/branch/branch.txt b/hr/doctype/branch/branch.txt index ea20a1461f3..971c24b81b2 100644 --- a/hr/doctype/branch/branch.txt +++ b/hr/doctype/branch/branch.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:13", "docstatus": 0, - "modified": "2013-01-22 17:36:37", + "modified": "2013-07-05 14:28:09", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "field:branch", "doctype": "DocType", "document_type": "Master", + "icon": "icon-code-fork", "module": "HR", "name": "__common__" }, diff --git a/hr/doctype/deduction_type/deduction_type.txt b/hr/doctype/deduction_type/deduction_type.txt index f3467936f5f..7bd0fead7d3 100644 --- a/hr/doctype/deduction_type/deduction_type.txt +++ b/hr/doctype/deduction_type/deduction_type.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-22 16:50:30", "docstatus": 0, - "modified": "2013-05-02 11:22:59", + "modified": "2013-07-05 14:34:46", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "field:deduction_name", "doctype": "DocType", "document_type": "Master", + "icon": "icon-flag", "module": "HR", "name": "__common__" }, diff --git a/hr/doctype/department/department.txt b/hr/doctype/department/department.txt index f5a6ff61014..188e52a098f 100644 --- a/hr/doctype/department/department.txt +++ b/hr/doctype/department/department.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-05 11:48:26", "docstatus": 0, - "modified": "2013-02-14 17:21:51", + "modified": "2013-07-05 14:35:06", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "field:department_name", "doctype": "DocType", "document_type": "Master", + "icon": "icon-sitemap", "module": "HR", "name": "__common__" }, diff --git a/hr/doctype/designation/designation.txt b/hr/doctype/designation/designation.txt index e606a35aac1..75110c21230 100644 --- a/hr/doctype/designation/designation.txt +++ b/hr/doctype/designation/designation.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:13", "docstatus": 0, - "modified": "2013-01-29 19:06:00", + "modified": "2013-07-05 14:35:42", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "field:designation_name", "doctype": "DocType", "document_type": "Master", + "icon": "icon-bookmark", "module": "HR", "name": "__common__" }, diff --git a/hr/doctype/earning_type/earning_type.txt b/hr/doctype/earning_type/earning_type.txt index d69f48619cc..0fa8c42fab6 100644 --- a/hr/doctype/earning_type/earning_type.txt +++ b/hr/doctype/earning_type/earning_type.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-24 11:03:32", "docstatus": 0, - "modified": "2013-05-02 11:22:48", + "modified": "2013-07-05 14:36:03", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "field:earning_name", "doctype": "DocType", "document_type": "Master", + "icon": "icon-flag", "module": "HR", "name": "__common__" }, diff --git a/hr/doctype/employee/employee.txt b/hr/doctype/employee/employee.txt index 705eaa72730..9d6dfae8fde 100644 --- a/hr/doctype/employee/employee.txt +++ b/hr/doctype/employee/employee.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-07 09:04:18", "docstatus": 0, - "modified": "2013-04-12 07:16:42", + "modified": "2013-07-05 14:36:19", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "naming_series:", "doctype": "DocType", "document_type": "Master", + "icon": "icon-user", "module": "HR", "name": "__common__", "search_fields": "employee_name" @@ -608,12 +609,6 @@ "label": "Educational Qualification Details", "options": "Employee Education" }, - { - "doctype": "DocField", - "fieldname": "career_history", - "fieldtype": "Section Break", - "label": "Career History" - }, { "doctype": "DocField", "fieldname": "previous_work_experience", @@ -762,7 +757,6 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", - "match": "", "permlevel": 1, "report": 0, "role": "Employee", @@ -791,7 +785,6 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", - "match": "", "permlevel": 1, "report": 0, "role": "HR User", @@ -801,7 +794,6 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", - "match": "", "permlevel": 1, "report": 0, "role": "HR Manager", diff --git a/hr/doctype/employment_type/employment_type.txt b/hr/doctype/employment_type/employment_type.txt index a3e40f0bc7b..e4a2f24b808 100644 --- a/hr/doctype/employment_type/employment_type.txt +++ b/hr/doctype/employment_type/employment_type.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:14", "docstatus": 0, - "modified": "2013-01-22 14:46:42", + "modified": "2013-07-05 14:36:27", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "field:employee_type_name", "doctype": "DocType", "document_type": "Master", + "icon": "icon-flag", "module": "HR", "name": "__common__" }, diff --git a/hr/doctype/expense_claim/expense_claim.txt b/hr/doctype/expense_claim/expense_claim.txt index 979157299af..2b1882fc5b8 100644 --- a/hr/doctype/expense_claim/expense_claim.txt +++ b/hr/doctype/expense_claim/expense_claim.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-10 16:34:14", "docstatus": 0, - "modified": "2013-06-11 16:16:35", + "modified": "2013-07-05 14:36:59", "modified_by": "Administrator", "owner": "harshada@webnotestech.com" }, { "autoname": "EXP.######", "doctype": "DocType", + "icon": "icon-money", "is_submittable": 1, "module": "HR", "name": "__common__", diff --git a/hr/doctype/expense_claim_type/expense_claim_type.txt b/hr/doctype/expense_claim_type/expense_claim_type.txt index 3f59e6695b2..4d7035063da 100644 --- a/hr/doctype/expense_claim_type/expense_claim_type.txt +++ b/hr/doctype/expense_claim_type/expense_claim_type.txt @@ -2,7 +2,7 @@ { "creation": "2012-03-27 14:35:55", "docstatus": 0, - "modified": "2012-03-27 14:35:55", + "modified": "2013-07-05 14:37:47", "modified_by": "Administrator", "owner": "harshada@webnotestech.com" }, @@ -10,10 +10,9 @@ "autoname": "field:expense_type", "doctype": "DocType", "document_type": "Master", + "icon": "icon-flag", "module": "HR", - "name": "__common__", - "section_style": "Simple", - "version": 5 + "name": "__common__" }, { "doctype": "DocField", @@ -33,24 +32,13 @@ "permlevel": 0, "read": 1, "report": 1, + "role": "HR Manager", "write": 1 }, { "doctype": "DocType", "name": "Expense Claim Type" }, - { - "doctype": "DocPerm", - "role": "System Manager" - }, - { - "doctype": "DocPerm", - "role": "HR Manager" - }, - { - "doctype": "DocPerm", - "role": "System Manager" - }, { "doctype": "DocField", "fieldname": "expense_type", @@ -70,5 +58,8 @@ "oldfieldname": "description", "oldfieldtype": "Small Text", "width": "300px" + }, + { + "doctype": "DocPerm" } ] \ No newline at end of file diff --git a/hr/doctype/grade/grade.txt b/hr/doctype/grade/grade.txt index 51a041edf0b..b674c311539 100644 --- a/hr/doctype/grade/grade.txt +++ b/hr/doctype/grade/grade.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:14", "docstatus": 0, - "modified": "2013-01-22 14:46:59", + "modified": "2013-07-05 14:39:58", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "field:grade_name", "doctype": "DocType", "document_type": "Master", + "icon": "icon-star-half-empty", "module": "HR", "name": "__common__" }, diff --git a/hr/doctype/holiday_list/holiday_list.txt b/hr/doctype/holiday_list/holiday_list.txt index fc16aa90c96..5978f1457b0 100644 --- a/hr/doctype/holiday_list/holiday_list.txt +++ b/hr/doctype/holiday_list/holiday_list.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-10 16:34:14", "docstatus": 0, - "modified": "2013-01-22 14:47:00", + "modified": "2013-07-05 14:40:02", "modified_by": "Administrator", "owner": "Administrator" }, { "doctype": "DocType", "document_type": "Master", + "icon": "icon-calendar", "module": "HR", "name": "__common__" }, diff --git a/hr/doctype/job_applicant/job_applicant.txt b/hr/doctype/job_applicant/job_applicant.txt index d2a2d77ca76..ebf95f68bb6 100644 --- a/hr/doctype/job_applicant/job_applicant.txt +++ b/hr/doctype/job_applicant/job_applicant.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-29 19:25:37", "docstatus": 0, - "modified": "2013-01-29 17:44:52", + "modified": "2013-07-05 14:43:11", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "description": "Applicant for a Job", "doctype": "DocType", "document_type": "Transaction", + "icon": "icon-user", "module": "HR", "name": "__common__" }, diff --git a/hr/doctype/job_opening/job_opening.txt b/hr/doctype/job_opening/job_opening.txt index 5e26f0d1c17..a507547d6e1 100644 --- a/hr/doctype/job_opening/job_opening.txt +++ b/hr/doctype/job_opening/job_opening.txt @@ -1,65 +1,66 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2013-01-15 16:13:36", + "docstatus": 0, + "modified": "2013-07-05 14:43:35", "modified_by": "Administrator", - "modified": "2013-01-15 16:43:05" + "owner": "Administrator" }, { "autoname": "field:job_title", "description": "Description of a Job Opening", "doctype": "DocType", - "module": "HR", "document_type": "Transaction", + "icon": "icon-bookmark", + "module": "HR", "name": "__common__" }, { + "doctype": "DocField", "name": "__common__", "parent": "Job Opening", - "doctype": "DocField", + "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "parent": "Job Opening", - "read": 1, "cancel": 1, - "name": "__common__", "create": 1, "doctype": "DocPerm", - "write": 1, + "name": "__common__", + "parent": "Job Opening", + "parentfield": "permissions", "parenttype": "DocType", - "role": "HR User", - "report": 1, "permlevel": 0, - "parentfield": "permissions" + "read": 1, + "report": 1, + "role": "HR User", + "write": 1 }, { - "name": "Job Opening", - "doctype": "DocType" + "doctype": "DocType", + "name": "Job Opening" }, { "doctype": "DocField", - "label": "Job Title", "fieldname": "job_title", "fieldtype": "Data", + "label": "Job Title", "reqd": 1 }, { "doctype": "DocField", - "label": "Status", "fieldname": "status", "fieldtype": "Select", + "label": "Status", "options": "Open\nClosed" }, { "description": "Job profile, qualifications required etc.", "doctype": "DocField", - "label": "Description", "fieldname": "description", - "fieldtype": "Text Editor" + "fieldtype": "Text Editor", + "label": "Description" }, { "doctype": "DocPerm" diff --git a/hr/doctype/leave_allocation/leave_allocation.txt b/hr/doctype/leave_allocation/leave_allocation.txt index cd2fc029e04..a24823a454c 100644 --- a/hr/doctype/leave_allocation/leave_allocation.txt +++ b/hr/doctype/leave_allocation/leave_allocation.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-20 19:10:38", "docstatus": 0, - "modified": "2013-06-11 16:16:32", + "modified": "2013-07-05 14:44:19", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "allow_import": 1, "autoname": "LAL/.#####", "doctype": "DocType", + "icon": "icon-ok", "is_submittable": 1, "module": "HR", "name": "__common__", diff --git a/hr/doctype/leave_application/leave_application.txt b/hr/doctype/leave_application/leave_application.txt index 0710a5c6562..d5feb57a9ef 100644 --- a/hr/doctype/leave_application/leave_application.txt +++ b/hr/doctype/leave_application/leave_application.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-20 11:18:11", "docstatus": 0, - "modified": "2013-02-19 16:30:05", + "modified": "2013-07-05 14:44:37", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "description": "Apply / Approve Leaves", "doctype": "DocType", "document_type": "Transaction", + "icon": "icon-calendar", "is_submittable": 1, "max_attachments": 3, "module": "HR", @@ -240,7 +241,6 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", - "match": "", "permlevel": 1, "role": "All", "submit": 0 @@ -273,7 +273,6 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", - "match": "", "permlevel": 1, "report": 1, "role": "HR User", @@ -285,7 +284,6 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", - "match": "", "permlevel": 1, "report": 1, "role": "Leave Approver", diff --git a/hr/doctype/leave_block_list/leave_block_list.txt b/hr/doctype/leave_block_list/leave_block_list.txt index dec4819d072..770bfeecfa4 100644 --- a/hr/doctype/leave_block_list/leave_block_list.txt +++ b/hr/doctype/leave_block_list/leave_block_list.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-18 17:43:12", "docstatus": 0, - "modified": "2013-02-19 18:42:35", + "modified": "2013-07-05 14:44:45", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "description": "Block Holidays on important days.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-calendar", "module": "HR", "name": "__common__" }, diff --git a/hr/doctype/leave_control_panel/leave_control_panel.txt b/hr/doctype/leave_control_panel/leave_control_panel.txt index b9014ad7edd..bee3123399a 100644 --- a/hr/doctype/leave_control_panel/leave_control_panel.txt +++ b/hr/doctype/leave_control_panel/leave_control_panel.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:15", "docstatus": 0, - "modified": "2013-01-22 13:38:08", + "modified": "2013-07-05 14:44:50", "modified_by": "Administrator", "owner": "Administrator" }, @@ -13,6 +13,7 @@ "doctype": "DocType", "hide_heading": 0, "hide_toolbar": 0, + "icon": "icon-cog", "issingle": 1, "module": "HR", "name": "__common__", diff --git a/hr/doctype/leave_type/leave_type.txt b/hr/doctype/leave_type/leave_type.txt index 3087caaa1af..29960b252ac 100644 --- a/hr/doctype/leave_type/leave_type.txt +++ b/hr/doctype/leave_type/leave_type.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-21 09:55:58", "docstatus": 0, - "modified": "2013-03-05 08:06:43", + "modified": "2013-07-05 14:44:54", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "field:leave_type_name", "doctype": "DocType", "document_type": "Master", + "icon": "icon-flag", "module": "HR", "name": "__common__" }, diff --git a/hr/doctype/salary_manager/salary_manager.txt b/hr/doctype/salary_manager/salary_manager.txt index 081b156d803..f25de4ff00c 100644 --- a/hr/doctype/salary_manager/salary_manager.txt +++ b/hr/doctype/salary_manager/salary_manager.txt @@ -2,23 +2,20 @@ { "creation": "2012-03-27 14:35:59", "docstatus": 0, - "modified": "2012-03-27 14:35:59", + "modified": "2013-07-05 14:53:30", "modified_by": "Administrator", "owner": "Administrator" }, { - "_last_update": "1314253977", "allow_copy": 1, "allow_email": 1, "allow_print": 1, "doctype": "DocType", "document_type": "Other", + "icon": "icon-cog", "issingle": 1, "module": "HR", - "name": "__common__", - "section_style": "Simple", - "show_in_menu": 1, - "version": 30 + "name": "__common__" }, { "doctype": "DocField", @@ -43,18 +40,6 @@ "doctype": "DocType", "name": "Salary Manager" }, - { - "doctype": "DocPerm", - "role": "System Manager" - }, - { - "doctype": "DocPerm", - "role": "HR User" - }, - { - "doctype": "DocPerm", - "role": "HR Manager" - }, { "doctype": "DocField", "fieldname": "document_description", @@ -154,8 +139,7 @@ "doctype": "DocField", "fieldname": "create_salary_slip", "fieldtype": "Button", - "label": "Create Salary Slip", - "trigger": "Client" + "label": "Create Salary Slip" }, { "doctype": "DocField", @@ -168,8 +152,7 @@ "doctype": "DocField", "fieldname": "submit_salary_slip", "fieldtype": "Button", - "label": "Submit Salary Slip", - "trigger": "Client" + "label": "Submit Salary Slip" }, { "doctype": "DocField", @@ -182,8 +165,7 @@ "doctype": "DocField", "fieldname": "make_bank_voucher", "fieldtype": "Button", - "label": "Make Bank Voucher", - "trigger": "Client" + "label": "Make Bank Voucher" }, { "doctype": "DocField", @@ -195,5 +177,17 @@ "fieldname": "activity_log", "fieldtype": "HTML", "label": "Activity Log" + }, + { + "doctype": "DocPerm", + "role": "System Manager" + }, + { + "doctype": "DocPerm", + "role": "HR User" + }, + { + "doctype": "DocPerm", + "role": "HR Manager" } ] \ No newline at end of file diff --git a/hr/doctype/salary_slip/salary_slip.txt b/hr/doctype/salary_slip/salary_slip.txt index 894ea017c77..871c6b850b2 100644 --- a/hr/doctype/salary_slip/salary_slip.txt +++ b/hr/doctype/salary_slip/salary_slip.txt @@ -2,12 +2,13 @@ { "creation": "2013-01-10 16:34:15", "docstatus": 0, - "modified": "2013-06-11 16:16:35", + "modified": "2013-07-05 14:53:44", "modified_by": "Administrator", "owner": "Administrator" }, { "doctype": "DocType", + "icon": "icon-file-text", "is_submittable": 1, "module": "HR", "name": "__common__" diff --git a/hr/doctype/salary_structure/salary_structure.txt b/hr/doctype/salary_structure/salary_structure.txt index 43b36626f6c..57d7c0c30fc 100644 --- a/hr/doctype/salary_structure/salary_structure.txt +++ b/hr/doctype/salary_structure/salary_structure.txt @@ -2,12 +2,13 @@ { "creation": "2013-03-07 18:50:29", "docstatus": 0, - "modified": "2013-04-22 14:09:04", + "modified": "2013-07-05 14:54:02", "modified_by": "Administrator", "owner": "Administrator" }, { "doctype": "DocType", + "icon": "icon-file-text", "module": "HR", "name": "__common__" }, diff --git a/hr/doctype/upload_attendance/upload_attendance.py b/hr/doctype/upload_attendance/upload_attendance.py index ee4234a2791..54b8e49b091 100644 --- a/hr/doctype/upload_attendance/upload_attendance.py +++ b/hr/doctype/upload_attendance/upload_attendance.py @@ -13,8 +13,11 @@ class DocType(): self.doc = doc self.doclist = doclist -@webnotes.whitelist(allow_roles=['System Manager', 'HR Manager', "HR User"]) +@webnotes.whitelist() def get_template(): + if not webnotes.has_permission("Attendance", "create"): + raise webnotes.PermissionError + args = webnotes.form_dict global doclist doclist = webnotes.model.doctype.get("Attendance") @@ -96,8 +99,11 @@ def get_naming_series(): return series[0] -@webnotes.whitelist(allow_roles=['System Manager', 'HR Manager', "HR User"]) +@webnotes.whitelist() def upload(): + if not webnotes.has_permission("Attendance", "create"): + raise webnotes.PermissionError + from webnotes.utils.datautils import read_csv_content_from_uploaded_file from webnotes.modules import scrub diff --git a/hr/doctype/upload_attendance/upload_attendance.txt b/hr/doctype/upload_attendance/upload_attendance.txt index c47db65af33..ea861be185e 100644 --- a/hr/doctype/upload_attendance/upload_attendance.txt +++ b/hr/doctype/upload_attendance/upload_attendance.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-25 11:34:53", "docstatus": 0, - "modified": "2013-03-05 15:50:03", + "modified": "2013-07-05 15:02:09", "modified_by": "Administrator", "owner": "harshada@webnotestech.com" }, { "allow_attach": 0, "doctype": "DocType", + "icon": "icon-upload-alt", "issingle": 1, "max_attachments": 1, "module": "HR", diff --git a/manufacturing/doctype/bom/bom.txt b/manufacturing/doctype/bom/bom.txt index d539ad0338e..e677302a334 100644 --- a/manufacturing/doctype/bom/bom.txt +++ b/manufacturing/doctype/bom/bom.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-22 15:11:38", "docstatus": 0, - "modified": "2013-06-27 11:08:28", + "modified": "2013-07-05 14:27:38", "modified_by": "Administrator", "owner": "Administrator" }, @@ -16,6 +16,7 @@ "document_type": "Master", "hide_heading": 0, "hide_toolbar": 0, + "icon": "icon-sitemap", "in_create": 0, "is_submittable": 1, "issingle": 0, diff --git a/manufacturing/doctype/bom_replace_tool/bom_replace_tool.txt b/manufacturing/doctype/bom_replace_tool/bom_replace_tool.txt index a8036089946..cdb65ee24a9 100644 --- a/manufacturing/doctype/bom_replace_tool/bom_replace_tool.txt +++ b/manufacturing/doctype/bom_replace_tool/bom_replace_tool.txt @@ -2,7 +2,7 @@ { "creation": "2012-12-06 12:10:10", "docstatus": 0, - "modified": "2013-02-01 12:07:25", + "modified": "2013-07-05 14:27:52", "modified_by": "Administrator", "owner": "Administrator" }, @@ -15,6 +15,7 @@ "document_type": "Other", "hide_heading": 1, "hide_toolbar": 1, + "icon": "icon-magic", "in_create": 1, "issingle": 1, "module": "Manufacturing", diff --git a/manufacturing/doctype/production_order/production_order.txt b/manufacturing/doctype/production_order/production_order.txt index 08123e8e0b1..5e665e7ef19 100644 --- a/manufacturing/doctype/production_order/production_order.txt +++ b/manufacturing/doctype/production_order/production_order.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-10 16:34:16", "docstatus": 0, - "modified": "2013-07-03 17:00:29", + "modified": "2013-07-05 14:51:12", "modified_by": "Administrator", "owner": "Administrator" }, { "autoname": "naming_series:", "doctype": "DocType", + "icon": "icon-cogs", "in_create": 0, "is_submittable": 1, "module": "Manufacturing", diff --git a/manufacturing/doctype/production_planning_tool/production_planning_tool.txt b/manufacturing/doctype/production_planning_tool/production_planning_tool.txt index 4b37f9849d5..401b172cd0d 100644 --- a/manufacturing/doctype/production_planning_tool/production_planning_tool.txt +++ b/manufacturing/doctype/production_planning_tool/production_planning_tool.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-21 12:03:47", "docstatus": 0, - "modified": "2013-02-18 13:43:26", + "modified": "2013-07-05 14:51:19", "modified_by": "Administrator", "owner": "jai@webnotestech.com" }, { "default_print_format": "Standard", "doctype": "DocType", + "icon": "icon-calendar", "in_create": 1, "issingle": 1, "module": "Manufacturing", diff --git a/manufacturing/doctype/workstation/workstation.txt b/manufacturing/doctype/workstation/workstation.txt index 8dcb805b80d..038e2c9e45e 100644 --- a/manufacturing/doctype/workstation/workstation.txt +++ b/manufacturing/doctype/workstation/workstation.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:17", "docstatus": 0, - "modified": "2013-01-23 16:43:17", + "modified": "2013-07-05 15:04:25", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "field:workstation_name", "doctype": "DocType", "document_type": "Master", + "icon": "icon-wrench", "module": "Manufacturing", "name": "__common__" }, diff --git a/patches/patch_list.py b/patches/patch_list.py index daf584786a3..bbe51fadeb4 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -19,7 +19,7 @@ patch_list = [ "execute:webnotes.reload_doc('core', 'doctype', 'docfield')", "execute:webnotes.reload_doc('core', 'doctype', 'docperm') # 2013-04-07", "execute:webnotes.reload_doc('core', 'doctype', 'report')", - "execute:webnotes.reload_doc('core', 'doctype', 'doctype')", + "execute:webnotes.reload_doc('core', 'doctype', 'doctype') # 2013-07-04", "patches.mar_2012.so_rv_mapper_fix", "patches.mar_2012.clean_property_setter", "patches.april_2012.naming_series_patch", diff --git a/projects/doctype/activity_type/activity_type.txt b/projects/doctype/activity_type/activity_type.txt index 98665001b0e..94fffe7eb61 100644 --- a/projects/doctype/activity_type/activity_type.txt +++ b/projects/doctype/activity_type/activity_type.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-05 10:14:59", "docstatus": 0, - "modified": "2013-03-28 07:18:24", + "modified": "2013-07-05 14:23:55", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "field:activity_type", "doctype": "DocType", "document_type": "Master", + "icon": "icon-flag", "in_dialog": 0, "module": "Projects", "name": "__common__" diff --git a/projects/doctype/project/project.txt b/projects/doctype/project/project.txt index 88dfb97195f..91dcfa16816 100644 --- a/projects/doctype/project/project.txt +++ b/projects/doctype/project/project.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-07 11:55:07", "docstatus": 0, - "modified": "2013-06-07 12:38:37", + "modified": "2013-07-05 14:51:41", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "field:project_name", "doctype": "DocType", "document_type": "Master", + "icon": "icon-puzzle-piece", "max_attachments": 4, "module": "Projects", "name": "__common__", diff --git a/projects/doctype/task/task.txt b/projects/doctype/task/task.txt index 85d6aaa2ba9..d890bd67b94 100644 --- a/projects/doctype/task/task.txt +++ b/projects/doctype/task/task.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-29 19:25:50", "docstatus": 0, - "modified": "2013-01-29 16:27:52", + "modified": "2013-07-05 14:57:57", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "TASK.#####", "doctype": "DocType", "document_type": "Master", + "icon": "icon-check", "max_attachments": 5, "module": "Projects", "name": "__common__" diff --git a/projects/doctype/time_log/time_log.txt b/projects/doctype/time_log/time_log.txt index 897d6be7db8..ff1c2b46fcd 100644 --- a/projects/doctype/time_log/time_log.txt +++ b/projects/doctype/time_log/time_log.txt @@ -2,7 +2,7 @@ { "creation": "2013-04-03 16:38:41", "docstatus": 0, - "modified": "2013-04-03 15:51:32", + "modified": "2013-07-05 14:58:20", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "description": "Log of Activities performed by users against Tasks that can be used for tracking time, billing.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-time", "is_submittable": 1, "module": "Projects", "name": "__common__" diff --git a/projects/doctype/time_log_batch/time_log_batch.txt b/projects/doctype/time_log_batch/time_log_batch.txt index 7fe1827e5bc..09a43da2af6 100644 --- a/projects/doctype/time_log_batch/time_log_batch.txt +++ b/projects/doctype/time_log_batch/time_log_batch.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-28 17:57:33", "docstatus": 0, - "modified": "2013-03-01 17:54:57", + "modified": "2013-07-05 14:58:23", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "description": "Batch Time Logs for Billing.", "doctype": "DocType", "document_type": "Transaction", + "icon": "icon-time", "is_submittable": 1, "module": "Projects", "name": "__common__" diff --git a/selling/doctype/campaign/campaign.txt b/selling/doctype/campaign/campaign.txt index b9db8a5fe61..7025bf56540 100644 --- a/selling/doctype/campaign/campaign.txt +++ b/selling/doctype/campaign/campaign.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:18", "docstatus": 0, - "modified": "2013-01-22 14:55:58", + "modified": "2013-07-05 14:29:57", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "description": "Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ", "doctype": "DocType", "document_type": "Master", + "icon": "icon-bullhorn", "module": "Selling", "name": "__common__" }, diff --git a/selling/doctype/customer/customer.txt b/selling/doctype/customer/customer.txt index 86d40f869af..48c3d15273a 100644 --- a/selling/doctype/customer/customer.txt +++ b/selling/doctype/customer/customer.txt @@ -2,7 +2,7 @@ { "creation": "2013-06-11 14:26:44", "docstatus": 0, - "modified": "2013-07-03 10:26:04", + "modified": "2013-07-05 14:34:09", "modified_by": "Administrator", "owner": "Administrator" }, @@ -13,6 +13,7 @@ "description": "Buyer of Goods and Services.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-user", "module": "Selling", "name": "__common__", "search_fields": "customer_name,customer_group,country,territory" diff --git a/selling/doctype/industry_type/industry_type.txt b/selling/doctype/industry_type/industry_type.txt index 329a040e067..3c97b3e6822 100644 --- a/selling/doctype/industry_type/industry_type.txt +++ b/selling/doctype/industry_type/industry_type.txt @@ -2,7 +2,7 @@ { "creation": "2012-03-27 14:36:09", "docstatus": 0, - "modified": "2012-03-27 14:36:09", + "modified": "2013-07-05 14:40:42", "modified_by": "Administrator", "owner": "harshada@webnotestech.com" }, @@ -10,10 +10,9 @@ "autoname": "field:industry", "doctype": "DocType", "document_type": "Master", + "icon": "icon-flag", "module": "Selling", - "name": "__common__", - "section_style": "Simple", - "version": 4 + "name": "__common__" }, { "doctype": "DocField", @@ -43,6 +42,9 @@ "doctype": "DocType", "name": "Industry Type" }, + { + "doctype": "DocField" + }, { "create": 1, "doctype": "DocPerm", @@ -58,8 +60,5 @@ "doctype": "DocPerm", "role": "Sales Master Manager", "write": 1 - }, - { - "doctype": "DocField" } ] \ No newline at end of file diff --git a/selling/doctype/installation_note/installation_note.txt b/selling/doctype/installation_note/installation_note.txt index 8032cbe911f..9a9986390d8 100644 --- a/selling/doctype/installation_note/installation_note.txt +++ b/selling/doctype/installation_note/installation_note.txt @@ -2,13 +2,14 @@ { "creation": "2013-04-30 13:13:06", "docstatus": 0, - "modified": "2013-06-11 16:16:39", + "modified": "2013-07-05 14:40:56", "modified_by": "Administrator", "owner": "Administrator" }, { "autoname": "naming_series:", "doctype": "DocType", + "icon": "icon-wrench", "is_submittable": 1, "module": "Selling", "name": "__common__" diff --git a/selling/doctype/lead/lead.txt b/selling/doctype/lead/lead.txt index 343eb1ee78c..28a8ff4f6c9 100644 --- a/selling/doctype/lead/lead.txt +++ b/selling/doctype/lead/lead.txt @@ -2,7 +2,7 @@ { "creation": "2013-04-10 11:45:37", "docstatus": 0, - "modified": "2013-07-03 10:24:00", + "modified": "2013-07-05 14:44:00", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "naming_series:", "doctype": "DocType", "document_type": "Master", + "icon": "icon-user", "module": "Selling", "name": "__common__", "search_fields": "lead_name,lead_owner,status" diff --git a/selling/doctype/opportunity/opportunity.txt b/selling/doctype/opportunity/opportunity.txt index c4554409b7a..318bb49aa7c 100644 --- a/selling/doctype/opportunity/opportunity.txt +++ b/selling/doctype/opportunity/opportunity.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-07 18:50:30", "docstatus": 0, - "modified": "2013-07-03 10:29:20", + "modified": "2013-07-05 14:47:52", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "description": "Potential Sales Deal", "doctype": "DocType", "document_type": "Transaction", + "icon": "icon-info-sign", "is_submittable": 1, "module": "Selling", "name": "__common__", diff --git a/selling/doctype/quotation/quotation.txt b/selling/doctype/quotation/quotation.txt index 5aa3aa3c500..fb77282573e 100644 --- a/selling/doctype/quotation/quotation.txt +++ b/selling/doctype/quotation/quotation.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-24 19:29:08", "docstatus": 0, - "modified": "2013-07-04 10:56:10", + "modified": "2013-07-05 14:52:37", "modified_by": "Administrator", "owner": "Administrator" }, @@ -13,6 +13,7 @@ "doctype": "DocType", "document_type": "Transaction", "hide_toolbar": 0, + "icon": "icon-shopping-cart", "is_submittable": 1, "max_attachments": 1, "module": "Selling", diff --git a/selling/doctype/sales_bom/sales_bom.txt b/selling/doctype/sales_bom/sales_bom.txt index bf8fa479c22..9a9b6e67ccf 100644 --- a/selling/doctype/sales_bom/sales_bom.txt +++ b/selling/doctype/sales_bom/sales_bom.txt @@ -2,7 +2,7 @@ { "creation": "2013-06-20 11:53:21", "docstatus": 0, - "modified": "2013-06-25 16:43:18", + "modified": "2013-07-05 14:54:08", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "description": "Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. \n\nThe package **Item** will have \"Is Stock Item\" as \"No\" and \"Is Sales Item\" as \"Yes\".\n\nFor Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.\n\nNote: BOM = Bill of Materials", "doctype": "DocType", "document_type": "Master", + "icon": "icon-sitemap", "is_submittable": 0, "module": "Selling", "name": "__common__" @@ -23,6 +24,7 @@ "permlevel": 0 }, { + "amend": 0, "doctype": "DocPerm", "name": "__common__", "parent": "Sales BOM", @@ -73,7 +75,6 @@ "reqd": 1 }, { - "amend": 1, "cancel": 1, "create": 1, "doctype": "DocPerm", @@ -81,7 +82,6 @@ "write": 1 }, { - "amend": 0, "cancel": 0, "create": 0, "doctype": "DocPerm", @@ -89,7 +89,6 @@ "write": 0 }, { - "amend": 0, "cancel": 1, "create": 1, "doctype": "DocPerm", diff --git a/selling/doctype/sales_order/sales_order.js b/selling/doctype/sales_order/sales_order.js index 4bb2fa36e9e..1bf562e15eb 100644 --- a/selling/doctype/sales_order/sales_order.js +++ b/selling/doctype/sales_order/sales_order.js @@ -36,7 +36,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( cur_frm.dashboard.add_progress(cint(doc.per_delivered) + wn._("% Delivered"), doc.per_delivered); - cur_frm.dashboard.add_progress(cint(doc.per_delivered) + wn._("% Billed"), + cur_frm.dashboard.add_progress(cint(doc.per_billed) + wn._("% Billed"), doc.per_billed); cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); diff --git a/selling/doctype/sales_order/sales_order.txt b/selling/doctype/sales_order/sales_order.txt index 6ac7565042a..8b531245edb 100644 --- a/selling/doctype/sales_order/sales_order.txt +++ b/selling/doctype/sales_order/sales_order.txt @@ -2,7 +2,7 @@ { "creation": "2013-06-18 12:39:59", "docstatus": 0, - "modified": "2013-07-04 10:56:35", + "modified": "2013-07-05 14:54:26", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "naming_series:", "doctype": "DocType", "document_type": "Transaction", + "icon": "icon-file-text", "is_submittable": 1, "issingle": 0, "module": "Selling", diff --git a/selling/doctype/selling_settings/selling_settings.txt b/selling/doctype/selling_settings/selling_settings.txt index a08964d82a3..35d256ec7b5 100644 --- a/selling/doctype/selling_settings/selling_settings.txt +++ b/selling/doctype/selling_settings/selling_settings.txt @@ -2,7 +2,7 @@ { "creation": "2013-06-25 10:25:16", "docstatus": 0, - "modified": "2013-06-25 10:52:35", + "modified": "2013-07-05 14:54:47", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "description": "Settings for Selling Module", "doctype": "DocType", "document_type": "Other", + "icon": "icon-cog", "issingle": 1, "module": "Selling", "name": "__common__" diff --git a/selling/doctype/sms_center/sms_center.txt b/selling/doctype/sms_center/sms_center.txt index e9b8fdd71c4..bed9cf4ac04 100644 --- a/selling/doctype/sms_center/sms_center.txt +++ b/selling/doctype/sms_center/sms_center.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:22", "docstatus": 0, - "modified": "2013-01-22 14:57:24", + "modified": "2013-07-05 14:55:36", "modified_by": "Administrator", "owner": "Administrator" }, @@ -14,6 +14,7 @@ "doctype": "DocType", "hide_heading": 0, "hide_toolbar": 0, + "icon": "icon-mobile-phone", "in_create": 0, "issingle": 1, "module": "Selling", diff --git a/setup/doctype/authorization_rule/authorization_rule.txt b/setup/doctype/authorization_rule/authorization_rule.txt index 9814f5268de..27594807427 100644 --- a/setup/doctype/authorization_rule/authorization_rule.txt +++ b/setup/doctype/authorization_rule/authorization_rule.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:22", "docstatus": 0, - "modified": "2013-01-23 16:51:17", + "modified": "2013-07-05 14:25:35", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "AR.####", "doctype": "DocType", "document_type": "Master", + "icon": "icon-shield", "module": "Setup", "name": "__common__", "search_fields": "transaction,based_on,system_user,system_role,approving_user,approving_role" diff --git a/setup/doctype/backup_manager/backup_manager.txt b/setup/doctype/backup_manager/backup_manager.txt index 2d6f191e5e8..cf4dbcc4f27 100644 --- a/setup/doctype/backup_manager/backup_manager.txt +++ b/setup/doctype/backup_manager/backup_manager.txt @@ -2,7 +2,7 @@ { "creation": "2013-04-30 12:58:38", "docstatus": 0, - "modified": "2013-05-02 11:42:08", + "modified": "2013-07-05 14:26:02", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "description": "System for managing Backups", "doctype": "DocType", "document_type": "System", + "icon": "icon-cloud-upload", "issingle": 1, "module": "Setup", "name": "__common__" diff --git a/setup/doctype/brand/brand.txt b/setup/doctype/brand/brand.txt index cddd918c4ec..633e8aa1b46 100644 --- a/setup/doctype/brand/brand.txt +++ b/setup/doctype/brand/brand.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-22 01:27:54", "docstatus": 0, - "modified": "2013-03-28 07:18:30", + "modified": "2013-07-05 14:28:33", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "field:brand", "doctype": "DocType", "document_type": "Master", + "icon": "icon-certificate", "in_dialog": 0, "module": "Setup", "name": "__common__" diff --git a/setup/doctype/company/company.txt b/setup/doctype/company/company.txt index c4176d81329..c4def9a7883 100644 --- a/setup/doctype/company/company.txt +++ b/setup/doctype/company/company.txt @@ -2,7 +2,7 @@ { "creation": "2013-04-10 08:35:39", "docstatus": 0, - "modified": "2013-04-17 14:07:46", + "modified": "2013-07-05 14:32:14", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "description": "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-building", "module": "Setup", "name": "__common__" }, diff --git a/setup/doctype/country/country.txt b/setup/doctype/country/country.txt index e4bb408b5f8..ee54dcf0727 100644 --- a/setup/doctype/country/country.txt +++ b/setup/doctype/country/country.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-19 10:23:30", "docstatus": 0, - "modified": "2013-01-21 15:56:50", + "modified": "2013-07-05 14:33:19", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "field:country_name", "doctype": "DocType", "document_type": "Master", + "icon": "icon-globe", "in_create": 0, "module": "Setup", "name": "__common__", diff --git a/setup/doctype/currency/currency.txt b/setup/doctype/currency/currency.txt index 9252c5ae3dc..2954c9f9e48 100644 --- a/setup/doctype/currency/currency.txt +++ b/setup/doctype/currency/currency.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-28 10:06:02", "docstatus": 0, - "modified": "2013-01-29 14:55:36", + "modified": "2013-07-05 14:33:39", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "field:currency_name", "description": "**Currency** Master", "doctype": "DocType", + "icon": "icon-bitcoin", "in_create": 0, "module": "Setup", "name": "__common__", diff --git a/setup/doctype/currency_exchange/currency_exchange.txt b/setup/doctype/currency_exchange/currency_exchange.txt index 94bb28ab473..f90ecc20b45 100644 --- a/setup/doctype/currency_exchange/currency_exchange.txt +++ b/setup/doctype/currency_exchange/currency_exchange.txt @@ -2,7 +2,7 @@ { "creation": "2013-06-20 15:40:29", "docstatus": 0, - "modified": "2013-07-03 17:11:40", + "modified": "2013-07-05 14:33:47", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "description": "Specify Exchange Rate to convert one currency into another", "doctype": "DocType", "document_type": "Master", + "icon": "icon-bitcoin", "module": "Setup", "name": "__common__" }, diff --git a/setup/doctype/customer_group/customer_group.txt b/setup/doctype/customer_group/customer_group.txt index 6b67d595b62..6a1350046e7 100644 --- a/setup/doctype/customer_group/customer_group.txt +++ b/setup/doctype/customer_group/customer_group.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:23", "docstatus": 0, - "modified": "2013-01-22 14:55:59", + "modified": "2013-07-05 14:34:20", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "field:customer_group_name", "doctype": "DocType", "document_type": "Master", + "icon": "icon-sitemap", "in_create": 1, "module": "Setup", "name": "__common__", diff --git a/setup/doctype/email_digest/email_digest.txt b/setup/doctype/email_digest/email_digest.txt index 7817429ad39..f71d82a0e3c 100644 --- a/setup/doctype/email_digest/email_digest.txt +++ b/setup/doctype/email_digest/email_digest.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-21 14:15:31", "docstatus": 0, - "modified": "2013-02-25 13:08:26", + "modified": "2013-07-05 14:36:13", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "description": "Send regular summary reports via Email.", "doctype": "DocType", "document_type": "System", + "icon": "icon-envelope", "module": "Setup", "name": "__common__" }, diff --git a/setup/doctype/email_settings/email_settings.txt b/setup/doctype/email_settings/email_settings.txt index 5547c2e74cf..44aacc6dd2c 100644 --- a/setup/doctype/email_settings/email_settings.txt +++ b/setup/doctype/email_settings/email_settings.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-25 17:53:21", "docstatus": 0, - "modified": "2013-03-25 18:41:27", + "modified": "2013-07-05 14:36:16", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "allow_print": 1, "description": "Email Settings for Outgoing and Incoming Emails.", "doctype": "DocType", + "icon": "icon-cog", "in_create": 1, "issingle": 1, "module": "Setup", diff --git a/setup/doctype/features_setup/features_setup.txt b/setup/doctype/features_setup/features_setup.txt index 18a01dc913a..e1a4c08acfa 100644 --- a/setup/doctype/features_setup/features_setup.txt +++ b/setup/doctype/features_setup/features_setup.txt @@ -2,12 +2,13 @@ { "creation": "2012-12-20 12:50:49", "docstatus": 0, - "modified": "2013-02-18 13:44:28", + "modified": "2013-07-05 14:37:59", "modified_by": "Administrator", "owner": "Administrator" }, { "doctype": "DocType", + "icon": "icon-glass", "issingle": 1, "module": "Setup", "name": "__common__", diff --git a/setup/doctype/global_defaults/global_defaults.txt b/setup/doctype/global_defaults/global_defaults.txt index 98a428c3115..6fc07b6c57c 100644 --- a/setup/doctype/global_defaults/global_defaults.txt +++ b/setup/doctype/global_defaults/global_defaults.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-02 17:53:24", "docstatus": 0, - "modified": "2013-06-25 11:20:40", + "modified": "2013-07-05 14:39:17", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "allow_print": 1, "doctype": "DocType", "hide_toolbar": 0, + "icon": "icon-cog", "in_create": 1, "issingle": 1, "module": "Setup", diff --git a/setup/doctype/item_group/item_group.txt b/setup/doctype/item_group/item_group.txt index 568cf9d03d6..a2b04e7d905 100644 --- a/setup/doctype/item_group/item_group.txt +++ b/setup/doctype/item_group/item_group.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-28 10:35:29", "docstatus": 0, - "modified": "2013-04-01 12:06:52", + "modified": "2013-07-05 14:43:08", "modified_by": "Administrator", "owner": "Administrator" }, @@ -13,6 +13,7 @@ "description": "Item Classification", "doctype": "DocType", "document_type": "Master", + "icon": "icon-sitemap", "in_create": 1, "issingle": 0, "max_attachments": 3, diff --git a/setup/doctype/jobs_email_settings/jobs_email_settings.txt b/setup/doctype/jobs_email_settings/jobs_email_settings.txt index 788f51b7e94..769fc27cfe4 100644 --- a/setup/doctype/jobs_email_settings/jobs_email_settings.txt +++ b/setup/doctype/jobs_email_settings/jobs_email_settings.txt @@ -1,87 +1,88 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2013-01-15 16:50:01", + "docstatus": 0, + "modified": "2013-07-05 14:43:39", "modified_by": "Administrator", - "modified": "2013-01-15 16:57:08" + "owner": "Administrator" }, { - "issingle": 1, "description": "Email settings for jobs email id \"jobs@example.com\"", "doctype": "DocType", + "icon": "icon-cog", + "issingle": 1, "module": "Setup", "name": "__common__" }, { + "doctype": "DocField", "name": "__common__", "parent": "Jobs Email Settings", - "doctype": "DocField", + "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "parent": "Jobs Email Settings", - "read": 1, - "name": "__common__", "create": 1, "doctype": "DocPerm", - "write": 1, + "name": "__common__", + "parent": "Jobs Email Settings", + "parentfield": "permissions", "parenttype": "DocType", - "role": "System Manager", "permlevel": 0, - "parentfield": "permissions" + "read": 1, + "role": "System Manager", + "write": 1 }, { - "name": "Jobs Email Settings", - "doctype": "DocType" + "doctype": "DocType", + "name": "Jobs Email Settings" }, { "description": "Settings to extract Job Applicants from a mailbox e.g. \"jobs@example.com\"", "doctype": "DocField", - "label": "POP3 Mail Settings", "fieldname": "pop3_mail_settings", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "POP3 Mail Settings" }, { "description": "Check to activate", "doctype": "DocField", - "label": "Extract Emails", "fieldname": "extract_emails", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Extract Emails" }, { "description": "Email Id where a job applicant will email e.g. \"jobs@example.com\"", "doctype": "DocField", - "label": "Email Id", "fieldname": "email_id", - "fieldtype": "Data" + "fieldtype": "Data", + "label": "Email Id" }, { "description": "POP3 server e.g. (pop.gmail.com)", "doctype": "DocField", - "label": "Host", "fieldname": "host", - "fieldtype": "Data" + "fieldtype": "Data", + "label": "Host" }, { "doctype": "DocField", - "label": "Use SSL", "fieldname": "use_ssl", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Use SSL" }, { "doctype": "DocField", - "label": "Username", "fieldname": "username", - "fieldtype": "Data" + "fieldtype": "Data", + "label": "Username" }, { "doctype": "DocField", - "label": "Password", "fieldname": "password", - "fieldtype": "Password" + "fieldtype": "Password", + "label": "Password" }, { "doctype": "DocPerm" diff --git a/setup/doctype/naming_series/naming_series.txt b/setup/doctype/naming_series/naming_series.txt index 0dab9e970dc..28d4765cb4c 100644 --- a/setup/doctype/naming_series/naming_series.txt +++ b/setup/doctype/naming_series/naming_series.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-25 11:35:08", "docstatus": 0, - "modified": "2013-05-02 15:34:41", + "modified": "2013-07-05 14:46:46", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "doctype": "DocType", "hide_heading": 0, "hide_toolbar": 1, + "icon": "icon-sort-by-order", "issingle": 1, "module": "Setup", "name": "__common__", diff --git a/setup/doctype/price_list/price_list.txt b/setup/doctype/price_list/price_list.txt index 5113a3e0808..769e3d0d7ff 100644 --- a/setup/doctype/price_list/price_list.txt +++ b/setup/doctype/price_list/price_list.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-25 11:35:09", "docstatus": 0, - "modified": "2013-06-25 12:05:12", + "modified": "2013-07-05 14:50:47", "modified_by": "Administrator", "owner": "Administrator" }, @@ -15,6 +15,7 @@ "description": "Price List Master", "doctype": "DocType", "document_type": "Master", + "icon": "icon-tags", "max_attachments": 1, "module": "Setup", "name": "__common__" @@ -116,6 +117,13 @@ "label": "How to upload", "options": "
Use the Data Import Tool to upload, update Item Prices in bulk:\n
    \n
  1. Go to Data Import Tool.\n
  2. Select \"Item\"\n
  3. Check on \"With Data\"\n
  4. Download \"Item Price\" from Child Tables.\n
  5. Update the prices required and add new rows if required.\n
  6. Check on \"Overwrite\"\n
  7. Upload the modified sheet.\n
\n" }, + { + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "role": "Sales Manager", + "write": 0 + }, { "cancel": 0, "create": 0, diff --git a/setup/doctype/print_heading/print_heading.txt b/setup/doctype/print_heading/print_heading.txt index 91df2db9674..d6cbe95d63e 100644 --- a/setup/doctype/print_heading/print_heading.txt +++ b/setup/doctype/print_heading/print_heading.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:24", "docstatus": 0, - "modified": "2013-01-22 14:47:50", + "modified": "2013-07-05 14:50:55", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "field:print_heading", "doctype": "DocType", "document_type": "Master", + "icon": "icon-font", "module": "Setup", "name": "__common__", "search_fields": "print_heading" diff --git a/setup/doctype/quotation_lost_reason/quotation_lost_reason.txt b/setup/doctype/quotation_lost_reason/quotation_lost_reason.txt index 4bb8fc7a433..d580410d442 100644 --- a/setup/doctype/quotation_lost_reason/quotation_lost_reason.txt +++ b/setup/doctype/quotation_lost_reason/quotation_lost_reason.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:24", "docstatus": 0, - "modified": "2013-01-22 14:47:58", + "modified": "2013-07-05 14:52:43", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "field:order_lost_reason", "doctype": "DocType", "document_type": "Master", + "icon": "icon-flag", "module": "Setup", "name": "__common__" }, diff --git a/setup/doctype/sales_email_settings/sales_email_settings.txt b/setup/doctype/sales_email_settings/sales_email_settings.txt index d8042e970fe..17578128fba 100644 --- a/setup/doctype/sales_email_settings/sales_email_settings.txt +++ b/setup/doctype/sales_email_settings/sales_email_settings.txt @@ -1,87 +1,88 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2013-01-16 10:25:26", + "docstatus": 0, + "modified": "2013-07-05 14:54:14", "modified_by": "Administrator", - "modified": "2013-01-16 10:25:26" + "owner": "Administrator" }, { - "issingle": 1, "description": "Email settings to extract Leads from sales email id e.g. \"sales@example.com\"", "doctype": "DocType", + "icon": "icon-cog", + "issingle": 1, "module": "Setup", "name": "__common__" }, { + "doctype": "DocField", "name": "__common__", "parent": "Sales Email Settings", - "doctype": "DocField", + "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "parent": "Sales Email Settings", - "read": 1, - "name": "__common__", "create": 1, "doctype": "DocPerm", - "write": 1, + "name": "__common__", + "parent": "Sales Email Settings", + "parentfield": "permissions", "parenttype": "DocType", - "role": "System Manager", "permlevel": 0, - "parentfield": "permissions" + "read": 1, + "role": "System Manager", + "write": 1 }, { - "name": "Sales Email Settings", - "doctype": "DocType" + "doctype": "DocType", + "name": "Sales Email Settings" }, { "description": "Email settings to extract Leads from sales email id e.g. \"sales@example.com\"", "doctype": "DocField", - "label": "POP3 Mail Settings", "fieldname": "pop3_mail_settings", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "POP3 Mail Settings" }, { "description": "Check to activate", "doctype": "DocField", - "label": "Extract Emails", "fieldname": "extract_emails", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Extract Emails" }, { "description": "Email Id where a job applicant will email e.g. \"jobs@example.com\"", "doctype": "DocField", - "label": "Email Id", "fieldname": "email_id", - "fieldtype": "Data" + "fieldtype": "Data", + "label": "Email Id" }, { "description": "POP3 server e.g. (pop.gmail.com)", "doctype": "DocField", - "label": "Host", "fieldname": "host", - "fieldtype": "Data" + "fieldtype": "Data", + "label": "Host" }, { "doctype": "DocField", - "label": "Use SSL", "fieldname": "use_ssl", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Use SSL" }, { "doctype": "DocField", - "label": "Username", "fieldname": "username", - "fieldtype": "Data" + "fieldtype": "Data", + "label": "Username" }, { "doctype": "DocField", - "label": "Password", "fieldname": "password", - "fieldtype": "Password" + "fieldtype": "Password", + "label": "Password" }, { "doctype": "DocPerm" diff --git a/setup/doctype/sales_partner/sales_partner.txt b/setup/doctype/sales_partner/sales_partner.txt index 6fdeb69422a..ab475657443 100644 --- a/setup/doctype/sales_partner/sales_partner.txt +++ b/setup/doctype/sales_partner/sales_partner.txt @@ -2,7 +2,7 @@ { "creation": "2013-04-12 15:34:06", "docstatus": 0, - "modified": "2013-06-13 14:40:04", + "modified": "2013-07-05 14:54:31", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "description": "A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-user", "in_create": 0, "module": "Setup", "name": "__common__", diff --git a/setup/doctype/sales_person/sales_person.txt b/setup/doctype/sales_person/sales_person.txt index 8878a657ce1..44a246dc3ea 100644 --- a/setup/doctype/sales_person/sales_person.txt +++ b/setup/doctype/sales_person/sales_person.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:24", "docstatus": 0, - "modified": "2013-01-22 14:57:23", + "modified": "2013-07-05 14:54:33", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "description": "All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-user", "in_create": 1, "module": "Setup", "name": "__common__", diff --git a/setup/doctype/sms_settings/sms_settings.txt b/setup/doctype/sms_settings/sms_settings.txt index 43a6d7ef1e1..5d10209cb27 100755 --- a/setup/doctype/sms_settings/sms_settings.txt +++ b/setup/doctype/sms_settings/sms_settings.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:24", "docstatus": 0, - "modified": "2013-01-22 14:57:24", + "modified": "2013-07-05 14:55:50", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "allow_email": 1, "allow_print": 1, "doctype": "DocType", + "icon": "icon-cog", "in_create": 0, "issingle": 1, "module": "Setup", diff --git a/setup/doctype/supplier_type/supplier_type.txt b/setup/doctype/supplier_type/supplier_type.txt index 007bf9432ce..200dc8115e6 100644 --- a/setup/doctype/supplier_type/supplier_type.txt +++ b/setup/doctype/supplier_type/supplier_type.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:24", "docstatus": 0, - "modified": "2013-01-22 14:57:25", + "modified": "2013-07-05 14:57:16", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "field:supplier_type", "doctype": "DocType", "document_type": "Master", + "icon": "icon-flag", "module": "Setup", "name": "__common__" }, diff --git a/setup/doctype/terms_and_conditions/terms_and_conditions.txt b/setup/doctype/terms_and_conditions/terms_and_conditions.txt index 47a8c4c2401..0ddc8f5d5da 100644 --- a/setup/doctype/terms_and_conditions/terms_and_conditions.txt +++ b/setup/doctype/terms_and_conditions/terms_and_conditions.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:24", "docstatus": 0, - "modified": "2013-01-22 17:36:24", + "modified": "2013-07-05 14:58:02", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "description": "Standard Terms and Conditions that can be added to Sales and Purchases.\n\nExamples:\n\n1. Validity of the offer.\n1. Payment Terms (In Advance, On Credit, part advance etc).\n1. What is extra (or payable by the Customer).\n1. Safety / usage warning.\n1. Warranty if any.\n1. Returns Policy.\n1. Terms of shipping, if applicable.\n1. Ways of addressing disputes, indemnity, liability, etc.\n1. Address and Contact of your Company.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-legal", "module": "Setup", "name": "__common__" }, diff --git a/setup/doctype/territory/territory.txt b/setup/doctype/territory/territory.txt index 653606687c6..bba7e3ead3f 100644 --- a/setup/doctype/territory/territory.txt +++ b/setup/doctype/territory/territory.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:24", "docstatus": 0, - "modified": "2013-01-22 14:57:26", + "modified": "2013-07-05 14:58:15", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "description": "Classification of Customers by region", "doctype": "DocType", "document_type": "Master", + "icon": "icon-map-marker", "in_create": 1, "module": "Setup", "name": "__common__", diff --git a/setup/doctype/uom/uom.txt b/setup/doctype/uom/uom.txt index 733eb659b3f..ac15095d19a 100644 --- a/setup/doctype/uom/uom.txt +++ b/setup/doctype/uom/uom.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:24", "docstatus": 0, - "modified": "2013-01-22 14:57:26", + "modified": "2013-07-05 15:02:01", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "field:uom_name", "doctype": "DocType", "document_type": "Master", + "icon": "icon-compass", "module": "Setup", "name": "__common__" }, diff --git a/setup/doctype/warehouse_type/warehouse_type.txt b/setup/doctype/warehouse_type/warehouse_type.txt index a43122155fd..31df7d6ff92 100644 --- a/setup/doctype/warehouse_type/warehouse_type.txt +++ b/setup/doctype/warehouse_type/warehouse_type.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-10 16:34:24", "docstatus": 0, - "modified": "2013-01-22 14:57:27", + "modified": "2013-07-05 15:02:15", "modified_by": "Administrator", "owner": "Administrator" }, { "autoname": "field:warehouse_type", "doctype": "DocType", + "icon": "icon-flag", "istable": 0, "module": "Setup", "name": "__common__" diff --git a/stock/doctype/batch/batch.txt b/stock/doctype/batch/batch.txt index c6ed3c370a0..5b7a8409ab0 100644 --- a/stock/doctype/batch/batch.txt +++ b/stock/doctype/batch/batch.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-05 14:50:38", "docstatus": 0, - "modified": "2013-05-01 15:49:47", + "modified": "2013-07-05 14:26:48", "modified_by": "Administrator", "owner": "harshada@webnotestech.com" }, @@ -11,6 +11,7 @@ "autoname": "field:batch_id", "doctype": "DocType", "document_type": "Master", + "icon": "icon-archive", "max_attachments": 5, "module": "Stock", "name": "__common__" diff --git a/stock/doctype/delivery_note/delivery_note.txt b/stock/doctype/delivery_note/delivery_note.txt index 20e2196cb0c..99c3dcaa27e 100644 --- a/stock/doctype/delivery_note/delivery_note.txt +++ b/stock/doctype/delivery_note/delivery_note.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-24 19:29:09", "docstatus": 0, - "modified": "2013-06-27 11:33:53", + "modified": "2013-07-05 14:34:50", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "doctype": "DocType", "document_type": "Transaction", "hide_toolbar": 0, + "icon": "icon-truck", "in_create": 0, "is_submittable": 1, "module": "Stock", @@ -41,6 +42,13 @@ "doctype": "DocType", "name": "Delivery Note" }, + { + "doctype": "DocField", + "fieldname": "delivery_to_section", + "fieldtype": "Section Break", + "label": "Delivery To", + "options": "icon-user" + }, { "doctype": "DocField", "fieldname": "column_break0", @@ -100,38 +108,34 @@ "read_only": 1 }, { - "depends_on": "customer", "doctype": "DocField", "fieldname": "address_display", "fieldtype": "Small Text", - "hidden": 0, + "hidden": 1, "label": "Shipping Address", "read_only": 1 }, { - "depends_on": "customer", "doctype": "DocField", "fieldname": "contact_display", "fieldtype": "Small Text", - "hidden": 0, + "hidden": 1, "label": "Contact", "read_only": 1 }, { - "depends_on": "customer", "doctype": "DocField", "fieldname": "contact_mobile", "fieldtype": "Text", - "hidden": 0, + "hidden": 1, "label": "Mobile No", "read_only": 1 }, { - "depends_on": "customer", "doctype": "DocField", "fieldname": "contact_email", "fieldtype": "Text", - "hidden": 0, + "hidden": 1, "label": "Contact Email", "print_hide": 1, "read_only": 1 @@ -248,6 +252,7 @@ "fieldname": "sec_break25", "fieldtype": "Section Break", "label": "Price List and Currency", + "options": "icon-tag", "read_only": 0 }, { @@ -323,6 +328,7 @@ "fieldtype": "Section Break", "label": "Items", "oldfieldtype": "Section Break", + "options": "icon-shopping-cart", "read_only": 0 }, { @@ -345,6 +351,7 @@ "fieldtype": "Section Break", "label": "Packing List", "oldfieldtype": "Section Break", + "options": "icon-suitcase", "print_hide": 1, "read_only": 0 }, @@ -371,7 +378,6 @@ "doctype": "DocField", "fieldname": "section_break0", "fieldtype": "Section Break", - "options": "Simple", "read_only": 0 }, { @@ -442,6 +448,7 @@ "fieldtype": "Section Break", "label": "Taxes", "oldfieldtype": "Section Break", + "options": "icon-money", "read_only": 0 }, { @@ -542,6 +549,7 @@ "fieldtype": "Section Break", "label": "Totals", "oldfieldtype": "Section Break", + "options": "icon-money", "print_hide": 0, "read_only": 0 }, @@ -644,6 +652,7 @@ "fieldtype": "Section Break", "label": "Terms and Conditions", "oldfieldtype": "Section Break", + "options": "icon-legal", "read_only": 0 }, { @@ -690,6 +699,7 @@ "fieldname": "transporter_info", "fieldtype": "Section Break", "label": "Transporter Info", + "options": "icon-truck", "print_hide": 1, "read_only": 0 }, @@ -751,6 +761,7 @@ "fieldname": "contact_info", "fieldtype": "Section Break", "label": "Contact Info", + "options": "icon-bullhorn", "read_only": 0 }, { @@ -802,6 +813,7 @@ "fieldtype": "Section Break", "label": "More Info", "oldfieldtype": "Section Break", + "options": "icon-file-text", "print_hide": 1, "read_only": 0 }, @@ -1040,6 +1052,7 @@ "fieldtype": "Section Break", "label": "Sales Team", "oldfieldtype": "Section Break", + "options": "icon-group", "print_hide": 1, "read_only": 0 }, @@ -1095,7 +1108,6 @@ "doctype": "DocField", "fieldname": "section_break1", "fieldtype": "Section Break", - "options": "Simple", "print_hide": 1, "read_only": 0 }, diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt index d5fcb9ef28a..548be2f49c9 100644 --- a/stock/doctype/item/item.txt +++ b/stock/doctype/item/item.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-03 10:45:46", "docstatus": 0, - "modified": "2013-07-01 11:45:59", + "modified": "2013-07-05 14:43:01", "modified_by": "Administrator", "owner": "Administrator" }, @@ -14,6 +14,7 @@ "description": "A Product or a Service that is bought, sold or kept in stock.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-circle", "max_attachments": 1, "module": "Stock", "name": "__common__", @@ -44,11 +45,12 @@ }, { "doctype": "DocField", - "fieldname": "item", + "fieldname": "name_and_description_section", "fieldtype": "Section Break", - "label": "Item", + "label": "Name and Description", "no_copy": 0, "oldfieldtype": "Section Break", + "options": "icon-flag", "read_only": 0 }, { @@ -188,6 +190,7 @@ "fieldtype": "Section Break", "label": "Inventory", "oldfieldtype": "Section Break", + "options": "icon-truck", "read_only": 0 }, { @@ -343,6 +346,7 @@ "fieldname": "reorder_section", "fieldtype": "Section Break", "label": "Re-order", + "options": "icon-rss", "read_only": 0 }, { @@ -367,7 +371,6 @@ "doctype": "DocField", "fieldname": "section_break_31", "fieldtype": "Section Break", - "options": "Simple", "read_only": 0 }, { @@ -384,6 +387,7 @@ "fieldtype": "Section Break", "label": "Purchase Details", "oldfieldtype": "Section Break", + "options": "icon-shopping-cart", "read_only": 0 }, { @@ -508,6 +512,7 @@ "fieldtype": "Section Break", "label": "Sales Details", "oldfieldtype": "Section Break", + "options": "icon-tag", "read_only": 0 }, { @@ -617,6 +622,7 @@ "fieldtype": "Section Break", "label": "Item Tax", "oldfieldtype": "Section Break", + "options": "icon-money", "read_only": 0 }, { @@ -634,6 +640,7 @@ "fieldname": "price_list_section", "fieldtype": "Section Break", "label": "Price Lists and Rates", + "options": "icon-money", "read_only": 0 }, { @@ -653,6 +660,7 @@ "fieldtype": "Section Break", "label": "Inspection Criteria", "oldfieldtype": "Section Break", + "options": "icon-search", "read_only": 0 }, { @@ -686,6 +694,7 @@ "fieldtype": "Section Break", "label": "Manufacturing", "oldfieldtype": "Section Break", + "options": "icon-cogs", "read_only": 0 }, { @@ -756,6 +765,7 @@ "fieldname": "website_section", "fieldtype": "Section Break", "label": "Website", + "options": "icon-globe", "read_only": 0 }, { diff --git a/stock/doctype/landed_cost_wizard/landed_cost_wizard.txt b/stock/doctype/landed_cost_wizard/landed_cost_wizard.txt index d27fa83200e..36a5d727b9a 100644 --- a/stock/doctype/landed_cost_wizard/landed_cost_wizard.txt +++ b/stock/doctype/landed_cost_wizard/landed_cost_wizard.txt @@ -2,12 +2,13 @@ { "creation": "2013-01-22 16:50:39", "docstatus": 0, - "modified": "2013-01-22 16:54:49", + "modified": "2013-07-05 14:43:57", "modified_by": "Administrator", "owner": "wasim@webnotestech.com" }, { "doctype": "DocType", + "icon": "icon-magic", "issingle": 1, "module": "Stock", "name": "__common__" diff --git a/stock/doctype/material_request/material_request.txt b/stock/doctype/material_request/material_request.txt index 7ebb1974e41..ad9450386d1 100644 --- a/stock/doctype/material_request/material_request.txt +++ b/stock/doctype/material_request/material_request.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-07 14:48:38", "docstatus": 0, - "modified": "2013-07-04 10:24:53", + "modified": "2013-07-05 14:46:13", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "allow_print": 0, "autoname": "naming_series:", "doctype": "DocType", + "icon": "icon-ticket", "is_submittable": 1, "module": "Stock", "name": "__common__", diff --git a/stock/doctype/packing_slip/packing_slip.txt b/stock/doctype/packing_slip/packing_slip.txt index ed33e3ff2ad..3252ef82dbb 100644 --- a/stock/doctype/packing_slip/packing_slip.txt +++ b/stock/doctype/packing_slip/packing_slip.txt @@ -2,7 +2,7 @@ { "creation": "2013-04-11 15:32:24", "docstatus": 0, - "modified": "2013-06-11 16:16:37", + "modified": "2013-07-05 14:47:57", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "description": "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.", "doctype": "DocType", "document_type": "Transaction", + "icon": "icon-suitcase", "is_submittable": 1, "module": "Stock", "name": "__common__", diff --git a/stock/doctype/purchase_receipt/purchase_receipt.txt b/stock/doctype/purchase_receipt/purchase_receipt.txt index 03e2fa0aa4f..27eaf875f9f 100755 --- a/stock/doctype/purchase_receipt/purchase_receipt.txt +++ b/stock/doctype/purchase_receipt/purchase_receipt.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-21 16:16:39", "docstatus": 0, - "modified": "2013-07-05 14:38:03", + "modified": "2013-07-05 14:52:08", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "naming_series:", "doctype": "DocType", "document_type": "Transaction", + "icon": "icon-truck", "is_submittable": 1, "module": "Stock", "name": "__common__", @@ -38,6 +39,13 @@ "doctype": "DocType", "name": "Purchase Receipt" }, + { + "doctype": "DocField", + "fieldname": "supplier_section", + "fieldtype": "Section Break", + "label": "Supplier", + "options": "icon-user" + }, { "doctype": "DocField", "fieldname": "column_break0", @@ -86,38 +94,34 @@ "read_only": 1 }, { - "depends_on": "supplier", "doctype": "DocField", "fieldname": "address_display", "fieldtype": "Small Text", - "hidden": 0, + "hidden": 1, "label": "Address", "read_only": 1 }, { - "depends_on": "supplier", "doctype": "DocField", "fieldname": "contact_display", "fieldtype": "Small Text", - "hidden": 0, + "hidden": 1, "label": "Contact", "read_only": 1 }, { - "depends_on": "supplier", "doctype": "DocField", "fieldname": "contact_mobile", "fieldtype": "Text", - "hidden": 0, + "hidden": 1, "label": "Mobile No", "read_only": 1 }, { - "depends_on": "supplier", "doctype": "DocField", "fieldname": "contact_email", "fieldtype": "Text", - "hidden": 0, + "hidden": 1, "label": "Contact Email", "print_hide": 1, "read_only": 1 @@ -195,7 +199,8 @@ "fieldname": "items", "fieldtype": "Section Break", "label": "Items", - "oldfieldtype": "Section Break" + "oldfieldtype": "Section Break", + "options": "icon-shopping-cart" }, { "allow_on_submit": 1, @@ -213,8 +218,7 @@ "doctype": "DocField", "fieldname": "section_break0", "fieldtype": "Section Break", - "oldfieldtype": "Section Break", - "options": "Simple" + "oldfieldtype": "Section Break" }, { "doctype": "DocField", @@ -267,7 +271,8 @@ "doctype": "DocField", "fieldname": "currency_price_list", "fieldtype": "Section Break", - "label": "Currency & Price List" + "label": "Currency & Price List", + "options": "icon-tag" }, { "description": "Supplier's currency", @@ -334,7 +339,8 @@ "fieldname": "taxes", "fieldtype": "Section Break", "label": "Taxes", - "oldfieldtype": "Section Break" + "oldfieldtype": "Section Break", + "options": "icon-money" }, { "description": "If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.", @@ -387,7 +393,8 @@ "fieldname": "totals", "fieldtype": "Section Break", "label": "Totals", - "oldfieldtype": "Section Break" + "oldfieldtype": "Section Break", + "options": "icon-money" }, { "doctype": "DocField", @@ -536,7 +543,8 @@ "fieldname": "terms_section_break", "fieldtype": "Section Break", "label": "Terms and Conditions", - "oldfieldtype": "Section Break" + "oldfieldtype": "Section Break", + "options": "icon-legal" }, { "doctype": "DocField", @@ -568,7 +576,8 @@ "doctype": "DocField", "fieldname": "contact_section", "fieldtype": "Section Break", - "label": "Contact Info" + "label": "Contact Info", + "options": "icon-bullhorn" }, { "doctype": "DocField", @@ -597,7 +606,8 @@ "fieldname": "more_info", "fieldtype": "Section Break", "label": "More Info", - "oldfieldtype": "Section Break" + "oldfieldtype": "Section Break", + "options": "icon-file-text" }, { "doctype": "DocField", @@ -801,7 +811,8 @@ "doctype": "DocField", "fieldname": "transporter_info", "fieldtype": "Section Break", - "label": "Transporter Info" + "label": "Transporter Info", + "options": "icon-truck" }, { "doctype": "DocField", @@ -849,8 +860,9 @@ "doctype": "DocField", "fieldname": "raw_material_details", "fieldtype": "Section Break", - "label": "Raw Material Details", + "label": "Raw Materials Supplied", "oldfieldtype": "Section Break", + "options": "icon-table", "print_hide": 1, "read_only": 1 }, diff --git a/stock/doctype/serial_no/serial_no.txt b/stock/doctype/serial_no/serial_no.txt index 20f074b1ac5..72f78286366 100644 --- a/stock/doctype/serial_no/serial_no.txt +++ b/stock/doctype/serial_no/serial_no.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-16 10:59:15", "docstatus": 0, - "modified": "2013-07-02 12:07:21", + "modified": "2013-07-05 14:54:52", "modified_by": "Administrator", "owner": "Administrator" }, @@ -13,6 +13,7 @@ "description": "Distinct unit of an Item", "doctype": "DocType", "document_type": "Master", + "icon": "icon-barcode", "module": "Stock", "name": "__common__", "search_fields": "item_code,status" diff --git a/stock/doctype/stock_entry/stock_entry.txt b/stock/doctype/stock_entry/stock_entry.txt index d88b0b76fde..682c054f832 100644 --- a/stock/doctype/stock_entry/stock_entry.txt +++ b/stock/doctype/stock_entry/stock_entry.txt @@ -2,7 +2,7 @@ { "creation": "2013-04-09 11:43:55", "docstatus": 0, - "modified": "2013-05-09 13:31:00", + "modified": "2013-07-05 14:56:06", "modified_by": "Administrator", "owner": "Administrator" }, @@ -16,6 +16,7 @@ "doctype": "DocType", "hide_heading": 0, "hide_toolbar": 0, + "icon": "icon-file-text", "in_create": 0, "in_dialog": 0, "is_submittable": 1, diff --git a/stock/doctype/stock_ledger_entry/stock_ledger_entry.py b/stock/doctype/stock_ledger_entry/stock_ledger_entry.py index b2a10853ac8..664ead21d90 100644 --- a/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +++ b/stock/doctype/stock_ledger_entry/stock_ledger_entry.py @@ -119,11 +119,11 @@ class DocType(DocListController): def scrub_posting_time(self): if not self.doc.posting_time or self.doc.posting_time == '00:0': self.doc.posting_time = '00:00' - - def on_doctype_update(self): - if not webnotes.conn.sql("""show index from `tabStock Ledger Entry` - where Key_name="posting_sort_index" """): - webnotes.conn.commit() - webnotes.conn.sql("""alter table `tabStock Ledger Entry` - add index posting_sort_index(posting_date, posting_time, name)""") - webnotes.conn.begin() \ No newline at end of file + +def on_doctype_update(): + if not webnotes.conn.sql("""show index from `tabStock Ledger Entry` + where Key_name="posting_sort_index" """): + webnotes.conn.commit() + webnotes.conn.sql("""alter table `tabStock Ledger Entry` + add index posting_sort_index(posting_date, posting_time, name)""") + webnotes.conn.begin() \ No newline at end of file diff --git a/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt b/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt index 674104dfeba..38005f7769a 100644 --- a/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt +++ b/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-29 19:25:42", "docstatus": 0, - "modified": "2013-06-28 12:39:07", + "modified": "2013-07-05 14:56:15", "modified_by": "Administrator", "owner": "Administrator" }, @@ -14,6 +14,7 @@ "doctype": "DocType", "document_type": "Other", "hide_toolbar": 1, + "icon": "icon-list", "in_create": 1, "module": "Stock", "name": "__common__" diff --git a/stock/doctype/stock_reconciliation/stock_reconciliation.txt b/stock/doctype/stock_reconciliation/stock_reconciliation.txt index 9b5b2a128a2..fc63b8dcd55 100644 --- a/stock/doctype/stock_reconciliation/stock_reconciliation.txt +++ b/stock/doctype/stock_reconciliation/stock_reconciliation.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-28 10:35:31", "docstatus": 0, - "modified": "2013-04-10 13:44:19", + "modified": "2013-07-05 14:56:37", "modified_by": "Administrator", "owner": "Administrator" }, @@ -14,6 +14,7 @@ "autoname": "SR/.######", "description": "This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.", "doctype": "DocType", + "icon": "icon-upload-alt", "is_submittable": 1, "max_attachments": 1, "module": "Stock", diff --git a/stock/doctype/stock_settings/stock_settings.txt b/stock/doctype/stock_settings/stock_settings.txt index 36b298a4658..e8edd0359af 100644 --- a/stock/doctype/stock_settings/stock_settings.txt +++ b/stock/doctype/stock_settings/stock_settings.txt @@ -2,13 +2,14 @@ { "creation": "2013-06-24 16:37:54", "docstatus": 0, - "modified": "2013-06-24 17:41:02", + "modified": "2013-07-05 14:56:41", "modified_by": "Administrator", "owner": "Administrator" }, { "description": "Settings", "doctype": "DocType", + "icon": "icon-cog", "issingle": 1, "module": "Stock", "name": "__common__" diff --git a/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt b/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt index 1efac0904e9..d820b01649b 100644 --- a/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt +++ b/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt @@ -2,12 +2,13 @@ { "creation": "2013-01-10 16:34:30", "docstatus": 0, - "modified": "2013-01-22 13:57:23", + "modified": "2013-07-05 14:56:45", "modified_by": "Administrator", "owner": "Administrator" }, { "doctype": "DocType", + "icon": "icon-magic", "in_create": 0, "issingle": 1, "module": "Stock", diff --git a/stock/doctype/warehouse/warehouse.txt b/stock/doctype/warehouse/warehouse.txt index d08b3ccff34..38734081a73 100644 --- a/stock/doctype/warehouse/warehouse.txt +++ b/stock/doctype/warehouse/warehouse.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-07 18:50:32", "docstatus": 0, - "modified": "2013-03-11 17:58:45", + "modified": "2013-07-05 15:02:12", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "description": "A logical Warehouse against which stock entries are made.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-building", "module": "Stock", "name": "__common__", "search_fields": "warehouse_type" diff --git a/support/doctype/customer_issue/customer_issue.txt b/support/doctype/customer_issue/customer_issue.txt index c60df62d08d..1850f571899 100644 --- a/support/doctype/customer_issue/customer_issue.txt +++ b/support/doctype/customer_issue/customer_issue.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-10 16:34:30", "docstatus": 0, - "modified": "2013-06-11 16:16:33", + "modified": "2013-07-05 14:34:37", "modified_by": "Administrator", "owner": "harshada@webnotestech.com" }, { "autoname": "naming_series:", "doctype": "DocType", + "icon": "icon-bug", "is_submittable": 1, "module": "Support", "name": "__common__", @@ -38,6 +39,13 @@ "doctype": "DocType", "name": "Customer Issue" }, + { + "doctype": "DocField", + "fieldname": "customer_section", + "fieldtype": "Section Break", + "label": "Customer", + "options": "icon-user" + }, { "doctype": "DocField", "fieldname": "naming_series", @@ -121,7 +129,7 @@ "fieldtype": "Section Break", "label": "Issue Details", "oldfieldtype": "Section Break", - "options": "Simple" + "options": "icon-ticket" }, { "doctype": "DocField", @@ -212,7 +220,7 @@ "fieldtype": "Section Break", "label": "Resolution", "oldfieldtype": "Section Break", - "options": "Simple" + "options": "icon-thumbs-up" }, { "doctype": "DocField", @@ -250,7 +258,8 @@ "doctype": "DocField", "fieldname": "contact_info", "fieldtype": "Section Break", - "label": "Contact Info" + "label": "Contact Info", + "options": "icon-bullhorn" }, { "doctype": "DocField", @@ -333,7 +342,8 @@ "doctype": "DocField", "fieldname": "more_info", "fieldtype": "Section Break", - "label": "More Info" + "label": "More Info", + "options": "icon-file-text" }, { "doctype": "DocField", diff --git a/support/doctype/maintenance_schedule/maintenance_schedule.txt b/support/doctype/maintenance_schedule/maintenance_schedule.txt index ba46555bdeb..63148dcaa0a 100644 --- a/support/doctype/maintenance_schedule/maintenance_schedule.txt +++ b/support/doctype/maintenance_schedule/maintenance_schedule.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-10 16:34:30", "docstatus": 0, - "modified": "2013-06-11 16:16:37", + "modified": "2013-07-05 14:45:42", "modified_by": "Administrator", "owner": "Administrator" }, { "autoname": "MS.#####", "doctype": "DocType", + "icon": "icon-calendar", "is_submittable": 1, "module": "Support", "name": "__common__", diff --git a/support/doctype/maintenance_visit/maintenance_visit.txt b/support/doctype/maintenance_visit/maintenance_visit.txt index 919c003c789..5f9bb1b3d04 100644 --- a/support/doctype/maintenance_visit/maintenance_visit.txt +++ b/support/doctype/maintenance_visit/maintenance_visit.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-10 16:34:31", "docstatus": 0, - "modified": "2013-06-11 16:16:37", + "modified": "2013-07-05 14:45:54", "modified_by": "Administrator", "owner": "ashwini@webnotestech.com" }, { "autoname": "MV.#####", "doctype": "DocType", + "icon": "icon-file-text", "is_submittable": 1, "module": "Support", "name": "__common__", diff --git a/support/doctype/newsletter/newsletter.txt b/support/doctype/newsletter/newsletter.txt index dbab81ee0a3..e760135b66c 100644 --- a/support/doctype/newsletter/newsletter.txt +++ b/support/doctype/newsletter/newsletter.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:31", "docstatus": 0, - "modified": "2013-02-11 17:23:08", + "modified": "2013-07-05 14:47:08", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "description": "Create and Send Newsletters", "doctype": "DocType", "document_type": "Other", + "icon": "icon-envelope", "module": "Support", "name": "__common__" }, diff --git a/support/doctype/support_ticket/support_ticket.txt b/support/doctype/support_ticket/support_ticket.txt index 50e547ece7a..44801eef783 100644 --- a/support/doctype/support_ticket/support_ticket.txt +++ b/support/doctype/support_ticket/support_ticket.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-01 10:36:25", "docstatus": 0, - "modified": "2013-05-21 16:27:46", + "modified": "2013-07-05 14:57:19", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "allow_attach": 1, "autoname": "naming_series:", "doctype": "DocType", + "icon": "icon-ticket", "module": "Support", "name": "__common__", "search_fields": "status,customer,allocated_to,subject,raised_by" @@ -40,6 +41,13 @@ "doctype": "DocType", "name": "Support Ticket" }, + { + "doctype": "DocField", + "fieldname": "subject_section", + "fieldtype": "Section Break", + "label": "Subject", + "options": "icon-flag" + }, { "doctype": "DocField", "fieldname": "naming_series", @@ -99,7 +107,9 @@ { "doctype": "DocField", "fieldname": "sb00", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "Messages", + "options": "icon-comments" }, { "depends_on": "eval:doc.__islocal", @@ -123,7 +133,8 @@ "doctype": "DocField", "fieldname": "additional_info", "fieldtype": "Section Break", - "label": "Additional Info", + "label": "Reference", + "options": "icon-pushpin", "read_only": 1 }, { diff --git a/utilities/doctype/address/address.txt b/utilities/doctype/address/address.txt index 5e09daadd09..edc7ac739e5 100644 --- a/utilities/doctype/address/address.txt +++ b/utilities/doctype/address/address.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-10 16:34:32", "docstatus": 0, - "modified": "2013-07-01 17:25:00", + "modified": "2013-07-05 14:24:00", "modified_by": "Administrator", "owner": "Administrator" }, { "doctype": "DocType", "document_type": "Master", + "icon": "icon-map-marker", "in_dialog": 0, "module": "Utilities", "name": "__common__", @@ -39,6 +40,13 @@ "doctype": "DocType", "name": "Address" }, + { + "doctype": "DocField", + "fieldname": "address_details", + "fieldtype": "Section Break", + "label": "Address Details", + "options": "icon-map-marker" + }, { "description": "Name of person or organization that this address belongs to.", "doctype": "DocField", @@ -154,7 +162,8 @@ "doctype": "DocField", "fieldname": "linked_with", "fieldtype": "Section Break", - "label": "Linked With" + "label": "Reference", + "options": "icon-pushpin" }, { "depends_on": "eval:!doc.supplier && !doc.sales_partner", diff --git a/utilities/doctype/contact/contact.txt b/utilities/doctype/contact/contact.txt index 580a9fce608..63d02521db8 100644 --- a/utilities/doctype/contact/contact.txt +++ b/utilities/doctype/contact/contact.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-10 16:34:32", "docstatus": 0, - "modified": "2013-02-11 14:32:13", + "modified": "2013-07-05 14:32:19", "modified_by": "Administrator", "owner": "Administrator" }, { "doctype": "DocType", "document_type": "Master", + "icon": "icon-user", "in_create": 0, "in_dialog": 0, "module": "Utilities", @@ -39,6 +40,13 @@ "doctype": "DocType", "name": "Contact" }, + { + "doctype": "DocField", + "fieldname": "contact_section", + "fieldtype": "Section Break", + "label": "Contact Details", + "options": "icon-user" + }, { "doctype": "DocField", "fieldname": "first_name", @@ -91,7 +99,9 @@ { "doctype": "DocField", "fieldname": "sb00", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "Communication History", + "options": "icon-comments" }, { "doctype": "DocField", @@ -103,7 +113,8 @@ "doctype": "DocField", "fieldname": "contact_details", "fieldtype": "Section Break", - "label": "Contact Details" + "label": "Reference", + "options": "icon-pushpin" }, { "depends_on": "eval:!doc.supplier && !doc.sales_partner", @@ -125,6 +136,13 @@ "label": "Customer Name", "read_only": 1 }, + { + "doctype": "DocField", + "fieldname": "column_break1", + "fieldtype": "Column Break", + "oldfieldtype": "Column Break", + "width": "50%" + }, { "depends_on": "eval:!doc.customer && !doc.sales_partner", "doctype": "DocField", @@ -163,10 +181,10 @@ }, { "doctype": "DocField", - "fieldname": "column_break1", - "fieldtype": "Column Break", - "oldfieldtype": "Column Break", - "width": "50%" + "fieldname": "more_info", + "fieldtype": "Section Break", + "label": "More Info", + "options": "icon-file-text" }, { "doctype": "DocField", diff --git a/utilities/doctype/note/note.txt b/utilities/doctype/note/note.txt index a6cdf2bf207..5c6b7713bbf 100644 --- a/utilities/doctype/note/note.txt +++ b/utilities/doctype/note/note.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-24 13:41:00", "docstatus": 0, - "modified": "2013-05-27 12:16:46", + "modified": "2013-07-05 14:47:11", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "description": "Note is a free page where users can share documents / notes", "doctype": "DocType", "document_type": "Transaction", + "icon": "icon-file-text", "module": "Utilities", "name": "__common__", "read_only_onload": 1 diff --git a/utilities/doctype/rename_tool/rename_tool.py b/utilities/doctype/rename_tool/rename_tool.py index 5accf3c6b77..4da3a28ad92 100644 --- a/utilities/doctype/rename_tool/rename_tool.py +++ b/utilities/doctype/rename_tool/rename_tool.py @@ -13,7 +13,7 @@ def get_doctypes(): return webnotes.conn.sql_list("""select name from tabDocType where ifnull(allow_rename,0)=1 and module!='Core' order by name""") -@webnotes.whitelist(allow_roles=["System Manager"]) +@webnotes.whitelist() def upload(select_doctype=None, rows=None): from webnotes.utils.datautils import read_csv_content_from_uploaded_file from webnotes.modules import scrub @@ -21,6 +21,9 @@ def upload(select_doctype=None, rows=None): if not select_doctype: select_doctype = webnotes.form_dict.select_doctype + + if not webnotes.has_permission(select_doctype, "write"): + raise webnotes.PermissionError if not rows: rows = read_csv_content_from_uploaded_file() diff --git a/utilities/doctype/rename_tool/rename_tool.txt b/utilities/doctype/rename_tool/rename_tool.txt index 20c25615561..e397cf3de4d 100644 --- a/utilities/doctype/rename_tool/rename_tool.txt +++ b/utilities/doctype/rename_tool/rename_tool.txt @@ -2,7 +2,7 @@ { "creation": "2012-12-03 10:25:59", "docstatus": 0, - "modified": "2013-03-26 12:46:07", + "modified": "2013-07-05 14:52:51", "modified_by": "Administrator", "owner": "Administrator" }, @@ -13,6 +13,7 @@ "doctype": "DocType", "hide_heading": 0, "hide_toolbar": 1, + "icon": "icon-magic", "issingle": 1, "max_attachments": 1, "module": "Utilities", diff --git a/utilities/doctype/sms_control/sms_control.txt b/utilities/doctype/sms_control/sms_control.txt index 06b4b7bcb80..bd63dab3d26 100644 --- a/utilities/doctype/sms_control/sms_control.txt +++ b/utilities/doctype/sms_control/sms_control.txt @@ -2,12 +2,13 @@ { "creation": "2013-01-10 16:34:32", "docstatus": 0, - "modified": "2013-01-22 14:57:24", + "modified": "2013-07-05 14:55:40", "modified_by": "Administrator", "owner": "Administrator" }, { "doctype": "DocType", + "icon": "icon-mobile-phone", "in_create": 0, "issingle": 1, "module": "Utilities", diff --git a/utilities/doctype/sms_log/sms_log.txt b/utilities/doctype/sms_log/sms_log.txt index 37ca4c6f1ae..094adfd660e 100644 --- a/utilities/doctype/sms_log/sms_log.txt +++ b/utilities/doctype/sms_log/sms_log.txt @@ -2,18 +2,16 @@ { "creation": "2012-03-27 14:36:47", "docstatus": 0, - "modified": "2012-03-27 14:36:47", + "modified": "2013-07-05 14:55:45", "modified_by": "Administrator", "owner": "Administrator" }, { "autoname": "SMSLOG/.########", "doctype": "DocType", + "icon": "icon-mobile-phone", "module": "Utilities", - "name": "__common__", - "section_style": "Simple", - "show_in_menu": 0, - "version": 3 + "name": "__common__" }, { "doctype": "DocField", @@ -40,9 +38,6 @@ "doctype": "DocType", "name": "SMS Log" }, - { - "doctype": "DocPerm" - }, { "doctype": "DocField", "fieldname": "column_break0", @@ -90,5 +85,8 @@ "fieldname": "message", "fieldtype": "Small Text", "label": "Message" + }, + { + "doctype": "DocPerm" } ] \ No newline at end of file diff --git a/website/css/website.css b/website/css/website.css index df37821bfe3..816b3efd9db 100644 --- a/website/css/website.css +++ b/website/css/website.css @@ -134,4 +134,35 @@ img { .accordion-heading, .accordion-inner { padding-left: 10px; -} \ No newline at end of file +} + +/* buttons */ +.btn-default { + color: #ffffff; + background-color: #a7a9aa; + border-color: #a7a9aa; +} + +.btn-default:hover, +.btn-default:focus, +.btn-default:active, +.btn-default.active { + background-color: #9a9c9d; + border-color: #8d9091; +} + +.btn-default.disabled:hover, +.btn-default[disabled]:hover, +fieldset[disabled] .btn-default:hover, +.btn-default.disabled:focus, +.btn-default[disabled]:focus, +fieldset[disabled] .btn-default:focus, +.btn-default.disabled:active, +.btn-default[disabled]:active, +fieldset[disabled] .btn-default:active, +.btn-default.disabled.active, +.btn-default[disabled].active, +fieldset[disabled] .btn-default.active { + background-color: #a7a9aa; + border-color: #a7a9aa; +} diff --git a/website/doctype/about_us_settings/about_us_settings.txt b/website/doctype/about_us_settings/about_us_settings.txt index baf9cc0af8c..0e34d67083a 100644 --- a/website/doctype/about_us_settings/about_us_settings.txt +++ b/website/doctype/about_us_settings/about_us_settings.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-19 12:02:15", "docstatus": 0, - "modified": "2013-05-03 11:01:30", + "modified": "2013-07-05 14:23:27", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "description": "Settings for the About Us Page", "doctype": "DocType", "document_type": "Other", + "icon": "icon-group", "issingle": 1, "module": "Website", "name": "__common__" diff --git a/website/doctype/blog_category/blog_category.txt b/website/doctype/blog_category/blog_category.txt index d55d39cd465..b986c441a56 100644 --- a/website/doctype/blog_category/blog_category.txt +++ b/website/doctype/blog_category/blog_category.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-08 09:41:11", "docstatus": 0, - "modified": "2013-06-18 18:36:28", + "modified": "2013-07-05 14:27:02", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "field:category_name", "doctype": "DocType", "document_type": "Master", + "icon": "icon-tag", "module": "Website", "name": "__common__" }, diff --git a/website/doctype/blog_post/blog_post.txt b/website/doctype/blog_post/blog_post.txt index 07c53926a91..79c1aee94fd 100644 --- a/website/doctype/blog_post/blog_post.txt +++ b/website/doctype/blog_post/blog_post.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-28 10:35:30", "docstatus": 0, - "modified": "2013-03-18 13:55:53", + "modified": "2013-07-05 15:08:30", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "allow_attach": 1, "allow_import": 1, "doctype": "DocType", + "icon": "icon-quote-left", "max_attachments": 5, "module": "Website", "name": "__common__" diff --git a/website/doctype/blog_settings/blog_settings.txt b/website/doctype/blog_settings/blog_settings.txt index 09740eb78f8..27fa5630dd0 100644 --- a/website/doctype/blog_settings/blog_settings.txt +++ b/website/doctype/blog_settings/blog_settings.txt @@ -2,13 +2,14 @@ { "creation": "2013-03-11 17:48:16", "docstatus": 0, - "modified": "2013-03-11 17:48:16", + "modified": "2013-07-05 14:27:31", "modified_by": "Administrator", "owner": "Administrator" }, { "description": "Blog Settings", "doctype": "DocType", + "icon": "icon-cog", "issingle": 1, "module": "Website", "name": "__common__" diff --git a/website/doctype/blogger/blogger.txt b/website/doctype/blogger/blogger.txt index da065c52f6b..e2b4367efb2 100644 --- a/website/doctype/blogger/blogger.txt +++ b/website/doctype/blogger/blogger.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-25 16:00:51", "docstatus": 0, - "modified": "2013-03-29 10:37:37", + "modified": "2013-07-05 14:27:34", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "description": "Profile of a Blogger", "doctype": "DocType", "document_type": "Master", + "icon": "icon-user", "max_attachments": 1, "module": "Website", "name": "__common__" diff --git a/website/doctype/contact_us_settings/contact_us_settings.txt b/website/doctype/contact_us_settings/contact_us_settings.txt index ef2da02af71..21db27efce8 100644 --- a/website/doctype/contact_us_settings/contact_us_settings.txt +++ b/website/doctype/contact_us_settings/contact_us_settings.txt @@ -2,13 +2,14 @@ { "creation": "2013-02-21 20:12:42", "docstatus": 0, - "modified": "2013-03-12 14:49:01", + "modified": "2013-07-05 14:32:24", "modified_by": "Administrator", "owner": "Administrator" }, { "description": "Settings for Contact Us Page", "doctype": "DocType", + "icon": "icon-cog", "issingle": 1, "module": "Website", "name": "__common__" diff --git a/website/doctype/shopping_cart_settings/shopping_cart_settings.txt b/website/doctype/shopping_cart_settings/shopping_cart_settings.txt index 1d472b7f1b5..8cb148041a4 100644 --- a/website/doctype/shopping_cart_settings/shopping_cart_settings.txt +++ b/website/doctype/shopping_cart_settings/shopping_cart_settings.txt @@ -2,13 +2,14 @@ { "creation": "2013-06-19 15:57:32", "docstatus": 0, - "modified": "2013-07-03 21:01:00", + "modified": "2013-07-05 14:55:05", "modified_by": "Administrator", "owner": "Administrator" }, { "description": "Default settings for Shopping Cart", "doctype": "DocType", + "icon": "icon-shopping-cart", "issingle": 1, "module": "Website", "name": "__common__" diff --git a/website/doctype/style_settings/style_settings.txt b/website/doctype/style_settings/style_settings.txt index e31713aa5ff..7119d2c250f 100644 --- a/website/doctype/style_settings/style_settings.txt +++ b/website/doctype/style_settings/style_settings.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-25 16:01:33", "docstatus": 0, - "modified": "2013-03-14 11:57:20", + "modified": "2013-07-05 14:57:01", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "allow_attach": 1, "description": "Set your background color, font and image (tiled)", "doctype": "DocType", + "icon": "icon-cog", "issingle": 1, "max_attachments": 1, "module": "Website", diff --git a/website/doctype/web_page/web_page.txt b/website/doctype/web_page/web_page.txt index effe06433d9..34fa266928a 100644 --- a/website/doctype/web_page/web_page.txt +++ b/website/doctype/web_page/web_page.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-28 10:35:30", "docstatus": 0, - "modified": "2013-03-11 17:41:11", + "modified": "2013-07-05 15:02:45", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "description": "Page to show on the website\n", "doctype": "DocType", "document_type": "Transaction", + "icon": "icon-file-alt", "max_attachments": 20, "module": "Website", "name": "__common__" @@ -148,7 +149,6 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", - "match": "", "permlevel": 1 } ] \ No newline at end of file diff --git a/website/doctype/website_script/website_script.txt b/website/doctype/website_script/website_script.txt index cf22537bf8a..ae22a345dc2 100644 --- a/website/doctype/website_script/website_script.txt +++ b/website/doctype/website_script/website_script.txt @@ -1,46 +1,47 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-12-27 11:51:24", + "docstatus": 0, + "modified": "2013-07-05 15:02:48", "modified_by": "Administrator", - "modified": "2012-12-27 12:25:04" + "owner": "Administrator" }, { - "issingle": 1, "description": "Script to attach to all web pages.", "doctype": "DocType", - "module": "Website", "document_type": "Other", + "icon": "icon-code", + "issingle": 1, + "module": "Website", "name": "__common__" }, { - "parent": "Website Script", "doctype": "DocField", - "name": "__common__", - "label": "Javascript", - "parenttype": "DocType", - "options": "Javascript", "fieldname": "javascript", "fieldtype": "Code", - "permlevel": 0, - "parentfield": "fields" + "label": "Javascript", + "name": "__common__", + "options": "Javascript", + "parent": "Website Script", + "parentfield": "fields", + "parenttype": "DocType", + "permlevel": 0 }, { - "parent": "Website Script", - "read": 1, - "name": "__common__", "create": 1, "doctype": "DocPerm", - "write": 1, + "name": "__common__", + "parent": "Website Script", + "parentfield": "permissions", "parenttype": "DocType", - "role": "Website Manager", "permlevel": 0, - "parentfield": "permissions" + "read": 1, + "role": "Website Manager", + "write": 1 }, { - "name": "Website Script", - "doctype": "DocType" + "doctype": "DocType", + "name": "Website Script" }, { "doctype": "DocField" diff --git a/website/doctype/website_settings/website_settings.txt b/website/doctype/website_settings/website_settings.txt index 9c15480f07a..b3828a22f48 100644 --- a/website/doctype/website_settings/website_settings.txt +++ b/website/doctype/website_settings/website_settings.txt @@ -2,7 +2,7 @@ { "creation": "2013-04-30 12:58:46", "docstatus": 0, - "modified": "2013-05-02 15:51:14", + "modified": "2013-07-05 15:02:50", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "allow_attach": 1, "doctype": "DocType", "document_type": "Other", + "icon": "icon-cog", "issingle": 1, "max_attachments": 10, "module": "Website", diff --git a/website/doctype/website_slideshow/website_slideshow.txt b/website/doctype/website_slideshow/website_slideshow.txt index e67e1f8ca10..e8ca08e4f66 100644 --- a/website/doctype/website_slideshow/website_slideshow.txt +++ b/website/doctype/website_slideshow/website_slideshow.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-07 15:53:15", "docstatus": 0, - "modified": "2013-05-28 16:57:32", + "modified": "2013-07-05 15:03:30", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "description": "Slideshow like display for the website", "doctype": "DocType", "document_type": "Transaction", + "icon": "icon-play", "max_attachments": 10, "module": "Website", "name": "__common__"