Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[conflict] fixed

Browse Source
This commit is contained in:
Nabin Hait 2013-07-05 15:25:58 +05:30
commit 1bec8012d2
145 changed files with 772 additions and 497 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
accounts/doctype/account/account.txt
View File

@ -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__",

3
accounts/doctype/accounts_settings/accounts_settings.txt
View File

@ -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__"

2
accounts/doctype/bank_reconciliation/bank_reconciliation.js
View File

@ -17,4 +17,6 @@
cur_frm.add_fetch("bank_account", "company", "company");
cur_frm.cscript.onload = function(doc, cdt, cdn){
cur_frm.set_intro('<i class="icon-question" /> ' +
wn._("Update clearance date of Journal Entries marked as 'Bank Vouchers'"))
}

3
accounts/doctype/bank_reconciliation/bank_reconciliation.txt
View File

@ -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__",

18
accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
View File

@ -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"
}
]

3
accounts/doctype/budget_distribution/budget_distribution.txt
View File

@ -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"

3
accounts/doctype/c_form/c_form.txt
View File

@ -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",

3
accounts/doctype/cost_center/cost_center.txt
View File

@ -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__",

3
accounts/doctype/fiscal_year/fiscal_year.txt
View File

@ -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__"
},

3
accounts/doctype/gl_entry/gl_entry.txt
View File

@ -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__",

15
accounts/doctype/journal_voucher/journal_voucher.txt
View File

@ -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
},
{

5
accounts/doctype/mis_control/mis_control.py
View File

@ -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']):

3
accounts/doctype/mode_of_payment/mode_of_payment.txt
View File

@ -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__"
},

3
accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt
View File

@ -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__"

3
accounts/doctype/period_closing_voucher/period_closing_voucher.txt
View File

@ -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__",

3
accounts/doctype/pos_setting/pos_setting.txt
View File

@ -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__"
},

33
accounts/doctype/purchase_invoice/purchase_invoice.txt
View File

@ -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
},

3
accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt
View File

@ -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__"
},

3
accounts/doctype/sales_invoice/sales_invoice.js
View File

@ -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);

76
accounts/doctype/sales_invoice/sales_invoice.txt
View File

@ -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
},

20
accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt
View File

@ -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
}
]

3
accounts/doctype/shipping_rule/shipping_rule.txt
View File

@ -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__"
},

3
buying/doctype/buying_settings/buying_settings.txt
View File

@ -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__"

37
buying/doctype/purchase_order/purchase_order.txt
View File

@ -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"
}
]

3
buying/doctype/quality_inspection/quality_inspection.txt
View File

@ -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__",

3
buying/doctype/supplier/supplier.txt
View File

@ -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"

19
buying/doctype/supplier_quotation/supplier_quotation.txt
View File

@ -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
}
]

69
buying/doctype/supplier_quotation/test_supplier_quotation.py Normal file
View File

@ -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 <http://www.gnu.org/licenses/>.
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",
}
],
]

8
home/doctype/feed/feed.txt
View File

@ -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",

3
hr/doctype/appraisal/appraisal.txt
View File

@ -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__",

61
hr/doctype/appraisal_template/appraisal_template.txt
View File

@ -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"
},
{

3
hr/doctype/attendance/attendance.txt
View File

@ -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__",

3
hr/doctype/branch/branch.txt
View File

@ -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__"
},

3
hr/doctype/deduction_type/deduction_type.txt
View File

@ -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__"
},

3
hr/doctype/department/department.txt
View File

@ -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__"
},

3
hr/doctype/designation/designation.txt
View File

@ -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__"
},

3
hr/doctype/earning_type/earning_type.txt
View File

@ -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__"
},

12
hr/doctype/employee/employee.txt
View File

@ -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",

3
hr/doctype/employment_type/employment_type.txt
View File

@ -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__"
},

3
hr/doctype/expense_claim/expense_claim.txt
View File

@ -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__",

23
hr/doctype/expense_claim_type/expense_claim_type.txt
View File

@ -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"
}
]

3
hr/doctype/grade/grade.txt
View File

@ -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__"
},

3
hr/doctype/holiday_list/holiday_list.txt
View File

@ -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__"
},

3
hr/doctype/job_applicant/job_applicant.txt
View File

@ -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__"
},

41
hr/doctype/job_opening/job_opening.txt
View File

@ -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"

3
hr/doctype/leave_allocation/leave_allocation.txt
View File

@ -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__",

6
hr/doctype/leave_application/leave_application.txt
View File

@ -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",

3
hr/doctype/leave_block_list/leave_block_list.txt
View File

@ -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__"
},

3
hr/doctype/leave_control_panel/leave_control_panel.txt
View File

@ -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__",

3
hr/doctype/leave_type/leave_type.txt
View File

