vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'develop' of https://github.com/tmimori/frappe into tmimori-develop

Browse source
This commit is contained in:
Anand Doshi 2015-07-27 12:06:53 +05:30
commit eb7d775e20
9 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frappe/core/doctype/user/user.json
View file

@ -154,7 +154,7 @@
"permlevel": 0
},
{
"description": "Get your globally recognized avatar from <a href=\"https://gravatar.com/\">Gravatar.com</a>",
"description": "Get your globally recognized avatar from Gravatar.com",
"fieldname": "user_image",
"fieldtype": "Attach",
"hidden": 0,
@ -326,7 +326,7 @@
"width": "50%"
},
{
"description": "Enter default value fields (keys) and values. If you add multiple values for a field, the first one will be picked. These defaults are also used to set \"match\" permission rules. To see list of fields, go to <a href=\"#Form/Customize Form/Customize Form\">Customize Form</a>.",
"description": "Enter default value fields (keys) and values. If you add multiple values for a field, the first one will be picked. These defaults are also used to set \"match\" permission rules. To see list of fields, go to \"Customize Form\".",
"fieldname": "defaults",
"fieldtype": "Table",
"hidden": 1,
@ -516,4 +516,4 @@
],
"read_only": 0,
"search_fields": "first_name, last_name"
}
}

2
frappe/custom/doctype/custom_field/custom_field.js
View file

@ -52,7 +52,7 @@ cur_frm.cscript.fieldtype = function(doc, dt, dn) {
__('Name of the Document Type (DocType) you want this field to be linked to. e.g. Customer');
} else if(doc.fieldtype == 'Select') {
cur_frm.fields_dict['options_help'].disp_area.innerHTML =
__('Options for select. Each option on a new line. e.g.: <br>Option 1<br>Option 2<br>Option 3<br>');
__('Options for select. Each option on a new line.')+' '+__('e.g.:')+'<br>'+__('Option 1')+'<br>'+__('Option 2')+'<br>'+__('Option 3')+'<br>';
} else if(doc.fieldtype == 'Dynamic Link') {
cur_frm.fields_dict['options_help'].disp_area.innerHTML =
__('Fieldname which will be the DocType for this link field.');

4
frappe/custom/doctype/customize_form/customize_form.json
View file

@ -33,7 +33,7 @@
"search_index": 0
},
{
"description": "Fields separated by comma (,) will be included in the<br /><b>Search By</b> list of Search dialog box",
"description": "Fields separated by comma (,) will be included in the \"Search By\" list of Search dialog box",
"fieldname": "search_fields",
"fieldtype": "Data",
"in_list_view": 1,
@ -133,4 +133,4 @@
}
],
"search_fields": "doc_type"
}
}

4
frappe/custom/doctype/customize_form_field/customize_form_field.json
View file

@ -119,7 +119,7 @@
"precision": ""
},
{
"description": "This field will appear only if the fieldname defined here has value OR the rules are true (examples): <br>\nmyfield\neval:doc.myfield=='My Value'<br>\neval:doc.age>18",
"description": "This field will appear only if the fieldname defined here has value OR the rules are true (examples): \nmyfield\neval:doc.myfield=='My Value'\neval:doc.age>18",
"fieldname": "depends_on",
"fieldtype": "Data",
"hidden": 0,
@ -301,4 +301,4 @@
"owner": "Administrator",
"permissions": [],
"read_only": 0
}
}

10
frappe/public/js/frappe/ui/toolbar/awesome_bar.js
View file

@ -84,15 +84,15 @@ frappe.search = {
onclick: function() {
var txt = '<table class="table table-bordered">\
<tr><td style="width: 50%">'+__("Make a new record")+'</td><td>'+
__("<b>new</b> <i>type of document</i>")+'</td></tr>\
__("new type of document")+'</td></tr>\
<tr><td>'+__("List a document type")+'</td><td>'+
__("<i>document type...</i>, e.g. <b>customer</b>")+'</td></tr>\
__("document type..., e.g. customer")+'</td></tr>\
<tr><td>'+__("Search in a document type")+'</td><td>'+
__("<i>text</i> <b>in</b> <i>document type</i>")+'</td></tr>\
__("text in document type")+'</td></tr>\
<tr><td>'+__("Open a module or tool")+'</td><td>'+
__("<i>module name...</i>")+'</td></tr>\
__("module name...")+'</td></tr>\
<tr><td>'+__("Calculate")+'</td><td>'+
__("<i>e.g. <strong>(55 + 434) / 4</strong> or <strong>=Math.sin(Math.PI/2)</strong>...</i>")+'</td></tr>\
__("e.g. (55 + 434) / 4 or =Math.sin(Math.PI/2)...")+'</td></tr>\
</table>'
msgprint(txt, "Search Help");
}

4
frappe/website/doctype/web_form/web_form.json
View file

@ -214,7 +214,7 @@
"precision": ""
},
{
"description": "In JSON as <pre>[{\"title\":\"Jobs\", \"name\":\"jobs\"}]</pre>",
"description": "In JSON as [{\"title\":\"Jobs\", \"name\":\"jobs\"}]",
"fieldname": "breadcrumbs",
"fieldtype": "Small Text",
"label": "Breadcrumbs",
@ -262,4 +262,4 @@
"sort_field": "modified",
"sort_order": "DESC",
"title_field": "title"
}
}

4
frappe/website/doctype/website_settings/website_settings.json
View file

@ -231,7 +231,7 @@
"permlevel": 0
},
{
"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>]",
"description": "An icon file with .ico extension. Should be 16 x 16 px. Generated using a favicon generator. [favicon-generator.org]",
"fieldname": "favicon",
"fieldtype": "Attach",
"label": "FavIcon",
@ -296,4 +296,4 @@
"submit": 0
}
]
}
}

6
frappe/website/doctype/website_theme/website_theme.json
View file

@ -110,7 +110,7 @@
"precision": ""
},
{
"description": "Add the name of a <a href=\"https://www.google.com/fonts/\" target=\"_blank\">Google Web Font</a> e.g. \"Open Sans\"",
"description": "Add the name of a \"Google Web Font\" e.g. \"Open Sans\"",
"fieldname": "text_webfont",
"fieldtype": "Data",
"label": "Google Font (Text)",
@ -118,7 +118,7 @@
"precision": ""
},
{
"description": "Add the name of a <a href=\"https://www.google.com/fonts/\" target=\"_blank\">Google Web Font</a> e.g. \"Open Sans\"",
"description": "Add the name of a \"Google Web Font\" e.g. \"Open Sans\"",
"fieldname": "heading_webfont",
"fieldtype": "Data",
"label": "Google Font (Heading)",
@ -301,4 +301,4 @@
"sort_field": "modified",
"sort_order": "DESC",
"title_field": ""
}
}

4
frappe/workflow/doctype/workflow/workflow.json
View file

@ -42,7 +42,7 @@
"permlevel": 0
},
{
"description": "All possible Workflow States and roles of the workflow. <br>Docstatus Options: 0 is\"Saved\", 1 is \"Submitted\" and 2 is \"Cancelled\"",
"description": "All possible Workflow States and roles of the workflow. \nDocstatus Options: 0 is\"Saved\", 1 is \"Submitted\" and 2 is \"Cancelled\"",
"fieldname": "states",
"fieldtype": "Table",
"label": "Document States",
@ -97,4 +97,4 @@
"write": 1
}
]
}
}