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

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

Browse Source 
Conflicts:
	accounts/doctype/account/account.py
	accounts/doctype/gl_entry/gl_entry.py
	accounts/doctype/period_closing_voucher/period_closing_voucher.py
	stock/doctype/delivery_note/delivery_note.py
	stock/doctype/landed_cost_wizard/landed_cost_wizard.py
	stock/doctype/purchase_receipt/purchase_receipt.py
	stock/doctype/stock_ledger/stock_ledger.py
	stock/doctype/warehouse/warehouse.py
	stock/stock_ledger.py
This commit is contained in:
Anand Doshi
2013-09-25 19:55:41 +05:30
parent a80f2e4431 7496b528a1
commit 5b004ff8a7
242 changed files with 3879 additions and 3910 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:14",
"docstatus": 0,
"modified": "2013-07-05 14:36:59",
"modified": "2013-09-25 11:36:11",
"modified_by": "Administrator",
"owner": "harshada@webnotestech.com"
},
@@ -41,6 +41,7 @@
},
{
"default": "Draft",
"depends_on": "eval:!doc.__islocal",
"doctype": "DocField",
"fieldname": "approval_status",
"fieldtype": "Select",
@@ -50,7 +51,7 @@
"no_copy": 1,
"oldfieldname": "approval_status",
"oldfieldtype": "Select",
"options": "\nDraft\nApproved\nRejected",
"options": "Draft\nApproved\nRejected",
"search_index": 1
},
{