mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-26 08:24:47 +00:00
fixed conflict
This commit is contained in:
@@ -2,23 +2,18 @@
|
||||
{
|
||||
"owner": "Administrator",
|
||||
"docstatus": 0,
|
||||
"creation": "2012-05-21 15:54:09",
|
||||
"creation": "2012-07-12 23:29:36",
|
||||
"modified_by": "Administrator",
|
||||
"modified": "2012-07-09 16:20:58"
|
||||
"modified": "2012-12-18 16:15:43"
|
||||
},
|
||||
{
|
||||
"section_style": "Simple",
|
||||
"allow_attach": 1,
|
||||
"module": "Website",
|
||||
"_last_update": "1329115882",
|
||||
"document_type": "Other",
|
||||
"issingle": 1,
|
||||
"name": "__common__",
|
||||
"colour": "White:FFF",
|
||||
"allow_attach": 1,
|
||||
"doctype": "DocType",
|
||||
"show_in_menu": 0,
|
||||
"module": "Website",
|
||||
"max_attachments": 10,
|
||||
"version": 1
|
||||
"document_type": "Other",
|
||||
"name": "__common__"
|
||||
},
|
||||
{
|
||||
"name": "__common__",
|
||||
@@ -40,23 +35,52 @@
|
||||
"doctype": "DocType"
|
||||
},
|
||||
{
|
||||
"create": 1,
|
||||
"doctype": "DocPerm",
|
||||
"write": 1,
|
||||
"role": "System Manager",
|
||||
"doctype": "DocField",
|
||||
"label": "Landing Page",
|
||||
"fieldname": "sb0",
|
||||
"fieldtype": "Section Break",
|
||||
"permlevel": 0
|
||||
},
|
||||
{
|
||||
"create": 1,
|
||||
"doctype": "DocPerm",
|
||||
"write": 1,
|
||||
"role": "Website Manager",
|
||||
"description": "The \"Web Page\" that is the website home page",
|
||||
"doctype": "DocField",
|
||||
"label": "Home Page",
|
||||
"options": "Web Page",
|
||||
"fieldname": "home_page",
|
||||
"fieldtype": "Link",
|
||||
"reqd": 1,
|
||||
"permlevel": 0
|
||||
},
|
||||
{
|
||||
"role": "All",
|
||||
"permlevel": 1,
|
||||
"doctype": "DocPerm"
|
||||
"description": "The name of your company / website as you want to appear on browser title bar. All pages will have this as the prefix to the title.",
|
||||
"doctype": "DocField",
|
||||
"label": "Title Prefix",
|
||||
"fieldname": "title_prefix",
|
||||
"fieldtype": "Data",
|
||||
"permlevel": 0
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "cb4",
|
||||
"fieldtype": "Column Break",
|
||||
"permlevel": 0
|
||||
},
|
||||
{
|
||||
"description": "Only Items / Groups under this Groups will be shown on the website. This will also represent the \"Products\" Home Page.",
|
||||
"doctype": "DocField",
|
||||
"label": "Default Product Category",
|
||||
"options": "Item Group",
|
||||
"fieldname": "default_product_category",
|
||||
"fieldtype": "Link",
|
||||
"permlevel": 0
|
||||
},
|
||||
{
|
||||
"description": "If checked, the Home page will be the default Item Group for the website.",
|
||||
"doctype": "DocField",
|
||||
"label": "Home Page is Products",
|
||||
"fieldname": "home_page_is_products",
|
||||
"fieldtype": "Check",
|
||||
"permlevel": 0
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
@@ -66,36 +90,7 @@
|
||||
"permlevel": 0
|
||||
},
|
||||
{
|
||||
"description": "The name of your company / website as you want to appear on browser title bar. All pages will have this as the prefix to the title.",
|
||||
"colour": "White:FFF",
|
||||
"doctype": "DocField",
|
||||
"label": "Title Prefix",
|
||||
"fieldname": "title_prefix",
|
||||
"fieldtype": "Data",
|
||||
"permlevel": 0
|
||||
},
|
||||
{
|
||||
"description": "The \"Web Page\" that is the website home page",
|
||||
"colour": "White:FFF",
|
||||
"doctype": "DocField",
|
||||
"label": "Home Page",
|
||||
"permlevel": 0,
|
||||
"fieldname": "home_page",
|
||||
"fieldtype": "Link",
|
||||
"reqd": 1,
|
||||
"options": "Web Page"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"options": "Item Group",
|
||||
"fieldname": "default_product_category",
|
||||
"fieldtype": "Link",
|
||||
"label": "Default Product Category",
|
||||
"permlevel": 0
|
||||
},
|
||||
{
|
||||
"description": "Brand is what appears on the top-right of the toolbar. If it is an image, make sure it\nhas a transparent background and use the <img /> tag",
|
||||
"colour": "White:FFF",
|
||||
"description": "Brand is what appears on the top-right of the toolbar. If it is an image, make sure it\nhas a transparent background and use the <img /> tag. Keep size as 200px x 30px",
|
||||
"doctype": "DocField",
|
||||
"label": "Brand HTML",
|
||||
"fieldname": "brand_html",
|
||||
@@ -104,10 +99,10 @@
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"label": "Top Bar Items",
|
||||
"options": "Top Bar Item",
|
||||
"fieldname": "top_bar_items",
|
||||
"fieldtype": "Table",
|
||||
"label": "Top Bar Items",
|
||||
"permlevel": 0
|
||||
},
|
||||
{
|
||||
@@ -133,10 +128,10 @@
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"label": "Footer Items",
|
||||
"options": "Top Bar Item",
|
||||
"fieldname": "footer_items",
|
||||
"fieldtype": "Table",
|
||||
"label": "Footer Items",
|
||||
"permlevel": 0
|
||||
},
|
||||
{
|
||||
@@ -148,13 +143,12 @@
|
||||
},
|
||||
{
|
||||
"description": "An icon file with .ico extension. Should be 16 x 16 px. Generated using a favicon generator. [<a href=\"http://favicon-generator.org/\" target=\"_blank\">favicon-generator.org</a>]",
|
||||
"colour": "White:FFF",
|
||||
"doctype": "DocField",
|
||||
"label": "FavIcon",
|
||||
"permlevel": 0,
|
||||
"options": "attach_files:",
|
||||
"fieldname": "favicon",
|
||||
"fieldtype": "Select",
|
||||
"options": "attach_files:"
|
||||
"permlevel": 0
|
||||
},
|
||||
{
|
||||
"description": "Sub-domain provided by erpnext.com",
|
||||
@@ -194,12 +188,30 @@
|
||||
},
|
||||
{
|
||||
"description": "Bind events on startup and page change",
|
||||
"colour": "White:FFF",
|
||||
"doctype": "DocField",
|
||||
"label": "Startup Code",
|
||||
"permlevel": 0,
|
||||
"options": "Javascript",
|
||||
"fieldname": "startup_code",
|
||||
"fieldtype": "Code",
|
||||
"options": "Javascript"
|
||||
"permlevel": 0
|
||||
},
|
||||
{
|
||||
"create": 1,
|
||||
"doctype": "DocPerm",
|
||||
"write": 1,
|
||||
"role": "System Manager",
|
||||
"permlevel": 0
|
||||
},
|
||||
{
|
||||
"create": 1,
|
||||
"doctype": "DocPerm",
|
||||
"write": 1,
|
||||
"role": "Website Manager",
|
||||
"permlevel": 0
|
||||
},
|
||||
{
|
||||
"doctype": "DocPerm",
|
||||
"role": "All",
|
||||
"permlevel": 1
|
||||
}
|
||||
]
|
||||
Reference in New Issue
Block a user