nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 23:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

merged with master

Browse Source
This commit is contained in:
Nabin Hait
2012-12-14 10:43:56 +05:30
parent df011dbfa5 72d2a627f5
commit f8de5b9878
67 changed files with 447 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,23 +2,18 @@
{
"owner": "ashwini@webnotestech.com",
"docstatus": 0,
"creation": "2012-03-27 14:35:53",
"creation": "2012-07-03 13:30:41",
"modified_by": "Administrator",
"modified": "2012-03-27 14:45:46"
"modified": "2012-12-13 14:23:24"
},
{
"section_style": "Simple",
"is_submittable": 1,
"autoname": "naming_series:",
"name": "__common__",
"search_fields": "employee, employee_name, att_date, status",
"module": "HR",
"doctype": "DocType",
"server_code_error": " ",
"document_type": "Master",
"name": "__common__",
"colour": "White:FFF",
"_last_update": "1317365120",
"show_in_menu": 0,
"version": 75
"document_type": "Master"
},
{
"name": "__common__",
@@ -30,12 +25,11 @@
{
"name": "__common__",
"parent": "Attendance",
"amend": 0,
"read": 1,
"create": 1,
"submit": 1,
"doctype": "DocPerm",
"write": 1,
"read": 1,
"parenttype": "DocType",
"cancel": 1,
"permlevel": 0,
@@ -45,26 +39,14 @@
"name": "Attendance",
"doctype": "DocType"
},
{
"role": "System Manager",
"doctype": "DocPerm"
},
{
"role": "HR User",
"doctype": "DocPerm"
},
{
"role": "HR Manager",
"doctype": "DocPerm"
},
{
"oldfieldtype": "Section Break",
"doctype": "DocField",
"label": "Attendance Details",
"permlevel": 0,
"options": "Simple",
"fieldname": "attendance_details",
"fieldtype": "Section Break",
"options": "Simple"
"permlevel": 0
},
{
"no_copy": 1,
@@ -72,25 +54,23 @@
"doctype": "DocField",
"label": "Naming Series",
"oldfieldname": "naming_series",
"permlevel": 0,
"options": "ATT",
"fieldname": "naming_series",
"fieldtype": "Select",
"reqd": 1,
"options": "ATT"
"permlevel": 0
},
{
"oldfieldtype": "Link",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Employee",
"oldfieldname": "employee",
"permlevel": 0,
"trigger": "Client",
"options": "Employee",
"fieldname": "employee",
"fieldtype": "Link",
"search_index": 1,
"reqd": 1,
"options": "Employee",
"permlevel": 0,
"in_filter": 1
},
{
@@ -105,7 +85,6 @@
{
"no_copy": 1,
"oldfieldtype": "Select",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Status",
"oldfieldname": "status",
@@ -120,7 +99,6 @@
{
"print_hide": 1,
"oldfieldtype": "Link",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Leave Type",
"oldfieldname": "leave_type",
@@ -140,13 +118,13 @@
"permlevel": 0
},
{
"search_index": 0,
"oldfieldtype": "Date",
"doctype": "DocField",
"label": "Attendance Date",
"oldfieldname": "att_date",
"fieldname": "att_date",
"fieldtype": "Date",
"oldfieldtype": "Date",
"search_index": 0,
"reqd": 1,
"permlevel": 0,
"in_filter": 1
@@ -156,11 +134,11 @@
"doctype": "DocField",
"label": "Fiscal Year",
"oldfieldname": "fiscal_year",
"permlevel": 0,
"options": "\n2012\n2013",
"fieldname": "fiscal_year",
"fieldtype": "Select",
"reqd": 1,
"options": "link:Fiscal Year",
"permlevel": 0,
"in_filter": 1
},
{
@@ -168,11 +146,11 @@
"doctype": "DocField",
"label": "Company",
"oldfieldname": "company",
"permlevel": 0,
"options": "\nAlpha\nBeta\nDemo Company",
"fieldname": "company",
"fieldtype": "Select",
"reqd": 1,
"options": "link:Company",
"permlevel": 0,
"in_filter": 1
},
{
@@ -191,9 +169,21 @@
"no_copy": 1,
"doctype": "DocField",
"label": "Amended From",
"permlevel": 1,
"options": "Attendance",
"fieldname": "amended_from",
"fieldtype": "Link",
"options": "Sales Invoice"
"permlevel": 1
},
{
"role": "HR User",
"doctype": "DocPerm"
},
{
"role": "HR Manager",
"doctype": "DocPerm"
},
{
"role": "System Manager",
"doctype": "DocPerm"
}
]

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

@@ -53,7 +53,7 @@ cur_frm.cscript['Make Salary Structure']=function(){
}
cur_frm.cscript.make_salary_structure = function(doc,dt,dn,det){
var st = LocalDB.create('Salary Structure');
var st = wn.model.make_new_doc_and_get_name('Salary Structure');
st = locals['Salary Structure'][st];
st.employee = doc.name;
st.employee_name = doc.employee_name;

8
hr/doctype/expense_claim/expense_claim.py
View File

@@ -20,6 +20,7 @@ import webnotes
from webnotes.utils import add_days
from webnotes.model.wrapper import getlist
from webnotes import form, msgprint
from webnotes.model.code import get_obj
sql = webnotes.conn.sql
@@ -36,8 +37,8 @@ class DocType:
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)
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)
@@ -57,5 +58,6 @@ 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.")
webnotes.msgprint("No Expense Approvers. Please assign 'Expense Approver' \
Role to atleast one user.")
return roles

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

@@ -24,7 +24,7 @@ cur_frm.cscript.onload = function(doc,dt,dn){
// Validation For To Date
// ================================================================================================
cur_frm.cscript.to_date = function(doc, cdt, cdn) {
$c('runserverobj', args={'method':'to_date_validation','docs':compress_doclist(make_doclist(doc.doctype, doc.name))},
$c('runserverobj', args={'method':'to_date_validation','docs':wn.model.compress(make_doclist(doc.doctype, doc.name))},
function(r, rt) {
var doc = locals[cdt][cdn];
if (r.message) {

10
hr/doctype/salary_manager/salary_manager.js
View File

@@ -28,7 +28,7 @@ cur_frm.cscript.create_salary_slip = function(doc, cdt, cdn) {
if (r.message)
display_activity_log(r.message);
}
$c('runserverobj', args={'method':'create_sal_slip','docs':compress_doclist(make_doclist (cdt, cdn))},callback);
$c('runserverobj', args={'method':'create_sal_slip','docs':wn.model.compress(make_doclist (cdt, cdn))},callback);
}
@@ -42,7 +42,7 @@ cur_frm.cscript.submit_salary_slip = function(doc, cdt, cdn) {
if (r.message)
display_activity_log(r.message);
}
$c('runserverobj', args={'method':'submit_salary_slip','docs':compress_doclist(make_doclist (cdt, cdn))},callback);
$c('runserverobj', args={'method':'submit_salary_slip','docs':wn.model.compress(make_doclist (cdt, cdn))},callback);
}
}
@@ -59,7 +59,7 @@ cur_frm.cscript.make_bank_voucher = function(doc,cdt,cdn){
//-----------------------
cur_frm.cscript.make_jv = function(doc, dt, dn) {
var call_back = function(r,rt){
var jv = LocalDB.create('Journal Voucher');
var jv = wn.model.make_new_doc_and_get_name('Journal Voucher');
jv = locals['Journal Voucher'][jv];
jv.voucher_type = 'Bank Voucher';
jv.user_remark = 'Payment of salary for the month: ' + doc.month + 'and fiscal year: ' + doc.fiscal_year;
@@ -68,12 +68,12 @@ cur_frm.cscript.make_jv = function(doc, dt, dn) {
jv.posting_date = dateutil.obj_to_str(new Date());
// credit to bank
var d1 = LocalDB.add_child(jv, 'Journal Voucher Detail', 'entries');
var d1 = wn.model.add_child(jv, 'Journal Voucher Detail', 'entries');
d1.account = r.message['default_bank_account'];
d1.credit = r.message['amount']
// debit to salary account
var d2 = LocalDB.add_child(jv, 'Journal Voucher Detail', 'entries');
var d2 = wn.model.add_child(jv, 'Journal Voucher Detail', 'entries');
d2.account = r.message['default_salary_account'];
d2.debit = r.message['amount']

4
hr/doctype/salary_structure/salary_structure.js
View File

@@ -42,9 +42,9 @@ cur_frm.cscript['Make Salary Slip'] = function(){
var doc = cur_frm.doc;
var callback = function(r,rt){
ret = r.message;
n = createLocal("Salary Slip");
n = wn.model.make_new_doc_and_get_name("Salary Slip");
$c('dt_map', args={
'docs':compress_doclist([locals["Salary Slip"][n]]),
'docs':wn.model.compress([locals["Salary Slip"][n]]),
'from_doctype':'Salary Structure',
'to_doctype':'Salary Slip',
'from_docname':doc.name,