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

[conflicts] [merged]

Browse Source
This commit is contained in:
Rushabh Mehta
2013-05-02 16:02:59 +05:30
parent 3ddc524361 99181fa772
commit d3e00995db
71 changed files with 1249 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,13 @@
[
{
"creation": "2013-01-10 16:34:13",
"creation": "2013-01-22 16:50:30",
"docstatus": 0,
"modified": "2013-01-22 14:25:38",
"modified": "2013-05-02 11:22:59",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"allow_rename": 1,
"autoname": "field:deduction_name",
"doctype": "DocType",
"document_type": "Master",

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

@@ -1,12 +1,13 @@
[
{
"creation": "2013-01-10 16:34:13",
"creation": "2013-01-24 11:03:32",
"docstatus": 0,
"modified": "2013-01-23 16:32:07",
"modified": "2013-05-02 11:22:48",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"allow_rename": 1,
"autoname": "field:earning_name",
"doctype": "DocType",
"document_type": "Master",