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

merge conflict fixed

Browse Source
This commit is contained in:
Akhilesh Darjee
2014-01-27 15:42:02 +05:30
parent 2a79b00700 3f8f4ff6cd
commit 86894f3bbf
182 changed files with 1768 additions and 985 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/hr/doctype/appraisal/appraisal.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:12",
"docstatus": 0,
"modified": "2013-12-20 19:23:55",
"modified": "2014-01-22 16:05:34",
"modified_by": "Administrator",
"owner": "ashwini@webnotestech.com"
},
@@ -230,14 +230,17 @@
"width": "150px"
},
{
"cancel": 0,
"delete": 0,
"doctype": "DocPerm",
"match": "owner",
"restricted": 1,
"role": "Employee",
"submit": 0
},
{
"amend": 1,
"cancel": 1,
"delete": 1,
"doctype": "DocPerm",
"role": "System Manager",
"submit": 1
@@ -245,6 +248,7 @@
{
"amend": 1,
"cancel": 1,
"delete": 1,
"doctype": "DocPerm",
"role": "HR User",
"submit": 1

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

@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:13",
"docstatus": 0,
"modified": "2013-12-20 19:23:55",
"modified": "2014-01-20 17:48:23",
"modified_by": "Administrator",
"owner": "ashwini@webnotestech.com"
},
@@ -28,6 +28,7 @@
{
"cancel": 1,
"create": 1,
"delete": 1,
"doctype": "DocPerm",
"email": 1,
"name": "__common__",

5
erpnext/hr/doctype/branch/branch.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:13",
"docstatus": 0,
"modified": "2013-12-20 19:23:57",
"modified": "2014-01-20 17:48:26",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -25,8 +25,9 @@
"permlevel": 0
},
{
"cancel": 1,
"cancel": 0,
"create": 1,
"delete": 1,
"doctype": "DocPerm",
"email": 1,
"name": "__common__",

5
erpnext/hr/doctype/deduction_type/deduction_type.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-22 16:50:30",
"docstatus": 0,
"modified": "2013-12-20 19:24:02",
"modified": "2014-01-20 17:48:34",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -25,8 +25,9 @@
"permlevel": 0
},
{
"cancel": 1,
"cancel": 0,
"create": 1,
"delete": 1,
"doctype": "DocPerm",
"email": 1,
"name": "__common__",

5
erpnext/hr/doctype/department/department.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-02-05 11:48:26",
"docstatus": 0,
"modified": "2013-12-20 19:24:04",
"modified": "2014-01-20 17:48:38",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -24,8 +24,9 @@
"permlevel": 0
},
{
"cancel": 1,
"cancel": 0,
"create": 1,
"delete": 1,
"doctype": "DocPerm",
"email": 1,
"name": "__common__",

5
erpnext/hr/doctype/designation/designation.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:13",
"docstatus": 0,
"modified": "2013-12-20 19:24:04",
"modified": "2014-01-20 17:48:38",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -25,8 +25,9 @@
"permlevel": 0
},
{
"cancel": 1,
"cancel": 0,
"create": 1,
"delete": 1,
"doctype": "DocPerm",
"email": 1,
"name": "__common__",

5
erpnext/hr/doctype/earning_type/earning_type.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-24 11:03:32",
"docstatus": 0,
"modified": "2013-12-20 19:24:05",
"modified": "2014-01-20 17:48:38",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -25,8 +25,9 @@
"permlevel": 0
},
{
"cancel": 1,
"cancel": 0,
"create": 1,
"delete": 1,
"doctype": "DocPerm",
"email": 1,
"name": "__common__",

9
erpnext/hr/doctype/employee/employee.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 09:04:18",
"docstatus": 0,
"modified": "2013-12-23 19:35:27",
"modified": "2014-01-20 17:48:40",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -28,6 +28,7 @@
},
{
"amend": 0,
"cancel": 0,
"doctype": "DocPerm",
"email": 1,
"name": "__common__",
@@ -750,23 +751,23 @@
"read_only": 1
},
{
"cancel": 0,
"create": 0,
"delete": 0,
"doctype": "DocPerm",
"role": "Employee",
"write": 0
},
{
"cancel": 1,
"create": 1,
"delete": 1,
"doctype": "DocPerm",
"restrict": 0,
"role": "HR User",
"write": 1
},
{
"cancel": 1,
"create": 1,
"delete": 1,
"doctype": "DocPerm",
"restrict": 1,
"role": "HR Manager",

5
erpnext/hr/doctype/employment_type/employment_type.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:14",
"docstatus": 0,
"modified": "2013-12-20 19:24:07",
"modified": "2014-01-20 17:48:43",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -24,8 +24,9 @@
"permlevel": 0
},
{
"cancel": 1,
"cancel": 0,
"create": 1,
"delete": 1,
"doctype": "DocPerm",
"email": 1,
"name": "__common__",

7
erpnext/hr/doctype/expense_claim/expense_claim.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:14",
"docstatus": 0,
"modified": "2013-12-20 19:24:07",
"modified": "2014-01-22 16:05:34",
"modified_by": "Administrator",
"owner": "harshada@webnotestech.com"
},
@@ -221,13 +221,15 @@
"width": "160px"
},
{
"delete": 0,
"doctype": "DocPerm",
"match": "owner",
"restricted": 1,
"role": "Employee"
},
{
"amend": 1,
"cancel": 1,
"delete": 1,
"doctype": "DocPerm",
"role": "Expense Approver",
"submit": 1
@@ -235,6 +237,7 @@
{
"amend": 1,
"cancel": 1,
"delete": 1,
"doctype": "DocPerm",
"role": "HR User",
"submit": 1

5
erpnext/hr/doctype/grade/grade.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:14",
"docstatus": 0,
"modified": "2013-12-20 19:24:08",
"modified": "2014-01-20 17:48:46",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -30,8 +30,9 @@
"reqd": 1
},
{
"cancel": 1,
"cancel": 0,
"create": 1,
"delete": 1,
"doctype": "DocPerm",
"email": 1,
"name": "__common__",

5
erpnext/hr/doctype/holiday_list/holiday_list.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:14",
"docstatus": 0,
"modified": "2013-12-20 19:24:08",
"modified": "2014-01-20 17:48:46",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -23,8 +23,9 @@
"permlevel": 0
},
{
"cancel": 1,
"cancel": 0,
"create": 1,
"delete": 1,
"doctype": "DocPerm",
"email": 1,
"name": "__common__",

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

@@ -2,7 +2,7 @@
{
"creation": "2013-01-29 19:25:37",
"docstatus": 0,
"modified": "2013-12-20 19:24:10",
"modified": "2014-01-20 17:48:50",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -27,6 +27,7 @@
{
"cancel": 1,
"create": 1,
"delete": 1,
"doctype": "DocPerm",
"email": 1,
"name": "__common__",

3
erpnext/hr/doctype/job_opening/job_opening.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-15 16:13:36",
"docstatus": 0,
"modified": "2013-12-20 19:24:11",
"modified": "2014-01-20 17:48:51",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -26,6 +26,7 @@
{
"cancel": 1,
"create": 1,
"delete": 1,
"doctype": "DocPerm",
"email": 1,
"name": "__common__",

5
erpnext/hr/doctype/leave_allocation/leave_allocation.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-02-20 19:10:38",
"docstatus": 0,
"modified": "2013-12-20 19:24:12",
"modified": "2014-01-22 16:05:35",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -28,6 +28,7 @@
"amend": 1,
"cancel": 1,
"create": 1,
"delete": 1,
"doctype": "DocPerm",
"email": 1,
"name": "__common__",
@@ -170,7 +171,7 @@
},
{
"doctype": "DocPerm",
"match": "owner",
"restricted": 1,
"role": "HR User"
},
{

8
erpnext/hr/doctype/leave_application/leave_application.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-02-20 11:18:11",
"docstatus": 0,
"modified": "2013-12-23 19:53:41",
"modified": "2014-01-20 17:48:55",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -230,6 +230,7 @@
},
{
"create": 1,
"delete": 0,
"doctype": "DocPerm",
"email": 1,
"permlevel": 0,
@@ -242,6 +243,7 @@
"amend": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"doctype": "DocPerm",
"permlevel": 1,
"role": "All",
@@ -251,6 +253,7 @@
"amend": 1,
"cancel": 1,
"create": 1,
"delete": 1,
"doctype": "DocPerm",
"email": 1,
"permlevel": 0,
@@ -265,6 +268,7 @@
"amend": 1,
"cancel": 0,
"create": 0,
"delete": 0,
"doctype": "DocPerm",
"email": 1,
"permlevel": 0,
@@ -278,6 +282,7 @@
"amend": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"doctype": "DocPerm",
"permlevel": 1,
"report": 1,
@@ -289,6 +294,7 @@
"amend": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"doctype": "DocPerm",
"permlevel": 1,
"report": 1,

5
erpnext/hr/doctype/leave_type/leave_type.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-02-21 09:55:58",
"docstatus": 0,
"modified": "2013-12-20 19:24:13",
"modified": "2014-01-20 17:48:56",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -24,8 +24,9 @@
"permlevel": 0
},
{
"cancel": 1,
"cancel": 0,
"create": 1,
"delete": 1,
"doctype": "DocPerm",
"email": 1,
"name": "__common__",

2
erpnext/hr/doctype/salary_manager/salary_manager.js
View File

@@ -43,7 +43,7 @@ cur_frm.cscript.make_jv = function(doc, dt, dn) {
jv = locals['Journal Voucher'][jv];
jv.voucher_type = 'Bank Voucher';
jv.user_remark = wn._('Payment of salary for the month: ') + doc.month +
wn._('and fiscal year: ') + doc.fiscal_year;
wn._(' and fiscal year: ') + doc.fiscal_year;
jv.fiscal_year = doc.fiscal_year;
jv.company = doc.company;
jv.posting_date = dateutil.obj_to_str(new Date());

4
erpnext/hr/doctype/salary_slip/salary_slip.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:15",
"docstatus": 0,
"modified": "2013-12-20 19:24:27",
"modified": "2014-01-20 17:49:18",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -390,12 +390,14 @@
},
{
"amend": 0,
"delete": 0,
"doctype": "DocPerm",
"role": "HR User"
},
{
"amend": 1,
"cancel": 1,
"delete": 1,
"doctype": "DocPerm",
"role": "HR Manager"
}

2
erpnext/hr/report/monthly_salary_register/monthly_salary_register.js
View File

@@ -7,7 +7,7 @@ wn.query_reports["Monthly Salary Register"] = {
"fieldname":"month",
"label": wn._("Month"),
"fieldtype": "Select",
"options": "Jan\nFeb\nMar\nApr\nMay\nJun\nJul\nAug\nSep\nOct\nNov\nDec",
"options": "\nJan\nFeb\nMar\nApr\nMay\nJun\nJul\nAug\nSep\nOct\nNov\nDec",
"default": ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov",
"Dec"][wn.datetime.str_to_obj(wn.datetime.get_today()).getMonth()],
},

10
erpnext/hr/report/monthly_salary_register/monthly_salary_register.py
View File

@@ -50,17 +50,17 @@ def get_columns(salary_slips):
where ifnull(d_modified_amount, 0) != 0 and parent in (%s)""" %
(', '.join(['%s']*len(salary_slips))), tuple([d.name for d in salary_slips]))
columns = columns + [(e + ":Link/Earning Type:120") for e in earning_types] + \
columns = columns + [(e + ":Currency:120") for e in earning_types] + \
["Arrear Amount:Currency:120", "Leave Encashment Amount:Currency:150",
"Gross Pay:Currency:120"] + [(d + ":Link/Deduction Type:120") for d in ded_types] + \
"Gross Pay:Currency:120"] + [(d + ":Currency:120") for d in ded_types] + \
["Total Deduction:Currency:120", "Net Pay:Currency:120"]
return columns, earning_types, ded_types
def get_salary_slips(filters):
conditions, filters = get_conditions(filters)
salary_slips = webnotes.conn.sql("""select * from `tabSalary Slip` where docstatus = 1 %s""" %
conditions, filters, as_dict=1)
salary_slips = webnotes.conn.sql("""select * from `tabSalary Slip` where docstatus = 1 %s
order by employee, month""" % conditions, filters, as_dict=1)
if not salary_slips:
msgprint(_("No salary slip found for month: ") + cstr(filters.get("month")) +
@@ -102,6 +102,6 @@ def get_ss_ded_map(salary_slips):
ss_ded_map = {}
for d in ss_deductions:
ss_ded_map.setdefault(d.parent, webnotes._dict()).setdefault(d.d_type, [])
ss_ded_map[d.parent][d.e_type] = flt(d.d_modified_amount)
ss_ded_map[d.parent][d.d_type] = flt(d.d_modified_amount)
return ss_ded_map