You wont be able to do any changes after rejecting this expense voucher. Are you sure, you want to reject it ?
'],
- ['HTML', 'Response', ''],
- ['HTML', 'Reject Voucher', '']
- ]);
-
- var reject_voucher_btn1 = $a($i(reject_voucher_dialog.widgets['Reject Voucher']), 'button', 'button');
- reject_voucher_btn1.innerHTML = 'Yes';
- reject_voucher_btn1.onclick = function(){ reject_voucher_dialog.add(); }
-
- var reject_voucher_btn2 = $a($i(reject_voucher_dialog.widgets['Reject Voucher']), 'button', 'button');
- reject_voucher_btn2.innerHTML = 'No';
- $y(reject_voucher_btn2,{marginLeft:'4px'});
- reject_voucher_btn2.onclick = function(){ reject_voucher_dialog.hide();}
-
- reject_voucher_dialog.onshow = function() {
- $i('reject_voucher_dialog_response').innerHTML = '';
- }
-
- reject_voucher_dialog.add = function() {
- // sending...
- $i('reject_voucher_dialog_response').innerHTML = 'Processing...';
-
- $c_obj(make_doclist(this.doc.doctype, this.doc.name),'reject_voucher','', function(r,rt){
- if(r.message == 'Rejected'){
- $i('reject_voucher_dialog_response').innerHTML = 'Rejected';
- refresh_field('approval_status');
- hide_field(['update_voucher', 'approve', 'reject', 'calculate_total_amount']);
- reject_voucher_dialog.hide();
- var args = {
- type: 'Expense Claim Rejected',
- doctype: 'Expense Claim',
- contact_name: doc.employee_name,
- send_to: doc.email_id
- }
- cur_frm.cscript.notify(doc, args);
- }
- });
- }
- }
-
- if(!reject_voucher_dialog){
- set_reject_voucher_dialog();
- }
- reject_voucher_dialog.doc = doc;
- reject_voucher_dialog.cdt = cdt;
- reject_voucher_dialog.cdn = cdn;
- reject_voucher_dialog.show();
- refresh_field('expense_voucher_details');
- doc.__unsaved = 0;
- cur_frm.refresh_header();
- }else{
- msgprint("Expense Claim can be rejected by Approver only");
- }
-}
-
-//update follow up
-//=================================================================================
-cur_frm.cscript.update_voucher = function(doc){
-
- $c_obj(make_doclist(doc.doctype, doc.name),'update_voucher','',function(r, rt){
- refresh_field('expense_voucher_details');
- doc.__unsaved = 0;
- cur_frm.refresh_header();
- });
-}
-
cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
- if(cint(wn.boot.notification_settings.expense_claim)) {
+ if(cint(wn.boot.notification_settings && wn.boot.notification_settings.expense_claim)) {
cur_frm.email_doc(wn.boot.notification_settings.expense_claim_message);
}
-}
-
-cur_frm.fields_dict.employee.get_query = erpnext.utils.employee_query;
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/hr/doctype/expense_claim/expense_claim.py b/hr/doctype/expense_claim/expense_claim.py
index 0bfc318cff..b5fddda14f 100644
--- a/hr/doctype/expense_claim/expense_claim.py
+++ b/hr/doctype/expense_claim/expense_claim.py
@@ -17,86 +17,27 @@
from __future__ import unicode_literals
import webnotes
-from webnotes.utils import add_days, cstr
-from webnotes.model import db_exists
-from webnotes.model.wrapper import getlist, copy_doclist
-from webnotes.model.code import get_obj
+from webnotes.utils import add_days
+from webnotes.model.wrapper import getlist
from webnotes import form, msgprint
sql = webnotes.conn.sql
-
-
class DocType:
def __init__(self, doc, doclist=[]):
self.doc = doc
self.doclist = doclist
- def get_employee_name(self):
- emp_dtl = sql("select employee_name,company_email from `tabEmployee` where name=%s", self.doc.employee)
- emp_nm = emp_dtl and emp_dtl[0][0] or ''
- self.doc.employee_name = emp_nm
- self.doc.email_id = emp_dtl and emp_dtl[0][1] or ''
-
- return cstr(emp_nm)
-
- def get_approver_lst(self):
- approver_lst =[]
- approver_lst1 = get_obj('Authorization Control').get_approver_name(self.doc.doctype,0,self)
- if approver_lst1:
- approver_lst=approver_lst1
- else:
- approver_lst = [x[0] for x in sql("select distinct name from `tabProfile` where enabled=1 and name!='Administrator' and name!='Guest' and docstatus!=2")]
- return approver_lst
-
- def set_approver(self):
- ret={}
- approver_lst =[]
- emp_nm = self.get_employee_name()
- approver_lst = self.get_approver_lst()
- ret = {'app_lst':"\n" + "\n".join(approver_lst), 'emp_nm':cstr(emp_nm)}
- return ret
-
- def update_voucher(self):
- sql("delete from `tabExpense Claim Detail` where parent = '%s'"%self.doc.name)
- for d in getlist(self.doclist, 'expense_voucher_details'):
- if not d.expense_type or not d.claim_amount:
- msgprint("Please remove the extra blank row added")
- raise Exception
- d.save(1)
- if self.doc.total_sanctioned_amount:
- webnotes.conn.set(self.doc,'total_sanctioned_amount',self.doc.total_sanctioned_amount)
- if self.doc.remark:
- webnotes.conn.set(self.doc, 'remark', self.doc.remark)
-
- def approve_voucher(self):
- missing_count = 0
- for d in getlist(self.doclist, 'expense_voucher_details'):
- if not d.sanctioned_amount:
- missing_count += 1
- if missing_count == len(getlist(self.doclist, 'expense_voucher_details')):
- msgprint("Please add 'Sanctioned Amount' for atleast one expense")
- return cstr('Incomplete')
-
- if not self.doc.total_sanctioned_amount:
- msgprint("Please calculate total sanctioned amount using button 'Calculate Total Amount'")
- return cstr('No Amount')
- self.update_voucher()
-
- webnotes.conn.set(self.doc, 'approval_status', 'Approved')
- # on approval notification
- #get_obj('Notification Control').notify_contact('Expense Claim Approved', self.doc.doctype, self.doc.name, self.doc.email_id, self.doc.employee_name)
-
- return cstr('Approved')
-
- def reject_voucher(self):
-
- if self.doc.remark:
- webnotes.conn.set(self.doc, 'remark', self.doc.remark)
- webnotes.conn.set(self.doc, 'approval_status', 'Rejected')
-
- return cstr('Rejected')
-
+ def validate(self):
+ if self.doc.exp_approver == self.doc.owner:
+ webnotes.msgprint("""Self Approval is not allowed.""", raise_exception=1)
+ self.validate_fiscal_year()
+ self.validate_exp_details()
+
+ def on_submit(self):
+ if self.doc.approval_status=="Draft":
+ webnotes.msgprint("""Please set Approval Status to 'Approved' or 'Rejected' before submitting""",
+ raise_exception=1)
def validate_fiscal_year(self):
fy=sql("select year_start_date from `tabFiscal Year` where name='%s'"%self.doc.fiscal_year)
@@ -105,33 +46,16 @@ class DocType:
if str(self.doc.posting_date) < str(ysd) or str(self.doc.posting_date) > str(yed):
msgprint("Posting Date is not within the Fiscal Year selected")
raise Exception
-
- def validate(self):
- self.validate_fiscal_year()
-
- def on_update(self):
- webnotes.conn.set(self.doc, 'approval_status', 'Draft')
-
+
def validate_exp_details(self):
if not getlist(self.doclist, 'expense_voucher_details'):
msgprint("Please add expense voucher details")
raise Exception
- if not self.doc.total_claimed_amount:
- msgprint("Please calculate Total Claimed Amount")
- raise Exception
-
- if not self.doc.exp_approver:
- msgprint("Please select Expense Claim approver")
- raise Exception
-
- def on_submit(self):
- self.validate_exp_details()
- webnotes.conn.set(self.doc, 'approval_status', 'Submitted')
-
- def on_cancel(self):
- webnotes.conn.set(self.doc, 'approval_status', 'Cancelled')
-
- def get_formatted_message(self, args):
- """ get formatted message for auto notification"""
- return get_obj('Notification Control').get_formatted_message(args)
+@webnotes.whitelist()
+def get_approver_list():
+ roles = [r[0] for r in webnotes.conn.sql("""select distinct parent from `tabUserRole`
+ where role='Expense Approver'""")]
+ if not roles:
+ webnotes.msgprint("No Expense Approvers. Please assign 'Expense Approver' Role to atleast one user.")
+ return roles
diff --git a/hr/doctype/expense_claim/expense_claim.txt b/hr/doctype/expense_claim/expense_claim.txt
index 34ed31c852..f42e2dd571 100644
--- a/hr/doctype/expense_claim/expense_claim.txt
+++ b/hr/doctype/expense_claim/expense_claim.txt
@@ -1,390 +1,271 @@
-# DocType, Expense Claim
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:56',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:45:48',
- 'modified_by': u'Administrator',
- 'owner': u'harshada@webnotestech.com'
- },
-
- # These values are common for all DocType
- {
- '_last_update': u'1308808105',
- 'autoname': u'EXP.######',
- 'colour': u'White:FFF',
- 'default_print_format': u'Standard',
- 'doctype': 'DocType',
- 'is_submittable': 1,
- 'module': u'HR',
- 'name': '__common__',
- 'search_fields': u'approval_status,employee,employee_name',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'show_in_menu': 0,
- 'subject': u'From %(employee_name)s for %(total_claimed_amount)s (claimed)',
- 'tag_fields': u'approval_status',
- 'version': 135
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Expense Claim',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
- # These values are common for all DocPerm
- {
- 'doctype': u'DocPerm',
- 'name': '__common__',
- 'parent': u'Expense Claim',
- 'parentfield': u'permissions',
- 'parenttype': u'DocType',
- 'read': 1
- },
-
- # DocType, Expense Claim
- {
- 'doctype': 'DocType',
- 'name': u'Expense Claim'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'All'
- },
-
- # DocPerm
- {
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'match': u'owner',
- 'permlevel': 0,
- 'submit': 1,
- 'write': 1
- },
-
- # DocPerm
- {
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'HR Manager',
- 'submit': 1,
- 'write': 1
- },
-
- # DocPerm
- {
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'HR User',
- 'submit': 1,
- 'write': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'details',
- 'fieldtype': u'Section Break',
- 'label': u'Details',
- 'oldfieldtype': u'Section Break',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'default': u'Draft',
- 'doctype': u'DocField',
- 'fieldname': u'approval_status',
- 'fieldtype': u'Select',
- 'in_filter': 1,
- 'label': u'Approval Status',
- 'no_copy': 1,
- 'oldfieldname': u'approval_status',
- 'oldfieldtype': u'Select',
- 'options': u'\nDraft\nSubmitted\nApproved \nRejected\nCancelled',
- 'permlevel': 1,
- 'search_index': 1
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'employee',
- 'fieldtype': u'Link',
- 'in_filter': 1,
- 'label': u'From Employee',
- 'oldfieldname': u'employee',
- 'oldfieldtype': u'Link',
- 'options': u'Employee',
- 'permlevel': 0,
- 'reqd': 1,
- 'search_index': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'employee_name',
- 'fieldtype': u'Data',
- 'in_filter': 1,
- 'label': u'Employee Name',
- 'oldfieldname': u'employee_name',
- 'oldfieldtype': u'Data',
- 'permlevel': 1,
- 'search_index': 0,
- 'width': u'150px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'fiscal_year',
- 'fieldtype': u'Select',
- 'in_filter': 1,
- 'label': u'Fiscal Year',
- 'oldfieldname': u'fiscal_year',
- 'oldfieldtype': u'Select',
- 'options': u'link:Fiscal Year',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'company',
- 'fieldtype': u'Select',
- 'in_filter': 1,
- 'label': u'Company',
- 'oldfieldname': u'company',
- 'oldfieldtype': u'Link',
- 'options': u'link:Company',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'column_break0',
- 'fieldtype': u'Column Break',
- 'oldfieldtype': u'Column Break',
- 'permlevel': 0,
- 'width': u'50%'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'posting_date',
- 'fieldtype': u'Date',
- 'in_filter': 1,
- 'label': u'Posting Date',
- 'oldfieldname': u'posting_date',
- 'oldfieldtype': u'Date',
- 'permlevel': 0,
- 'reqd': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'exp_approver',
- 'fieldtype': u'Select',
- 'label': u'Approver',
- 'oldfieldname': u'exp_approver',
- 'oldfieldtype': u'Select',
- 'permlevel': 0,
- 'width': u'160px'
- },
-
- # DocField
- {
- 'allow_on_submit': 1,
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'remark',
- 'fieldtype': u'Small Text',
- 'label': u'Remark',
- 'no_copy': 1,
- 'oldfieldname': u'remark',
- 'oldfieldtype': u'Small Text',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'amended_from',
- 'fieldtype': u'Data',
- 'label': u'Amended From',
- 'no_copy': 1,
- 'oldfieldname': u'amended_from',
- 'oldfieldtype': u'Data',
- 'permlevel': 1,
- 'print_hide': 1,
- 'report_hide': 1,
- 'width': u'160px'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'amendment_date',
- 'fieldtype': u'Date',
- 'label': u'Amendment Date',
- 'no_copy': 1,
- 'oldfieldname': u'amendment_date',
- 'oldfieldtype': u'Date',
- 'permlevel': 1,
- 'print_hide': 1,
- 'report_hide': 1,
- 'width': u'160px'
- },
-
- # DocField
- {
- 'allow_on_submit': 1,
- 'doctype': u'DocField',
- 'fieldname': u'approve',
- 'fieldtype': u'Button',
- 'hidden': 1,
- 'label': u'Approve',
- 'oldfieldtype': u'Button',
- 'permlevel': 0,
- 'print_hide': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'allow_on_submit': 1,
- 'doctype': u'DocField',
- 'fieldname': u'reject',
- 'fieldtype': u'Button',
- 'hidden': 1,
- 'label': u'Reject',
- 'oldfieldtype': u'Button',
- 'permlevel': 0,
- 'print_hide': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'expense_details',
- 'fieldtype': u'Section Break',
- 'label': u'Expense Details',
- 'oldfieldtype': u'Section Break',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'allow_on_submit': 1,
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'calculate_total_amount',
- 'fieldtype': u'Button',
- 'label': u'Calculate Total Amount',
- 'oldfieldtype': u'Button',
- 'permlevel': 0,
- 'print_hide': 1,
- 'report_hide': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'total_claimed_amount',
- 'fieldtype': u'Currency',
- 'in_filter': 0,
- 'label': u'Total Claimed Amount',
- 'no_copy': 1,
- 'oldfieldname': u'total_claimed_amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1,
- 'reqd': 0,
- 'width': u'160px'
- },
-
- # DocField
- {
- 'colour': u'White:FFF',
- 'doctype': u'DocField',
- 'fieldname': u'total_sanctioned_amount',
- 'fieldtype': u'Currency',
- 'in_filter': 0,
- 'label': u'Total Sanctioned Amount',
- 'no_copy': 1,
- 'oldfieldname': u'total_sanctioned_amount',
- 'oldfieldtype': u'Currency',
- 'permlevel': 1,
- 'width': u'160px'
- },
-
- # DocField
- {
- 'allow_on_submit': 1,
- 'doctype': u'DocField',
- 'fieldname': u'update_voucher',
- 'fieldtype': u'Button',
- 'hidden': 1,
- 'label': u'Update Voucher',
- 'oldfieldtype': u'Button',
- 'permlevel': 0,
- 'print_hide': 1,
- 'trigger': u'Client'
- },
-
- # DocField
- {
- 'allow_on_submit': 1,
- 'doctype': u'DocField',
- 'fieldname': u'expense_voucher_details',
- 'fieldtype': u'Table',
- 'label': u'Expense Claim Details',
- 'oldfieldname': u'expense_voucher_details',
- 'oldfieldtype': u'Table',
- 'options': u'Expense Claim Detail',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'email_id',
- 'fieldtype': u'Data',
- 'hidden': 1,
- 'label': u'Employees Email Id',
- 'oldfieldname': u'email_id',
- 'oldfieldtype': u'Data',
- 'permlevel': 0,
- 'print_hide': 1
- }
+ {
+ "owner": "harshada@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2012-12-05 14:11:53",
+ "modified_by": "Administrator",
+ "modified": "2012-12-05 14:22:27"
+ },
+ {
+ "is_submittable": 1,
+ "autoname": "EXP.######",
+ "name": "__common__",
+ "default_print_format": "Standard",
+ "search_fields": "approval_status,employee,employee_name",
+ "module": "HR",
+ "doctype": "DocType"
+ },
+ {
+ "name": "__common__",
+ "parent": "Expense Claim",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "parentfield": "fields"
+ },
+ {
+ "name": "__common__",
+ "parent": "Expense Claim",
+ "read": 1,
+ "doctype": "DocPerm",
+ "parenttype": "DocType",
+ "parentfield": "permissions"
+ },
+ {
+ "name": "Expense Claim",
+ "doctype": "DocType"
+ },
+ {
+ "oldfieldtype": "Section Break",
+ "doctype": "DocField",
+ "label": "Details",
+ "fieldname": "details",
+ "fieldtype": "Section Break",
+ "permlevel": 0
+ },
+ {
+ "permlevel": 1,
+ "no_copy": 1,
+ "oldfieldtype": "Select",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Approval Status",
+ "oldfieldname": "approval_status",
+ "default": "Draft",
+ "fieldname": "approval_status",
+ "fieldtype": "Select",
+ "search_index": 1,
+ "options": "\nDraft\nApproved\nRejected",
+ "in_filter": 1
+ },
+ {
+ "oldfieldtype": "Select",
+ "doctype": "DocField",
+ "label": "Approver",
+ "oldfieldname": "exp_approver",
+ "width": "160px",
+ "fieldname": "exp_approver",
+ "fieldtype": "Select",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Date",
+ "doctype": "DocField",
+ "label": "Posting Date",
+ "oldfieldname": "posting_date",
+ "fieldname": "posting_date",
+ "fieldtype": "Date",
+ "reqd": 1,
+ "permlevel": 0,
+ "in_filter": 1
+ },
+ {
+ "oldfieldtype": "Column Break",
+ "doctype": "DocField",
+ "width": "50%",
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Link",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "From Employee",
+ "oldfieldname": "employee",
+ "permlevel": 0,
+ "trigger": "Client",
+ "fieldname": "employee",
+ "fieldtype": "Link",
+ "search_index": 1,
+ "reqd": 1,
+ "options": "Employee",
+ "in_filter": 1
+ },
+ {
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Employee Name",
+ "oldfieldname": "employee_name",
+ "width": "150px",
+ "fieldname": "employee_name",
+ "fieldtype": "Data",
+ "search_index": 0,
+ "permlevel": 1,
+ "in_filter": 1
+ },
+ {
+ "no_copy": 1,
+ "oldfieldtype": "Small Text",
+ "colour": "White:FFF",
+ "allow_on_submit": 0,
+ "doctype": "DocField",
+ "label": "Remark",
+ "oldfieldname": "remark",
+ "fieldname": "remark",
+ "fieldtype": "Small Text",
+ "permlevel": 0
+ },
+ {
+ "print_hide": 1,
+ "no_copy": 1,
+ "oldfieldtype": "Data",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Amended From",
+ "oldfieldname": "amended_from",
+ "width": "160px",
+ "fieldname": "amended_from",
+ "fieldtype": "Data",
+ "permlevel": 1,
+ "report_hide": 1
+ },
+ {
+ "print_hide": 1,
+ "no_copy": 1,
+ "oldfieldtype": "Date",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Amendment Date",
+ "oldfieldname": "amendment_date",
+ "width": "160px",
+ "fieldname": "amendment_date",
+ "fieldtype": "Date",
+ "permlevel": 1,
+ "report_hide": 1
+ },
+ {
+ "oldfieldtype": "Section Break",
+ "doctype": "DocField",
+ "label": "Expense Details",
+ "fieldname": "expense_details",
+ "fieldtype": "Section Break",
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Table",
+ "allow_on_submit": 0,
+ "doctype": "DocField",
+ "label": "Expense Claim Details",
+ "oldfieldname": "expense_voucher_details",
+ "options": "Expense Claim Detail",
+ "fieldname": "expense_voucher_details",
+ "fieldtype": "Table",
+ "permlevel": 0
+ },
+ {
+ "no_copy": 1,
+ "oldfieldtype": "Currency",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Total Claimed Amount",
+ "oldfieldname": "total_claimed_amount",
+ "width": "160px",
+ "fieldname": "total_claimed_amount",
+ "fieldtype": "Currency",
+ "reqd": 0,
+ "permlevel": 1,
+ "in_filter": 0
+ },
+ {
+ "no_copy": 1,
+ "oldfieldtype": "Currency",
+ "colour": "White:FFF",
+ "doctype": "DocField",
+ "label": "Total Sanctioned Amount",
+ "oldfieldname": "total_sanctioned_amount",
+ "width": "160px",
+ "fieldname": "total_sanctioned_amount",
+ "fieldtype": "Currency",
+ "permlevel": 1,
+ "in_filter": 0
+ },
+ {
+ "print_hide": 1,
+ "oldfieldtype": "Data",
+ "doctype": "DocField",
+ "label": "Employees Email Id",
+ "oldfieldname": "email_id",
+ "fieldname": "email_id",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "permlevel": 0
+ },
+ {
+ "oldfieldtype": "Select",
+ "doctype": "DocField",
+ "label": "Fiscal Year",
+ "oldfieldname": "fiscal_year",
+ "options": "link:Fiscal Year",
+ "fieldname": "fiscal_year",
+ "fieldtype": "Select",
+ "reqd": 1,
+ "permlevel": 0,
+ "in_filter": 1
+ },
+ {
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Company",
+ "oldfieldname": "company",
+ "options": "link:Company",
+ "fieldname": "company",
+ "fieldtype": "Select",
+ "reqd": 1,
+ "permlevel": 0,
+ "in_filter": 1
+ },
+ {
+ "create": 1,
+ "doctype": "DocPerm",
+ "write": 1,
+ "role": "Employee",
+ "permlevel": 0,
+ "match": "owner"
+ },
+ {
+ "amend": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "submit": 1,
+ "write": 1,
+ "cancel": 1,
+ "role": "Expense Approver",
+ "permlevel": 0,
+ "match": "exp_approver:user"
+ },
+ {
+ "amend": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "submit": 1,
+ "write": 1,
+ "cancel": 1,
+ "role": "HR User",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocPerm",
+ "role": "All",
+ "permlevel": 1
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/expense_claim_detail/expense_claim_detail.txt b/hr/doctype/expense_claim_detail/expense_claim_detail.txt
index a11ce5c25d..f28811f74a 100644
--- a/hr/doctype/expense_claim_detail/expense_claim_detail.txt
+++ b/hr/doctype/expense_claim_detail/expense_claim_detail.txt
@@ -1,103 +1,80 @@
-# DocType, Expense Claim Detail
[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-03-27 14:35:56',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:56',
- 'modified_by': u'Administrator',
- 'owner': u'harshada@webnotestech.com'
- },
-
- # These values are common for all DocType
- {
- 'colour': u'White:FFF',
- 'doctype': 'DocType',
- 'istable': 1,
- 'module': u'HR',
- 'name': '__common__',
- 'section_style': u'Simple',
- 'server_code_error': u' ',
- 'version': 5
- },
-
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Expense Claim Detail',
- 'parentfield': u'fields',
- 'parenttype': u'DocType',
- 'permlevel': 0
- },
-
- # DocType, Expense Claim Detail
- {
- 'doctype': 'DocType',
- 'name': u'Expense Claim Detail'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'expense_date',
- 'fieldtype': u'Date',
- 'label': u'Expense Date',
- 'oldfieldname': u'expense_date',
- 'oldfieldtype': u'Date',
- 'reqd': 0,
- 'width': u'150px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'expense_type',
- 'fieldtype': u'Link',
- 'label': u'Expense Claim Type',
- 'oldfieldname': u'expense_type',
- 'oldfieldtype': u'Link',
- 'options': u'Expense Claim Type',
- 'reqd': 1,
- 'width': u'150px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'description',
- 'fieldtype': u'Small Text',
- 'label': u'Description',
- 'oldfieldname': u'description',
- 'oldfieldtype': u'Small Text',
- 'width': u'300px'
- },
-
- # DocField
- {
- 'doctype': u'DocField',
- 'fieldname': u'claim_amount',
- 'fieldtype': u'Currency',
- 'label': u'Claim Amount',
- 'oldfieldname': u'claim_amount',
- 'oldfieldtype': u'Currency',
- 'reqd': 1,
- 'trigger': u'Client',
- 'width': u'150px'
- },
-
- # DocField
- {
- 'allow_on_submit': 1,
- 'doctype': u'DocField',
- 'fieldname': u'sanctioned_amount',
- 'fieldtype': u'Currency',
- 'label': u'Sanctioned Amount',
- 'no_copy': 1,
- 'oldfieldname': u'sanctioned_amount',
- 'oldfieldtype': u'Currency',
- 'trigger': u'Client',
- 'width': u'150px'
- }
+ {
+ "owner": "harshada@webnotestech.com",
+ "docstatus": 0,
+ "creation": "2012-07-03 13:30:39",
+ "modified_by": "Administrator",
+ "modified": "2012-12-05 14:22:03"
+ },
+ {
+ "istable": 1,
+ "name": "__common__",
+ "doctype": "DocType",
+ "module": "HR"
+ },
+ {
+ "name": "__common__",
+ "parent": "Expense Claim Detail",
+ "doctype": "DocField",
+ "parenttype": "DocType",
+ "permlevel": 0,
+ "parentfield": "fields"
+ },
+ {
+ "name": "Expense Claim Detail",
+ "doctype": "DocType"
+ },
+ {
+ "oldfieldtype": "Date",
+ "doctype": "DocField",
+ "label": "Expense Date",
+ "oldfieldname": "expense_date",
+ "width": "150px",
+ "fieldname": "expense_date",
+ "fieldtype": "Date",
+ "reqd": 0
+ },
+ {
+ "oldfieldtype": "Link",
+ "doctype": "DocField",
+ "label": "Expense Claim Type",
+ "oldfieldname": "expense_type",
+ "width": "150px",
+ "fieldname": "expense_type",
+ "fieldtype": "Select",
+ "reqd": 1,
+ "options": "link:Expense Claim Type"
+ },
+ {
+ "oldfieldtype": "Small Text",
+ "doctype": "DocField",
+ "label": "Description",
+ "oldfieldname": "description",
+ "width": "300px",
+ "fieldname": "description",
+ "fieldtype": "Small Text"
+ },
+ {
+ "oldfieldtype": "Currency",
+ "doctype": "DocField",
+ "label": "Claim Amount",
+ "oldfieldname": "claim_amount",
+ "width": "150px",
+ "trigger": "Client",
+ "fieldname": "claim_amount",
+ "fieldtype": "Currency",
+ "reqd": 1
+ },
+ {
+ "no_copy": 1,
+ "oldfieldtype": "Currency",
+ "allow_on_submit": 0,
+ "doctype": "DocField",
+ "label": "Sanctioned Amount",
+ "oldfieldname": "sanctioned_amount",
+ "width": "150px",
+ "trigger": "Client",
+ "fieldname": "sanctioned_amount",
+ "fieldtype": "Currency"
+ }
]
\ No newline at end of file
diff --git a/hr/doctype/leave_application/leave_application.js b/hr/doctype/leave_application/leave_application.js
index 00df476ede..2d71aac0e7 100755
--- a/hr/doctype/leave_application/leave_application.js
+++ b/hr/doctype/leave_application/leave_application.js
@@ -8,14 +8,23 @@
//
// 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
+// 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 ')
- .insertAfter($(wn.pages.users).find('.help'));
- if(wn.boot.max_users) {
- $sub_info.append(repl('\
- \
- Max Users: %(max_users)s \
- ', { max_users: wn.boot.max_users }));
- }
- if(wn.boot.expires_on) {
- $sub_info.append(repl('\
- \
- Expires On: %(expires_on)s \
- ', { expires_on: dateutil.str_to_user(wn.boot.expires_on) }));
- }
- }
- },
- render: function(data) {
- if(data.file_list) {
- data.imgsrc = 'files/' + data.file_list.split('\n')[0].split(',')[1];
- } else {
- data.imgsrc = 'lib/images/ui/no_img_' + (data.gender=='Female' ? 'f' : 'm') + '.gif';
- }
- data.fullname = wn.user_info(data.name).fullname;
- data.delete_html = '';
- if(!data.enabled)
- data.delete_html = '×';
-
- $(wn.pages.users).find('.layout-main').append(repl('
\ - So, to add more users, you can:
\ - 1. Upgrade to the unlimited users plan, or
\ - 2. Disable one or more of your existing users and try again", - {active_users: active_users.length})); - return; - } - var d = new wn.ui.Dialog({ - title: 'Add User', - width: 400, - fields: [{ - fieldtype: 'Data', fieldname: 'user', reqd: 1, - label: 'Email Id of the user to add' - }, { - fieldtype: 'Data', fieldname: 'first_name', reqd: 1, label: 'First Name' - }, { - fieldtype: 'Data', fieldname: 'last_name', label: 'Last Name' - }, { - fieldtype: 'Data', fieldname: 'password', reqd: 1, label: 'Password' - }, { - fieldtype: 'Button', label: 'Add', fieldname: 'add' - }] - }); - - d.make(); - d.fields_dict.add.input.onclick = function() { - v = d.get_values(); - if(v) { - d.fields_dict.add.input.set_working(); - $c_page('utilities', 'users', 'add_user', v, function(r,rt) { - if(r.exc) { msgprint(r.exc); return; } - else { - wn.boot.user_info[v.user] = {fullname:v.first_name + ' ' + (v.last_name || '')}; - d.hide(); - me.refresh(); - } - }) - } - } - d.show(); - } -}); - -erpnext.RoleEditor = Class.extend({ - init: function() { - this.dialog = new wn.ui.Dialog({ - title: 'Set Roles' - }); - var me = this; - $(this.dialog.body).html('
');
- for(var i in r.message) {
- var perm = r.message[i];
-
- // if permission -> icon
- for(key in perm) {
- if(key!='parent' && key!='permlevel') {
- if(perm[key]) {
- perm[key] = '';
- } else {
- perm[key] = '';
- }
- }
- }
-
- $body.find('tbody').append(repl('\
- %(parent)s \
- %(permlevel)s \
- %(read)s \
- %(write)s \
- %(submit)s \
- %(cancel)s \
- %(amend)s \
- ', perm))
- }
-
- me.perm_dialog.show();
- }
- });
-
- },
- make_perm_dialog: function() {
- this.perm_dialog = new wn.ui.Dialog({
- title:'Role Permissions',
- width: 500
- });
- }
-})
diff --git a/utilities/page/users/users.py b/utilities/page/users/users.py
deleted file mode 100644
index 9878d3ca7c..0000000000
--- a/utilities/page/users/users.py
+++ /dev/null
@@ -1,202 +0,0 @@
-# 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
\ - You already have %(active_users)s active users, \ - which is the maximum number that you are currently allowed to add.
\ - So, to add more users, you can:
\ - 1. Upgrade to the unlimited users plan, or
\ - 2. Disable one or more of your existing users and try again""" \ - % {'active_users': active_users}, raise_exception=1) - - if not email: - email = webnotes.form_dict.get('user') - if not validate_email_add(email): - raise Exception - return 'Invalid Email Id' - - if sql("select name from tabProfile where name = %s", email): - # exists, enable it - sql("update tabProfile set enabled = 1, docstatus=0 where name = %s", email) - webnotes.msgprint('Profile exists, enabled it with new password') - else: - # does not exist, create it! - pr = Document('Profile') - pr.name = email - pr.email = email - pr.first_name = args.get('first_name') - pr.last_name = args.get('last_name') - pr.enabled = 1 - pr.user_type = 'System User' - pr.save(1) - - if args.get('password'): - sql(""" - UPDATE tabProfile - SET password = PASSWORD(%s), modified = %s - WHERE name = %s""", (args.get('password'), now, email)) - - send_welcome_mail(email, args) - -@webnotes.whitelist() -def send_welcome_mail(email, args): - """send welcome mail to user with password and login url""" - pr = Document('Profile', email) - from webnotes.utils.email_lib import sendmail_md - args.update({ - 'company': webnotes.conn.get_default('company'), - 'password': args.get('password'), - 'account_url': webnotes.conn.get_value('Website Settings', - 'Website Settings', 'subdomain') or "" - }) - if not args.get('last_name'): args['last_name'] = '' - sendmail_md(pr.email, subject="Welcome to ERPNext", msg=welcome_txt % args) - -# -# delete user -# -@webnotes.whitelist() -def delete(arg=None): - """delete user""" - webnotes.conn.sql("update tabProfile set enabled=0, docstatus=2 where name=%s", - webnotes.form_dict['uid']) - webnotes.login_manager.logout(user=webnotes.form_dict['uid']) - -welcome_txt = """ -## %(company)s - -Dear %(first_name)s %(last_name)s - -Welcome! - -A new account has been created for you, here are your details: - -login-id: %(user)s -password: %(password)s - -To login to your new ERPNext account, please go to: - -%(account_url)s -""" diff --git a/utilities/page/users/users.txt b/utilities/page/users/users.txt deleted file mode 100644 index 165cc1695b..0000000000 --- a/utilities/page/users/users.txt +++ /dev/null @@ -1,28 +0,0 @@ -# Page, users -[ - - # These values are common in all dictionaries - { - 'creation': '2012-02-28 10:29:39', - 'docstatus': 0, - 'modified': '2012-02-28 10:29:39', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all Page - { - 'doctype': 'Page', - 'module': u'Utilities', - 'name': '__common__', - 'page_name': u'users', - 'standard': u'Yes', - 'title': u'Users' - }, - - # Page, users - { - 'doctype': 'Page', - 'name': u'users' - } -] \ No newline at end of file
\
- %(delete_html)s\
- s)
\
- \
-
', data));
-
- if(!data.enabled) {
- $(wn.pages.users).find('.layout-main .user-card:last')
- .addClass('disabled')
- .find('.user-fullname').html('Disabled');
- }
- },
- show_settings: function(uid) {
- var me = wn.pages.users;
- if(!me.settings_dialog)
- me.make_settings_dialog();
-
- var p = me.profiles[uid];
- me.uid = uid;
-
- me.settings_dialog.set_values({
- restrict_ip: p.restrict_ip || '',
- login_before: p.login_before || '',
- login_after: p.login_after || '',
- enabled: p.enabled || 0,
- new_password: ''
- });
-
- me.settings_dialog.show();
-
- },
- make_settings_dialog: function() {
- var me = wn.pages.users;
- me.settings_dialog = new wn.ui.Dialog({
- title: 'Set User Security',
- width: 500,
- fields: [
- {
- label:'Enabled',
- description: 'Uncheck to disable',
- fieldtype: 'Check', fieldname: 'enabled'
- },
- {
- label:'IP Address',
- description: 'Restrict user login by IP address, partial ips (111.111.111), \
- multiple addresses (separated by commas) allowed',
- fieldname:'restrict_ip', fieldtype:'Data'
- },
- {
- label:'Login After',
- description: 'User can only login after this hour (0-24)',
- fieldtype: 'Int', fieldname: 'login_after'
- },
- {
- label:'Login Before',
- description: 'User can only login before this hour (0-24)',
- fieldtype: 'Int', fieldname: 'login_before'
- },
- {
- label:'New Password',
- description: 'Update the current user password',
- fieldtype: 'Data', fieldname: 'new_password'
- },
- {
- label:'Update', fieldtype:'Button', fieldname:'update'
- }
- ]
- });
-
- this.settings_dialog.fields_dict.update.input.onclick = function() {
- var btn = this;
- var args = me.settings_dialog.get_values();
- args.user = me.uid;
-
- if (args.new_password) {
- me.get_password(btn, args);
- } else {
- me.update_security(btn, args);
- }
- };
-
- },
- update_security: function(btn, args) {
- var me = wn.pages.users;
- $(btn).set_working();
- $c_page('utilities', 'users', 'update_security', JSON.stringify(args), function(r,rt) {
- $(btn).done_working();
- if(r.exc) {
- msgprint(r.exc);
- return;
- }
- me.settings_dialog.hide();
- $.extend(me.profiles[me.uid], me.settings_dialog.get_values());
- me.refresh();
- });
- },
- get_password: function(btn, args) {
- var me = wn.pages.users;
- var pass_d = new wn.ui.Dialog({
- title: 'Your Password',
- width: 300,
- fields: [
- {
- label: 'Please Enter Your Password',
- description: "Your password is required to update the user's password",
- fieldtype: 'Password', fieldname: 'sys_admin_pwd', reqd: 1
- },
- {
- label: 'Continue', fieldtype: 'Button', fieldname: 'continue'
- }
- ]
- });
-
- pass_d.fields_dict.continue.input.onclick = function() {
- btn.pwd_dialog.hide();
- args.sys_admin_pwd = btn.pwd_dialog.get_values().sys_admin_pwd;
- btn.set_working();
- me.update_security(btn, args);
- btn.done_working();
- }
-
- pass_d.show();
- btn.pwd_dialog = pass_d;
- btn.done_working();
- },
- add_user: function() {
- var me = wn.pages.users;
- var active_users = $('.user-card:not(.disabled)');
- if(wn.boot.max_users && (active_users.length >= wn.boot.max_users)) {
- msgprint(repl("You already have %(active_users)s active users, \
- which is the maximum number that you are currently allowed to add. \ - So, to add more users, you can:
\ - 1. Upgrade to the unlimited users plan, or
\ - 2. Disable one or more of your existing users and try again", - {active_users: active_users.length})); - return; - } - var d = new wn.ui.Dialog({ - title: 'Add User', - width: 400, - fields: [{ - fieldtype: 'Data', fieldname: 'user', reqd: 1, - label: 'Email Id of the user to add' - }, { - fieldtype: 'Data', fieldname: 'first_name', reqd: 1, label: 'First Name' - }, { - fieldtype: 'Data', fieldname: 'last_name', label: 'Last Name' - }, { - fieldtype: 'Data', fieldname: 'password', reqd: 1, label: 'Password' - }, { - fieldtype: 'Button', label: 'Add', fieldname: 'add' - }] - }); - - d.make(); - d.fields_dict.add.input.onclick = function() { - v = d.get_values(); - if(v) { - d.fields_dict.add.input.set_working(); - $c_page('utilities', 'users', 'add_user', v, function(r,rt) { - if(r.exc) { msgprint(r.exc); return; } - else { - wn.boot.user_info[v.user] = {fullname:v.first_name + ' ' + (v.last_name || '')}; - d.hide(); - me.refresh(); - } - }) - } - } - d.show(); - } -}); - -erpnext.RoleEditor = Class.extend({ - init: function() { - this.dialog = new wn.ui.Dialog({ - title: 'Set Roles' - }); - var me = this; - $(this.dialog.body).html('
Loading...
')
- wn.call({
- method:'utilities.page.users.users.get_roles',
- callback: function(r) {
- me.roles = r.message;
- me.show_roles();
- }
- });
- },
- show_roles: function() {
- var me = this;
- $(this.dialog.body).empty();
- for(var i in this.roles) {
- $(this.dialog.body).append(repl('', {role: this.roles[i]}));
- }
- $(this.dialog.body).append('\
-
');
- $(this.dialog.body).find('button.btn-info').click(function() {
- me.save();
- });
- $(this.dialog.body).find('.user-role a').click(function() {
- me.show_permissions($(this).parent().attr('data-user-role'))
- return false;
- })
- },
- show: function(uid) {
- var me = this;
- this.uid = uid;
- this.dialog.show();
- // set user roles
- wn.call({
- method:'utilities.page.users.users.get_user_roles',
- args: {uid:uid},
- callback: function(r, rt) {
- $(me.dialog.body).find('input[type="checkbox"]').attr('checked', false);
- for(var i in r.message) {
- $(me.dialog.body)
- .find('[data-user-role="'+r.message[i]
- +'"] input[type="checkbox"]').attr('checked',true);
- }
- }
- })
- },
- save: function() {
- var set_roles = [];
- var unset_roles = [];
- $(this.dialog.body).find('[data-user-role]').each(function() {
- var $check = $(this).find('input[type="checkbox"]');
- if($check.attr('checked')) {
- set_roles.push($(this).attr('data-user-role'));
- } else {
- unset_roles.push($(this).attr('data-user-role'));
- }
- })
- wn.call({
- method:'utilities.page.users.users.update_roles',
- args: {
- set_roles: JSON.stringify(set_roles),
- unset_roles: JSON.stringify(unset_roles),
- uid: this.uid
- },
- btn: $(this.dialog.body).find('.btn-info').get(0),
- callback: function() {
-
- }
- })
- },
- show_permissions: function(role) {
- // show permissions for a role
- var me = this;
- if(!this.perm_dialog)
- this.make_perm_dialog()
- $(this.perm_dialog.body).empty();
- wn.call({
- method:'utilities.page.users.users.get_perm_info',
- args: {role: role},
- callback: function(r) {
- var $body = $(me.perm_dialog.body);
- $body.append('| Document Type | \ -Level | \ -Read | \ -Write | \ -Submit | \ -Cancel | \ -Amend |
|---|
\ - You already have %(active_users)s active users, \ - which is the maximum number that you are currently allowed to add.
\ - So, to add more users, you can:
\ - 1. Upgrade to the unlimited users plan, or
\ - 2. Disable one or more of your existing users and try again""" \ - % {'active_users': active_users}, raise_exception=1) - - if not email: - email = webnotes.form_dict.get('user') - if not validate_email_add(email): - raise Exception - return 'Invalid Email Id' - - if sql("select name from tabProfile where name = %s", email): - # exists, enable it - sql("update tabProfile set enabled = 1, docstatus=0 where name = %s", email) - webnotes.msgprint('Profile exists, enabled it with new password') - else: - # does not exist, create it! - pr = Document('Profile') - pr.name = email - pr.email = email - pr.first_name = args.get('first_name') - pr.last_name = args.get('last_name') - pr.enabled = 1 - pr.user_type = 'System User' - pr.save(1) - - if args.get('password'): - sql(""" - UPDATE tabProfile - SET password = PASSWORD(%s), modified = %s - WHERE name = %s""", (args.get('password'), now, email)) - - send_welcome_mail(email, args) - -@webnotes.whitelist() -def send_welcome_mail(email, args): - """send welcome mail to user with password and login url""" - pr = Document('Profile', email) - from webnotes.utils.email_lib import sendmail_md - args.update({ - 'company': webnotes.conn.get_default('company'), - 'password': args.get('password'), - 'account_url': webnotes.conn.get_value('Website Settings', - 'Website Settings', 'subdomain') or "" - }) - if not args.get('last_name'): args['last_name'] = '' - sendmail_md(pr.email, subject="Welcome to ERPNext", msg=welcome_txt % args) - -# -# delete user -# -@webnotes.whitelist() -def delete(arg=None): - """delete user""" - webnotes.conn.sql("update tabProfile set enabled=0, docstatus=2 where name=%s", - webnotes.form_dict['uid']) - webnotes.login_manager.logout(user=webnotes.form_dict['uid']) - -welcome_txt = """ -## %(company)s - -Dear %(first_name)s %(last_name)s - -Welcome! - -A new account has been created for you, here are your details: - -login-id: %(user)s -password: %(password)s - -To login to your new ERPNext account, please go to: - -%(account_url)s -""" diff --git a/utilities/page/users/users.txt b/utilities/page/users/users.txt deleted file mode 100644 index 165cc1695b..0000000000 --- a/utilities/page/users/users.txt +++ /dev/null @@ -1,28 +0,0 @@ -# Page, users -[ - - # These values are common in all dictionaries - { - 'creation': '2012-02-28 10:29:39', - 'docstatus': 0, - 'modified': '2012-02-28 10:29:39', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all Page - { - 'doctype': 'Page', - 'module': u'Utilities', - 'name': '__common__', - 'page_name': u'users', - 'standard': u'Yes', - 'title': u'Users' - }, - - # Page, users - { - 'doctype': 'Page', - 'name': u'users' - } -] \ No newline at end of file