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

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

Browse Source
This commit is contained in:
Anand Doshi
2012-12-03 17:35:56 +05:30
parent 9356ac7ef5 23aac61bbf
commit a502f7dcd9
19 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@
"docstatus": 0,
"creation": "2012-07-03 13:29:40",
"modified_by": "Administrator",
"modified": "2012-03-27 14:45:51"
"modified": "2012-12-03 17:10:41"
},
{
"is_submittable": 1,

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

@@ -4,7 +4,7 @@
"docstatus": 0,
"creation": "2012-07-03 13:29:41",
"modified_by": "Administrator",
"modified": "2012-03-27 14:36:00"
"modified": "2012-12-03 17:10:41"
},
{
"name": "__common__",