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

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

Browse Source 
Conflicts:
	accounts/doctype/gl_control/gl_control.py
This commit is contained in:
Anand Doshi
2013-01-17 20:31:41 +05:30
parent 8957bf9e09 16546d25e7
commit ef02ddfc40
92 changed files with 1234 additions and 1924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
utilities/module_def/utilities/locale/_messages_doc.json
View File

@@ -1,11 +0,0 @@
[
"Users",
"To Do",
"Markdown Reference",
"Messages",
"question-view",
"WIP Monitor",
"questions",
"Calendar",
"Trash"
]

11
utilities/module_def/utilities/locale/hi-doc.json
View File

@@ -1,11 +0,0 @@
{
"Calendar": "\u0915\u0948\u0932\u0947\u0902\u0921\u0930",
"Markdown Reference": "Markdown \u0938\u0902\u0926\u0930\u094d\u092d",
"Messages": "\u0938\u0902\u0926\u0947\u0936",
"To Do": "\u0915\u0930\u0928\u0947 \u0915\u0947 \u0932\u093f\u090f \u0915\u094d\u092f\u093e",
"Trash": "\u0915\u091a\u0930\u093e \u092a\u0947\u091f\u0940",
"Users": "\u0909\u092a\u092f\u094b\u0917\u0915\u0930\u094d\u0924\u093e",
"WIP Monitor": "WIP \u092e\u0949\u0928\u093f\u091f\u0930",
"question-view": "\u0938\u0935\u093e\u0932 \u0926\u0943\u0936\u094d\u092f",
"questions": "\u0938\u0935\u093e\u0932\u094b\u0902"
}

1
utilities/page/trash/trash.txt
View File

@@ -9,7 +9,6 @@
{
"name": "__common__",
"module": "Utilities",
"show_in_menu": 0,
"page_name": "Trash",
"doctype": "Page",
"standard": "Yes"