@ -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__"
},

42
hr/doctype/salary_manager/salary_manager.txt
View File

@ -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"
}
]

3
hr/doctype/salary_slip/salary_slip.txt
View File

@ -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__"

3
hr/doctype/salary_structure/salary_structure.txt
View File

@ -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__"
},

10
hr/doctype/upload_attendance/upload_attendance.py
View File

@ -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

3
hr/doctype/upload_attendance/upload_attendance.txt
View File

@ -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",

3
manufacturing/doctype/bom/bom.txt
View File

@ -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,

3
manufacturing/doctype/bom_replace_tool/bom_replace_tool.txt
View File

@ -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",

3
manufacturing/doctype/production_order/production_order.txt
View File

@ -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",

3
manufacturing/doctype/production_planning_tool/production_planning_tool.txt
View File

@ -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",

3
manufacturing/doctype/workstation/workstation.txt
View File

@ -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__"
},

2
patches/patch_list.py
View File

@ -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",

3
projects/doctype/activity_type/activity_type.txt
View File

@ -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__"

3
projects/doctype/project/project.txt
View File

@ -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__",

3
projects/doctype/task/task.txt
View File

@ -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__"

3
projects/doctype/time_log/time_log.txt
View File

@ -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__"

3
projects/doctype/time_log_batch/time_log_batch.txt
View File

@ -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__"

3
selling/doctype/campaign/campaign.txt
View File

@ -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__"
},

3
selling/doctype/customer/customer.txt
View File

@ -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"

13
selling/doctype/industry_type/industry_type.txt
View File

@ -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"
}
]

3
selling/doctype/installation_note/installation_note.txt
View File

@ -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__"

3
selling/doctype/lead/lead.txt
View File

@ -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"

3
selling/doctype/opportunity/opportunity.txt
View File

@ -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__",

3
selling/doctype/quotation/quotation.txt
View File

@ -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",

7
selling/doctype/sales_bom/sales_bom.txt
View File

@ -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",

2
selling/doctype/sales_order/sales_order.js
View File

@ -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);

3
selling/doctype/sales_order/sales_order.txt
View File

@ -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",

3
selling/doctype/selling_settings/selling_settings.txt
View File

@ -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__"

3
selling/doctype/sms_center/sms_center.txt
View File

@ -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",

3
setup/doctype/authorization_rule/authorization_rule.txt
View File

@ -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"

3
setup/doctype/backup_manager/backup_manager.txt
View File

@ -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__"

3
setup/doctype/brand/brand.txt
View File

@ -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__"

3
setup/doctype/company/company.txt
View File

@ -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__"
},

3
setup/doctype/country/country.txt
View File

@ -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__",

3
setup/doctype/currency/currency.txt
View File

@ -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__",

3
setup/doctype/currency_exchange/currency_exchange.txt
View File

@ -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__"
},

3
setup/doctype/customer_group/customer_group.txt
View File

@ -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__",

3
setup/doctype/email_digest/email_digest.txt
View File

@ -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__"
},

3
setup/doctype/email_settings/email_settings.txt
View File

@ -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",

3
setup/doctype/features_setup/features_setup.txt
View File

@ -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__",

3
setup/doctype/global_defaults/global_defaults.txt
View File

@ -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",

3
setup/doctype/item_group/item_group.txt
View File

@ -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,

59
setup/doctype/jobs_email_settings/jobs_email_settings.txt
View File

@ -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"

3
setup/doctype/naming_series/naming_series.txt
View File

@ -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__",

10
setup/doctype/price_list/price_list.txt
View File

@ -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": "<div class=\"well\">Use the <a href=\"#data-import-tool\">Data Import Tool</a> to upload, update Item Prices in bulk:\n<ol> \n<li>Go to Data Import Tool.\n<li>Select \"Item\"\n<li>Check on \"With Data\"\n<li>Download \"Item Price\" from Child Tables.\n<li>Update the prices required and add new rows if required.\n<li>Check on \"Overwrite\"\n<li>Upload the modified sheet.\n</div>\n"
},
{
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"role": "Sales Manager",
"write": 0
},
{
"cancel": 0,
"create": 0,

3
setup/doctype/print_heading/print_heading.txt
View File

@ -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"

3
setup/doctype/quotation_lost_reason/quotation_lost_reason.txt
View File

@ -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__"
},

59
setup/doctype/sales_email_settings/sales_email_settings.txt
View File

@ -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"

3
setup/doctype/sales_partner/sales_partner.txt
View File

@ -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__",

3
setup/doctype/sales_person/sales_person.txt
View File

@ -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__",

3
setup/doctype/sms_settings/sms_settings.txt
View File

@ -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",

Some files were not shown because too many files have changed in this diff Show More