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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Rushabh Mehta 2012-12-03 07:03:33 +01:00
commit fccdfb1ccf
14 changed files with 1862 additions and 2178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,396 +1,324 @@
# DocType, Account
[ [
{
# These values are common in all dictionaries "owner": "Administrator",
{ "docstatus": 0,
'creation': '2012-07-03 13:30:50', "creation": "2012-11-16 10:32:50",
'docstatus': 0, "modified_by": "Administrator",
'modified': '2012-07-11 13:58:44', "modified": "2012-12-03 11:26:49"
'modified_by': u'Administrator', },
'owner': u'Administrator' {
}, "in_create": 1,
"search_fields": "debit_or_credit, group_or_ledger",
# These values are common for all DocType "module": "Accounts",
{ "document_type": "Master",
'_last_update': u'1325570645', "description": "Heads (or groups) against which Accounting Entries are made and balances are maintained.",
'allow_copy': 1, "name": "__common__",
'allow_trash': 1, "default_print_format": "Standard",
'colour': u'White:FFF', "allow_rename": 1,
'default_print_format': u'Standard', "doctype": "DocType",
'description': u'An **Account** is heading under which financial and business transactions are carried on. For example, \u201cTravel Expense\u201d is an account, \u201cCustomer Zoe\u201d, \u201cSupplier Mae\u201d are accounts. \n\n**Note:** ERPNext creates accounts for Customers and Suppliers automatically.\n\n### Groups and Ledgers\n\nThere are two main kinds of Accounts in ERPNext - Group and Ledger. Groups can have sub-groups and ledgers within them, whereas ledgers are the leaf nodes of your chart and cannot be further classified.\n\nAccounting Transactions can only be made against Ledger Accounts (not Groups)\n', "allow_copy": 1
'doctype': 'DocType', },
'document_type': u'Master', {
'in_create': 1, "name": "__common__",
'module': u'Accounts', "parent": "Account",
'name': '__common__', "doctype": "DocField",
'search_fields': u'debit_or_credit, group_or_ledger', "parenttype": "DocType",
'section_style': u'Tray', "parentfield": "fields"
'server_code_error': u' ', },
'show_in_menu': 0, {
'version': 1 "name": "__common__",
}, "parent": "Account",
"amend": 0,
# These values are common for all DocField "submit": 0,
{ "doctype": "DocPerm",
'doctype': u'DocField', "read": 1,
'name': '__common__', "parenttype": "DocType",
'parent': u'Account', "parentfield": "permissions"
'parentfield': u'fields', },
'parenttype': u'DocType' {
}, "name": "Account",
"doctype": "DocType"
# These values are common for all DocPerm },
{ {
'amend': 0, "oldfieldtype": "Section Break",
'doctype': u'DocPerm', "doctype": "DocField",
'name': '__common__', "label": "Account Details",
'parent': u'Account', "fieldname": "properties",
'parentfield': u'permissions', "fieldtype": "Section Break",
'parenttype': u'DocType', "permlevel": 0
'read': 1, },
'submit': 0 {
}, "doctype": "DocField",
"width": "50%",
# DocType, Account "fieldname": "column_break0",
{ "fieldtype": "Column Break",
'doctype': 'DocType', "permlevel": 0
'name': u'Account' },
}, {
"no_copy": 1,
# DocPerm "oldfieldtype": "Data",
{ "doctype": "DocField",
'cancel': 0, "label": "Account Name",
'create': 0, "oldfieldname": "account_name",
'doctype': u'DocPerm', "fieldname": "account_name",
'permlevel': 0, "fieldtype": "Data",
'role': u'Auditor', "search_index": 1,
'write': 1 "reqd": 1,
}, "permlevel": 1,
"in_filter": 1
# DocPerm },
{ {
'cancel': 0, "print_hide": 1,
'create': 0, "oldfieldtype": "Int",
'doctype': u'DocPerm', "doctype": "DocField",
'permlevel': 1, "label": "Level",
'role': u'Auditor', "oldfieldname": "level",
'write': 0 "fieldname": "level",
}, "fieldtype": "Int",
"hidden": 1,
# DocPerm "permlevel": 1
{ },
'cancel': 0, {
'create': 0, "default": "Ledger",
'doctype': u'DocPerm', "oldfieldtype": "Select",
'permlevel': 2, "doctype": "DocField",
'role': u'Auditor', "label": "Group or Ledger",
'write': 0 "oldfieldname": "group_or_ledger",
}, "permlevel": 1,
"fieldname": "group_or_ledger",
# DocPerm "fieldtype": "Select",
{ "search_index": 1,
'cancel': 0, "reqd": 1,
'create': 0, "options": "\nLedger\nGroup",
'doctype': u'DocPerm', "in_filter": 1
'permlevel': 0, },
'role': u'Sales User', {
'write': 0 "oldfieldtype": "Data",
}, "doctype": "DocField",
"label": "Debit or Credit",
# DocPerm "oldfieldname": "debit_or_credit",
{ "fieldname": "debit_or_credit",
'cancel': 0, "fieldtype": "Data",
'create': 0, "search_index": 1,
'doctype': u'DocPerm', "permlevel": 1,
'permlevel': 0, "in_filter": 1
'role': u'Purchase User', },
'write': 0 {
}, "oldfieldtype": "Select",
"doctype": "DocField",
# DocPerm "label": "Is PL Account",
{ "oldfieldname": "is_pl_account",
'cancel': 0, "options": "Yes\nNo",
'create': 0, "fieldname": "is_pl_account",
'doctype': u'DocPerm', "fieldtype": "Select",
'permlevel': 0, "search_index": 1,
'role': u'Accounts User', "permlevel": 1,
'write': 1 "in_filter": 1
}, },
{
# DocPerm "oldfieldtype": "Link",
{ "doctype": "DocField",
'cancel': 1, "label": "Company",
'create': 1, "oldfieldname": "company",
'doctype': u'DocPerm', "options": "Company",
'permlevel': 0, "fieldname": "company",
'role': u'Accounts Manager', "fieldtype": "Link",
'write': 1 "search_index": 1,
}, "reqd": 1,
"permlevel": 1,
# DocPerm "in_filter": 1
{ },
'cancel': 0, {
'create': 0, "doctype": "DocField",
'doctype': u'DocPerm', "width": "50%",
'permlevel': 1, "fieldname": "column_break1",
'role': u'Accounts User', "fieldtype": "Column Break",
'write': 0 "permlevel": 0
}, },
{
# DocPerm "oldfieldtype": "Link",
{ "doctype": "DocField",
'cancel': 0, "label": "Parent Account",
'create': 0, "oldfieldname": "parent_account",
'doctype': u'DocPerm', "trigger": "Client",
'permlevel': 1, "fieldname": "parent_account",
'role': u'Accounts Manager', "fieldtype": "Link",
'write': 0 "search_index": 1,
}, "options": "Account",
"permlevel": 0
# DocPerm },
{ {
'cancel': 0, "description": "Setting Account Type helps in selecting this Account in transactions.",
'create': 0, "oldfieldtype": "Select",
'doctype': u'DocPerm', "colour": "White:FFF",
'permlevel': 2, "doctype": "DocField",
'role': u'Accounts Manager', "label": "Account Type",
'write': 1 "oldfieldname": "account_type",
}, "permlevel": 0,
"trigger": "Client",
# DocPerm "fieldname": "account_type",
{ "fieldtype": "Select",
'cancel': 0, "search_index": 0,
'create': 0, "in_filter": 1,
'doctype': u'DocPerm', "options": "\nFixed Asset Account\nBank or Cash\nExpense Account\nTax\nIncome Account\nChargeable"
'permlevel': 2, },
'role': u'Accounts User', {
'write': 0 "description": "Rate at which this tax is applied",
}, "oldfieldtype": "Currency",
"colour": "White:FFF",
# DocField "doctype": "DocField",
{ "label": "Rate",
'doctype': u'DocField', "oldfieldname": "tax_rate",
'fieldname': u'properties', "fieldname": "tax_rate",
'fieldtype': u'Section Break', "fieldtype": "Currency",
'label': u'Account Details', "reqd": 0,
'oldfieldtype': u'Section Break', "hidden": 0,
'permlevel': 0 "permlevel": 0
}, },
{
# DocField "description": "If the account is frozen, entries are allowed for the \"Account Manager\" only.",
{ "oldfieldtype": "Select",
'doctype': u'DocField', "colour": "White:FFF",
'fieldname': u'column_break0', "doctype": "DocField",
'fieldtype': u'Column Break', "label": "Frozen",
'permlevel': 0, "oldfieldname": "freeze_account",
'width': u'50%' "options": "No\nYes",
}, "fieldname": "freeze_account",
"fieldtype": "Select",
# DocField "permlevel": 2
{ },
'doctype': u'DocField', {
'fieldname': u'account_name', "print_hide": 1,
'fieldtype': u'Data', "oldfieldtype": "Int",
'in_filter': 1, "colour": "White:FFF",
'label': u'Account Name', "doctype": "DocField",
'no_copy': 1, "label": "Credit Days",
'oldfieldname': u'account_name', "oldfieldname": "credit_days",
'oldfieldtype': u'Data', "fieldname": "credit_days",
'permlevel': 1, "fieldtype": "Int",
'reqd': 1, "hidden": 1,
'search_index': 1 "permlevel": 0
}, },
{
# DocField "print_hide": 1,
{ "oldfieldtype": "Currency",
'doctype': u'DocField', "doctype": "DocField",
'fieldname': u'level', "label": "Credit Limit",
'fieldtype': u'Int', "oldfieldname": "credit_limit",
'hidden': 1, "fieldname": "credit_limit",
'label': u'Level', "fieldtype": "Currency",
'oldfieldname': u'level', "hidden": 1,
'oldfieldtype': u'Int', "permlevel": 0
'permlevel': 1, },
'print_hide': 1 {
}, "description": "If this Account represents a Customer, Supplier or Employee, set it here.",
"oldfieldtype": "Select",
# DocField "colour": "White:FFF",
{ "doctype": "DocField",
'default': u'Ledger', "label": "Master Type",
'doctype': u'DocField', "oldfieldname": "master_type",
'fieldname': u'group_or_ledger', "options": "\nSupplier\nCustomer\nEmployee",
'fieldtype': u'Select', "fieldname": "master_type",
'in_filter': 1, "fieldtype": "Select",
'label': u'Group or Ledger', "permlevel": 0
'oldfieldname': u'group_or_ledger', },
'oldfieldtype': u'Select', {
'options': u'\nLedger\nGroup', "oldfieldtype": "Link",
'permlevel': 1, "doctype": "DocField",
'reqd': 1, "label": "Master Name",
'search_index': 1 "oldfieldname": "master_name",
}, "trigger": "Client",
"fieldname": "master_name",
# DocField "fieldtype": "Link",
{ "options": "[Select]",
'doctype': u'DocField', "permlevel": 0
'fieldname': u'debit_or_credit', },
'fieldtype': u'Data', {
'in_filter': 1, "create": 0,
'label': u'Debit or Credit', "doctype": "DocPerm",
'oldfieldname': u'debit_or_credit', "write": 1,
'oldfieldtype': u'Data', "cancel": 0,
'permlevel': 1, "role": "Auditor",
'search_index': 1 "permlevel": 0
}, },
{
# DocField "create": 0,
{ "doctype": "DocPerm",
'doctype': u'DocField', "write": 0,
'fieldname': u'is_pl_account', "cancel": 0,
'fieldtype': u'Select', "role": "Auditor",
'in_filter': 1, "permlevel": 2
'label': u'Is PL Account', },
'oldfieldname': u'is_pl_account', {
'oldfieldtype': u'Select', "create": 0,
'options': u'Yes\nNo', "doctype": "DocPerm",
'permlevel': 1, "write": 0,
'search_index': 1 "cancel": 0,
}, "role": "Auditor",
"permlevel": 1
# DocField },
{ {
'doctype': u'DocField', "create": 0,
'fieldname': u'company', "doctype": "DocPerm",
'fieldtype': u'Link', "write": 0,
'in_filter': 1, "cancel": 0,
'label': u'Company', "role": "Sales User",
'oldfieldname': u'company', "permlevel": 0
'oldfieldtype': u'Link', },
'options': u'Company', {
'permlevel': 1, "create": 0,
'reqd': 1, "doctype": "DocPerm",
'search_index': 1 "write": 0,
}, "cancel": 0,
"role": "Purchase User",
# DocField "permlevel": 0
{ },
'doctype': u'DocField', {
'fieldname': u'column_break1', "create": 0,
'fieldtype': u'Column Break', "doctype": "DocPerm",
'permlevel': 0, "write": 1,
'width': u'50%' "cancel": 0,
}, "role": "Accounts User",
"permlevel": 0
# DocField },
{ {
'doctype': u'DocField', "create": 1,
'fieldname': u'parent_account', "doctype": "DocPerm",
'fieldtype': u'Link', "write": 1,
'label': u'Parent Account', "cancel": 1,
'oldfieldname': u'parent_account', "role": "Accounts Manager",
'oldfieldtype': u'Link', "permlevel": 0
'options': u'Account', },
'permlevel': 0, {
'search_index': 1, "create": 0,
'trigger': u'Client' "doctype": "DocPerm",
}, "write": 0,
"cancel": 0,
# DocField "role": "Accounts User",
{ "permlevel": 1
'colour': u'White:FFF', },
'description': u'Setting Account Type helps in selecting this Account in transactions.', {
'doctype': u'DocField', "create": 0,
'fieldname': u'account_type', "doctype": "DocPerm",
'fieldtype': u'Select', "write": 0,
'in_filter': 1, "cancel": 0,
'label': u'Account Type', "role": "Accounts Manager",
'oldfieldname': u'account_type', "permlevel": 1
'oldfieldtype': u'Select', },
'options': u'\nFixed Asset Account\nBank or Cash\nExpense Account\nTax\nIncome Account\nChargeable', {
'permlevel': 0, "create": 0,
'search_index': 0, "doctype": "DocPerm",
'trigger': u'Client' "write": 1,
}, "cancel": 0,
"role": "Accounts Manager",
# DocField "permlevel": 2
{ },
'colour': u'White:FFF', {
'description': u'Rate at which this tax is applied', "create": 0,
'doctype': u'DocField', "doctype": "DocPerm",
'fieldname': u'tax_rate', "write": 0,
'fieldtype': u'Currency', "cancel": 0,
'hidden': 0, "role": "Accounts User",
'label': u'Rate', "permlevel": 2
'oldfieldname': u'tax_rate', }
'oldfieldtype': u'Currency',
'permlevel': 0,
'reqd': 0
},
# DocField
{
'colour': u'White:FFF',
'description': u'If the account is frozen, entries are allowed for the "Account Manager" only.',
'doctype': u'DocField',
'fieldname': u'freeze_account',
'fieldtype': u'Select',
'label': u'Frozen',
'oldfieldname': u'freeze_account',
'oldfieldtype': u'Select',
'options': u'No\nYes',
'permlevel': 2
},
# DocField
{
'colour': u'White:FFF',
'doctype': u'DocField',
'fieldname': u'credit_days',
'fieldtype': u'Int',
'hidden': 1,
'label': u'Credit Days',
'oldfieldname': u'credit_days',
'oldfieldtype': u'Int',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'credit_limit',
'fieldtype': u'Currency',
'hidden': 1,
'label': u'Credit Limit',
'oldfieldname': u'credit_limit',
'oldfieldtype': u'Currency',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
'colour': u'White:FFF',
'description': u'If this Account represents a Customer, Supplier or Employee, set it here.',
'doctype': u'DocField',
'fieldname': u'master_type',
'fieldtype': u'Select',
'label': u'Master Type',
'oldfieldname': u'master_type',
'oldfieldtype': u'Select',
'options': u'\nSupplier\nCustomer\nEmployee',
'permlevel': 0
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'master_name',
'fieldtype': u'Link',
'label': u'Master Name',
'oldfieldname': u'master_name',
'oldfieldtype': u'Link',
'permlevel': 0,
'trigger': u'Client'
}
] ]

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

@ -498,7 +498,7 @@ cur_frm.cscript.view_ledger_entry = function(){
cur_frm.cscript.on_submit = function(doc, cdt, cdn) { cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
if(cint(wn.boot.notification_settings.sales_invoice)) { if(cint(wn.boot.notification_settings.sales_invoice)) {
cur_frm.email_doc(wn.boot.notification_settings.sales_invoice); cur_frm.email_doc(wn.boot.notification_settings.sales_invoice_message);
} }
} }

18
accounts/page/accounts_browser/accounts_browser.html
View File

@ -1,12 +1,18 @@
<div class="layout-wrapper layout-wrapper-background"> <div class="layout-wrapper layout-wrapper-background">
<div class="appframe-area"></div> <div class="appframe-area"></div>
<div class="layout-main-section"> <div class="layout-main">
<div class="tree-area"></div> <div class="tree-area"></div>
</div> <hr>
<div class="layout-side-section"> <div class="well">
<div class="help">1. To add child nodes, explore tree and click on the node under which you want to add more nodes.<br><br> <h4>Quick Help</h4>
2. Please do NOT create accounts (ledgers) for Customers and Suppliers. They are created directly from the Customer / Supplier masters.<br> <ol>
<li>To add child nodes, explore tree and click on the node under which you want to add more nodes.
<li>Accounting Entries can be made against leaf nodes, called <b>Ledgers</b>. Entries against <b>Groups</b> are not allowed.
<li>Please do NOT create Account (Ledgers) for Customers and Suppliers. They are created directly from the Customer / Supplier masters.
<li><b>To create a Bank Account:</b> Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts) and create a new Account Ledger (by clicking on Add Child) of type "Bank or Cash"
<li><b>To create a Tax Account:</b> Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties) and create a new Account Ledger (by clicking on Add Child) of type "Tax" and do mention the Tax rate.
</ol>
<p>Please setup your chart of accounts before you start Accounting Entries</p>
</div> </div>
</div> </div>
<div class="clear"></div>
</div> </div>

2
buying/doctype/purchase_order/purchase_order.js
View File

@ -220,6 +220,6 @@ cur_frm.pformat.indent_no = function(doc, cdt, cdn){
cur_frm.cscript.on_submit = function(doc, cdt, cdn) { cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
if(cint(wn.boot.notification_settings.purchase_order)) { if(cint(wn.boot.notification_settings.purchase_order)) {
cur_frm.email_doc(wn.boot.notification_settings.purchase_order); cur_frm.email_doc(wn.boot.notification_settings.purchase_order_message);
} }
} }

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

@ -2,17 +2,19 @@
{ {
"owner": "Administrator", "owner": "Administrator",
"docstatus": 0, "docstatus": 0,
"creation": "2012-11-02 17:17:04", "creation": "2012-12-03 10:31:02",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-11-30 10:53:32" "modified": "2012-12-03 11:25:12"
}, },
{ {
"autoname": "naming_series:", "autoname": "naming_series:",
"name": "__common__", "description": "Supplier of Goods or Services.",
"allow_rename": 1,
"search_fields": "supplier_name,supplier_type", "search_fields": "supplier_name,supplier_type",
"module": "Buying", "module": "Buying",
"doctype": "DocType", "doctype": "DocType",
"document_type": "Master" "document_type": "Master",
"name": "__common__"
}, },
{ {
"name": "__common__", "name": "__common__",
@ -243,6 +245,26 @@
"fieldtype": "Small Text", "fieldtype": "Small Text",
"permlevel": 1 "permlevel": 1
}, },
{
"amend": 0,
"create": 0,
"doctype": "DocPerm",
"submit": 0,
"write": 0,
"role": "Purchase Manager",
"cancel": 0,
"permlevel": 1
},
{
"amend": 0,
"create": 0,
"doctype": "DocPerm",
"submit": 0,
"write": 0,
"role": "Purchase Manager",
"cancel": 0,
"permlevel": 0
},
{ {
"doctype": "DocPerm", "doctype": "DocPerm",
"role": "Purchase Master Manager", "role": "Purchase Master Manager",
@ -257,25 +279,5 @@
"role": "Purchase Master Manager", "role": "Purchase Master Manager",
"cancel": 1, "cancel": 1,
"permlevel": 0 "permlevel": 0
},
{
"amend": 0,
"create": 0,
"doctype": "DocPerm",
"submit": 0,
"write": 0,
"role": "Purchase Manager",
"cancel": 0,
"permlevel": 1
},
{
"amend": 0,
"create": 0,
"doctype": "DocPerm",
"submit": 0,
"write": 0,
"role": "Purchase Manager",
"cancel": 0,
"permlevel": 0
} }
] ]

2
hr/doctype/expense_claim/expense_claim.js
View File

@ -247,7 +247,7 @@ cur_frm.cscript.update_voucher = function(doc){
cur_frm.cscript.on_submit = function(doc, cdt, cdn) { cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
if(cint(wn.boot.notification_settings.expense_claim)) { if(cint(wn.boot.notification_settings.expense_claim)) {
cur_frm.email_doc(wn.boot.notification_settings.expense_claim); cur_frm.email_doc(wn.boot.notification_settings.expense_claim_message);
} }
} }

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

@ -2,19 +2,21 @@
{ {
"owner": "Administrator", "owner": "Administrator",
"docstatus": 0, "docstatus": 0,
"creation": "2012-11-02 17:16:46", "creation": "2012-12-03 10:31:05",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-11-30 10:54:38" "modified": "2012-12-03 11:25:29"
}, },
{ {
"autoname": "naming_series:", "description": "Buyer of Goods and Services.",
"name": "__common__",
"default_print_format": "Standard",
"allow_print": 0, "allow_print": 0,
"search_fields": "customer_name,customer_group,country,territory", "search_fields": "customer_name,customer_group,country,territory",
"module": "Selling", "module": "Selling",
"doctype": "DocType", "document_type": "Master",
"document_type": "Master" "autoname": "naming_series:",
"name": "__common__",
"default_print_format": "Standard",
"allow_rename": 1,
"doctype": "DocType"
}, },
{ {
"name": "__common__", "name": "__common__",
@ -364,44 +366,54 @@
"fieldtype": "Small Text", "fieldtype": "Small Text",
"permlevel": 1 "permlevel": 1
}, },
{
"amend": 0,
"create": 0,
"doctype": "DocPerm",
"submit": 0,
"write": 0,
"cancel": 0,
"role": "Sales Manager",
"permlevel": 1
},
{
"amend": 0,
"create": 0,
"doctype": "DocPerm",
"submit": 0,
"write": 0,
"cancel": 0,
"role": "Sales Manager",
"permlevel": 0
},
{
"amend": 0,
"create": 0,
"doctype": "DocPerm",
"submit": 0,
"write": 0,
"cancel": 0,
"role": "Sales User",
"permlevel": 1
},
{
"amend": 0,
"create": 0,
"doctype": "DocPerm",
"submit": 0,
"write": 0,
"cancel": 0,
"role": "Sales User",
"permlevel": 0
},
{ {
"amend": 0, "amend": 0,
"create": 1, "create": 1,
"doctype": "DocPerm", "doctype": "DocPerm",
"submit": 0, "submit": 0,
"write": 1, "write": 1,
"role": "Sales Master Manager",
"cancel": 1, "cancel": 1,
"permlevel": 0
},
{
"amend": 0,
"create": 0,
"doctype": "DocPerm",
"submit": 0,
"write": 0,
"role": "Sales Master Manager", "role": "Sales Master Manager",
"cancel": 0,
"permlevel": 1
},
{
"amend": 0,
"create": 0,
"doctype": "DocPerm",
"submit": 0,
"write": 0,
"role": "Sales Manager",
"cancel": 0,
"permlevel": 1
},
{
"amend": 0,
"create": 0,
"doctype": "DocPerm",
"submit": 0,
"write": 0,
"role": "Sales Manager",
"cancel": 0,
"permlevel": 0 "permlevel": 0
}, },
{ {
@ -410,18 +422,18 @@
"doctype": "DocPerm", "doctype": "DocPerm",
"submit": 0, "submit": 0,
"write": 0, "write": 0,
"role": "Sales User",
"cancel": 0, "cancel": 0,
"role": "Sales Master Manager",
"permlevel": 1 "permlevel": 1
}, },
{ {
"amend": 0, "amend": 0,
"create": 0, "create": 1,
"doctype": "DocPerm", "doctype": "DocPerm",
"submit": 0, "submit": 0,
"write": 0, "write": 1,
"role": "Sales User",
"cancel": 0, "cancel": 0,
"role": "Purchase User",
"permlevel": 0 "permlevel": 0
}, },
{ {

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

@ -369,6 +369,6 @@ cur_frm.fields_dict['territory'].get_query = function(doc,cdt,cdn) {
cur_frm.cscript.on_submit = function(doc, cdt, cdn) { cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
if(cint(wn.boot.notification_settings.sales_order)) { if(cint(wn.boot.notification_settings.sales_order)) {
cur_frm.email_doc(wn.boot.notification_settings.sales_order); cur_frm.email_doc(wn.boot.notification_settings.sales_order_message);
} }
} }

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

@ -1,377 +1,307 @@
# DocType, Company
[ [
{
# These values are common in all dictionaries "owner": "Administrator",
{ "docstatus": 0,
'creation': '2012-05-15 12:15:00', "creation": "2012-08-10 13:00:45",
'docstatus': 0, "modified_by": "Administrator",
'modified': '2012-08-10 12:15:45', "modified": "2012-12-03 11:26:05"
'modified_by': u'Administrator', },
'owner': u'Administrator' {
}, "autoname": "field:company_name",
"description": "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.",
# These values are common for all DocType "allow_rename": 1,
{ "doctype": "DocType",
'_last_update': u'1323855292', "module": "Setup",
'allow_trash': 1, "document_type": "Master",
'autoname': u'field:company_name', "name": "__common__"
'colour': u'White:FFF', },
'doctype': 'DocType', {
'document_type': u'Master', "name": "__common__",
'module': u'Setup', "parent": "Company",
'name': '__common__', "doctype": "DocField",
'section_style': u'Tabbed', "parenttype": "DocType",
'server_code_error': u' ', "parentfield": "fields"
'show_in_menu': 0, },
'version': 1 {
}, "name": "__common__",
"parent": "Company",
# These values are common for all DocField "read": 1,
{ "doctype": "DocPerm",
'doctype': u'DocField', "parenttype": "DocType",
'name': '__common__', "parentfield": "permissions"
'parent': u'Company', },
'parentfield': u'fields', {
'parenttype': u'DocType' "name": "Company",
}, "doctype": "DocType"
},
# These values are common for all DocPerm {
{ "oldfieldtype": "Section Break",
'doctype': u'DocPerm', "colour": "White:FFF",
'name': '__common__', "doctype": "DocField",
'parent': u'Company', "label": "Company Details",
'parentfield': u'permissions', "fieldname": "details",
'parenttype': u'DocType', "fieldtype": "Section Break",
'read': 1 "permlevel": 0
}, },
{
# DocType, Company "no_copy": 0,
{ "oldfieldtype": "Data",
'doctype': 'DocType', "colour": "White:FFF",
'name': u'Company' "doctype": "DocField",
}, "label": "Company",
"oldfieldname": "company_name",
# DocPerm "fieldname": "company_name",
{ "fieldtype": "Data",
'amend': 0, "reqd": 1,
'cancel': 1, "permlevel": 0
'create': 1, },
'doctype': u'DocPerm', {
'permlevel': 0, "doctype": "DocField",
'role': u'System Manager', "fieldname": "cb0",
'submit': 0, "fieldtype": "Column Break",
'write': 1 "permlevel": 0
}, },
{
# DocPerm "description": "Please Enter Abbreviation or Short Name properly as it will be added as Suffix to all Account Heads.",
{ "no_copy": 0,
'amend': 0, "oldfieldtype": "Data",
'cancel': 1, "colour": "White:FFF",
'create': 1, "doctype": "DocField",
'doctype': u'DocPerm', "label": "Abbr",
'permlevel': 0, "oldfieldname": "abbr",
'role': u'System Manager', "fieldname": "abbr",
'submit': 0, "fieldtype": "Data",
'write': 1 "reqd": 1,
}, "permlevel": 0
},
# DocPerm {
{ "oldfieldtype": "Section Break",
'cancel': 0, "doctype": "DocField",
'doctype': u'DocPerm', "label": "Default Settings",
'permlevel': 1, "fieldname": "default_settings",
'role': u'All' "fieldtype": "Section Break",
}, "permlevel": 0
},
# DocField {
{ "doctype": "DocField",
'colour': u'White:FFF', "label": "Default Currency",
'doctype': u'DocField', "options": "link:Currency",
'fieldname': u'details', "fieldname": "default_currency",
'fieldtype': u'Section Break', "fieldtype": "Select",
'label': u'Company Details', "reqd": 1,
'oldfieldtype': u'Section Break', "permlevel": 0
'permlevel': 0 },
}, {
"no_copy": 1,
# DocField "oldfieldtype": "Link",
{ "doctype": "DocField",
'colour': u'White:FFF', "label": "Default Bank Account",
'doctype': u'DocField', "oldfieldname": "default_bank_account",
'fieldname': u'company_name', "trigger": "Client",
'fieldtype': u'Data', "fieldname": "default_bank_account",
'label': u'Company', "fieldtype": "Link",
'no_copy': 0, "depends_on": "eval:!doc.__islocal",
'oldfieldname': u'company_name', "options": "Account",
'oldfieldtype': u'Data', "permlevel": 0
'permlevel': 0, },
'reqd': 1 {
}, "no_copy": 1,
"oldfieldtype": "Link",
# DocField "doctype": "DocField",
{ "label": "Receivables Group",
'doctype': u'DocField', "oldfieldname": "receivables_group",
'fieldname': u'cb0', "trigger": "Client",
'fieldtype': u'Column Break', "fieldname": "receivables_group",
'permlevel': 0 "fieldtype": "Link",
}, "depends_on": "eval:!doc.__islocal",
"options": "Account",
# DocField "permlevel": 0
{ },
'colour': u'White:FFF', {
'description': u'Please Enter Abbreviation or Short Name properly as it will be added as Suffix to all Account Heads.', "no_copy": 1,
'doctype': u'DocField', "oldfieldtype": "Link",
'fieldname': u'abbr', "doctype": "DocField",
'fieldtype': u'Data', "label": "Payables Group",
'label': u'Abbr', "oldfieldname": "payables_group",
'no_copy': 0, "trigger": "Client",
'oldfieldname': u'abbr', "fieldname": "payables_group",
'oldfieldtype': u'Data', "fieldtype": "Link",
'permlevel': 0, "depends_on": "eval:!doc.__islocal",
'reqd': 1 "options": "Account",
}, "permlevel": 0
},
# DocField {
{ "oldfieldtype": "Column Break",
'doctype': u'DocField', "doctype": "DocField",
'fieldname': u'default_settings', "width": "50%",
'fieldtype': u'Section Break', "fieldname": "column_break0",
'label': u'Default Settings', "fieldtype": "Column Break",
'oldfieldtype': u'Section Break', "permlevel": 0
'permlevel': 0 },
}, {
"oldfieldtype": "Int",
# DocField "doctype": "DocField",
{ "label": "Credit Days",
'doctype': u'DocField', "oldfieldname": "credit_days",
'fieldname': u'default_currency', "fieldname": "credit_days",
'fieldtype': u'Select', "fieldtype": "Int",
'label': u'Default Currency', "depends_on": "eval:!doc.__islocal",
'options': u'link:Currency', "permlevel": 0
'permlevel': 0, },
'reqd': 1 {
}, "oldfieldtype": "Currency",
"doctype": "DocField",
# DocField "label": "Credit Limit",
{ "oldfieldname": "credit_limit",
'depends_on': u'eval:!doc.__islocal', "fieldname": "credit_limit",
'doctype': u'DocField', "fieldtype": "Currency",
'fieldname': u'default_bank_account', "depends_on": "eval:!doc.__islocal",
'fieldtype': u'Link', "permlevel": 0
'label': u'Default Bank Account', },
'no_copy': 1, {
'oldfieldname': u'default_bank_account', "oldfieldtype": "Select",
'oldfieldtype': u'Link', "colour": "White:FFF",
'options': u'Account', "doctype": "DocField",
'permlevel': 0, "label": "If Yearly Budget Exceeded",
'trigger': u'Client' "oldfieldname": "yearly_bgt_flag",
}, "options": "\nWarn\nIgnore\nStop",
"fieldname": "yearly_bgt_flag",
# DocField "fieldtype": "Select",
{ "depends_on": "eval:!doc.__islocal",
'depends_on': u'eval:!doc.__islocal', "permlevel": 0
'doctype': u'DocField', },
'fieldname': u'receivables_group', {
'fieldtype': u'Link', "oldfieldtype": "Select",
'label': u'Receivables Group', "doctype": "DocField",
'no_copy': 1, "label": "If Monthly Budget Exceeded",
'oldfieldname': u'receivables_group', "oldfieldname": "monthly_bgt_flag",
'oldfieldtype': u'Link', "options": "\nWarn\nIgnore\nStop",
'options': u'Account', "fieldname": "monthly_bgt_flag",
'permlevel': 0, "fieldtype": "Select",
'trigger': u'Client' "depends_on": "eval:!doc.__islocal",
}, "permlevel": 0
},
# DocField {
{ "description": "For reference only.",
'depends_on': u'eval:!doc.__islocal', "colour": "White:FFF",
'doctype': u'DocField', "doctype": "DocField",
'fieldname': u'payables_group', "label": "Company Info",
'fieldtype': u'Link', "fieldname": "company_info",
'label': u'Payables Group', "fieldtype": "Section Break",
'no_copy': 1, "permlevel": 0
'oldfieldname': u'payables_group', },
'oldfieldtype': u'Link', {
'options': u'Account', "oldfieldtype": "Small Text",
'permlevel': 0, "doctype": "DocField",
'trigger': u'Client' "label": "Address",
}, "oldfieldname": "address",
"fieldname": "address",
# DocField "fieldtype": "Small Text",
{ "permlevel": 0
'doctype': u'DocField', },
'fieldname': u'column_break0', {
'fieldtype': u'Column Break', "oldfieldtype": "Column Break",
'oldfieldtype': u'Column Break', "doctype": "DocField",
'permlevel': 0, "width": "50%",
'width': u'50%' "fieldname": "column_break1",
}, "fieldtype": "Column Break",
"permlevel": 0
# DocField },
{ {
'depends_on': u'eval:!doc.__islocal', "oldfieldtype": "Data",
'doctype': u'DocField', "doctype": "DocField",
'fieldname': u'credit_days', "label": "Phone No",
'fieldtype': u'Int', "oldfieldname": "phone_no",
'label': u'Credit Days', "options": "Phone",
'oldfieldname': u'credit_days', "fieldname": "phone_no",
'oldfieldtype': u'Int', "fieldtype": "Data",
'permlevel': 0 "permlevel": 0
}, },
{
# DocField "oldfieldtype": "Data",
{ "doctype": "DocField",
'depends_on': u'eval:!doc.__islocal', "label": "Fax",
'doctype': u'DocField', "oldfieldname": "fax",
'fieldname': u'credit_limit', "options": "Phone",
'fieldtype': u'Currency', "fieldname": "fax",
'label': u'Credit Limit', "fieldtype": "Data",
'oldfieldname': u'credit_limit', "permlevel": 0
'oldfieldtype': u'Currency', },
'permlevel': 0 {
}, "oldfieldtype": "Data",
"doctype": "DocField",
# DocField "label": "Email",
{ "oldfieldname": "email",
'colour': u'White:FFF', "options": "Email",
'depends_on': u'eval:!doc.__islocal', "fieldname": "email",
'doctype': u'DocField', "fieldtype": "Data",
'fieldname': u'yearly_bgt_flag', "permlevel": 0
'fieldtype': u'Select', },
'label': u'If Yearly Budget Exceeded', {
'oldfieldname': u'yearly_bgt_flag', "oldfieldtype": "Data",
'oldfieldtype': u'Select', "doctype": "DocField",
'options': u'\nWarn\nIgnore\nStop', "label": "Website",
'permlevel': 0 "oldfieldname": "website",
}, "fieldname": "website",
"fieldtype": "Data",
# DocField "permlevel": 0
{ },
'depends_on': u'eval:!doc.__islocal', {
'doctype': u'DocField', "description": "Company registration numbers for your reference. Example: VAT Registration Numbers etc.",
'fieldname': u'monthly_bgt_flag', "oldfieldtype": "Section Break",
'fieldtype': u'Select', "colour": "White:FFF",
'label': u'If Monthly Budget Exceeded', "doctype": "DocField",
'oldfieldname': u'monthly_bgt_flag', "label": "Registration Info",
'oldfieldtype': u'Select', "width": "50%",
'options': u'\nWarn\nIgnore\nStop', "fieldname": "registration_info",
'permlevel': 0 "fieldtype": "Section Break",
}, "permlevel": 0
},
# DocField {
{ "description": "Company registration numbers for your reference. Tax numbers etc.",
'colour': u'White:FFF', "oldfieldtype": "Code",
'description': u'For reference only.', "colour": "White:FFF",
'doctype': u'DocField', "doctype": "DocField",
'fieldname': u'company_info', "label": "Registration Details",
'fieldtype': u'Section Break', "oldfieldname": "registration_details",
'label': u'Company Info', "fieldname": "registration_details",
'permlevel': 0 "fieldtype": "Code",
}, "permlevel": 0
},
# DocField {
{ "no_copy": 1,
'doctype': u'DocField', "oldfieldtype": "Small Text",
'fieldname': u'address', "doctype": "DocField",
'fieldtype': u'Small Text', "label": "Trash Reason",
'label': u'Address', "oldfieldname": "trash_reason",
'oldfieldname': u'address', "fieldname": "trash_reason",
'oldfieldtype': u'Small Text', "fieldtype": "Small Text",
'permlevel': 0 "permlevel": 1
}, },
{
# DocField "amend": 0,
{ "create": 1,
'doctype': u'DocField', "doctype": "DocPerm",
'fieldname': u'column_break1', "submit": 0,
'fieldtype': u'Column Break', "write": 1,
'oldfieldtype': u'Column Break', "role": "System Manager",
'permlevel': 0, "cancel": 1,
'width': u'50%' "permlevel": 0
}, },
{
# DocField "amend": 0,
{ "create": 1,
'doctype': u'DocField', "doctype": "DocPerm",
'fieldname': u'phone_no', "submit": 0,
'fieldtype': u'Data', "write": 1,
'label': u'Phone No', "role": "System Manager",
'oldfieldname': u'phone_no', "cancel": 1,
'oldfieldtype': u'Data', "permlevel": 0
'options': u'Phone', },
'permlevel': 0 {
}, "doctype": "DocPerm",
"role": "All",
# DocField "cancel": 0,
{ "permlevel": 1
'doctype': u'DocField', }
'fieldname': u'fax',
'fieldtype': u'Data',
'label': u'Fax',
'oldfieldname': u'fax',
'oldfieldtype': u'Data',
'options': u'Phone',
'permlevel': 0
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'email',
'fieldtype': u'Data',
'label': u'Email',
'oldfieldname': u'email',
'oldfieldtype': u'Data',
'options': u'Email',
'permlevel': 0
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'website',
'fieldtype': u'Data',
'label': u'Website',
'oldfieldname': u'website',
'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
'colour': u'White:FFF',
'description': u'Company registration numbers for your reference. Example: VAT Registration Numbers etc.',
'doctype': u'DocField',
'fieldname': u'registration_info',
'fieldtype': u'Section Break',
'label': u'Registration Info',
'oldfieldtype': u'Section Break',
'permlevel': 0,
'width': u'50%'
},
# DocField
{
'colour': u'White:FFF',
'description': u'Company registration numbers for your reference. Tax numbers etc.',
'doctype': u'DocField',
'fieldname': u'registration_details',
'fieldtype': u'Code',
'label': u'Registration Details',
'oldfieldname': u'registration_details',
'oldfieldtype': u'Code',
'permlevel': 0
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'trash_reason',
'fieldtype': u'Small Text',
'label': u'Trash Reason',
'no_copy': 1,
'oldfieldname': u'trash_reason',
'oldfieldtype': u'Small Text',
'permlevel': 1
}
] ]

