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

fixed conflict

Browse Source
This commit is contained in:
Nabin Hait
2012-12-19 12:18:15 +05:30
parent 1a6a94b760 bb852e45e9
commit 4ecc785aab
28 changed files with 393 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
stock/doctype/item/item.txt
View File

@@ -4,7 +4,7 @@
"docstatus": 0,
"creation": "2012-12-17 14:56:32",
"modified_by": "Administrator",
"modified": "2012-12-17 16:02:00"
"modified": "2012-12-18 14:23:19"
},
{
"allow_attach": 1,
@@ -823,11 +823,12 @@
"permlevel": 0
},
{
"description": "Will appear in search",
"depends_on": "show_in_website",
"doctype": "DocField",
"label": "Short Description",
"fieldname": "web_short_description",
"fieldtype": "Text",
"fieldtype": "Text Editor",
"permlevel": 0
},
{