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

fixes merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2013-01-21 17:30:35 +05:30
parent aeb992a4fd a1e8e07fde
commit 223897f145
136 changed files with 3652 additions and 3278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
stock/doctype/batch/batch.txt
View File

@@ -9,13 +9,13 @@
{
"section_style": "Simple",
"module": "Stock",
"server_code_error": " ",
"allow_trash": 1,
"doctype": "DocType",
"autoname": "field:batch_id",
"allow_trash": 1,
"document_type": "Master",
"autoname": "field:batch_id",
"name": "__common__",
"colour": "White:FFF",
"server_code_error": " ",
"version": 12
},
{
@@ -43,6 +43,7 @@
"doctype": "DocPerm",
"write": 1,
"cancel": 1,
"report": 1,
"permlevel": 0
},
{
@@ -111,10 +112,10 @@
"doctype": "DocField",
"label": "Item",
"oldfieldname": "item",
"permlevel": 0,
"options": "Item",
"fieldname": "item",
"fieldtype": "Link",
"reqd": 1,
"options": "Item"
"permlevel": 0
}
]