2
stock/doctype/delivery_note/delivery_note.js
View File

@ -327,6 +327,6 @@ cur_frm.pformat.sales_order_no= function(doc, cdt, cdn){
cur_frm.cscript.on_submit = function(doc, cdt, cdn) { cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
if(cint(wn.boot.notification_settings.delivery_note)) { if(cint(wn.boot.notification_settings.delivery_note)) {
cur_frm.email_doc(wn.boot.notification_settings.delivery_note); cur_frm.email_doc(wn.boot.notification_settings.delivery_note_message);
} }
} }

1852
stock/doctype/item/item.txt
View File

File diff suppressed because it is too large Load Diff

2
stock/doctype/purchase_receipt/purchase_receipt.js
View File

@ -299,6 +299,6 @@ cur_frm.pformat.purchase_order_no = function(doc, cdt, cdn){
cur_frm.cscript.on_submit = function(doc, cdt, cdn) { cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
if(cint(wn.boot.notification_settings.purchase_receipt)) { if(cint(wn.boot.notification_settings.purchase_receipt)) {
cur_frm.email_doc(wn.boot.notification_settings.purchase_receipt); cur_frm.email_doc(wn.boot.notification_settings.purchase_receipt_message);
} }
} }

606
stock/doctype/warehouse/warehouse.txt
View File

@ -1,314 +1,296 @@
# DocType, Warehouse
[ [
{
# These values are common in all dictionaries "owner": "Administrator",
{ "docstatus": 0,
u'creation': '2012-10-10 12:07:10', "creation": "2012-10-26 14:47:52",
u'docstatus': 0, "modified_by": "Administrator",
u'modified': '2012-10-25 15:03:49', "modified": "2012-12-03 11:24:31"
u'modified_by': u'Administrator', },
u'owner': u'Administrator' {
}, "autoname": "field:warehouse_name",
"description": "A logical Warehouse against which stock entries are made.",
# These values are common for all DocType "default_print_format": "Standard",
{ "allow_rename": 1,
'_last_update': u'1319016431', "search_fields": "warehouse_type",
'allow_trash': 1, "module": "Stock",
'autoname': u'field:warehouse_name', "doctype": "DocType",
'colour': u'White:FFF', "document_type": "Master",
'default_print_format': u'Standard', "name": "__common__"
'description': u'A logical Warehouse against which stock entries are made.\n\nThere are two main Warehouse Types that are significant in ERPNext.\n\n1. **Stores:** These are where your incoming **Items** are kept before they are consumed or sold. You can have as many \u201cStores\u201d type **Warehouses** as you wish. Stores type warehouses are significant because if you set an Item for automatic re-order, ERPNext will check its quantities in all \u201cStores\u201d type **Warehouses** when deciding whether to re-order or not.\n\n2. **Asset**: **Items** marked as type \u201cFixed Asset\u201d are maintained in Asset Type **Warehouses**. This helps you separate them for the **Items** that are consumed as a part of your regular operations or \u201cCost of Goods Sold\u201d.\n', },
u'doctype': u'DocType', {
'document_type': u'Master', "name": "__common__",
'module': u'Stock', "parent": "Warehouse",
u'name': u'__common__', "doctype": "DocField",
'search_fields': u'warehouse_type', "parenttype": "DocType",
'section_style': u'Tabbed', "parentfield": "fields"
'server_code_error': u' ', },
'show_in_menu': 0, {
'version': 1 "name": "__common__",
}, "parent": "Warehouse",
"read": 1,
# These values are common for all DocField "doctype": "DocPerm",
{ "parenttype": "DocType",
u'doctype': u'DocField', "parentfield": "permissions"
u'name': u'__common__', },
'parent': u'Warehouse', {
'parentfield': u'fields', "name": "Warehouse",
'parenttype': u'DocType' "doctype": "DocType"
}, },
{
# These values are common for all DocPerm "oldfieldtype": "Section Break",
{ "doctype": "DocField",
u'doctype': u'DocPerm', "label": "Warehouse Detail",
u'name': u'__common__', "fieldname": "warehouse_detail",
'parent': u'Warehouse', "fieldtype": "Section Break",
'parentfield': u'permissions', "permlevel": 0
'parenttype': u'DocType', },
'read': 1 {
}, "oldfieldtype": "Data",
"doctype": "DocField",
# DocType, Warehouse "label": "Warehouse Name",
{ "oldfieldname": "warehouse_name",
u'doctype': u'DocType', "fieldname": "warehouse_name",
u'name': u'Warehouse' "fieldtype": "Data",
}, "reqd": 1,
"permlevel": 0
# DocField },
{ {
u'doctype': u'DocField', "oldfieldtype": "Link",
'fieldname': u'warehouse_detail', "colour": "White:FFF",
'fieldtype': u'Section Break', "doctype": "DocField",
'label': u'Warehouse Detail', "label": "Warehouse Type",
'oldfieldtype': u'Section Break', "oldfieldname": "warehouse_type",
'permlevel': 0 "options": "Warehouse Type",
}, "fieldname": "warehouse_type",
"fieldtype": "Link",
# DocField "reqd": 1,
{ "permlevel": 0
u'doctype': u'DocField', },
'fieldname': u'warehouse_name', {
'fieldtype': u'Data', "oldfieldtype": "Link",
'label': u'Warehouse Name', "colour": "White:FFF",
'oldfieldname': u'warehouse_name', "doctype": "DocField",
'oldfieldtype': u'Data', "label": "Company",
'permlevel': 0, "oldfieldname": "company",
'reqd': 1 "options": "Company",
}, "fieldname": "company",
"fieldtype": "Link",
# DocField "search_index": 1,
{ "permlevel": 0,
'colour': u'White:FFF', "in_filter": 1
u'doctype': u'DocField', },
'fieldname': u'warehouse_type', {
'fieldtype': u'Link', "description": "For Reference Only.",
'label': u'Warehouse Type', "colour": "White:FFF",
'oldfieldname': u'warehouse_type', "doctype": "DocField",
'oldfieldtype': u'Link', "label": "Warehouse Contact Info",
'options': u'Warehouse Type', "fieldname": "warehouse_contact_info",
'permlevel': 0, "fieldtype": "Section Break",
'reqd': 1 "permlevel": 0
}, },
{
# DocField "print_hide": 0,
{ "oldfieldtype": "Data",
'colour': u'White:FFF', "doctype": "DocField",
u'doctype': u'DocField', "label": "Email Id",
'fieldname': u'company', "oldfieldname": "email_id",
'fieldtype': u'Link', "fieldname": "email_id",
'in_filter': 1, "fieldtype": "Data",
'label': u'Company', "hidden": 1,
'oldfieldname': u'company', "permlevel": 0
'oldfieldtype': u'Link', },
'options': u'Company', {
'permlevel': 0, "oldfieldtype": "Int",
'search_index': 1 "doctype": "DocField",
}, "label": "Phone No",
"oldfieldname": "phone_no",
# DocField "options": "Phone",
{ "fieldname": "phone_no",
'colour': u'White:FFF', "fieldtype": "Data",
'description': u'For Reference Only.', "permlevel": 0
u'doctype': u'DocField', },
'fieldname': u'warehouse_contact_info', {
'fieldtype': u'Section Break', "oldfieldtype": "Int",
'label': u'Warehouse Contact Info', "doctype": "DocField",
'permlevel': 0 "label": "Mobile No",
}, "oldfieldname": "mobile_no",
"options": "Phone",
# DocField "fieldname": "mobile_no",
{ "fieldtype": "Data",
u'doctype': u'DocField', "permlevel": 0
'fieldname': u'email_id', },
'fieldtype': u'Data', {
'hidden': 1, "oldfieldtype": "Column Break",
'label': u'Email Id', "doctype": "DocField",
'oldfieldname': u'email_id', "fieldname": "column_break0",
'oldfieldtype': u'Data', "fieldtype": "Column Break",
'permlevel': 0, "permlevel": 0
'print_hide': 0 },
}, {
"oldfieldtype": "Data",
# DocField "doctype": "DocField",
{ "label": "Address Line 1",
u'doctype': u'DocField', "oldfieldname": "address_line_1",
'fieldname': u'phone_no', "fieldname": "address_line_1",
'fieldtype': u'Data', "fieldtype": "Data",
'label': u'Phone No', "permlevel": 0
'oldfieldname': u'phone_no', },
'oldfieldtype': u'Int', {
'options': u'Phone', "oldfieldtype": "Data",
'permlevel': 0 "doctype": "DocField",
}, "label": "Address Line 2",
"oldfieldname": "address_line_2",
# DocField "fieldname": "address_line_2",
{ "fieldtype": "Data",
u'doctype': u'DocField', "permlevel": 0
'fieldname': u'mobile_no', },
'fieldtype': u'Data', {
'label': u'Mobile No', "oldfieldtype": "Data",
'oldfieldname': u'mobile_no', "doctype": "DocField",
'oldfieldtype': u'Int', "label": "City",
'options': u'Phone', "oldfieldname": "city",
'permlevel': 0 "fieldname": "city",
}, "fieldtype": "Data",
"reqd": 0,
# DocField "permlevel": 0
{ },
u'doctype': u'DocField', {
'fieldname': u'column_break0', "oldfieldtype": "Select",
'fieldtype': u'Column Break', "colour": "White:FFF",
'oldfieldtype': u'Column Break', "doctype": "DocField",
'permlevel': 0 "label": "State",
}, "oldfieldname": "state",
"options": "Suggest",
# DocField "fieldname": "state",
{ "fieldtype": "Data",
u'doctype': u'DocField', "permlevel": 0
'fieldname': u'address_line_1', },
'fieldtype': u'Data', {
'label': u'Address Line 1', "oldfieldtype": "Int",
'oldfieldname': u'address_line_1', "doctype": "DocField",
'oldfieldtype': u'Data', "label": "PIN",
'permlevel': 0 "oldfieldname": "pin",
}, "fieldname": "pin",
"fieldtype": "Int",
# DocField "permlevel": 0
{ },
u'doctype': u'DocField', {
'fieldname': u'address_line_2', "description": "This feature is for merging duplicate warehouses. It will replace all the links of this warehouse by \"Merge With\" warehouse. After merging you can delete this warehouse, as stock level for this warehouse will be zero.",
'fieldtype': u'Data', "colour": "White:FFF",
'label': u'Address Line 2', "doctype": "DocField",
'oldfieldname': u'address_line_2', "label": "Merge Warehouses",
'oldfieldtype': u'Data', "fieldname": "merge_warehouses_section",
'permlevel': 0 "fieldtype": "Section Break",
}, "permlevel": 2
},
# DocField {
{ "doctype": "DocField",
u'doctype': u'DocField', "label": "Merge With",
'fieldname': u'city', "options": "Warehouse",
'fieldtype': u'Data', "fieldname": "merge_with",
'label': u'City', "fieldtype": "Link",
'oldfieldname': u'city', "permlevel": 2
'oldfieldtype': u'Data', },
'permlevel': 0, {
'reqd': 0 "doctype": "DocField",
}, "label": "Merge",
"fieldname": "merge",
# DocField "fieldtype": "Button",
{ "permlevel": 2
'colour': u'White:FFF', },
u'doctype': u'DocField', {
'fieldname': u'state', "amend": 0,
'fieldtype': u'Data', "create": 0,
'label': u'State', "doctype": "DocPerm",
'oldfieldname': u'state', "submit": 0,
'oldfieldtype': u'Select', "write": 0,
'options': u'Suggest', "cancel": 0,
'permlevel': 0 "role": "Material User",
}, "permlevel": 2
},
# DocField {
{ "amend": 0,
u'doctype': u'DocField', "create": 0,
'fieldname': u'pin', "doctype": "DocPerm",
'fieldtype': u'Int', "submit": 0,
'label': u'PIN', "write": 0,
'oldfieldname': u'pin', "cancel": 0,
'oldfieldtype': u'Int', "role": "Material User",
'permlevel': 0 "permlevel": 0
}, },
{
# DocField "amend": 0,
{ "create": 0,
'colour': u'White:FFF', "doctype": "DocPerm",
'description': u'This feature is for merging duplicate warehouses. It will replace all the links of this warehouse by "Merge With" warehouse. After merging you can delete this warehouse, as stock level for this warehouse will be zero.', "submit": 0,
u'doctype': u'DocField', "write": 0,
'fieldname': u'merge_warehouses_section', "cancel": 0,
'fieldtype': u'Section Break', "role": "Material User",
'label': u'Merge Warehouses', "permlevel": 1
'permlevel': 2 },
}, {
"amend": 0,
# DocField "create": 0,
{ "doctype": "DocPerm",
u'doctype': u'DocField', "submit": 0,
'fieldname': u'merge_with', "write": 0,
'fieldtype': u'Link', "cancel": 0,
'label': u'Merge With', "role": "Material Manager",
'options': u'Warehouse', "permlevel": 2
'permlevel': 2 },
}, {
"amend": 0,
# DocField "create": 0,
{ "doctype": "DocPerm",
u'doctype': u'DocField', "submit": 0,
'fieldname': u'merge', "write": 0,
'fieldtype': u'Button', "cancel": 0,
'label': u'Merge', "role": "Material Manager",
'permlevel': 2 "permlevel": 0
}, },
{
# DocPerm "amend": 0,
{ "create": 0,
'amend': 0, "doctype": "DocPerm",
'cancel': 1, "submit": 0,
'create': 1, "write": 0,
u'doctype': u'DocPerm', "cancel": 0,
'permlevel': 0, "role": "Material Manager",
'role': u'Material Master Manager', "permlevel": 1
'submit': 0, },
'write': 1 {
}, "doctype": "DocPerm",
"role": "All",
# DocPerm "permlevel": 1
{ },
'cancel': 1, {
'create': 1, "amend": 0,
u'doctype': u'DocPerm', "create": 1,
'permlevel': 0, "doctype": "DocPerm",
'role': u'System Manager', "submit": 0,
'write': 1 "write": 1,
}, "cancel": 1,
"role": "Material Master Manager",
# DocPerm "permlevel": 0
{ },
'amend': 0, {
'cancel': 0, "doctype": "DocPerm",
'create': 0, "role": "Material Master Manager",
u'doctype': u'DocPerm', "permlevel": 1
'permlevel': 0, },
'role': u'Material Manager', {
'submit': 0, "create": 1,
'write': 0 "doctype": "DocPerm",
}, "write": 1,
"role": "System Manager",
# DocPerm "cancel": 1,
{ "permlevel": 0
'amend': 0, },
'cancel': 0, {
'create': 0, "create": 0,
u'doctype': u'DocPerm', "doctype": "DocPerm",
'permlevel': 0, "write": 1,
'role': u'Material User', "role": "System Manager",
'submit': 0, "permlevel": 2
'write': 0 }
},
# DocPerm
{
u'doctype': u'DocPerm',
'permlevel': 1,
'role': u'All'
},
# DocPerm
{
'create': 0,
u'doctype': u'DocPerm',
'permlevel': 2,
'role': u'System Manager',
'write': 1
}
] ]

12
utilities/page/messages/messages.py
View File

@ -24,13 +24,13 @@ def get_list(arg=None):
webnotes.form_dict['limit_page_length'] = int(webnotes.form_dict['limit_page_length']) webnotes.form_dict['limit_page_length'] = int(webnotes.form_dict['limit_page_length'])
webnotes.form_dict['user'] = webnotes.session['user'] webnotes.form_dict['user'] = webnotes.session['user']
# set all messages as read
webnotes.conn.sql("""UPDATE `tabComment`
set docstatus = 1 where comment_doctype in ('My Company', 'Message')
and comment_docname = %s
""", webnotes.user.name)
if webnotes.form_dict['contact'] == webnotes.session['user']: if webnotes.form_dict['contact'] == webnotes.session['user']:
# set all messages as read
webnotes.conn.sql("""UPDATE `tabComment`
set docstatus = 1 where comment_doctype in ('My Company', 'Message')
and comment_docname = %s
""", webnotes.user.name)
# return messages # return messages
return webnotes.conn.sql("""select * from `tabComment` return webnotes.conn.sql("""select * from `tabComment`
where (owner=%(contact)s where (owner=%(contact)s