Merge branch 'renamedt' into shf_rename
Conflicts:
erpnext/patches/patch_list.py
diff --git a/build.json b/build.json
index 499d594..6069394 100644
--- a/build.json
+++ b/build.json
@@ -3,14 +3,22 @@
"lib/js/core.min.js": [
"lib/js/wn/class.js",
"lib/js/wn/provide.js",
- "lib/js/wn/xmlhttp.js",
"lib/js/wn/versions.js",
"lib/js/wn/assets.js",
"lib/js/wn/require.js",
"lib/js/wn/dom.js",
- "lib/js/wn/page.js",
+ "lib/js/wn/model.js",
+ "lib/js/wn/misc/tools.js",
"lib/js/wn/misc/user.js",
"lib/js/lib/json2.js",
+ "lib/js/wn/router.js",
+ "lib/js/wn/ui/listing.js",
+ "lib/js/wn/views/container.js",
+ "lib/js/wn/views/doclistview.js",
+ "lib/js/wn/views/pageview.js",
+ "lib/js/wn/views/formview.js",
+ "lib/js/wn/views/reportview.js",
+ "lib/js/wn/request.js",
"lib/js/core.js"
]
},
@@ -44,6 +52,8 @@
"lib/css/bootstrap/navbar.css",
"lib/css/bootstrap/dropdown.css",
"lib/css/bootstrap/tooltip.css",
+ "lib/css/ui/fonts.css",
+ "lib/css/ui/list.css",
"erpnext/startup/startup.css",
"erpnext/website/css/website.css"
]
@@ -57,10 +67,12 @@
"lib/css/legacy/grid.css",
"lib/css/legacy/listing.css",
"lib/css/legacy/report.css",
- "lib/css/legacy/autosuggest.css",
"lib/css/legacy/dialog.css",
"lib/css/legacy/tabs.css",
"lib/css/legacy/sidebar.css",
+ "lib/css/Aristo/aristo.selected.css",
+ "lib/css/ui/list.css",
+ "lib/css/ui/fonts.css",
"lib/css/bootstrap/headings.css",
"lib/css/bootstrap/buttons.css",
"lib/css/bootstrap/navbar.css",
@@ -68,7 +80,8 @@
"lib/css/bootstrap/tooltip.css",
"lib/css/bootstrap/label.css",
"lib/css/bootstrap/icons.css",
- "erpnext/startup/startup.css"
+ "lib/css/bootstrap/popover.css",
+ "erpnext/startup/startup.css"
]
},
@@ -87,15 +100,13 @@
"lib/js/legacy/utils/shortcut.js",
"lib/js/legacy/widgets/form/fields.js",
"lib/js/wn/ui/dialog.js",
+ "lib/js/wn/ui/button.js",
"lib/js/legacy/widgets/dialog.js",
"lib/js/wn/ui/listing.js",
"lib/js/legacy/widgets/layout.js",
"lib/js/legacy/webpage/page_header.js",
- "lib/js/legacy/widgets/select.js",
- "lib/js/legacy/webpage/history.js",
"lib/js/legacy/webpage/search.js",
"lib/js/legacy/webpage/spinner.js",
- "lib/js/legacy/webpage/freeze_page.js",
"lib/js/legacy/webpage/error_console.js",
"lib/js/legacy/webpage/loaders.js",
"lib/js/legacy/webpage/uploader.js",
@@ -104,7 +115,6 @@
"lib/js/legacy/wn/widgets/footer.js",
"lib/js/legacy/model/local_data.js",
"lib/js/legacy/model/doclist.js",
- "lib/js/legacy/webpage/body.js",
"lib/js/legacy/app.js",
"js/app.js",
"erpnext/startup/startup.js",
@@ -115,8 +125,10 @@
{
"js/all-app.js": [
"lib/js/lib/history/history.min.js:concat",
- "lib/js/legacy/jquery/jquery-ui.min.js:concat",
- "lib/js/legacy/tiny_mce_33/jquery.tinymce.js:concat",
+ "lib/js/lib/jquery/jquery.ui.core.js:concat",
+ "lib/js/lib/jquery/jquery.ui.datepicker.js:concat",
+ "lib/js/lib/jquery/jquery.ui.autocomplete.js:concat",
+ "lib/js/lib/tiny_mce_33/jquery.tinymce.js:concat",
"lib/js/lib/bootstrap.min.js:concat",
"lib/js/lib/sprintf.js",
"lib/js/core.min.js:concat",
@@ -130,19 +142,15 @@
"lib/js/legacy/utils/printElement.js",
"lib/js/legacy/widgets/form/fields.js",
"lib/js/wn/ui/dialog.js",
+ "lib/js/wn/ui/button.js",
"lib/js/legacy/widgets/dialog.js",
- "lib/js/legacy/widgets/listing.js",
- "lib/js/wn/ui/listing.js",
"lib/js/legacy/widgets/layout.js",
"lib/js/legacy/widgets/tabbedpage.js",
"lib/js/legacy/webpage/page_header.js",
- "lib/js/legacy/widgets/select.js",
"lib/js/legacy/widgets/tags.js",
"lib/js/legacy/widgets/export_query.js",
- "lib/js/legacy/webpage/history.js",
"lib/js/legacy/webpage/search.js",
"lib/js/legacy/webpage/spinner.js",
- "lib/js/legacy/webpage/freeze_page.js",
"lib/js/legacy/webpage/error_console.js",
"lib/js/legacy/webpage/loaders.js",
"lib/js/legacy/webpage/uploader.js",
@@ -153,9 +161,9 @@
"lib/js/legacy/model/local_data.js",
"lib/js/legacy/model/doclist.js",
"lib/js/wn/ui/toolbar.min.js:concat",
- "lib/js/legacy/webpage/body.js",
+ "lib/js/wn/views/breadcrumbs.js",
"lib/js/legacy/widgets/form/fields.js",
- "lib/js/legacy/widgets/form/form_container.js",
+ "lib/js/legacy/widgets/form/form_dialog.js",
"lib/js/legacy/widgets/form/form_header.js",
"lib/js/legacy/widgets/form/form.js",
"lib/js/legacy/widgets/form/form_fields.js",
diff --git a/css/all-app.css b/css/all-app.css
index 0dea8b7..c2a6730 100644
--- a/css/all-app.css
+++ b/css/all-app.css
@@ -1,7 +1,8 @@
/*
* lib/css/legacy/body.css
- */html {
+ */
+html {
margin: 0px;
padding: 0px;
}
@@ -10,7 +11,7 @@
margin: 0px;
padding: 0px;
font-family: Arial, Helvetica, Sans;
- font-size: 12px;
+ font-size: 14px;
color: #000;
background-color: #e2e2e2;
}
@@ -25,19 +26,22 @@
}
select, input, textarea {
- border: 1px solid #AAA;
+ border: 1px solid #ccc;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
- font-size: 13px;
+ font-size: inherit;
padding: 4px;
- color: #222;
+ color: #444;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
textarea {
font-family: inherit;
height: 120px;
width: 90%;
- font-size: 12px;
+ font-size: inherit;
white-space: normal;
}
@@ -100,8 +104,16 @@
div.comment { color: #444; }
+.small {
+ font-size: 11px;
+}
+
+.help {
+ margin: 3px 0px;
+ color: #888;
+}
+
div#body_div {
- position: relative;
display: none;
padding-right: 7px;
width: 900px;
@@ -109,6 +121,17 @@
margin-top: 56px;
}
+.content {
+ width: 900px;
+}
+
+.background-fade-in {
+ -webkit-transition: background 1s ease-in; /* property duration timing-function delay */
+ -moz-transition: background 1s ease-in;
+ -o-transition: background 1s ease-in;
+ transition: background 1s ease-in;
+}
+
footer {
width: 900px;
margin: auto;
@@ -118,12 +141,23 @@
margin: auto;
}
+@media (max-width: 1200px) {
+ div#body_div, header .container, .content, #opened-page-selector, footer {
+ width: 900px;
+ }
+}
+
+@media (min-width: 1200px) {
+ div#body_div, header .container, .content, #opened-page-selector, footer {
+ width: 1100px;
+ }
+}
+
div.no_script {
display: none;
}
div.loading_div {
- position: absolute;
background-color: #FFFFCC;
z-index: 1999;
right: 5px;
@@ -131,7 +165,6 @@
display: none;
text-align: center;
padding: 2px;
- font-size: 12px;
border: 1px solid #FF4;
}
@@ -156,27 +189,17 @@
-moz-border-radius: 5px;
border-radius: 5px;
}
-.gradient {
- background: #ededed; /* Old browsers */
- background: -moz-linear-gradient(top, #ededed 0%, #d1d1d1 47%, #b7b7b7 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ededed), color-stop(47%,#d1d1d1), color-stop(100%,#b7b7b7)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* Opera11.10+ */
- background: -ms-linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* IE10+ */
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ededed', endColorstr='#b7b7b7',GradientType=0 ); /* IE6-9 */
- background: linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* W3C */
-}
.layout_wrapper, .layout-wrapper {
- -moz-box-shadow: 1px 1px 8px #555;
- -webkit-box-shadow: 1px 1px 8px #555;
- box-shadow: 1px 1px 8px #555;
+ -moz-box-shadow: 0px 0px 6px rgba(0,0,0,0.3);
+ -webkit-box-shadow: 0px 0px 6px rgba(0,0,0,0.3);
+ box-shadow: 0px 0px 6px rgba(0,0,0,0.3);
background-color: #fff;
padding: 15px;
}
.layout-wrapper-background {
- background-color: #f2f2f2 !important;
+ background-color: #fafafa !important;
padding: 0px;
}
@@ -185,7 +208,7 @@
float: left;
padding: 15px;
background-color: #FFF;
- min-height: 450px;
+ min-height: 600px;
-moz-box-shadow: 7px 0px 6px -2px #ddd;
-webkit-box-shadow: 7px 0px 6px -2px #ddd;
box-shadow: 7px 0px 6px -2px #ddd;
@@ -194,10 +217,10 @@
.layout-side-section {
width: 22%;
/*float: right;*/
- color: #606060;
+ color: #606060;
overflow-x: hidden;
padding: 15px;
- min-height: 450px;
+ min-height: 600px;
}
/* from bootstrap */
@@ -232,17 +255,20 @@
.avatar-small {
display: inline-block;
- min-width: 29px;
+ width: 24px;
+ height: 20px;
+ vertical-align: middle;
+ overflow: hidden;
+ margin: 0px 3px;
}
.avatar-small img {
- height: 24px;
- margin-bottom: -7px;
- max-width: 24px;
+ width: 24px;
}
/*
* lib/css/legacy/messages.css
*/
+
/* FLOATING MESSAGE */
.btn-img { cursor: pointer; }
@@ -291,9 +317,29 @@
text-align: center;
font-size: 14px;
}
+
/*
* lib/css/legacy/forms.css
- *//* FORMS */
+ */
+/* FORMS */
+
+div.form-section-head {
+ margin: 11px 0px 3px 0px;
+ border-top: 1px solid #ccc;
+ padding-top: 11px;
+}
+
+div.form-layout-row:first-child .form-section-head {
+ border-top: 0px solid #ccc !important;
+}
+
+div.form-section-head h3 {
+ line-height: 20px;
+}
+
+div.form-section-head hr {
+ margin: 9px 0px;
+}
div.frm_print_wrapper {
@@ -323,24 +369,6 @@
}
-div.frm_tip_box {
- margin: 0px;
- padding: 8px;
- background-color: #FFC;
- display: none;
- font-size: 11px;
- border: 1px solid #FFB;
-}
-
-div.frm_tip_box table {
- border-collapse: collapse;
- vertical-align: top;
-}
-
-td.frm_tray_area {
- width: 122px;
-}
-
div.dialog_frm {
position: relative;
margin: 10px;
@@ -437,19 +465,14 @@
.datainputcell { padding: 2px 0px; }
-.field_description, .help {
- margin: 3px 0px 11px 0px;
- color: #888;
- font-style: italic;
+.help ol {
+ padding-left: 19px;
}
.field_description_top {
margin-bottom: 3px;
}
-.field_label {
- font-size:11px;
-}
.input_area input, select, textarea {
font-size: 14px;
padding: 2px;
@@ -500,7 +523,6 @@
}
div.sidebar-comment-message {
margin-top: 8px;
- font-size: 11px;
color: #777;
}
@@ -511,13 +533,14 @@
color: #444;
}
div.sidebar-comment-info {
- font-size: 10px;
color: #777;
}
+
/*
* lib/css/legacy/grid.css
*/
+
/* Grid */
@@ -638,19 +661,11 @@
}
.gridDivSelected option { border: 0px; }
+
/*
* lib/css/legacy/listing.css
- *//* listing 2.0 */
+ */
-div.listing-more {
- margin: 7px 0px 17px 0px;
- text-align: center;
- display: none;
-}
-
-div.listing-toolbar {
- margin: 7px 0px;
-}
/* SRS */
@@ -694,12 +709,10 @@
vertical-align: middle;
}
-
-
-
/*
* lib/css/legacy/report.css
*/
+
/* Reports */
div.report_grid_area {
@@ -878,103 +891,11 @@
width: 33%;
padding: 2px;
}
-/*
- * lib/css/legacy/autosuggest.css
- *//*
-================================================
-autosuggest, inquisitor style
-================================================
-*/
-
-div.autosuggest
-{
- position: absolute;
- margin-top: 3px;
- border: 1px solid #222;
-}
-
-div.autosuggest ul
-{
- list-style: none;
- margin: 0px;
- padding: 2px;
- overflow: hidden;
- background-color: #FFF;
-}
-
-div.autosuggest ul li
-{
- color: #444;
- padding: 0;
- margin: 0;
- text-align: left;
-}
-
-div.autosuggest ul li a
-{
- color: #444;
- display: block;
- text-decoration: none;
- position: relative;
- padding: 0;
- width: 100%;
-}
-div.autosuggest ul li a:hover
-{
-
-}
-div.autosuggest ul li.as_highlight a:hover
-{
- background-color: #45A;
- color: #FFF;
-}
-
-div.autosuggest ul li a span
-{
- display: block;
- padding: 3px 6px;
- color: #444;
- border-bottom:1px solid #DDD;
-}
-
-div.autosuggest ul li a span small
-{
- display: block;
- font-weight: normal;
- color: #444;
-}
-
-div.autosuggest ul li.as_highlight a span small
-{
- color: #FFF;
-}
-
-div.autosuggest ul li.as_highlight a span {
- color: #FFF;
-}
-
-div.autosuggest ul li.as_highlight a
-{
- color: #FFF;
- background-color: #45A;
- cursor: pointer;
-}
-
-div.autosuggest ul li.as_warning
-{
- font-weight: bold;
- text-align: center;
-}
-
-div.autosuggest ul em
-{
- font-style: normal;
- font-weight: bold;
-}
/*
* lib/css/legacy/dialog.css
- *//***** Dialogs *******/
+ */
+/***** Dialogs *******/
div.dialog_wrapper {
position: absolute;
@@ -1052,9 +973,11 @@
font-size: 12px;
}
+
/*
* lib/css/legacy/tabs.css
*/
+
/******* TABS ********/
div.box_label_wrapper {
@@ -1108,9 +1031,11 @@
ul.box_tabs li.box_tab_selected a {
color: #fff;
}
+
/*
* lib/css/legacy/sidebar.css
- */div.psidebar {
+ */
+div.psidebar {
}
div.psidebar div.head {
@@ -1126,9 +1051,8 @@
}
div.psidebar div.section-head {
- font-size: 12px;
padding: 5px 11px;
- border-bottom: 2px solid #444;
+ border-bottom: 1px solid #aaa;
}
div.psidebar div.section-body {
@@ -1140,12 +1064,685 @@
}
div.psidebar div.section-item, div.psidebar .section-link {
- font-size: 11px;
color: #666;
}
+
+/*
+ * lib/css/Aristo/aristo.selected.css
+ */
+/*
+ * jQuery UI CSS Framework 1.8.7
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ */
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.ui-helper-clearfix { display: inline-block; }
+/* required comment for clearfix to work in Opera \*/
+* html .ui-helper-clearfix { height:1%; }
+.ui-helper-clearfix { display:block; }
+/* end clearfix */
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+
+/*
+ * jQuery UI CSS Framework 1.8.7
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?ctl=themeroller
+ */
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-family: Arial,sans-serif; font-size: 1.1em; }
+.ui-widget .ui-widget { font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Arial,sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #B6B6B6; background: #ffffff; color: #4F4F4F; }
+.ui-widget-content a { color: #4F4F4F; }
+.ui-widget-header { border: 1px solid #B6B6B6; color: #4F4F4F; font-weight: bold; }
+.ui-widget-header {
+ background: #ededed url(../lib/css/Aristo/images/bg_fallback.png) 0 0 repeat-x; /* Old browsers */
+ background: -moz-linear-gradient(top, #ededed 0%, #c4c4c4 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ededed), color-stop(100%,#c4c4c4)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #ededed 0%,#c4c4c4 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #ededed 0%,#c4c4c4 100%); /* Opera11.10+ */
+ background: -ms-linear-gradient(top, #ededed 0%,#c4c4c4 100%); /* IE10+ */
+ background: linear-gradient(top, #ededed 0%,#c4c4c4 100%); /* W3C */
+}
+.ui-widget-header a { color: #4F4F4F; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #B6B6B6; font-weight: normal; color: #4F4F4F; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
+ background: #ededed url(../lib/css/Aristo/images/bg_fallback.png) 0 0 repeat-x; /* Old browsers */
+ background: -moz-linear-gradient(top, #ededed 0%, #c4c4c4 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ededed), color-stop(100%,#c4c4c4)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #ededed 0%,#c4c4c4 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #ededed 0%,#c4c4c4 100%); /* Opera11.10+ */
+ background: -ms-linear-gradient(top, #ededed 0%,#c4c4c4 100%); /* IE10+ */
+ background: linear-gradient(top, #ededed 0%,#c4c4c4 100%); /* W3C */
+ -webkit-box-shadow: 0 1px 0 rgba(255,255,255,0.6) inset;
+ -moz-box-shadow: 0 1px 0 rgba(255,255,255,0.6) inset;
+ box-shadow: 0 1px 0 rgba(255,255,255,0.6) inset;
+}
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #4F4F4F; text-decoration: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #9D9D9D; font-weight: normal; color: #313131; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #313131; text-decoration: none; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active {
+ outline: none;
+ color: #1c4257; border: 1px solid #7096ab;
+ background: #ededed url(../lib/css/Aristo/images/bg_fallback.png) 0 -50px repeat-x; /* Old browsers */
+ background: -moz-linear-gradient(top, #b9e0f5 0%, #92bdd6 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#b9e0f5), color-stop(100%,#92bdd6)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #b9e0f5 0%,#92bdd6 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #b9e0f5 0%,#92bdd6 100%); /* Opera11.10+ */
+ background: -ms-linear-gradient(top, #b9e0f5 0%,#92bdd6 100%); /* IE10+ */
+ background: linear-gradient(top, #b9e0f5 0%,#92bdd6 100%); /* W3C */
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
+}
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #313131; text-decoration: none; }
+.ui-widget :active { outline: none; }
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight { border: 1px solid #d2dbf4; background: #f4f8fd; color: #0d2054; -moz-border-radius: 0 !important; -webkit-border-radius: 0 !important; border-radius: 0 !important; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error { border: 1px solid #e2d0d0; background: #fcf0f0; color: #280b0b; -moz-border-radius: 0 !important; -webkit-border-radius: 0 !important; border-radius: 0 !important; }
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(../lib/css/Aristo/images/ui-icons_222222_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(../lib/css/Aristo/images/ui-icons_222222_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(../lib/css/Aristo/images/ui-icons_222222_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(../lib/css/Aristo/images/ui-icons_454545_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(../lib/css/Aristo/images/ui-icons_454545_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(../lib/css/Aristo/images/ui-icons_454545_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(../lib/css/Aristo/images/ui-icons_454545_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon { background: url(../lib/css/Aristo/images/icon_sprite.png) -16px 0 no-repeat !important; }
+.ui-state-highlight .ui-icon, .ui-state-error .ui-icon { margin-top: -1px; }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background: url(../lib/css/Aristo/images/icon_sprite.png) 0 0 no-repeat !important; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-tl { -moz-border-radius-topleft: 3px; -webkit-border-top-left-radius: 3px; border-top-left-radius: 3px; }
+.ui-corner-tr { -moz-border-radius-topright: 3px; -webkit-border-top-right-radius: 3px; border-top-right-radius: 3px; }
+.ui-corner-bl { -moz-border-radius-bottomleft: 3px; -webkit-border-bottom-left-radius: 3px; border-bottom-left-radius: 3px; }
+.ui-corner-br { -moz-border-radius-bottomright: 3px; -webkit-border-bottom-right-radius: 3px; border-bottom-right-radius: 3px; }
+.ui-corner-top { -moz-border-radius-topleft: 3px; -webkit-border-top-left-radius: 3px; border-top-left-radius: 3px; -moz-border-radius-topright: 3px; -webkit-border-top-right-radius: 3px; border-top-right-radius: 3px; }
+.ui-corner-bottom { -moz-border-radius-bottomleft: 3px; -webkit-border-bottom-left-radius: 3px; border-bottom-left-radius: 3px; -moz-border-radius-bottomright: 3px; -webkit-border-bottom-right-radius: 3px; border-bottom-right-radius: 3px; }
+.ui-corner-right { -moz-border-radius-topright: 3px; -webkit-border-top-right-radius: 3px; border-top-right-radius: 3px; -moz-border-radius-bottomright: 3px; -webkit-border-bottom-right-radius: 3px; border-bottom-right-radius: 3px; }
+.ui-corner-left { -moz-border-radius-topleft: 3px; -webkit-border-top-left-radius: 3px; border-top-left-radius: 3px; -moz-border-radius-bottomleft: 3px; -webkit-border-bottom-left-radius: 3px; border-bottom-left-radius: 3px; }
+.ui-corner-all { -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; }
+
+/* Overlays */
+.ui-widget-overlay { background: #262b33; opacity: .70;filter:Alpha(Opacity=70); }
+.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #000000; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }
+
+/*
+ * jQuery UI Autocomplete 1.8.7
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete#theming
+ */
+.ui-autocomplete {
+ position: absolute; cursor: default; z-index: 3;
+ -moz-border-radius: 0;
+ -webkit-border-radius: 0;
+ border-radius: 0;
+ -moz-box-shadow: 0 1px 5px rgba(0,0,0,0.3);
+ -webkit-box-shadow: 0 1px 5px rgba(0,0,0,0.3);
+ box-shadow: 0 1px 5px rgba(0,0,0,0.3);
+}
+
+/* workarounds */
+* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
+
+/*
+ * jQuery UI Menu 1.8.7
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu#theming
+ */
+.ui-menu {
+ list-style:none;
+ padding: 2px;
+ margin: 0;
+ display:block;
+ float: left;
+}
+.ui-menu .ui-menu {
+ margin-top: -3px;
+}
+.ui-menu .ui-menu-item {
+ margin:0;
+ padding: 0;
+ zoom: 1;
+ float: left;
+ clear: left;
+ width: 100%;
+}
+.ui-menu .ui-menu-item a {
+ text-decoration:none;
+ display:block;
+ padding:.2em .4em;
+ line-height:1.5;
+ zoom:1;
+}
+.ui-menu .ui-menu-item a.ui-state-hover,
+.ui-menu .ui-menu-item a.ui-state-active {
+ font-weight: normal;
+ margin: -1px;
+ background: #5f83b9;
+ color: #FFFFFF;
+ border-color: #466086;
+ -moz-border-radius: 0;
+ -webkit-border-radius: 0;
+ border-radius: 0;
+}
+
+/*
+ * jQuery UI Datepicker 1.8.7
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker#theming
+ */
+.ui-datepicker { width: 17em; padding: 0; display: none; border-color: #DDDDDD; }
+.ui-datepicker {
+ -moz-box-shadow: 0 4px 8px rgba(0,0,0,0.5);
+ -webkit-box-shadow: 0 4px 8px rgba(0,0,0,0.5);
+ box-shadow: 0 4px 8px rgba(0,0,0,0.5);
+}
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.35em 0; border: none; border-bottom: 1px solid #B6B6B6; -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 6px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { border: 1px none; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev span { background-position: 0px -32px !important; }
+.ui-datepicker .ui-datepicker-next span { background-position: -16px -32px !important; }
+.ui-datepicker .ui-datepicker-prev-hover span { background-position: 0px -48px !important; }
+.ui-datepicker .ui-datepicker-next-hover span { background-position: -16px -48px !important; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; background: url(../lib/css/Aristo/images/icon_sprite.png) no-repeat; }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; font-size: 12px; text-shadow: 0 1px 0 rgba(255,255,255,0.6); }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month,
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+.ui-datepicker table .ui-state-highlight { border-color: #5F83B9; }
+.ui-datepicker table .ui-state-hover { background: #5F83B9; color: #FFF; font-weight: bold; text-shadow: 0 1px 1px #234386; -webkit-box-shadow: 0 0px 0 rgba(255,255,255,0.6) inset; -moz-box-shadow: 0 0px 0 rgba(255,255,255,0.6) inset; box-shadow: 0 0px 0 rgba(255,255,255,0.6) inset; border-color: #5F83B9; }
+.ui-datepicker-calendar .ui-state-default { background: transparent; border-color: #FFF; }
+.ui-datepicker-calendar .ui-state-active { background: #5F83B9; border-color: #5F83B9; color: #FFF; font-weight: bold; text-shadow: 0 1px 1px #234386; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+ display: none; /*sorry for IE5*/
+ display/**/: block; /*sorry for IE5*/
+ position: absolute; /*must have*/
+ z-index: -1; /*must have*/
+ filter: mask(); /*must have*/
+ top: -4px; /*must have*/
+ left: -4px; /*must have*/
+ width: 200px; /*must have*/
+ height: 200px; /*must have*/
+}
+
+
+
+/*
+ * lib/css/ui/list.css
+ */
+.hide {
+ display: none;
+}
+
+.list-filters {
+ margin: 7px 0px;
+}
+
+.wnlist .img-load {
+ display: none;
+ float: left;
+ margin-bottom: 8px;
+}
+
+/* list-row */
+div.list-row {
+ border-bottom: 1px solid #eee;
+ padding: 5px 0px;
+}
+div.list-row:hover {
+ background-color: #eef
+}
+
+div.list-row .label {
+ margin-right: 4px;
+}
+
+div.list-row table {
+ table-layout: fixed;
+ border-collapse: collapse;
+ width: 100%;
+}
+
+div.list-row table td {
+ overflow: hidden;
+ padding-right: 3px;
+ vertical-align: middle;
+ height: 24px;
+ max-height: 24px;
+}
+
+div.paging-button {
+ text-align: center;
+ padding: 11px 0px;
+}
+
+div.show_filters {
+ display: none;
+}
+
+div.filter_list {
+ padding: 13px;
+}
+
+div.show_filters.well {
+ margin-top: 11px;
+ margin-bottom: 11px;
+}
+
+div.filter_list .run_btn {
+ text-align: right;
+}
+
+div.filter_list .add_filter {
+ margin: 3px 0px;
+}
+
+div.list_filter {
+ margin: 7px 0px;
+}
+
+div.list_filter input, div.list_filter select {
+ width: 130px;
+ margin-right: 7px;
+}
+
+/* bar */
+
+span.bar-outer {
+ display: inline-block;
+ margin: 0px 7px;
+ margin-top: 3px;
+ background-color: #fff;
+ border: 1px solid #aaa;
+ height: 10px;
+}
+
+span.bar-inner {
+ display: inline-block;
+ background-color: #bdf;
+ height: 100%;
+ margin-bottom: 2px;
+ float: left;
+}
+span.bar-complete {
+ background-color: #009900;
+}
+span.bar-empty {
+ background-color: #990000;
+}
+
+
+/* stats */
+
+div.stat-wrapper {
+ margin-bottom: 19px;
+}
+
+div.stat-grid {
+ border: 2px solid #bbb;
+ background-color: white;
+ border-radius: 5px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ overflow: hidden;
+}
+
+div.stat-label {
+ position: relative;
+ padding: 3px;
+ text-align: center;
+}
+div.stat-label, div.stat-label a {
+ z-index: 5;
+}
+
+div.stat-item {
+ position: relative;
+ border-bottom: 1px solid #ddd;
+}
+div.stat-item:last-child {
+ border-bottom: 0px solid #ddd;
+}
+
+div.stat-bar {
+ position: absolute;
+ left: 0px;
+ background-color: #def;
+ height: 100%;
+ z-index: 0;
+}
+
+
+
+
+
+/*
+ * lib/css/ui/fonts.css
+ */
+@font-face {
+ font-family: 'Pontano Sans';
+ font-style: normal;
+ font-weight: 800;
+ src: url('../lib/css/fonts/pontanosans.woff') format('woff');
+}
+
+@font-face {
+ font-family: 'Droid Sans';
+ font-style: normal;
+ font-weight: normal;
+ src: local('Droid Sans'), local('DroidSans'), url('../lib/css/fonts/droidsans.woff') format('woff');
+}
+
+@font-face {
+ font-family: 'PT Sans';
+ font-style: normal;
+ font-weight: normal;
+ src: local('PT Sans'), local('PTSans-Regular'), url('../lib/css/fonts/ptsans.woff') format('woff');
+}
+
+@font-face {
+ font-family: 'Open Sans';
+ font-style: normal;
+ font-weight: 400;
+ src: local('Open Sans'), local('OpenSans'), url('../lib/css/fonts/opensans.woff') format('woff');
+}
+@font-face {
+ font-family: 'Lato';
+ font-style: normal;
+ font-weight: 400;
+ src: local('Lato Regular'), local('Lato-Regular'), url('../lib/css/fonts/lato.woff') format('woff');
+}
+
+
+
/*
* lib/css/bootstrap/headings.css
- *//* heading from bootstrap */
+ */
+/* heading from bootstrap */
h1,
h2,
@@ -1206,9 +1803,12 @@
color: #999999;
text-transform: uppercase;
}
+
/*
* lib/css/bootstrap/buttons.css
- */.close {
+ */
+.close {
+ font-family: Helvetica, Sans;
float: right;
font-size: 20px;
font-weight: bold;
@@ -1591,9 +2191,11 @@
.btn-small .caret {
margin-top: 4px;
}
+
/*
* lib/css/bootstrap/navbar.css
- */.nav {
+ */
+.nav {
margin-left: 0;
margin-bottom: 18px;
list-style: none;
@@ -2059,9 +2661,11 @@
padding: 0px 20px;
}
+
/*
* lib/css/bootstrap/dropdown.css
- */.dropdown {
+ */
+.dropdown {
position: relative;
}
.dropdown-toggle {
@@ -2161,9 +2765,11 @@
.dropdown.open .dropdown-menu {
display: block;
}
+
/*
* lib/css/bootstrap/tooltip.css
- */.tooltip {
+ */
+.tooltip {
position: absolute;
z-index: 1020;
display: block;
@@ -2329,9 +2935,11 @@
.popover-content p, .popover-content ul, .popover-content ol {
margin-bottom: 0;
}
+
/*
* lib/css/bootstrap/label.css
- */.label {
+ */
+.label {
padding: 2px 4px 3px;
font-size: 11.049999999999999px;
font-weight: bold;
@@ -2370,9 +2978,11 @@
.label-info:hover {
background-color: #2d6987;
}
+
/*
* lib/css/bootstrap/icons.css
- */[class^="icon-"], [class*=" icon-"] {
+ */
+[class^="icon-"], [class*=" icon-"] {
display: inline-block;
width: 14px;
height: 14px;
@@ -2749,16 +3359,114 @@
.icon-resize-horizontal {
background-position: -456px -118px;
}
+
+/*
+ * lib/css/bootstrap/popover.css
+ */
+.popover {
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: 1010;
+ display: none;
+ padding: 5px;
+}
+.popover.top {
+ margin-top: -5px;
+}
+.popover.right {
+ margin-left: 5px;
+}
+.popover.bottom {
+ margin-top: 5px;
+}
+.popover.left {
+ margin-left: -5px;
+}
+.popover.top .arrow {
+ bottom: 0;
+ left: 50%;
+ margin-left: -5px;
+ border-left: 5px solid transparent;
+ border-right: 5px solid transparent;
+ border-top: 5px solid #000000;
+}
+.popover.right .arrow {
+ top: 50%;
+ left: 0;
+ margin-top: -5px;
+ border-top: 5px solid transparent;
+ border-bottom: 5px solid transparent;
+ border-right: 5px solid #000000;
+}
+.popover.bottom .arrow {
+ top: 0;
+ left: 50%;
+ margin-left: -5px;
+ border-left: 5px solid transparent;
+ border-right: 5px solid transparent;
+ border-bottom: 5px solid #000000;
+}
+.popover.left .arrow {
+ top: 50%;
+ right: 0;
+ margin-top: -5px;
+ border-top: 5px solid transparent;
+ border-bottom: 5px solid transparent;
+ border-left: 5px solid #000000;
+}
+.popover .arrow {
+ position: absolute;
+ width: 0;
+ height: 0;
+}
+.popover-inner {
+ padding: 3px;
+ width: 280px;
+ overflow: hidden;
+ background: #000000;
+ background: rgba(0, 0, 0, 0.8);
+ -webkit-border-radius: 6px;
+ -moz-border-radius: 6px;
+ border-radius: 6px;
+ -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+ -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+ box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+}
+.popover-title {
+ padding: 9px 15px;
+ line-height: 1;
+ background-color: #f5f5f5;
+ border-bottom: 1px solid #eee;
+ -webkit-border-radius: 3px 3px 0 0;
+ -moz-border-radius: 3px 3px 0 0;
+ border-radius: 3px 3px 0 0;
+}
+.popover-content {
+ padding: 14px;
+ background-color: #ffffff;
+ -webkit-border-radius: 0 0 3px 3px;
+ -moz-border-radius: 0 0 3px 3px;
+ border-radius: 0 0 3px 3px;
+ -webkit-background-clip: padding-box;
+ -moz-background-clip: padding-box;
+ background-clip: padding-box;
+}
+.popover-content p, .popover-content ul, .popover-content ol {
+ margin-bottom: 0;
+}
+
/*
* erpnext/startup/startup.css
- */h1, h2, h3, h4, h5 {
- font-family: Tahoma, Arial, Verdana, sans-serif;
+ */
+h1, h2, h3, h4, h5 {
+ font-family: "Open Sans", Helvetica, "Helvetica Neue", sans-serif;
font-weight: bold;
}
body {
- font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
- font-size: 12px;
+ font-family: "Open Sans", Helvetica, "Helvetica Neue", sans-serif;
+ font-size: 13px;
}
span, div, td, input, textarea, button, select {
@@ -2766,7 +3474,11 @@
}
body {
- background: url(../images/stripedbg.png) repeat;
+ background: url(../images/redbeech.jpg) repeat;
+}
+
+.small {
+ font-size: 11.5px;
}
.erpnext-footer {
@@ -2835,3 +3547,4 @@
min-width: 160px !important;
max-width: 260px !important;
}
+
diff --git a/css/all-web.css b/css/all-web.css
index 36d9cda..d818b7f 100644
--- a/css/all-web.css
+++ b/css/all-web.css
@@ -1,7 +1,8 @@
/*
* lib/css/legacy/body.css
- */html {
+ */
+html {
margin: 0px;
padding: 0px;
}
@@ -10,7 +11,7 @@
margin: 0px;
padding: 0px;
font-family: Arial, Helvetica, Sans;
- font-size: 12px;
+ font-size: 14px;
color: #000;
background-color: #e2e2e2;
}
@@ -25,19 +26,22 @@
}
select, input, textarea {
- border: 1px solid #AAA;
+ border: 1px solid #ccc;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
- font-size: 13px;
+ font-size: inherit;
padding: 4px;
- color: #222;
+ color: #444;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
textarea {
font-family: inherit;
height: 120px;
width: 90%;
- font-size: 12px;
+ font-size: inherit;
white-space: normal;
}
@@ -100,8 +104,16 @@
div.comment { color: #444; }
+.small {
+ font-size: 11px;
+}
+
+.help {
+ margin: 3px 0px;
+ color: #888;
+}
+
div#body_div {
- position: relative;
display: none;
padding-right: 7px;
width: 900px;
@@ -109,6 +121,17 @@
margin-top: 56px;
}
+.content {
+ width: 900px;
+}
+
+.background-fade-in {
+ -webkit-transition: background 1s ease-in; /* property duration timing-function delay */
+ -moz-transition: background 1s ease-in;
+ -o-transition: background 1s ease-in;
+ transition: background 1s ease-in;
+}
+
footer {
width: 900px;
margin: auto;
@@ -118,12 +141,23 @@
margin: auto;
}
+@media (max-width: 1200px) {
+ div#body_div, header .container, .content, #opened-page-selector, footer {
+ width: 900px;
+ }
+}
+
+@media (min-width: 1200px) {
+ div#body_div, header .container, .content, #opened-page-selector, footer {
+ width: 1100px;
+ }
+}
+
div.no_script {
display: none;
}
div.loading_div {
- position: absolute;
background-color: #FFFFCC;
z-index: 1999;
right: 5px;
@@ -131,7 +165,6 @@
display: none;
text-align: center;
padding: 2px;
- font-size: 12px;
border: 1px solid #FF4;
}
@@ -156,27 +189,17 @@
-moz-border-radius: 5px;
border-radius: 5px;
}
-.gradient {
- background: #ededed; /* Old browsers */
- background: -moz-linear-gradient(top, #ededed 0%, #d1d1d1 47%, #b7b7b7 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ededed), color-stop(47%,#d1d1d1), color-stop(100%,#b7b7b7)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* Opera11.10+ */
- background: -ms-linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* IE10+ */
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ededed', endColorstr='#b7b7b7',GradientType=0 ); /* IE6-9 */
- background: linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* W3C */
-}
.layout_wrapper, .layout-wrapper {
- -moz-box-shadow: 1px 1px 8px #555;
- -webkit-box-shadow: 1px 1px 8px #555;
- box-shadow: 1px 1px 8px #555;
+ -moz-box-shadow: 0px 0px 6px rgba(0,0,0,0.3);
+ -webkit-box-shadow: 0px 0px 6px rgba(0,0,0,0.3);
+ box-shadow: 0px 0px 6px rgba(0,0,0,0.3);
background-color: #fff;
padding: 15px;
}
.layout-wrapper-background {
- background-color: #f2f2f2 !important;
+ background-color: #fafafa !important;
padding: 0px;
}
@@ -185,7 +208,7 @@
float: left;
padding: 15px;
background-color: #FFF;
- min-height: 450px;
+ min-height: 600px;
-moz-box-shadow: 7px 0px 6px -2px #ddd;
-webkit-box-shadow: 7px 0px 6px -2px #ddd;
box-shadow: 7px 0px 6px -2px #ddd;
@@ -194,10 +217,10 @@
.layout-side-section {
width: 22%;
/*float: right;*/
- color: #606060;
+ color: #606060;
overflow-x: hidden;
padding: 15px;
- min-height: 450px;
+ min-height: 600px;
}
/* from bootstrap */
@@ -232,17 +255,20 @@
.avatar-small {
display: inline-block;
- min-width: 29px;
+ width: 24px;
+ height: 20px;
+ vertical-align: middle;
+ overflow: hidden;
+ margin: 0px 3px;
}
.avatar-small img {
- height: 24px;
- margin-bottom: -7px;
- max-width: 24px;
+ width: 24px;
}
/*
* lib/css/legacy/messages.css
*/
+
/* FLOATING MESSAGE */
.btn-img { cursor: pointer; }
@@ -291,9 +317,11 @@
text-align: center;
font-size: 14px;
}
+
/*
* lib/css/legacy/dialog.css
- *//***** Dialogs *******/
+ */
+/***** Dialogs *******/
div.dialog_wrapper {
position: absolute;
@@ -371,9 +399,11 @@
font-size: 12px;
}
+
/*
* lib/css/bootstrap/headings.css
- *//* heading from bootstrap */
+ */
+/* heading from bootstrap */
h1,
h2,
@@ -434,9 +464,12 @@
color: #999999;
text-transform: uppercase;
}
+
/*
* lib/css/bootstrap/buttons.css
- */.close {
+ */
+.close {
+ font-family: Helvetica, Sans;
float: right;
font-size: 20px;
font-weight: bold;
@@ -819,9 +852,11 @@
.btn-small .caret {
margin-top: 4px;
}
+
/*
* lib/css/bootstrap/navbar.css
- */.nav {
+ */
+.nav {
margin-left: 0;
margin-bottom: 18px;
list-style: none;
@@ -1287,9 +1322,11 @@
padding: 0px 20px;
}
+
/*
* lib/css/bootstrap/dropdown.css
- */.dropdown {
+ */
+.dropdown {
position: relative;
}
.dropdown-toggle {
@@ -1389,9 +1426,11 @@
.dropdown.open .dropdown-menu {
display: block;
}
+
/*
* lib/css/bootstrap/tooltip.css
- */.tooltip {
+ */
+.tooltip {
position: absolute;
z-index: 1020;
display: block;
@@ -1557,16 +1596,206 @@
.popover-content p, .popover-content ul, .popover-content ol {
margin-bottom: 0;
}
+
+/*
+ * lib/css/ui/fonts.css
+ */
+@font-face {
+ font-family: 'Pontano Sans';
+ font-style: normal;
+ font-weight: 800;
+ src: url('../lib/css/fonts/pontanosans.woff') format('woff');
+}
+
+@font-face {
+ font-family: 'Droid Sans';
+ font-style: normal;
+ font-weight: normal;
+ src: local('Droid Sans'), local('DroidSans'), url('../lib/css/fonts/droidsans.woff') format('woff');
+}
+
+@font-face {
+ font-family: 'PT Sans';
+ font-style: normal;
+ font-weight: normal;
+ src: local('PT Sans'), local('PTSans-Regular'), url('../lib/css/fonts/ptsans.woff') format('woff');
+}
+
+@font-face {
+ font-family: 'Open Sans';
+ font-style: normal;
+ font-weight: 400;
+ src: local('Open Sans'), local('OpenSans'), url('../lib/css/fonts/opensans.woff') format('woff');
+}
+@font-face {
+ font-family: 'Lato';
+ font-style: normal;
+ font-weight: 400;
+ src: local('Lato Regular'), local('Lato-Regular'), url('../lib/css/fonts/lato.woff') format('woff');
+}
+
+
+
+/*
+ * lib/css/ui/list.css
+ */
+.hide {
+ display: none;
+}
+
+.list-filters {
+ margin: 7px 0px;
+}
+
+.wnlist .img-load {
+ display: none;
+ float: left;
+ margin-bottom: 8px;
+}
+
+/* list-row */
+div.list-row {
+ border-bottom: 1px solid #eee;
+ padding: 5px 0px;
+}
+div.list-row:hover {
+ background-color: #eef
+}
+
+div.list-row .label {
+ margin-right: 4px;
+}
+
+div.list-row table {
+ table-layout: fixed;
+ border-collapse: collapse;
+ width: 100%;
+}
+
+div.list-row table td {
+ overflow: hidden;
+ padding-right: 3px;
+ vertical-align: middle;
+ height: 24px;
+ max-height: 24px;
+}
+
+div.paging-button {
+ text-align: center;
+ padding: 11px 0px;
+}
+
+div.show_filters {
+ display: none;
+}
+
+div.filter_list {
+ padding: 13px;
+}
+
+div.show_filters.well {
+ margin-top: 11px;
+ margin-bottom: 11px;
+}
+
+div.filter_list .run_btn {
+ text-align: right;
+}
+
+div.filter_list .add_filter {
+ margin: 3px 0px;
+}
+
+div.list_filter {
+ margin: 7px 0px;
+}
+
+div.list_filter input, div.list_filter select {
+ width: 130px;
+ margin-right: 7px;
+}
+
+/* bar */
+
+span.bar-outer {
+ display: inline-block;
+ margin: 0px 7px;
+ margin-top: 3px;
+ background-color: #fff;
+ border: 1px solid #aaa;
+ height: 10px;
+}
+
+span.bar-inner {
+ display: inline-block;
+ background-color: #bdf;
+ height: 100%;
+ margin-bottom: 2px;
+ float: left;
+}
+span.bar-complete {
+ background-color: #009900;
+}
+span.bar-empty {
+ background-color: #990000;
+}
+
+
+/* stats */
+
+div.stat-wrapper {
+ margin-bottom: 19px;
+}
+
+div.stat-grid {
+ border: 2px solid #bbb;
+ background-color: white;
+ border-radius: 5px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ overflow: hidden;
+}
+
+div.stat-label {
+ position: relative;
+ padding: 3px;
+ text-align: center;
+}
+div.stat-label, div.stat-label a {
+ z-index: 5;
+}
+
+div.stat-item {
+ position: relative;
+ border-bottom: 1px solid #ddd;
+}
+div.stat-item:last-child {
+ border-bottom: 0px solid #ddd;
+}
+
+div.stat-bar {
+ position: absolute;
+ left: 0px;
+ background-color: #def;
+ height: 100%;
+ z-index: 0;
+}
+
+
+
+
+
/*
* erpnext/startup/startup.css
- */h1, h2, h3, h4, h5 {
- font-family: Tahoma, Arial, Verdana, sans-serif;
+ */
+h1, h2, h3, h4, h5 {
+ font-family: "Open Sans", Helvetica, "Helvetica Neue", sans-serif;
font-weight: bold;
}
body {
- font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
- font-size: 12px;
+ font-family: "Open Sans", Helvetica, "Helvetica Neue", sans-serif;
+ font-size: 13px;
}
span, div, td, input, textarea, button, select {
@@ -1574,7 +1803,11 @@
}
body {
- background: url(../images/stripedbg.png) repeat;
+ background: url(../images/redbeech.jpg) repeat;
+}
+
+.small {
+ font-size: 11.5px;
}
.erpnext-footer {
@@ -1644,9 +1877,11 @@
max-width: 260px !important;
}
+
/*
* erpnext/website/css/website.css
- */.layout_wrapper {
+ */
+.layout_wrapper {
padding: 20px;
}
@@ -1662,6 +1897,10 @@
margin-bottom: 7px;
}
+p, li {
+ line-height: 1.6em;
+}
+
pre {
background-color: #F8F8F8;
border: 1px solid #CCCCCC;
@@ -1757,4 +1996,4 @@
.web-footer-menu ul li:last-child {
border-right: 0px solid #777 !important;
-}
\ No newline at end of file
+}
diff --git a/css/style-app.css b/css/style-app.css
deleted file mode 100644
index f5447cf..0000000
--- a/css/style-app.css
+++ /dev/null
@@ -1,1850 +0,0 @@
-
-/*
- * lib/css/legacy/body.css
- */html {
- margin: 0px;
- padding: 0px;
-}
-
-body {
- margin: 0px;
- padding: 0px;
- font-family: Arial, Helvetica, Sans;
- font-size: 12px;
- color: #000;
-}
-
-/* heading from bootstrap */
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
- margin: 0;
- font-weight: bold;
- color: #333333;
- text-rendering: optimizelegibility;
- margin-bottom: 0.3em;
-}
-h1 small,
-h2 small,
-h3 small,
-h4 small,
-h5 small,
-h6 small {
- font-weight: normal;
- color: #999999;
-}
-h1 {
- font-size: 30px;
- line-height: 36px;
-}
-h1 small {
- font-size: 18px;
-}
-h2 {
- font-size: 24px;
- line-height: 36px;
-}
-h2 small {
- font-size: 18px;
-}
-h3 {
- line-height: 27px;
- font-size: 18px;
-}
-h3 small {
- font-size: 14px;
-}
-h4, h5, h6 {
- line-height: 18px;
-}
-h4 {
- font-size: 14px;
-}
-h4 small {
- font-size: 12px;
-}
-h5 {
- font-size: 12px;
-}
-h6 {
- font-size: 11px;
- color: #999999;
- text-transform: uppercase;
-}
-
-pre { margin: 0px; padding: 0px; }
-
-button { margin: 2px; margin-left: 0px; }
-
-label {
- padding-top: 15px;
- color: #404040;
-}
-
-select, input, textarea {
- border: 1px solid #AAA;
- -moz-border-radius: 4px;
- -webkit-border-radius: 4px;
- font-size: 13px;
- padding: 4px;
- color: #222;
-}
-
-textarea {
- font-family: inherit;
- height: 120px;
- width: 90%;
- font-size: 12px;
- white-space: normal;
-}
-
-table { padding: 0px; border-collapse: 'collapse'}
-
-td {
- padding:0px;
- margin: 0px;
- vertical-align: top;
-}
-
-p {
- margin: 0px 0px 9px 0px;
- line-height: 1.5em;
-}
-
-li {
- line-height: 1.5em;
-}
-
-a:active { outline:none; }
-
-:focus { -moz-outline-style:none; }
-
-table.simpletable { border-collapse: collapse; margin-bottom: 10px;}
-table.simpletable td {border: 1pt solid #000; vertical-align: top; padding: 2px; }
-
-div.fix_ff_cursor { overflow: auto; }
-
-/* --- Layout --- */
-
-div.comment { color: #444; }
-
-div#body_div {
- position: relative;
- display: none;
- margin-top: 56px;
- padding-right: 7px;
-}
-
-div.no_script {
- display: none;
-}
-
-div.loading_div {
- position: absolute;
- background-color: #FFFFCC;
- z-index: 1999;
- right: 5px;
- width: 90px;
- display: none;
- text-align: center;
- padding: 2px;
- font-size: 12px;
- border: 1px solid #FF4;
-}
-
-
-div#head_div { background-color: #FFF; }
-
-#head_banner { background-color: #FFF; }
-
-.link_type {
- padding:2px;
- color: #00b;
- text-decoration: underline;
- cursor: pointer;
-}
-
-.link_type:hover {
- color: #fff !important;
- background-color: #07b;
- text-decoration: none;
-}
-
-div.std-footer {
- margin: 13px 0px;
- border-top: 1px solid #AAA;
- padding: 13px;
-}
-
-div.std-footer-item {
- margin: 0px 13px 13px 0px;
-}
-
-.shadow {
- -moz-box-shadow: 0px 2px 2px #888;
- -webkit-box-shadow: 0px 2px 2px #888;
- box-shadow: 0px 2px 2px #888;
-}
-
-.round {
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px;
-}
-.gradient {
- background: #ededed; /* Old browsers */
- background: -moz-linear-gradient(top, #ededed 0%, #d1d1d1 47%, #b7b7b7 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ededed), color-stop(47%,#d1d1d1), color-stop(100%,#b7b7b7)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* Opera11.10+ */
- background: -ms-linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* IE10+ */
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ededed', endColorstr='#b7b7b7',GradientType=0 ); /* IE6-9 */
- background: linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* W3C */
-}
-
-.header-gradient {
- background: #84827c; /* Old browsers */
- background: -moz-linear-gradient(top, #84827c 0%, #27211c 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#84827c), color-stop(100%,#27211c)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #84827c 0%,#27211c 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #84827c 0%,#27211c 100%); /* Opera11.10+ */
- background: -ms-linear-gradient(top, #84827c 0%,#27211c 100%); /* IE10+ */
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#84827c', endColorstr='#27211c',GradientType=0 ); /* IE6-9 */
- background: linear-gradient(top, #84827c 0%,#27211c 100%); /* W3C */
- color: #FFF;
-}
-
-.layout_wrapper {
- padding: 15px;
- -moz-box-shadow: 1px 1px 6px #AAA;
- -webkit-box-shadow: 1px 1px 6px #AAA;
- box-shadow: 1px 1px 6px #AAA;
- background-color: #FFF;
-}
-
-/* from bootstrap */
-.container {
- margin-left: auto;
- margin-right: auto;
- zoom: 1;
-}
-.container:before, .container:after {
- display: table;
- content: "";
- zoom: 1;
-}
-.container:after {
- clear: both;
-}
-
-/*
- * lib/css/legacy/menus.css
- */
-/******** Menus - menu.js ************/
-
-ul.menu_toolbar {
- z-index: 30;
- padding: 0px;
- margin: 0px;
- margin-top: 1px;
-}
-
-ul.menu_toolbar li {
- list-style: none;
- margin: 0px;
- float: left;
-}
-
-.top_menu {
- margin: 0px;
- padding: 4px;
- cursor: pointer;
- color: #FFF;
- margin-right: 8px;
-}
-
-.top_menu_mo {
- background-color: #000;
-
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
-}
-
-div.menu_toolbar_dropdown {
- position: absolute;
- margin-top: 4px;
- margin-left: 8px;
- width: 140px;
- background-color: #FFF;
- color: #000;
- display: none;
- border: 2px solid #333;
- z-index: 31;
- overflow-y: auto;
- overflow-x: hidden;
-}
-
-div.dd_item {
- cursor: pointer;
- padding: 4px;
- background-color: #FFF;
-}
-div.dd_item_mo { background-color: #FE8; }
-/*
- * lib/css/legacy/messages.css
- */
-/* FLOATING MESSAGE */
-
-.btn-img { cursor: pointer; }
-
-div.fetching { color: #888; text-align:right; }
-
-div.notice {
- postion: absolute;
- background-color: #000;
- -moz-border-radius: 5px; -webkit-border-radius: 5px;
- opacity: 0.6;
- right: 0;
- top: 0;
- margin-top: 8px;
- z-index: -1;
- padding: 8px;
-}
-
-/** help **/
-
-.info-box {
- background-color: #F8F8F8;
- border: 1px solid #CCCCCC;
- border-radius: 3px 3px 3px 3px;
- line-height: 1.6em;
- overflow: auto;
- padding: 6px 10px;
- margin-bottom: 9px;
-}
-
-.help_box, .help-box {
- background-color:#FFC;
- font-size: 13px;
- color: #864;
- padding: 7px;
- margin: 11px 0px;
- border: 1px solid #EEB;
-}
-
-.help_box_big {
- background-color:#FFC;
- color: #864;
- padding: 7px;
- margin: 7px 0px;
- border: 1px solid #EEB;
- text-align: center;
- font-size: 14px;
-}
-/*
- * lib/css/legacy/forms.css
- *//* FORMS */
-
-
-div.frm_print_wrapper {
- background-color:#FFF;
- border:1px solid #444;
- padding: 40px;
-
- box-shadow:1px 1px 8px #229;
- -moz-box-shadow: 1px 1px 8px #229;
- -webkit-box-shadow: 1px 1px 8px #229;
-}
-
-div.page_break {
- margin: 24px 0px;
- border-top: 1px dashed #888;
-}
-
-div.grid_tbarlinks {
- border-bottom: 0px;
- background-color: #CCC;
- padding: 4px 4px 2px 4px;
- width: 180px;
- float: right;
-
- -moz-border-radius-topleft: 5px; -moz-border-radius-topright: 5px;
- -webkit-border-top-left-radius: 5px; -webkit-border-top-right-radius: 5px;
-}
-
-
-div.frm_tip_box {
- margin: 0px;
- padding: 8px;
- background-color: #FFC;
- display: none;
- font-size: 11px;
- border: 1px solid #FFB;
-}
-
-div.frm_tip_box table {
- border-collapse: collapse;
- vertical-align: top;
-}
-
-td.frm_tray_area {
- width: 122px;
-}
-
-div.dialog_frm {
- position: relative;
- margin: 10px;
-}
-
-
-
-/*------------------*/
-
-.top_cell {
- height: 50px;
-}
-
-div.attach_area {
- padding: 8px;
- margin: 8px;
- background-color: #EEE;
-}
-
-div.attach_area table {
- width: 100%;
-}
-
-.tablabel_normal {
- margin: 0 4px 0 0;
- padding: 3px 5px;
- line-height: 1.3em;
- display: inline;
- cursor: pointer;
-}
-
-.tablabel_selected {
- margin: 0 4px 0 0;
- padding: 3px 5px;
- line-height: 1.3em;
- font-weight: bold;
- display: inline;
- cursor: pointer;
- color: #000;
-}
-
-.scrollhead_wrapper {
- position: absolute;
- z-index: 1;
- height: 30px;
-}
-
-.treeimg {
- cursor: pointer;
- margin-right: 3px;
-}
-
-
-.sectionCell {
- padding: 5px;
- vertical-align: top;
-}
-
-.code_area {
- width: 80%;
- margin: 8px;
- padding: 4px;
- background-color: #F8F8F8;
- border: 1px solid #CCC;
- overflow-x: auto;
-}
-
-.code_text {
- width: 100%;
- height: 360px;
- margin-top: 3px;
- font-family: Courier, Fixed;
- font-size: 12px;
-}
-
-div.time_field select{
- display: inline;
- margin: 2px;
- width: 45px;
-}
-
-/* Documents */
-
-.frm_field_table {
- width: 100%;
- border-collapse: collapse;
-}
-
-.datalabelcell {
- padding: 2px 0px;
- width: 160px;
- vertical-align: top;
-}
-.datainputcell { padding: 2px 0px; }
-
-
-.field_description, .help {
- margin: 3px 0px 11px 0px;
- color: #888;
- font-style: italic;
-}
-
-.field_description_top {
- margin-bottom: 3px;
-}
-
-.field_label {
- font-size:11px;
-}
-.input_area input, select, textarea {
- font-size: 14px;
- padding: 2px;
-}
-
-.input_area input {
- width: 80%;
- margin: 0px;
-}
-.input_area select {
- width: 80%;
-}
-.input_area textarea {
- width: 90%;
-}
-
-.disp_area {
- width: 80%;
- padding: 2px 0px;
- font-size: 12px;
-}
-.disp_area_no_val {
- height: 14px;
-}
-
-.no_img {
- padding: 40px;
- width: 100px;
- height: 20px;
- color: #888;
- text-align: center;
- border: 1px solid #AAA;
-}
-
-.input-mandatory {
- font-size: 14px !important;
- font-weight: bold;
-}
-
-.field-to-update {
- background-color:#FEE;
-}
-
-/* sidebar */
-
-div.sidebar-comment-wrapper input {
- width: 50%;
-}
-div.sidebar-comment-message {
- margin-top: 8px;
- font-size: 11px;
- color: #777;
-}
-
-div.sidebar-comment-text {
- font-size: 12px;
- font-weight: bold;
- margin-top: 8px;
- color: #444;
-}
-div.sidebar-comment-info {
- font-size: 10px;
- color: #777;
-}
-/*
- * lib/css/legacy/grid.css
- */
-
-/* Grid */
-
-
-/* --- Simple --- */
-.grid_wrapper_simple {
- width: 100%;
- margin-bottom: 8px;
- border: 1px solid #AA9;
-}
-
-.grid_head_wrapper_simple {
- padding: 0px;
- border-bottom: 2px solid #AAA;
-}
-
-.grid_head_wrapper_simple td {
- border-right: 1px solid #AA9;
-}
-
-.grid_head_wrapper_simple td div {
- padding: 2px;
-}
-
-.grid_tab_wrapper_simple {
-}
-
-.grid_cell_simple {
- padding: 2px;
- background-color: #fff;
- border-right: 1px solid #AA9;
-}
-
-
-/* --- Normal --- */
-.grid_wrapper {
- position: relative;
- overflow: auto;
- border: 1px solid #AAA;
- width: 100%;
- margin-bottom: 8px;
- background-color: #fff;
-}
-
-.grid_tab_wrapper {
- position: absolute;
- top: 40px;
- border-bottom: 1px solid #DDD;
-}
-
-.grid_table, .grid_head_table {
- table-layout: fixed;
- border-collapse: collapse;
- /*width: 100%;*/
-}
-
-.grid_cell {
- border-right: 1px solid #ddd;
- padding: 0px;
- background-color: #fff;
-}
-
-.grid_head_wrapper {
- position: absolute;
- z-index: 1;
- height: 40px;
- padding: 0px;
- overflow: hidden;
- /*background-color: #fff;*/
-}
-
-.grid_head_table td {
- background-color: #EEE;
- border-right: 1px solid #AAA;
- border-bottom: 1px solid #AAA;
- height: 40px;
- padding: 0px;
-}
-
-.grid_head_table td div {
- color: #222;
- font-weight: bold;
- overflow: hidden;
- padding: 2px 0px;
- text-align: center;
-}
-
-.grid_selector {
- padding: 1px;
- border-right: 1px solid #DDD;
- width: 20px;
- background-color: #fff;
-}
-
-.grid_cell_div {
- padding: 2px;
- cursor: pointer;
- overflow: hidden;
- border: 2px solid #FFF;
-}
-
-.grid_cell_div_selected {
- border: 2px solid #88f;
-}
-
-.grid_cell_div input, .grid_cell_div select, .grid_cell_div div input {
- margin: 0px;
- border: 0px;
- width: 100%;
- margin: 0px;
- }
-
-.grid_cell_div textarea {
- border: 3px solid #abf;
- height:200px;
- width: 300px;
- z-index: 10;
- position:absolute;
-}
-
-.gridDivSelected option { border: 0px; }
-/*
- * lib/css/legacy/listing.css
- *//* listing 2.0 */
-
-div.listing-more {
- margin: 7px 0px 17px 0px;
- text-align: center;
- display: none;
-}
-
-div.listing-toolbar {
- margin: 7px 0px;
-}
-
-/* SRS */
-
-table.srs_result_tab {
- border: 2px solid #AAA;
- border-collapse: collapse;
-}
-
-/* firefox bug fix for disappering borders */
-table.srs_result_tab td, table.srs_result_tab tr, table.srs_result_tab tbody, table.srs_result_tab div {
- position: static;
-}
-
-table.srs_result_tab td {
- padding: 3px 2px;
- position: static;
-}
-
-div.srs_body_area {
-}
-
-div.srs_results_area {
-}
-
-div.srs_filter_wrapper {
- border: 1px solid #CCF;
-
- background-color: #EEF;
- margin:0px 0px 8px 0px;
-
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- border-radius: 5px;
-}
-
-div.srs_filter_area {
- padding: 8px;
-}
-
-div.srs_filter_area td {
- vertical-align: middle;
-}
-
-
-
-
-/*
- * lib/css/legacy/report.css
- */
-/* Reports */
-
-div.report_grid_area {
- position: relative;
- padding: 8px;
-}
-
-
-div.report_tab {
- border: 1px solid #AAA;
- position: relative;
- overflow: auto;
-}
-
-div.report_no_data {
- padding: 8px;
- background-color: #EEE;
- border: 1px solid #DDD;
- position: absolute;
- margin-left: 40%;
- margin-top: 50px;
- display: none;
-}
-
-div.report_htitle {
- float: left;
- padding: 2px;
- font-size: 14px;
- font-weight: bold;
- margin-left: 4px;
- color: #665;
- /*font-weight: bold;*/
-}
-
-div.report_tbar {
- /*background: url('../images/ui/blue-back.gif') repeat-x; */
- background-color: #EEF;
- border: 1px solid #CCF;
- border-bottom: 0px;
- height: 28px;
-}
-
-div.report_tbar table{
- width: 100%;
-}
-div.report_tbar table td {
-
-}
-div.report_tbar table td div {
- position: relative;
-}
-div.report_tbar button, div.report_tbar select, div.report_tbar img {
- font-size: 11px;
- margin: 0px;
-}
-
-div.report_head_wrapper {
- position: absolute;
- height: 24px;
- top: 0px;
- z-index: 1;
-}
-
-div.report_tab_wrapper {
- position: absolute;
- border-bottom: 1px solid #AAA;
- border-top: 1px solid #AAA;
-}
-
-div.report_tab_wrapper table, div.report_head_wrapper table {
- table-layout: fixed;
- border-collapse: collapse;
- /*width: 100%;*/
-}
-
-div.report_tab_wrapper table td, div.report_head_wrapper table td {
- border-left: 1px solid #AAA;
- border-right: 1px solid #AAA;
- border-bottom: 1px solid #AAA;
- overflow: hidden;
- padding: 0px;
-}
-
-div.report_tab_wrapper table td div, div.report_head_wrapper table td div {
- padding: 3px;
- overflow: hidden;
-}
-
-.report_head_cell {
- background-color: #EEE;
- border-bottom: 1px solid #AA9;
- text-align: center;
- font-weight: bold;
-}
-.report_head_cell div {
- color:#222;
- height: 18px;
-}
-
-
-/* FINDER */
-
-div.finder_wrapper {
-}
-
-div.finder_body_area {
- margin: 16px;
-}
-
-div.finder_body {
- display: none;
-}
-
-div.finder_advanced_area table {
- width: 80%;
-}
-
-div.finder_advanced_area textarea {
- width: 80%;
-}
-
-div.finder_filter_area {
- position: relative;
-}
-
-div.filter_head {
- font-size: 14px;
- margin-bottom: 2px;
-}
-div.filter_dt_head {
- font-size: 14px;
- font-weight: bold;
- margin-bottom: 2px;
-}
-table.filter_tab {
- width: 96%;
- border-collapse: collapse;
-}
-
-table.filter_tab td {
- width: 50%;
-}
-
-div.finder_picker_area {
-
-}
-div.builder_field {
- margin: 0px;
-}
-div.builder_dt_head {
- font-size: 14px;
- font-weight: bold;
- margin-bottom: 2px;
-}
-
-div.builder_field table {
- width: 90%;
- border-collapse: collapse;
-}
-
-div.builder_label {
- height: 20px;
-}
-
-div.builder_head {
- font-size: 16px;
- font-weight: bold;
- color: #AB6;
-}
-
-table.builder_tab {
- width: 96%;
- border-collapse: collapse;
-}
-
-table.builder_tab td {
- width: 33%;
- padding: 2px;
-}
-/*
- * lib/css/legacy/calendar.css
- *//**** CALENDAR ****/
-
-.caldiv {
- position:absolute;
- visibility:hidden;
- background-color:white;
- width: 144px;
- z-index: 301; /* always on top(?) */
-}
-
-
-
-div.cal_wrapper { }
-div.cal_body {
- margin: 16px;
- background-color: #DDD;
- position: relative;
- border-radius: 5px;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
-}
-
-div.cal_head {
- margin: 16px;
- margin-bottom: 0px;
-}
-div.cal_head div {
- font-size: 18px;
- color: #666;
- padding-top: 8px;
-}
-
-div.cal_view_body {
- margin: 16px;
-}
-
-div.cal_view_body_plain {
- margin: 16px;
-}
-
-div.cal_month_head {
-}
-
-div.cal_month_body {
- border-top: 1px solid #888;
-}
-
-.cal_month_headtable {
- /*table-layout:fixed;*/
- width: 100%;
-}
-
-.cal_month_name {
- width: 100%;
- color: #888;
- font-size: 14px;
- font-weight: bold;
- text-align: center;
- padding: 4px;
-}
-
-.cal_month_headtable tr td{
- font-size: 12px;
- font-weight: bold;
- text-align: center;
- padding: 4px;
-}
-
-table.cal_month_table {
- border-collapse: collapse;
- /*table-layout:fixed;*/
- height: 100%;
- width: 100%;
-}
-
-table.cal_month_table td {
- width: 14.29%;
- height: 20%;
- /*overflow:hidden;*/
- padding:0px;
-}
-
-div.cal_month_date {
- width:100%;
- height:25%;
- font-size: 10px;
- overflow:hidden;
- /*background-color: #EEF;*/
-}
-
-div.cal_month_date_holiday {
- /*background-color: #FFF;*/
-}
-
-div.cal_month_unit {
- width:100%;
- height:75%;
- overflow:hidden;
- cursor:pointer;
- /*background-color:#FFF;*/
-}
-
-div.cal_vu_disabled {
- background-color:#FFF;
- cursor:default;
-}
-
-table.cal_day_table {
- border-collapse: collapse;
- width: 100%;
-}
-
-table.cal_day_table td {
-}
-
-div.cal_day_body {
- width: 100%;
- height: 80%;
- overflow-y: auto;
- overflow-x: hidden;
- border-top: 1px solid #AAA;
-}
-
-div.cal_day_unit{
- width:100%;
- cursor:pointer;
-}
-
-table.cal_week_table {
- border-collapse: collapse;
- width: 100%;
-}
-
-table.cal_week_table td {
- width: 12.5%;
-}
-
-div.cal_week_body {
- width: 100%;
- height: 80%;
- overflow-y: auto;
- overflow-x: hidden;
- border-top: 1px solid #888;
-}
-
-div.cal_week_unit{
- width: 100%;
- cursor:pointer;
-}
-
-div.cal_event {
- width: 100%;
- height: 12px;
- overflow: hidden;
- font-size: 11px;
- color: #00B;
- margin-bottom: 2px;
- text-decoration: underline;
-}
-
-div.cal_event_Public {
- color: GREEN;
-}
-
-div.cal_event_Private {
- color: BLUE;
-}
-
-div.cal_event_hover {
- text-decoration: underline;
-}
-
-/*
- * lib/css/legacy/autosuggest.css
- *//*
-================================================
-autosuggest, inquisitor style
-================================================
-*/
-
-div.autosuggest
-{
- position: absolute;
- margin-top: 3px;
- border: 1px solid #222;
-}
-
-div.autosuggest ul
-{
- list-style: none;
- margin: 0px;
- padding: 2px;
- overflow: hidden;
- background-color: #FFF;
-}
-
-div.autosuggest ul li
-{
- color: #444;
- padding: 0;
- margin: 0;
- text-align: left;
-}
-
-div.autosuggest ul li a
-{
- color: #444;
- display: block;
- text-decoration: none;
- position: relative;
- padding: 0;
- width: 100%;
-}
-div.autosuggest ul li a:hover
-{
-
-}
-div.autosuggest ul li.as_highlight a:hover
-{
- background-color: #45A;
- color: #FFF;
-}
-
-div.autosuggest ul li a span
-{
- display: block;
- padding: 3px 6px;
- color: #444;
- border-bottom:1px solid #DDD;
-}
-
-div.autosuggest ul li a span small
-{
- display: block;
- font-weight: normal;
- color: #444;
-}
-
-div.autosuggest ul li.as_highlight a span small
-{
- color: #FFF;
-}
-
-div.autosuggest ul li.as_highlight a span {
- color: #FFF;
-}
-
-div.autosuggest ul li.as_highlight a
-{
- color: #FFF;
- background-color: #45A;
- cursor: pointer;
-}
-
-div.autosuggest ul li.as_warning
-{
- font-weight: bold;
- text-align: center;
-}
-
-div.autosuggest ul em
-{
- font-style: normal;
- font-weight: bold;
-}
-
-/*
- * lib/css/legacy/dialog.css
- *//***** Dialogs *******/
-
-div.dialog_wrapper {
- position: absolute;
- width: 440px;
- display: none;
- z-index: 90;
- background-color: #FFF;
- border: 3px solid #222;
- box-shadow:1px 1px 5px #777;
- -moz-box-shadow: 1px 1px 5px #777;
- -webkit-box-shadow: 1px 1px 5px #777;
-
- border-radius: 5px;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
-}
-
-div.dialog_head {
- height: 22px;
- padding: 4px;
- background-color: #222;
- color: #FFF;
-}
-
-div.dialog_body {
- padding: 8px 4px 16px 4px;
- border-radius: 5px;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
-}
-
-div.dialog_back {
- position: fixed;
- display: none;
- top: 0px;
- left: 0px;
- bottom: 0px;
- right: 0px;
- background-color: #EEE;
- opacity: 0.6;
- z-index: 50;
- text-align: center;
-}
-
-div.dialog_message {
- display: none;
- position: absolute;
- width: 250px;
- font-size: 12px;
- z-index: 91;
- background-color:#FFF;
- padding: 12px;
- border: 1px solid #444;
-}
-
-div.dialog_row {
- padding: 8px 8px 0px 8px;
-}
-
-div.dialog_row table {
- width: 100%;
-}
-
-div.dialog_row table td {
-}
-
-div.dialog_row input[type="text"], div.dialog_row input[type="password"], div.dialog_row textarea, div.dialog_row select {
- width: 80%;
- font-size: 14px;
-}
-
-div.dialog_row table td textarea {
- width: 80%;
- height: 200px;
- font-size: 12px;
-}
-
-/*
- * lib/css/legacy/tabs.css
- */
-/******* TABS ********/
-
-div.box_label_wrapper {
- border-bottom: 6px solid #777;
-}
-
-div.box_label_body {
- height: 22px;
-}
-
-ul.box_tabs {
- margin: 0px;
- padding: 0px;
- list-style: none;
-}
-
-ul.box_tabs li {
- height: 22px;
- float:left;
- font-size: 12px;
- text-decoration: underline;
-
- background-color: #DDD;
-
- margin:0;
- margin-left: 4px;
- padding:0 0 0 9px;
- cursor: pointer;
-}
-
-ul.box_tabs a {
- display:block;
- padding:3px 15px 3px 6px;
- text-decoration:none;
-}
-
-ul.box_tabs li.box_tab_mouseover {
- background-color: #BBB;
-}
-
-
-ul.box_tabs li.box_tab_selected {
-/* background:url("../images/ui/rc/tab-left-CCC.gif") no-repeat left top;
- background-color: #ABABAB; */
-
- background-color: #777;
-
- background: -webkit-gradient(linear, left top, left bottom, from(#999), to(#777));
- background: -moz-linear-gradient(top, #999, #777);
-
- color: #FFF;
- font-weight:bold;
-
-}
-ul.box_tabs li.box_tab_selected a {
-/* background:url("../images/ui/rc/tab-right-CCC.gif") no-repeat right top; */
-}
-
-/*
- * lib/css/legacy/bw-icons.css
- */
-/** general icons **/
-
-.wn-icon { background: url('lib/images/icons/icons.png'); width: 16px; height: 16px; cursor: pointer; }
-.ic-2x2_grid { background-position: 0 0; }
-.ic-3x3_grid { background-position: 0 -36px; }
-.ic-3x3_grid_2 { background-position: 0 -72px; }
-.ic-air_signal { background-position: 0 -108px; }
-.ic-align_center { background-position: 0 -144px; }
-.ic-align_just { background-position: 0 -180px; }
-.ic-align_left { background-position: 0 -216px; }
-.ic-align_right { background-position: 0 -252px; }
-.ic-app_window { background-position: 0 -288px; }
-.ic-arrow_bottom { background-position: 0 -324px; }
-.ic-arrow_bottom_left { background-position: 0 -360px; }
-.ic-arrow_bottom_right { background-position: 0 -396px; }
-.ic-arrow_l { background-position: 0 -432px; }
-.ic-arrow_left { background-position: 0 -468px; }
-.ic-arrow_r { background-position: 0 -504px; }
-.ic-arrow_right { background-position: 0 -540px; }
-.ic-arrow_top { background-position: 0 -576px; }
-.ic-arrow_top_left { background-position: 0 -612px; }
-.ic-arrow_top_right { background-position: 0 -648px; }
-.ic-arrow_two_head { background-position: 0 -684px; }
-.ic-arrow_two_head_2 { background-position: 0 -720px; }
-.ic-attention { background-position: 0 -756px; }
-.ic-battery { background-position: 0 -792px; }
-.ic-bell { background-position: 0 -828px; }
-.ic-book { background-position: 0 -864px; }
-.ic-bookmark_1 { background-position: 0 -900px; }
-.ic-bookmark_2 { background-position: 0 -936px; }
-.ic-box { background-position: 0 -972px; }
-.ic-br_down { background-position: 0 -1008px; }
-.ic-br_next { background-position: 0 -1044px; }
-.ic-br_prev { background-position: 0 -1080px; }
-.ic-br_up { background-position: 0 -1116px; }
-.ic-brackets { background-position: 0 -1152px; }
-.ic-browser { background-position: 0 -1188px; }
-.ic-brush { background-position: 0 -1224px; }
-.ic-bug { background-position: 0 -1260px; }
-.ic-burst { background-position: 0 -1296px; }
-.ic-calc { background-position: 0 -1332px; }
-.ic-calendar_1 { background-position: 0 -1368px; }
-.ic-calendar_2 { background-position: 0 -1404px; }
-.ic-cancel { background-position: 0 -1440px; }
-.ic-case { background-position: 0 -1476px; }
-.ic-cc { background-position: 0 -1512px; }
-.ic-cert { background-position: 0 -1548px; }
-.ic-chart_bar { background-position: 0 -1584px; }
-.ic-chart_line { background-position: 0 -1620px; }
-.ic-chart_line_2 { background-position: 0 -1656px; }
-.ic-chart_pie { background-position: 0 -1692px; }
-.ic-checkbox_checked { background-position: 0 -1728px; }
-.ic-checkbox_unchecked { background-position: 0 -1764px; }
-.ic-checkmark { background-position: 0 -1800px; }
-.ic-clip { background-position: 0 -1836px; }
-.ic-clipboard_copy { background-position: 0 -1872px; }
-.ic-clipboard_cut { background-position: 0 -1908px; }
-.ic-clipboard_past { background-position: 0 -1944px; }
-.ic-clock { background-position: -36px 0; }
-.ic-cloud { background-position: -36px -36px; }
-.ic-cloud_rain { background-position: -36px -72px; }
-.ic-cog { background-position: -36px -108px; }
-.ic-comp { background-position: -36px -144px; }
-.ic-compass { background-position: -36px -180px; }
-.ic-contact_card { background-position: -36px -216px; }
-.ic-cube { background-position: -36px -252px; }
-.ic-cur_bp { background-position: -36px -288px; }
-.ic-cur_dollar { background-position: -36px -324px; }
-.ic-cur_euro { background-position: -36px -360px; }
-.ic-cur_yen { background-position: -36px -396px; }
-.ic-cursor_H_split { background-position: -36px -432px; }
-.ic-cursor_V_split { background-position: -36px -468px; }
-.ic-cursor_arrow { background-position: -36px -504px; }
-.ic-cursor_drag_arrow { background-position: -36px -540px; }
-.ic-cursor_drag_arrow_2 { background-position: -36px -576px; }
-.ic-cursor_drag_hand { background-position: -36px -612px; }
-.ic-cursor_hand { background-position: -36px -648px; }
-.ic-db { background-position: -36px -684px; }
-.ic-delete { background-position: -36px -720px; }
-.ic-doc_delete { background-position: -36px -756px; }
-.ic-doc_edit { background-position: -36px -792px; }
-.ic-doc_empty { background-position: -36px -828px; }
-.ic-doc_export { background-position: -36px -864px; }
-.ic-doc_import { background-position: -36px -900px; }
-.ic-doc_lines { background-position: -36px -936px; }
-.ic-doc_lines_stright { background-position: -36px -972px; }
-.ic-doc_minus { background-position: -36px -1008px; }
-.ic-doc_new { background-position: -36px -1044px; }
-.ic-doc_plus { background-position: -36px -1080px; }
-.ic-document { background-position: -36px -1116px; }
-.ic-download { background-position: -36px -1152px; }
-.ic-emotion_sad { background-position: -36px -1188px; }
-.ic-emotion_smile { background-position: -36px -1224px; }
-.ic-expand { background-position: -36px -1260px; }
-.ic-eye { background-position: -36px -1296px; }
-.ic-eye_inv { background-position: -36px -1332px; }
-.ic-facebook { background-position: -36px -1368px; }
-.ic-filter { background-position: -36px -1404px; }
-.ic-fire { background-position: -36px -1440px; }
-.ic-flag { background-position: -36px -1476px; }
-.ic-folder { background-position: -36px -1512px; }
-.ic-folder_arrow { background-position: -36px -1548px; }
-.ic-folder_delete { background-position: -36px -1584px; }
-.ic-folder_minus { background-position: -36px -1620px; }
-.ic-folder_open { background-position: -36px -1656px; }
-.ic-folder_plus { background-position: -36px -1692px; }
-.ic-font_bold { background-position: -36px -1728px; }
-.ic-font_italic { background-position: -36px -1764px; }
-.ic-font_size { background-position: -36px -1800px; }
-.ic-font_strokethrough { background-position: -36px -1836px; }
-.ic-font_underline { background-position: -36px -1872px; }
-.ic-game_pad { background-position: -36px -1908px; }
-.ic-globe_1 { background-position: -36px -1944px; }
-.ic-globe_2 { background-position: -72px 0; }
-.ic-globe_3 { background-position: -72px -36px; }
-.ic-google { background-position: -72px -72px; }
-.ic-hand_1 { background-position: -72px -108px; }
-.ic-hand_2 { background-position: -72px -144px; }
-.ic-hand_contra { background-position: -72px -180px; }
-.ic-hand_pro { background-position: -72px -216px; }
-.ic-headphones { background-position: -72px -252px; }
-.ic-heart { background-position: -72px -288px; }
-.ic-heart_empty { background-position: -72px -324px; }
-.ic-home { background-position: -72px -360px; }
-.ic-image_text { background-position: -72px -396px; }
-.ic-inbox { background-position: -72px -432px; }
-.ic-indent_decrease { background-position: -72px -468px; }
-.ic-indent_increase { background-position: -72px -504px; }
-.ic-info { background-position: -72px -540px; }
-.ic-iphone { background-position: -72px -576px; }
-.ic-key { background-position: -72px -612px; }
-.ic-layers_1 { background-position: -72px -648px; }
-.ic-layers_2 { background-position: -72px -684px; }
-.ic-lightbulb { background-position: -72px -720px; }
-.ic-lighting { background-position: -72px -756px; }
-.ic-link { background-position: -72px -792px; }
-.ic-list_bullets { background-position: -72px -828px; }
-.ic-list_num { background-position: -72px -864px; }
-.ic-magic_wand { background-position: -72px -900px; }
-.ic-mail { background-position: -72px -936px; }
-.ic-mail_2 { background-position: -72px -972px; }
-.ic-mic { background-position: -72px -1008px; }
-.ic-monitor { background-position: -72px -1044px; }
-.ic-movie { background-position: -72px -1080px; }
-.ic-music { background-position: -72px -1116px; }
-.ic-net_comp { background-position: -72px -1152px; }
-.ic-network { background-position: -72px -1188px; }
-.ic-notepad { background-position: -72px -1224px; }
-.ic-notepad_2 { background-position: -72px -1260px; }
-.ic-on-off { background-position: -72px -1296px; }
-.ic-openid { background-position: -72px -1332px; }
-.ic-padlock_closed { background-position: -72px -1368px; }
-.ic-padlock_open { background-position: -72px -1404px; }
-.ic-page_layout { background-position: -72px -1440px; }
-.ic-paragraph { background-position: -72px -1476px; }
-.ic-pencil { background-position: -72px -1512px; }
-.ic-phone { background-position: -72px -1548px; }
-.ic-phone_1 { background-position: -72px -1584px; }
-.ic-phone_2 { background-position: -72px -1620px; }
-.ic-phone_touch { background-position: -72px -1656px; }
-.ic-photo { background-position: -72px -1692px; }
-.ic-picture { background-position: -72px -1728px; }
-.ic-pin { background-position: -72px -1764px; }
-.ic-pin_2 { background-position: -72px -1800px; }
-.ic-pin_map { background-position: -72px -1836px; }
-.ic-pin_map_down { background-position: -72px -1872px; }
-.ic-pin_map_left { background-position: -72px -1908px; }
-.ic-pin_map_right { background-position: -72px -1944px; }
-.ic-pin_map_top { background-position: -108px 0; }
-.ic-pin_sq_down { background-position: -108px -36px; }
-.ic-pin_sq_left { background-position: -108px -72px; }
-.ic-pin_sq_right { background-position: -108px -108px; }
-.ic-pin_sq_top { background-position: -108px -144px; }
-.ic-playback_ff { background-position: -108px -180px; }
-.ic-playback_next { background-position: -108px -216px; }
-.ic-playback_pause { background-position: -108px -252px; }
-.ic-playback_play { background-position: -108px -288px; }
-.ic-playback_prev { background-position: -108px -324px; }
-.ic-playback_rec { background-position: -108px -360px; }
-.ic-playback_reload { background-position: -108px -396px; }
-.ic-playback_rew { background-position: -108px -432px; }
-.ic-playback_stop { background-position: -108px -468px; }
-.ic-preso { background-position: -108px -504px; }
-.ic-print { background-position: -108px -540px; }
-.ic-question { background-position: -108px -576px; }
-.ic-redo { background-position: -108px -612px; }
-.ic-rnd_br_down { background-position: -108px -648px; }
-.ic-rnd_br_first { background-position: -108px -684px; }
-.ic-rnd_br_last { background-position: -108px -720px; }
-.ic-rnd_br_next { background-position: -108px -756px; }
-.ic-rnd_br_prev { background-position: -108px -792px; }
-.ic-rnd_br_up { background-position: -108px -828px; }
-.ic-round { background-position: -108px -864px; }
-.ic-round_and_up { background-position: -108px -900px; }
-.ic-round_arrow_left { background-position: -108px -936px; }
-.ic-round_arrow_right { background-position: -108px -972px; }
-.ic-round_checkmark { background-position: -108px -1008px; }
-.ic-round_delete { background-position: -108px -1044px; }
-.ic-round_minus { background-position: -108px -1080px; }
-.ic-round_plus { background-position: -108px -1116px; }
-.ic-rss { background-position: -108px -1152px; }
-.ic-rss_sq { background-position: -108px -1188px; }
-.ic-sand { background-position: -108px -1224px; }
-.ic-sat_dish { background-position: -108px -1260px; }
-.ic-save { background-position: -108px -1296px; }
-.ic-server { background-position: -108px -1332px; }
-.ic-share { background-position: -108px -1368px; }
-.ic-shop_cart { background-position: -108px -1404px; }
-.ic-sound_high { background-position: -108px -1440px; }
-.ic-sound_low { background-position: -108px -1476px; }
-.ic-sound_mute { background-position: -108px -1512px; }
-.ic-spechbubble { background-position: -108px -1548px; }
-.ic-spechbubble_2 { background-position: -108px -1584px; }
-.ic-spechbubble_sq { background-position: -108px -1620px; }
-.ic-spechbubble_sq_line { background-position: -108px -1656px; }
-.ic-sq_br_down { background-position: -108px -1692px; }
-.ic-sq_br_first { background-position: -108px -1728px; }
-.ic-sq_br_last { background-position: -108px -1764px; }
-.ic-sq_br_next { background-position: -108px -1800px; }
-.ic-sq_br_prev { background-position: -108px -1836px; }
-.ic-sq_br_up { background-position: -108px -1872px; }
-.ic-sq_down { background-position: -108px -1908px; }
-.ic-sq_minus { background-position: -108px -1944px; }
-.ic-sq_next { background-position: -144px 0; }
-.ic-sq_plus { background-position: -144px -36px; }
-.ic-sq_prev { background-position: -144px -72px; }
-.ic-sq_up { background-position: -144px -108px; }
-.ic-square_shape { background-position: -144px -144px; }
-.ic-star { background-position: -144px -180px; }
-.ic-star_fav { background-position: -144px -216px; }
-.ic-star_fav_empty { background-position: -144px -252px; }
-.ic-sun { background-position: -144px -288px; }
-.ic-tag { background-position: -144px -324px; }
-.ic-tape { background-position: -144px -360px; }
-.ic-target { background-position: -144px -396px; }
-.ic-text_curstor { background-position: -144px -432px; }
-.ic-text_letter_t { background-position: -144px -468px; }
-.ic-top_right_expand { background-position: -144px -504px; }
-.ic-trash { background-position: -144px -540px; }
-.ic-twitter { background-position: -144px -576px; }
-.ic-twitter_2 { background-position: -144px -612px; }
-.ic-undo { background-position: -144px -648px; }
-.ic-user { background-position: -144px -684px; }
-.ic-users { background-position: -144px -720px; }
-.ic-wrench { background-position: -144px -756px; }
-.ic-wrench_plus { background-position: -144px -792px; }
-.ic-wrench_plus_2 { background-position: -144px -828px; }
-.ic-zoom { background-position: -144px -864px; }
-
-
-/*
- * lib/css/legacy/sidebar.css
- */div.psidebar-wrapper {
- margin: 0px 8px;
-}
-
-div.psidebar-head {
- font-size: 14px;
- font-weight: bold;
- color: #555;
- margin-bottom: 12px;
-}
-
-div.psidebar-section {
- background-color: #fff;
- border: 1px solid #b2b2b7;
- margin-bottom: 11px;
- overflow: hidden;
-}
-
-div.psidebar-section-head {
- font-size: 12px;
- padding: 5px 11px;
- background: #eeeeee; /* Old browsers */
- background: -moz-linear-gradient(top, #eeeeee 0%, #cccccc 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#eeeeee), color-stop(100%,#cccccc)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #eeeeee 0%,#cccccc 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #eeeeee 0%,#cccccc 100%); /* Opera 11.10+ */
- background: -ms-linear-gradient(top, #eeeeee 0%,#cccccc 100%); /* IE10+ */
- background: linear-gradient(top, #eeeeee 0%,#cccccc 100%); /* W3C */
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#cccccc',GradientType=0 ); /* IE6-9 */
-}
-
-div.psidebar-section-body {
- margin: 7px 11px 11px 11px;
-}
-
-div.psidebar-section-item {
- margin-bottom: 7px;
-}
-
-.psidebar-section-link {
- font-size: 11px;
- color: #666;
-}
-
-div.follower-list {
- color: #666;
- margin-top: 7px;
- font-size: 11px;
-}
-/*
- * lib/css/legacy/bootstrap-buttons.css
- */.btn.danger,
-.alert-message.danger,
-.btn.danger:hover,
-.alert-message.danger:hover,
-.btn.error,
-.alert-message.error,
-.btn.error:hover,
-.alert-message.error:hover,
-.btn.success,
-.alert-message.success,
-.btn.success:hover,
-.alert-message.success:hover,
-.btn.info,
-.alert-message.info,
-.btn.info:hover,
-.alert-message.info:hover {
- color: #ffffff;
-}
-.btn .close, .alert-message .close {
- font-family: Arial, sans-serif;
- line-height: 18px;
-}
-.btn.danger,
-.alert-message.danger,
-.btn.error,
-.alert-message.error {
- background-color: #c43c35;
- background-repeat: repeat-x;
- background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));
- background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
- background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
- background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));
- background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
- background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
- background-image: linear-gradient(top, #ee5f5b, #c43c35);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
- border-color: #c43c35 #c43c35 #882a25;
- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-}
-.btn.success, .alert-message.success {
- background-color: #57a957;
- background-repeat: repeat-x;
- background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));
- background-image: -moz-linear-gradient(top, #62c462, #57a957);
- background-image: -ms-linear-gradient(top, #62c462, #57a957);
- background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));
- background-image: -webkit-linear-gradient(top, #62c462, #57a957);
- background-image: -o-linear-gradient(top, #62c462, #57a957);
- background-image: linear-gradient(top, #62c462, #57a957);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
- border-color: #57a957 #57a957 #3d773d;
- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-}
-.btn.info, .alert-message.info {
- background-color: #339bb9;
- background-repeat: repeat-x;
- background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));
- background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
- background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);
- background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));
- background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
- background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
- background-image: linear-gradient(top, #5bc0de, #339bb9);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
- border-color: #339bb9 #339bb9 #22697d;
- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-}
-.btn {
- cursor: pointer;
- display: inline-block;
- background-color: #e6e6e6;
- background-repeat: no-repeat;
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
- background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
- background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
- background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
- background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
- background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
- padding: 5px 14px 6px;
- text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
- color: #333;
- font-size: 11px;
- line-height: normal;
- border: 1px solid #ccc;
- border-bottom-color: #bbb;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
- -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
- -webkit-transition: 0.1s linear all;
- -moz-transition: 0.1s linear all;
- -ms-transition: 0.1s linear all;
- -o-transition: 0.1s linear all;
- transition: 0.1s linear all;
-}
-.btn:hover {
- background-position: 0 -15px;
- color: #333;
- text-decoration: none;
-}
-.btn:focus {
- outline: 1px dotted #666;
-}
-.btn.primary {
- color: #ffffff;
- background-color: #0064cd;
- background-repeat: repeat-x;
- background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
- background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
- background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
- background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
- background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
- background-image: -o-linear-gradient(top, #049cdb, #0064cd);
- background-image: linear-gradient(top, #049cdb, #0064cd);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
- border-color: #0064cd #0064cd #003f81;
- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-}
-.btn.active, .btn :active {
- -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
- -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
- box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-.btn.disabled {
- cursor: default;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
- filter: alpha(opacity=65);
- -khtml-opacity: 0.65;
- -moz-opacity: 0.65;
- opacity: 0.65;
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
- box-shadow: none;
-}
-.btn[disabled] {
- cursor: default;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
- filter: alpha(opacity=65);
- -khtml-opacity: 0.65;
- -moz-opacity: 0.65;
- opacity: 0.65;
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
- box-shadow: none;
-}
-.btn.large {
- font-size: 15px;
- line-height: normal;
- padding: 9px 14px 9px;
- -webkit-border-radius: 6px;
- -moz-border-radius: 6px;
- border-radius: 6px;
-}
-.btn.small {
- padding: 5px 7px 5px;
- font-size: 11px;
-}
-:root .alert-message, :root .btn {
- border-radius: 0 \0;
-}
-button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
- padding: 0;
- border: 0;
-}
-
-/* CLose */
-
-.close {
- float: right;
- color: #000000;
- font-size: 15px;
- font-weight: bold;
- line-height: 13.5px;
- margin-bottom: -2px;
- text-shadow: 0 1px 0 #ffffff;
- filter: alpha(opacity=25);
- -khtml-opacity: 0.25;
- -moz-opacity: 0.25;
- opacity: 0.25;
- text-decoration: none;
-}
-.close:hover {
- color: #000000;
- text-decoration: none;
- filter: alpha(opacity=40);
- -khtml-opacity: 0.4;
- -moz-opacity: 0.4;
- opacity: 0.4;
- cursor: pointer;
- font-weight: bold;
-}
\ No newline at end of file
diff --git a/css/style-web.css b/css/style-web.css
deleted file mode 100644
index a80fa2d..0000000
--- a/css/style-web.css
+++ /dev/null
@@ -1,629 +0,0 @@
-
-/*
- * lib/css/legacy/body.css
- */html {
- margin: 0px;
- padding: 0px;
-}
-
-body {
- margin: 0px;
- padding: 0px;
- font-family: Arial, Helvetica, Sans;
- font-size: 12px;
- color: #000;
-}
-
-/* heading from bootstrap */
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
- margin: 0;
- font-weight: bold;
- color: #333333;
- text-rendering: optimizelegibility;
- margin-bottom: 0.3em;
-}
-h1 small,
-h2 small,
-h3 small,
-h4 small,
-h5 small,
-h6 small {
- font-weight: normal;
- color: #999999;
-}
-h1 {
- font-size: 30px;
- line-height: 36px;
-}
-h1 small {
- font-size: 18px;
-}
-h2 {
- font-size: 24px;
- line-height: 36px;
-}
-h2 small {
- font-size: 18px;
-}
-h3 {
- line-height: 27px;
- font-size: 18px;
-}
-h3 small {
- font-size: 14px;
-}
-h4, h5, h6 {
- line-height: 18px;
-}
-h4 {
- font-size: 14px;
-}
-h4 small {
- font-size: 12px;
-}
-h5 {
- font-size: 12px;
-}
-h6 {
- font-size: 11px;
- color: #999999;
- text-transform: uppercase;
-}
-
-pre { margin: 0px; padding: 0px; }
-
-button { margin: 2px; margin-left: 0px; }
-
-label {
- padding-top: 15px;
- color: #404040;
-}
-
-select, input, textarea {
- border: 1px solid #AAA;
- -moz-border-radius: 4px;
- -webkit-border-radius: 4px;
- font-size: 13px;
- padding: 4px;
- color: #222;
-}
-
-textarea {
- font-family: inherit;
- height: 120px;
- width: 90%;
- font-size: 12px;
- white-space: normal;
-}
-
-table { padding: 0px; border-collapse: 'collapse'}
-
-td {
- padding:0px;
- margin: 0px;
- vertical-align: top;
-}
-
-p {
- margin: 0px 0px 9px 0px;
- line-height: 1.5em;
-}
-
-li {
- line-height: 1.5em;
-}
-
-a:active { outline:none; }
-
-:focus { -moz-outline-style:none; }
-
-table.simpletable { border-collapse: collapse; margin-bottom: 10px;}
-table.simpletable td {border: 1pt solid #000; vertical-align: top; padding: 2px; }
-
-div.fix_ff_cursor { overflow: auto; }
-
-/* --- Layout --- */
-
-div.comment { color: #444; }
-
-div#body_div {
- position: relative;
- display: none;
- margin-top: 56px;
- padding-right: 7px;
-}
-
-div.no_script {
- display: none;
-}
-
-div.loading_div {
- position: absolute;
- background-color: #FFFFCC;
- z-index: 1999;
- right: 5px;
- width: 90px;
- display: none;
- text-align: center;
- padding: 2px;
- font-size: 12px;
- border: 1px solid #FF4;
-}
-
-
-div#head_div { background-color: #FFF; }
-
-#head_banner { background-color: #FFF; }
-
-.link_type {
- padding:2px;
- color: #00b;
- text-decoration: underline;
- cursor: pointer;
-}
-
-.link_type:hover {
- color: #fff !important;
- background-color: #07b;
- text-decoration: none;
-}
-
-div.std-footer {
- margin: 13px 0px;
- border-top: 1px solid #AAA;
- padding: 13px;
-}
-
-div.std-footer-item {
- margin: 0px 13px 13px 0px;
-}
-
-.shadow {
- -moz-box-shadow: 0px 2px 2px #888;
- -webkit-box-shadow: 0px 2px 2px #888;
- box-shadow: 0px 2px 2px #888;
-}
-
-.round {
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px;
-}
-.gradient {
- background: #ededed; /* Old browsers */
- background: -moz-linear-gradient(top, #ededed 0%, #d1d1d1 47%, #b7b7b7 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ededed), color-stop(47%,#d1d1d1), color-stop(100%,#b7b7b7)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* Opera11.10+ */
- background: -ms-linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* IE10+ */
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ededed', endColorstr='#b7b7b7',GradientType=0 ); /* IE6-9 */
- background: linear-gradient(top, #ededed 0%,#d1d1d1 47%,#b7b7b7 100%); /* W3C */
-}
-
-.header-gradient {
- background: #84827c; /* Old browsers */
- background: -moz-linear-gradient(top, #84827c 0%, #27211c 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#84827c), color-stop(100%,#27211c)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #84827c 0%,#27211c 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #84827c 0%,#27211c 100%); /* Opera11.10+ */
- background: -ms-linear-gradient(top, #84827c 0%,#27211c 100%); /* IE10+ */
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#84827c', endColorstr='#27211c',GradientType=0 ); /* IE6-9 */
- background: linear-gradient(top, #84827c 0%,#27211c 100%); /* W3C */
- color: #FFF;
-}
-
-.layout_wrapper {
- padding: 15px;
- -moz-box-shadow: 1px 1px 6px #AAA;
- -webkit-box-shadow: 1px 1px 6px #AAA;
- box-shadow: 1px 1px 6px #AAA;
- background-color: #FFF;
-}
-
-/* from bootstrap */
-.container {
- margin-left: auto;
- margin-right: auto;
- zoom: 1;
-}
-.container:before, .container:after {
- display: table;
- content: "";
- zoom: 1;
-}
-.container:after {
- clear: both;
-}
-
-/*
- * lib/css/legacy/menus.css
- */
-/******** Menus - menu.js ************/
-
-ul.menu_toolbar {
- z-index: 30;
- padding: 0px;
- margin: 0px;
- margin-top: 1px;
-}
-
-ul.menu_toolbar li {
- list-style: none;
- margin: 0px;
- float: left;
-}
-
-.top_menu {
- margin: 0px;
- padding: 4px;
- cursor: pointer;
- color: #FFF;
- margin-right: 8px;
-}
-
-.top_menu_mo {
- background-color: #000;
-
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
-}
-
-div.menu_toolbar_dropdown {
- position: absolute;
- margin-top: 4px;
- margin-left: 8px;
- width: 140px;
- background-color: #FFF;
- color: #000;
- display: none;
- border: 2px solid #333;
- z-index: 31;
- overflow-y: auto;
- overflow-x: hidden;
-}
-
-div.dd_item {
- cursor: pointer;
- padding: 4px;
- background-color: #FFF;
-}
-div.dd_item_mo { background-color: #FE8; }
-/*
- * lib/css/legacy/messages.css
- */
-/* FLOATING MESSAGE */
-
-.btn-img { cursor: pointer; }
-
-div.fetching { color: #888; text-align:right; }
-
-div.notice {
- postion: absolute;
- background-color: #000;
- -moz-border-radius: 5px; -webkit-border-radius: 5px;
- opacity: 0.6;
- right: 0;
- top: 0;
- margin-top: 8px;
- z-index: -1;
- padding: 8px;
-}
-
-/** help **/
-
-.info-box {
- background-color: #F8F8F8;
- border: 1px solid #CCCCCC;
- border-radius: 3px 3px 3px 3px;
- line-height: 1.6em;
- overflow: auto;
- padding: 6px 10px;
- margin-bottom: 9px;
-}
-
-.help_box, .help-box {
- background-color:#FFC;
- font-size: 13px;
- color: #864;
- padding: 7px;
- margin: 11px 0px;
- border: 1px solid #EEB;
-}
-
-.help_box_big {
- background-color:#FFC;
- color: #864;
- padding: 7px;
- margin: 7px 0px;
- border: 1px solid #EEB;
- text-align: center;
- font-size: 14px;
-}
-/*
- * lib/css/legacy/dialog.css
- *//***** Dialogs *******/
-
-div.dialog_wrapper {
- position: absolute;
- width: 440px;
- display: none;
- z-index: 90;
- background-color: #FFF;
- border: 3px solid #222;
- box-shadow:1px 1px 5px #777;
- -moz-box-shadow: 1px 1px 5px #777;
- -webkit-box-shadow: 1px 1px 5px #777;
-
- border-radius: 5px;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
-}
-
-div.dialog_head {
- height: 22px;
- padding: 4px;
- background-color: #222;
- color: #FFF;
-}
-
-div.dialog_body {
- padding: 8px 4px 16px 4px;
- border-radius: 5px;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
-}
-
-div.dialog_back {
- position: fixed;
- display: none;
- top: 0px;
- left: 0px;
- bottom: 0px;
- right: 0px;
- background-color: #EEE;
- opacity: 0.6;
- z-index: 50;
- text-align: center;
-}
-
-div.dialog_message {
- display: none;
- position: absolute;
- width: 250px;
- font-size: 12px;
- z-index: 91;
- background-color:#FFF;
- padding: 12px;
- border: 1px solid #444;
-}
-
-div.dialog_row {
- padding: 8px 8px 0px 8px;
-}
-
-div.dialog_row table {
- width: 100%;
-}
-
-div.dialog_row table td {
-}
-
-div.dialog_row input[type="text"], div.dialog_row input[type="password"], div.dialog_row textarea, div.dialog_row select {
- width: 80%;
- font-size: 14px;
-}
-
-div.dialog_row table td textarea {
- width: 80%;
- height: 200px;
- font-size: 12px;
-}
-
-/*
- * lib/css/legacy/bootstrap-buttons.css
- */.btn.danger,
-.alert-message.danger,
-.btn.danger:hover,
-.alert-message.danger:hover,
-.btn.error,
-.alert-message.error,
-.btn.error:hover,
-.alert-message.error:hover,
-.btn.success,
-.alert-message.success,
-.btn.success:hover,
-.alert-message.success:hover,
-.btn.info,
-.alert-message.info,
-.btn.info:hover,
-.alert-message.info:hover {
- color: #ffffff;
-}
-.btn .close, .alert-message .close {
- font-family: Arial, sans-serif;
- line-height: 18px;
-}
-.btn.danger,
-.alert-message.danger,
-.btn.error,
-.alert-message.error {
- background-color: #c43c35;
- background-repeat: repeat-x;
- background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));
- background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
- background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
- background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));
- background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
- background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
- background-image: linear-gradient(top, #ee5f5b, #c43c35);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
- border-color: #c43c35 #c43c35 #882a25;
- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-}
-.btn.success, .alert-message.success {
- background-color: #57a957;
- background-repeat: repeat-x;
- background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));
- background-image: -moz-linear-gradient(top, #62c462, #57a957);
- background-image: -ms-linear-gradient(top, #62c462, #57a957);
- background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));
- background-image: -webkit-linear-gradient(top, #62c462, #57a957);
- background-image: -o-linear-gradient(top, #62c462, #57a957);
- background-image: linear-gradient(top, #62c462, #57a957);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
- border-color: #57a957 #57a957 #3d773d;
- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-}
-.btn.info, .alert-message.info {
- background-color: #339bb9;
- background-repeat: repeat-x;
- background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));
- background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
- background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);
- background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));
- background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
- background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
- background-image: linear-gradient(top, #5bc0de, #339bb9);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
- border-color: #339bb9 #339bb9 #22697d;
- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-}
-.btn {
- cursor: pointer;
- display: inline-block;
- background-color: #e6e6e6;
- background-repeat: no-repeat;
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
- background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
- background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
- background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
- background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
- background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
- padding: 5px 14px 6px;
- text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
- color: #333;
- font-size: 11px;
- line-height: normal;
- border: 1px solid #ccc;
- border-bottom-color: #bbb;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
- -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
- -webkit-transition: 0.1s linear all;
- -moz-transition: 0.1s linear all;
- -ms-transition: 0.1s linear all;
- -o-transition: 0.1s linear all;
- transition: 0.1s linear all;
-}
-.btn:hover {
- background-position: 0 -15px;
- color: #333;
- text-decoration: none;
-}
-.btn:focus {
- outline: 1px dotted #666;
-}
-.btn.primary {
- color: #ffffff;
- background-color: #0064cd;
- background-repeat: repeat-x;
- background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
- background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
- background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
- background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
- background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
- background-image: -o-linear-gradient(top, #049cdb, #0064cd);
- background-image: linear-gradient(top, #049cdb, #0064cd);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
- border-color: #0064cd #0064cd #003f81;
- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-}
-.btn.active, .btn :active {
- -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
- -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
- box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-.btn.disabled {
- cursor: default;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
- filter: alpha(opacity=65);
- -khtml-opacity: 0.65;
- -moz-opacity: 0.65;
- opacity: 0.65;
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
- box-shadow: none;
-}
-.btn[disabled] {
- cursor: default;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
- filter: alpha(opacity=65);
- -khtml-opacity: 0.65;
- -moz-opacity: 0.65;
- opacity: 0.65;
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
- box-shadow: none;
-}
-.btn.large {
- font-size: 15px;
- line-height: normal;
- padding: 9px 14px 9px;
- -webkit-border-radius: 6px;
- -moz-border-radius: 6px;
- border-radius: 6px;
-}
-.btn.small {
- padding: 5px 7px 5px;
- font-size: 11px;
-}
-:root .alert-message, :root .btn {
- border-radius: 0 \0;
-}
-button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
- padding: 0;
- border: 0;
-}
-
-/* CLose */
-
-.close {
- float: right;
- color: #000000;
- font-size: 15px;
- font-weight: bold;
- line-height: 13.5px;
- margin-bottom: -2px;
- text-shadow: 0 1px 0 #ffffff;
- filter: alpha(opacity=25);
- -khtml-opacity: 0.25;
- -moz-opacity: 0.25;
- opacity: 0.25;
- text-decoration: none;
-}
-.close:hover {
- color: #000000;
- text-decoration: none;
- filter: alpha(opacity=40);
- -khtml-opacity: 0.4;
- -moz-opacity: 0.4;
- opacity: 0.4;
- cursor: pointer;
- font-weight: bold;
-}
\ No newline at end of file
diff --git a/erpnext/accounts/Module Def/Accounts/Accounts.txt b/erpnext/accounts/Module Def/Accounts/Accounts.txt
deleted file mode 100644
index f9c36c8..0000000
--- a/erpnext/accounts/Module Def/Accounts/Accounts.txt
+++ /dev/null
@@ -1,411 +0,0 @@
-# Module Def, Accounts
-[
-
- # These values are common in all dictionaries
- {
- 'creation': '2010-09-25 10:50:37',
- 'docstatus': 0,
- 'modified': '2011-12-07 16:18:28',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
- },
-
- # These values are common for all Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'name': '__common__',
- 'parent': 'Accounts',
- 'parentfield': 'roles',
- 'parenttype': 'Module Def'
- },
-
- # These values are common for all Module Def Item
- {
- 'doctype': 'Module Def Item',
- 'name': '__common__',
- 'parent': 'Accounts',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
-
- # These values are common for all Module Def
- {
- 'disabled': 'No',
- 'doctype': u'Module Def',
- 'doctype_list': 'GL Mapper, Journal Voucher\nGL Mapper, Payable Voucher\nGL Mapper, Receivable Voucher\nDocType Label, Receivable Voucher\nDocType Label, Payable Voucher',
- 'file_list': 'finance.gif,FileData/00210',
- 'is_hidden': 'No',
- 'last_updated_date': '2010-12-08 10:13:30',
- 'module_desc': 'Data about your payables, receivables and books of accounts',
- 'module_icon': 'Accounts.gif',
- 'module_label': 'Accounts',
- 'module_name': 'Accounts',
- 'module_seq': 5,
- 'name': '__common__'
- },
-
- # Module Def, Accounts
- {
- 'doctype': u'Module Def',
- 'name': 'Accounts'
- },
-
- # Module Def Item
- {
- 'click_function': "show_chart_browser('Accounts Browser','Account')",
- 'description': 'Manage your accounts',
- 'display_name': 'Chart of Accounts',
- 'doc_name': 'Accounts Browser',
- 'doc_type': 'Pages',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'click_function': "show_chart_browser('Accounts Browser','Cost Center')",
- 'description': 'Manage your cost centers',
- 'display_name': 'Chart of Cost Centers',
- 'doc_name': 'Accounts Browser',
- 'doc_type': 'Pages',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'description': 'Regular journal entry',
- 'display_name': 'Journal Voucher',
- 'doc_name': 'Journal Voucher',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'voucher_type\nvoucher_date\nfiscal_year\ntotal_debit\ntotal_credit'
- },
-
- # Module Def Item
- {
- 'description': 'Outgoing Invoice to your customers',
- 'display_name': 'Sales Invoice',
- 'doc_name': 'Receivable Voucher',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'voucher_date\ndue_date\ndebit_to\ngrand_total\noutstanding_amount'
- },
-
- # Module Def Item
- {
- 'description': 'Incoming invoice from your service providers',
- 'display_name': 'Purchase Invoice',
- 'doc_name': 'Payable Voucher',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'voucher_date\ncredit_to\nbill_no\ngrand_total\noutstanding_amount'
- },
-
- # Module Def Item
- {
- 'description': 'Lease Agreement for Vehicles',
- 'display_name': 'Lease Agreement',
- 'doc_name': 'Lease Agreement',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'description': 'Profit & Loss and Balance Sheet builder',
- 'display_name': 'Financial Statements',
- 'doc_name': 'Financial Statements',
- 'doc_type': 'Pages',
- 'doctype': 'Module Def Item',
- 'icon': 'table.gif'
- },
-
- # Module Def Item
- {
- 'description': 'Update your actual clearance dates and find out if bank ledger tallies with your bank statement.',
- 'display_name': 'Bank Reconciliation',
- 'doc_name': 'Bank Reconciliation',
- 'doc_type': 'Single DocType',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'description': 'Link your invoices and payment vouchers to clear/update outstanding amount',
- 'display_name': 'Internal Reconciliation',
- 'doc_name': 'Internal Reconciliation',
- 'doc_type': 'Single DocType',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'TDS Payment',
- 'doc_name': 'TDS Payment',
- 'doc_type': 'Setup Forms',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'TDS Return Acknowledgement',
- 'doc_name': 'TDS Return Acknowledgement',
- 'doc_type': 'Setup Forms',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Form 16A',
- 'doc_name': 'Form 16A',
- 'doc_type': 'Setup Forms',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'description': 'Account closing entry (Profit Booking) on any date',
- 'display_name': 'Period Closing Voucher',
- 'doc_name': 'Period Closing Voucher',
- 'doc_type': 'Setup Forms',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'description': 'You can export balance of selected ledgers within a specific period',
- 'display_name': 'Ledger Balance Export',
- 'doc_name': 'Ledger Balance Export',
- 'doc_type': 'Single DocType',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'description': 'Track C-Form received from customers',
- 'display_name': 'C-Form',
- 'doc_name': 'C-Form',
- 'doc_type': 'Setup Forms',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'General Ledger',
- 'doc_name': 'GL Entry',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Accounts Receivable',
- 'doc_name': 'GL Entry',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Accounts Payable',
- 'doc_name': 'GL Entry',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Bank Reconciliation Statement',
- 'doc_name': 'Journal Voucher Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Trial Balance',
- 'doc_name': 'Account',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Sales Register',
- 'doc_name': 'Receivable Voucher',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Purchase Register',
- 'doc_name': 'Payable Voucher',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Bank Clearance report',
- 'doc_name': 'Journal Voucher Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Monthly Ledger Summary Report',
- 'doc_name': 'GL Entry',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Collection Report',
- 'doc_name': 'Journal Voucher Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Total amout collection for a period - Customerwise',
- 'doc_name': 'Account',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Payment Report',
- 'doc_name': 'Journal Voucher Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Itemwise Sales Register',
- 'doc_name': 'RV Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Itemwise Purchase Register',
- 'doc_name': 'PV Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Cost Center wise Expense',
- 'doc_name': 'GL Entry',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'TDS Return',
- 'doc_name': 'TDS Payment Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Budget Variance Report',
- 'doc_name': 'Budget Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Payment Receipt Report',
- 'doc_name': 'GL Entry',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'description': 'Track total commission given to your Business Associate',
- 'display_name': 'Business Associate Commission Report',
- 'doc_name': 'Receivable Voucher',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Lease Agreement List',
- 'doc_name': 'GL Entry',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Lease Monthly Future Installment Inflows',
- 'doc_name': 'GL Entry',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Lease Overdue Age Wise',
- 'doc_name': 'GL Entry',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Lease Overdue List',
- 'doc_name': 'GL Entry',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Lease Receipts Client Wise',
- 'doc_name': 'GL Entry',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Lease Yearly Future Installment Inflows',
- 'doc_name': 'GL Entry',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Voucher wise tax details',
- 'doc_name': 'RV Tax Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'role': 'Accounts Manager'
- },
-
- # Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'role': 'Accounts User'
- }
-]
\ No newline at end of file
diff --git a/erpnext/accounts/Role/Accounts Manager/Accounts Manager.txt b/erpnext/accounts/Role/Accounts Manager/Accounts Manager.txt
deleted file mode 100644
index 6f6759c..0000000
--- a/erpnext/accounts/Role/Accounts Manager/Accounts Manager.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-# Role, Accounts Manager
-[
-
- # These values are common in all dictionaries
- {
- 'creation': '2010-08-08 17:08:51',
- 'docstatus': 0,
- 'modified': '2009-03-19 14:57:46',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
- },
-
- # These values are common for all Role
- {
- 'doctype': 'Role',
- 'module': 'Accounts',
- 'name': '__common__',
- 'role_name': 'Accounts Manager'
- },
-
- # Role, Accounts Manager
- {
- 'doctype': 'Role',
- 'name': 'Accounts Manager'
- }
-]
\ No newline at end of file
diff --git a/erpnext/accounts/Role/Accounts User/Accounts User.txt b/erpnext/accounts/Role/Accounts User/Accounts User.txt
deleted file mode 100644
index 519924e..0000000
--- a/erpnext/accounts/Role/Accounts User/Accounts User.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-# Role, Accounts User
-[
-
- # These values are common in all dictionaries
- {
- 'creation': '2010-08-08 17:08:51',
- 'docstatus': 0,
- 'modified': '2010-04-08 12:05:21',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
- },
-
- # These values are common for all Role
- {
- 'doctype': 'Role',
- 'module': 'Accounts',
- 'name': '__common__',
- 'role_name': 'Accounts User'
- },
-
- # Role, Accounts User
- {
- 'doctype': 'Role',
- 'name': 'Accounts User'
- }
-]
\ No newline at end of file
diff --git a/erpnext/accounts/__init__.py b/erpnext/accounts/__init__.py
index 44d6aec..9df7240 100644
--- a/erpnext/accounts/__init__.py
+++ b/erpnext/accounts/__init__.py
@@ -18,6 +18,11 @@
from webnotes.utils import flt
from webnotes.model.code import get_obj
+install_docs = [
+ {"doctype":"Role", "name":"Accounts Manager"},
+ {"doctype":"Role", "name":"Accounts User"}
+]
+
@webnotes.whitelist()
def get_default_bank_account():
"""
diff --git a/erpnext/accounts/doctype/account/account.txt b/erpnext/accounts/doctype/account/account.txt
index c06aeba..ec0ade9 100644
--- a/erpnext/accounts/doctype/account/account.txt
+++ b/erpnext/accounts/doctype/account/account.txt
@@ -3,170 +3,168 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:51',
+ 'creation': '2012-03-27 14:35:39',
'docstatus': 0,
- 'modified': '2012-02-02 15:34:41',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:39',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1325570645',
+ '_last_update': u'1325570645',
'allow_copy': 1,
'allow_trash': 1,
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
- 'document_type': 'Master',
+ 'document_type': u'Master',
'in_create': 1,
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
- 'search_fields': 'debit_or_credit, group_or_ledger',
- 'section_style': 'Tray',
- 'server_code_error': ' ',
+ 'search_fields': u'debit_or_credit, group_or_ledger',
+ 'section_style': u'Tray',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 138
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Account',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Account',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'amend': 0,
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Account',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
- 'read': 1
+ 'parent': u'Account',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
+ 'read': 1,
+ 'submit': 0
},
# DocType, Account
{
'doctype': 'DocType',
- 'name': 'Account'
+ 'name': u'Account'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'permlevel': 0,
- 'role': 'Sales User'
- },
-
- # DocPerm
- {
- 'doctype': 'DocPerm',
- 'permlevel': 0,
- 'role': 'Purchase User'
- },
-
- # DocPerm
- {
- 'amend': 0,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Accounts User',
- 'submit': 0,
+ 'role': u'Accounts User',
'write': 1
},
# DocPerm
{
- 'amend': 0,
- 'cancel': 1,
- 'create': 1,
- 'doctype': 'DocPerm',
- 'permlevel': 0,
- 'role': 'Accounts Manager',
- 'submit': 0,
- 'write': 1
- },
-
- # DocPerm
- {
- 'amend': 0,
'cancel': 0,
'create': 0,
- 'doctype': 'DocPerm',
- 'permlevel': 1,
- 'role': 'Accounts User',
- 'submit': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Sales User',
'write': 0
},
# DocPerm
{
- 'amend': 0,
'cancel': 0,
'create': 0,
- 'doctype': 'DocPerm',
- 'permlevel': 1,
- 'role': 'Accounts Manager',
- 'submit': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Purchase User',
'write': 0
},
# DocPerm
{
- 'amend': 0,
'cancel': 0,
'create': 0,
- 'doctype': 'DocPerm',
- 'permlevel': 2,
- 'role': 'Accounts Manager',
- 'submit': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Accounts User',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Accounts Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 1,
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Accounts Manager',
'write': 1
},
# DocPerm
{
- 'amend': 0,
'cancel': 0,
'create': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 2,
- 'role': 'Accounts User',
- 'submit': 0,
+ 'role': u'Accounts Manager',
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 2,
+ 'role': u'Accounts User',
'write': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Properties',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'properties',
+ 'fieldtype': u'Section Break',
+ 'label': u'Properties',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'account_name',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'account_name',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Account Name',
+ 'label': u'Account Name',
'no_copy': 1,
- 'oldfieldname': 'account_name',
- 'oldfieldtype': 'Data',
+ 'oldfieldname': u'account_name',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'reqd': 1,
'search_index': 1
@@ -174,42 +172,42 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'parent_account',
- 'fieldtype': 'Link',
- 'label': 'Parent Account',
- 'oldfieldname': 'parent_account',
- 'oldfieldtype': 'Link',
- 'options': 'Account',
+ 'doctype': u'DocField',
+ 'fieldname': u'parent_account',
+ 'fieldtype': u'Link',
+ 'label': u'Parent Account',
+ 'oldfieldname': u'parent_account',
+ 'oldfieldtype': u'Link',
+ 'options': u'Account',
'permlevel': 0,
'search_index': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'level',
- 'fieldtype': 'Int',
+ 'doctype': u'DocField',
+ 'fieldname': u'level',
+ 'fieldtype': u'Int',
'hidden': 1,
- 'label': 'Level',
- 'oldfieldname': 'level',
- 'oldfieldtype': 'Int',
+ 'label': u'Level',
+ 'oldfieldname': u'level',
+ 'oldfieldtype': u'Int',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
- 'default': 'Ledger',
- 'doctype': 'DocField',
- 'fieldname': 'group_or_ledger',
- 'fieldtype': 'Select',
+ 'default': u'Ledger',
+ 'doctype': u'DocField',
+ 'fieldname': u'group_or_ledger',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Group or Ledger',
- 'oldfieldname': 'group_or_ledger',
- 'oldfieldtype': 'Select',
- 'options': '\nLedger\nGroup',
+ 'label': u'Group or Ledger',
+ 'oldfieldname': u'group_or_ledger',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nLedger\nGroup',
'permlevel': 1,
'reqd': 1,
'search_index': 1
@@ -217,109 +215,112 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Convert to Group',
+ 'doctype': u'DocField',
+ 'fieldname': u'convert_to_group',
+ 'fieldtype': u'Button',
+ 'label': u'Convert to Group',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Convert to Ledger',
+ 'doctype': u'DocField',
+ 'fieldname': u'convert_to_ledger',
+ 'fieldtype': u'Button',
+ 'label': u'Convert to Ledger',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'debit_or_credit',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'debit_or_credit',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Debit or Credit',
- 'oldfieldname': 'debit_or_credit',
- 'oldfieldtype': 'Data',
+ 'label': u'Debit or Credit',
+ 'oldfieldname': u'debit_or_credit',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'search_index': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'is_pl_account',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'is_pl_account',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Is PL Account',
- 'oldfieldname': 'is_pl_account',
- 'oldfieldtype': 'Select',
- 'options': 'Yes\nNo',
+ 'label': u'Is PL Account',
+ 'oldfieldname': u'is_pl_account',
+ 'oldfieldtype': u'Select',
+ 'options': u'Yes\nNo',
'permlevel': 1,
'search_index': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'account_type',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'account_type',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Account Type',
- 'oldfieldname': 'account_type',
- 'oldfieldtype': 'Select',
- 'options': '\nFixed Asset Account\nBank or Cash\nExpense Account\nTax\nIncome Account\nChargeable',
+ 'label': u'Account Type',
+ 'oldfieldname': u'account_type',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nFixed Asset Account\nBank or Cash\nExpense Account\nTax\nIncome Account\nChargeable',
'permlevel': 0,
'search_index': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'If Account Type is "Tax" then the default rate is required.',
- 'doctype': 'DocField',
- 'fieldname': 'tax_rate',
- 'fieldtype': 'Currency',
+ 'colour': u'White:FFF',
+ 'description': u'If Account Type is "Tax" then the default rate is required.',
+ 'doctype': u'DocField',
+ 'fieldname': u'tax_rate',
+ 'fieldtype': u'Currency',
'hidden': 0,
- 'label': 'Rate',
- 'oldfieldname': 'tax_rate',
- 'oldfieldtype': 'Currency',
+ 'label': u'Rate',
+ 'oldfieldname': u'tax_rate',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'reqd': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'freeze_account',
- 'fieldtype': 'Select',
- 'label': 'Freeze Account',
- 'oldfieldname': 'freeze_account',
- 'oldfieldtype': 'Select',
- 'options': 'No\nYes',
+ 'doctype': u'DocField',
+ 'fieldname': u'freeze_account',
+ 'fieldtype': u'Select',
+ 'label': u'Freeze Account',
+ 'oldfieldname': u'freeze_account',
+ 'oldfieldtype': u'Select',
+ 'options': u'No\nYes',
'permlevel': 2
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'company',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'company',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Company',
- 'oldfieldname': 'company',
- 'oldfieldtype': 'Link',
- 'options': 'Company',
+ 'label': u'Company',
+ 'oldfieldname': u'company',
+ 'oldfieldtype': u'Link',
+ 'options': u'Company',
'permlevel': 1,
'reqd': 1,
'search_index': 1
@@ -327,128 +328,129 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'credit_days',
- 'fieldtype': 'Int',
+ 'doctype': u'DocField',
+ 'fieldname': u'credit_days',
+ 'fieldtype': u'Int',
'hidden': 1,
- 'label': 'Credit Days',
- 'oldfieldname': 'credit_days',
- 'oldfieldtype': 'Int',
+ 'label': u'Credit Days',
+ 'oldfieldname': u'credit_days',
+ 'oldfieldtype': u'Int',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'credit_limit',
- 'fieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'credit_limit',
+ 'fieldtype': u'Currency',
'hidden': 1,
- 'label': 'Credit Limit',
- 'oldfieldname': 'credit_limit',
- 'oldfieldtype': 'Currency',
+ 'label': u'Credit Limit',
+ 'oldfieldname': u'credit_limit',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'master_type',
- 'fieldtype': 'Select',
- 'label': 'Master Type',
- 'oldfieldname': 'master_type',
- 'oldfieldtype': 'Select',
- 'options': '\nNA\nSupplier\nCustomer\nEmployee',
+ 'doctype': u'DocField',
+ 'fieldname': u'master_type',
+ 'fieldtype': u'Select',
+ 'label': u'Master Type',
+ 'oldfieldname': u'master_type',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nNA\nSupplier\nCustomer\nEmployee',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'master_name',
- 'fieldtype': 'Link',
- 'label': 'Master Name',
- 'oldfieldname': 'master_name',
- 'oldfieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'master_name',
+ 'fieldtype': u'Link',
+ 'label': u'Master Name',
+ 'oldfieldname': u'master_name',
+ 'oldfieldtype': u'Link',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'TDS',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'tds',
+ 'fieldtype': u'Section Break',
+ 'label': u'TDS',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'pan_number',
- 'fieldtype': 'Data',
- 'label': 'PAN Number',
- 'oldfieldname': 'pan_number',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'pan_number',
+ 'fieldtype': u'Data',
+ 'label': u'PAN Number',
+ 'oldfieldname': u'pan_number',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'default': 'No',
- 'doctype': 'DocField',
- 'fieldname': 'tds_applicable',
- 'fieldtype': 'Select',
- 'label': 'TDS Applicable',
- 'oldfieldname': 'tds_applicable',
- 'oldfieldtype': 'Select',
- 'options': '\nYes\nNo',
+ 'default': u'No',
+ 'doctype': u'DocField',
+ 'fieldname': u'tds_applicable',
+ 'fieldtype': u'Select',
+ 'label': u'TDS Applicable',
+ 'oldfieldname': u'tds_applicable',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nYes\nNo',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'tds_details',
- 'fieldtype': 'Table',
- 'label': 'TDS Details',
- 'oldfieldname': 'tds_details',
- 'oldfieldtype': 'Table',
- 'options': 'TDS Detail',
+ 'doctype': u'DocField',
+ 'fieldname': u'tds_details',
+ 'fieldtype': u'Table',
+ 'label': u'TDS Details',
+ 'oldfieldname': u'tds_details',
+ 'oldfieldtype': u'Table',
+ 'options': u'TDS Detail',
'permlevel': 0
},
# DocField
{
- 'description': "Don't delete this field at any cost",
- 'doctype': 'DocField',
- 'fieldname': 'old_parent',
- 'fieldtype': 'Link',
+ 'description': u"Don't delete this field at any cost",
+ 'doctype': u'DocField',
+ 'fieldname': u'old_parent',
+ 'fieldtype': u'Link',
'hidden': 1,
- 'label': 'Old Parent',
+ 'label': u'Old Parent',
'no_copy': 1,
- 'oldfieldname': 'old_parent',
- 'oldfieldtype': 'Data',
- 'options': 'Account',
+ 'oldfieldname': u'old_parent',
+ 'oldfieldtype': u'Data',
+ 'options': u'Account',
'permlevel': 0,
'report_hide': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': "Don't delete this field at any cost",
- 'doctype': 'DocField',
- 'fieldname': 'lft',
- 'fieldtype': 'Int',
+ 'colour': u'White:FFF',
+ 'description': u"Don't delete this field at any cost",
+ 'doctype': u'DocField',
+ 'fieldname': u'lft',
+ 'fieldtype': u'Int',
'hidden': 1,
'in_filter': 1,
- 'label': 'Lft',
+ 'label': u'Lft',
'no_copy': 1,
- 'oldfieldname': 'lft',
- 'oldfieldtype': 'Int',
+ 'oldfieldname': u'lft',
+ 'oldfieldtype': u'Int',
'permlevel': 3,
'print_hide': 1,
'report_hide': 1,
@@ -457,17 +459,17 @@
# DocField
{
- 'colour': 'White:FFF',
- 'description': "Don't delete this field at any cost",
- 'doctype': 'DocField',
- 'fieldname': 'rgt',
- 'fieldtype': 'Int',
+ 'colour': u'White:FFF',
+ 'description': u"Don't delete this field at any cost",
+ 'doctype': u'DocField',
+ 'fieldname': u'rgt',
+ 'fieldtype': u'Int',
'hidden': 1,
'in_filter': 1,
- 'label': 'Rgt',
+ 'label': u'Rgt',
'no_copy': 1,
- 'oldfieldname': 'rgt',
- 'oldfieldtype': 'Int',
+ 'oldfieldname': u'rgt',
+ 'oldfieldtype': u'Int',
'permlevel': 3,
'print_hide': 1,
'report_hide': 1,
@@ -476,12 +478,12 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
}
-]
+]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account_balance/account_balance.txt b/erpnext/accounts/doctype/account_balance/account_balance.txt
index 7f3c12e..903d270 100644
--- a/erpnext/accounts/doctype/account_balance/account_balance.txt
+++ b/erpnext/accounts/doctype/account_balance/account_balance.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:51',
+ 'creation': '2012-03-27 14:35:40',
'docstatus': 0,
- 'modified': '2012-03-21 12:55:11',
+ 'modified': '2012-03-27 14:35:40',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/accounts/doctype/advance_adjustment_detail/advance_adjustment_detail.txt b/erpnext/accounts/doctype/advance_adjustment_detail/advance_adjustment_detail.txt
index a3a63c9..794470b 100644
--- a/erpnext/accounts/doctype/advance_adjustment_detail/advance_adjustment_detail.txt
+++ b/erpnext/accounts/doctype/advance_adjustment_detail/advance_adjustment_detail.txt
@@ -3,108 +3,103 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:51',
+ 'creation': '2012-03-27 14:35:40',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'umair@iwebnotes.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:40',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
- 'section_style': 'Tray',
- 'server_code_error': ' ',
+ 'section_style': u'Tray',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 24
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
'no_copy': 1,
- 'parent': 'Advance Adjustment Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Advance Adjustment Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# DocType, Advance Adjustment Detail
{
'doctype': 'DocType',
- 'name': 'Advance Adjustment Detail'
+ 'name': u'Advance Adjustment Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'journal_voucher',
- 'fieldtype': 'Link',
- 'idx': 1,
- 'label': 'Journal Voucher',
- 'oldfieldname': 'journal_voucher',
- 'oldfieldtype': 'Link',
- 'options': 'Journal Voucher',
+ 'doctype': u'DocField',
+ 'fieldname': u'journal_voucher',
+ 'fieldtype': u'Link',
+ 'label': u'Journal Voucher',
+ 'oldfieldname': u'journal_voucher',
+ 'oldfieldtype': u'Link',
+ 'options': u'Journal Voucher',
'permlevel': 1,
- 'width': '250px'
+ 'width': u'250px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'jv_detail_no',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'jv_detail_no',
+ 'fieldtype': u'Data',
'hidden': 1,
- 'idx': 2,
- 'label': 'Journal Voucher Detail No',
- 'oldfieldname': 'jv_detail_no',
- 'oldfieldtype': 'Data',
+ 'label': u'Journal Voucher Detail No',
+ 'oldfieldname': u'jv_detail_no',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'print_hide': 1,
- 'width': '120px'
+ 'width': u'120px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'advance_amount',
- 'fieldtype': 'Currency',
- 'idx': 3,
- 'label': 'Advance amount',
- 'oldfieldname': 'advance_amount',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'advance_amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Advance amount',
+ 'oldfieldname': u'advance_amount',
+ 'oldfieldtype': u'Currency',
'permlevel': 1,
- 'width': '120px'
+ 'width': u'120px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'allocated_amount',
- 'fieldtype': 'Currency',
- 'idx': 4,
- 'label': 'Allocated amount',
- 'oldfieldname': 'allocated_amount',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'allocated_amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Allocated amount',
+ 'oldfieldname': u'allocated_amount',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
- 'trigger': 'Client',
- 'width': '120px'
+ 'trigger': u'Client',
+ 'width': u'120px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'remarks',
- 'fieldtype': 'Small Text',
- 'idx': 5,
- 'label': 'Remarks',
- 'oldfieldname': 'remarks',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'remarks',
+ 'fieldtype': u'Small Text',
+ 'label': u'Remarks',
+ 'oldfieldname': u'remarks',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1,
- 'width': '150px'
+ 'width': u'150px'
}
]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/advance_allocation_detail/advance_allocation_detail.txt b/erpnext/accounts/doctype/advance_allocation_detail/advance_allocation_detail.txt
index 5bb5d38..5cc99d2 100644
--- a/erpnext/accounts/doctype/advance_allocation_detail/advance_allocation_detail.txt
+++ b/erpnext/accounts/doctype/advance_allocation_detail/advance_allocation_detail.txt
@@ -3,139 +3,132 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:51',
+ 'creation': '2012-03-27 14:35:40',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'umair@iwebnotes.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:40',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
- 'section_style': 'Tray',
- 'server_code_error': ' ',
+ 'section_style': u'Tray',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 20
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Advance Allocation Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Advance Allocation Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# DocType, Advance Allocation Detail
{
'doctype': 'DocType',
- 'name': 'Advance Allocation Detail'
+ 'name': u'Advance Allocation Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'journal_voucher',
- 'fieldtype': 'Link',
- 'idx': 1,
- 'label': 'Journal Voucher',
+ 'doctype': u'DocField',
+ 'fieldname': u'journal_voucher',
+ 'fieldtype': u'Link',
+ 'label': u'Journal Voucher',
'no_copy': 1,
- 'oldfieldname': 'journal_voucher',
- 'oldfieldtype': 'Link',
- 'options': 'Journal Voucher',
+ 'oldfieldname': u'journal_voucher',
+ 'oldfieldtype': u'Link',
+ 'options': u'Journal Voucher',
'permlevel': 1,
- 'width': '180px'
+ 'width': u'180px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'jv_detail_no',
- 'fieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'jv_detail_no',
+ 'fieldtype': u'Date',
'hidden': 1,
- 'idx': 2,
- 'label': 'Journal Voucher Detail No',
+ 'label': u'Journal Voucher Detail No',
'no_copy': 1,
- 'oldfieldname': 'jv_detail_no',
- 'oldfieldtype': 'Date',
+ 'oldfieldname': u'jv_detail_no',
+ 'oldfieldtype': u'Date',
'permlevel': 1,
'print_hide': 1,
- 'width': '80px'
+ 'width': u'80px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'advance_amount',
- 'fieldtype': 'Currency',
- 'idx': 3,
- 'label': 'Advance Amount',
+ 'doctype': u'DocField',
+ 'fieldname': u'advance_amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Advance Amount',
'no_copy': 1,
- 'oldfieldname': 'advance_amount',
- 'oldfieldtype': 'Currency',
+ 'oldfieldname': u'advance_amount',
+ 'oldfieldtype': u'Currency',
'permlevel': 1,
- 'width': '100px'
+ 'width': u'100px'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'allocated_amount',
- 'fieldtype': 'Currency',
- 'idx': 4,
- 'label': 'Allocated Amount',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'allocated_amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Allocated Amount',
'no_copy': 1,
- 'oldfieldname': 'allocated_amount',
- 'oldfieldtype': 'Currency',
+ 'oldfieldname': u'allocated_amount',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
- 'trigger': 'Client',
- 'width': '100px'
+ 'trigger': u'Client',
+ 'width': u'100px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'tds_amount',
- 'fieldtype': 'Currency',
- 'idx': 5,
- 'label': 'TDS Amount',
- 'oldfieldname': 'tds_amount',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'tds_amount',
+ 'fieldtype': u'Currency',
+ 'label': u'TDS Amount',
+ 'oldfieldname': u'tds_amount',
+ 'oldfieldtype': u'Currency',
'permlevel': 1,
- 'width': '80px'
+ 'width': u'80px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'tds_allocated',
- 'fieldtype': 'Currency',
- 'idx': 6,
- 'label': 'TDS Allocated',
- 'oldfieldname': 'tds_allocated',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'tds_allocated',
+ 'fieldtype': u'Currency',
+ 'label': u'TDS Allocated',
+ 'oldfieldname': u'tds_allocated',
+ 'oldfieldtype': u'Currency',
'permlevel': 1,
- 'width': '80px'
+ 'width': u'80px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'remarks',
- 'fieldtype': 'Small Text',
- 'idx': 7,
- 'label': 'Remarks',
+ 'doctype': u'DocField',
+ 'fieldname': u'remarks',
+ 'fieldtype': u'Small Text',
+ 'label': u'Remarks',
'no_copy': 1,
- 'oldfieldname': 'remarks',
- 'oldfieldtype': 'Small Text',
+ 'oldfieldname': u'remarks',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1,
- 'width': '150px'
+ 'width': u'150px'
}
]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.txt b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.txt
index 7dc5e5a..f1d0b9f 100644
--- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.txt
+++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.txt
@@ -3,56 +3,56 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:52',
+ 'creation': '2012-03-27 14:35:40',
'docstatus': 0,
- 'modified': '2010-12-29 18:11:06',
- 'modified_by': 'umair@iwebnotes.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:40',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1294312169',
+ '_last_update': u'1294312169',
'allow_copy': 1,
'allow_email': 1,
'allow_print': 1,
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'hide_heading': 1,
'hide_toolbar': 1,
'issingle': 1,
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
'read_only': 1,
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 12
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Bank Reconciliation',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Bank Reconciliation',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Bank Reconciliation',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Bank Reconciliation',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Bank Reconciliation
{
'doctype': 'DocType',
- 'name': 'Bank Reconciliation'
+ 'name': u'Bank Reconciliation'
},
# DocPerm
@@ -60,106 +60,108 @@
'amend': 0,
'cancel': 0,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Accounts User',
+ 'role': u'Accounts User',
'submit': 0,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'All'
+ 'role': u'All'
+ },
+
+ # DocPerm
+ {
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Accounts Manager',
+ 'write': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'idx': 1,
- 'label': 'Head HTML',
+ 'doctype': u'DocField',
+ 'fieldname': u'head_html',
+ 'fieldtype': u'HTML',
+ 'label': u'Head HTML',
'permlevel': 0
},
# DocField
{
- 'description': 'Select account head of the bank where cheque was deposited.',
- 'doctype': 'DocField',
- 'fieldname': 'bank_account',
- 'fieldtype': 'Link',
- 'idx': 2,
- 'label': 'Bank Account',
- 'options': 'Account',
+ 'description': u'Select account head of the bank where cheque was deposited.',
+ 'doctype': u'DocField',
+ 'fieldname': u'bank_account',
+ 'fieldtype': u'Link',
+ 'label': u'Bank Account',
+ 'options': u'Account',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'from_date',
- 'fieldtype': 'Date',
- 'idx': 3,
- 'label': 'From Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'from_date',
+ 'fieldtype': u'Date',
+ 'label': u'From Date',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'to_date',
- 'fieldtype': 'Date',
- 'idx': 4,
- 'label': 'To Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'to_date',
+ 'fieldtype': u'Date',
+ 'label': u'To Date',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'idx': 5,
- 'label': 'Get Non Reconciled Entries',
- 'options': 'get_details',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'get_non_reconciled_entries',
+ 'fieldtype': u'Button',
+ 'label': u'Get Non Reconciled Entries',
+ 'options': u'get_details',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'entries',
- 'fieldtype': 'Table',
- 'idx': 6,
- 'label': 'Entries',
- 'options': 'Bank Reconciliation Detail',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'entries',
+ 'fieldtype': u'Table',
+ 'label': u'Entries',
+ 'options': u'Bank Reconciliation Detail',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'idx': 7,
- 'label': 'Update Clearance Date',
- 'options': 'update_details',
+ 'doctype': u'DocField',
+ 'fieldname': u'update_clearance_date',
+ 'fieldtype': u'Button',
+ 'label': u'Update Clearance Date',
+ 'options': u'update_details',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'total_amount',
- 'fieldtype': 'Currency',
- 'idx': 8,
- 'label': 'Total Amount',
+ 'doctype': u'DocField',
+ 'fieldname': u'total_amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Total Amount',
'permlevel': 1
}
]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt b/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
index 7dad3f6..3924980 100644
--- a/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
+++ b/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:52',
+ 'creation': '2012-03-27 14:35:41',
'docstatus': 0,
- 'modified': '2012-03-22 14:53:24',
+ 'modified': '2012-03-27 14:35:41',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/accounts/doctype/budget_control/budget_control.txt b/erpnext/accounts/doctype/budget_control/budget_control.txt
index 4f84bd4..a08762f 100644
--- a/erpnext/accounts/doctype/budget_control/budget_control.txt
+++ b/erpnext/accounts/doctype/budget_control/budget_control.txt
@@ -3,22 +3,22 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:54',
+ 'creation': '2012-03-27 14:35:41',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'umair@iwebnotes.com',
- 'owner': 'nabin@webnotestech.com'
+ 'modified': '2012-03-27 14:35:41',
+ 'modified_by': u'Administrator',
+ 'owner': u'nabin@webnotestech.com'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'issingle': 1,
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 23
},
@@ -26,6 +26,6 @@
# DocType, Budget Control
{
'doctype': 'DocType',
- 'name': 'Budget Control'
+ 'name': u'Budget Control'
}
]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/budget_detail/budget_detail.txt b/erpnext/accounts/doctype/budget_detail/budget_detail.txt
index dafa391..f9f287a 100644
--- a/erpnext/accounts/doctype/budget_detail/budget_detail.txt
+++ b/erpnext/accounts/doctype/budget_detail/budget_detail.txt
@@ -3,94 +3,90 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:54',
+ 'creation': '2012-03-27 14:35:41',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'umair@iwebnotes.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:41',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'autoname': 'CBD/.######',
- 'colour': 'White:FFF',
+ 'autoname': u'CBD/.######',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
- 'section_style': 'Tray',
+ 'section_style': u'Tray',
'show_in_menu': 0,
'version': 6
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Budget Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Budget Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# DocType, Budget Detail
{
'doctype': 'DocType',
- 'name': 'Budget Detail'
+ 'name': u'Budget Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'account',
- 'fieldtype': 'Link',
- 'idx': 1,
+ 'doctype': u'DocField',
+ 'fieldname': u'account',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Account',
- 'oldfieldname': 'account',
- 'oldfieldtype': 'Link',
- 'options': 'Account',
+ 'label': u'Account',
+ 'oldfieldname': u'account',
+ 'oldfieldtype': u'Link',
+ 'options': u'Account',
'permlevel': 0,
'reqd': 1,
'search_index': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'budget_allocated',
- 'fieldtype': 'Currency',
- 'idx': 2,
- 'label': 'Budget Allocated',
- 'oldfieldname': 'budget_allocated',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'budget_allocated',
+ 'fieldtype': u'Currency',
+ 'label': u'Budget Allocated',
+ 'oldfieldname': u'budget_allocated',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'actual',
- 'fieldtype': 'Currency',
- 'idx': 3,
- 'label': 'Actual',
- 'oldfieldname': 'actual',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'actual',
+ 'fieldtype': u'Currency',
+ 'label': u'Actual',
+ 'oldfieldname': u'actual',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'fiscal_year',
- 'fieldtype': 'Select',
- 'idx': 4,
+ 'doctype': u'DocField',
+ 'fieldname': u'fiscal_year',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Fiscal Year',
- 'oldfieldname': 'fiscal_year',
- 'oldfieldtype': 'Select',
- 'options': 'link:Fiscal Year',
+ 'label': u'Fiscal Year',
+ 'oldfieldname': u'fiscal_year',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:Fiscal Year',
'permlevel': 0,
'reqd': 1,
'search_index': 1
diff --git a/erpnext/accounts/doctype/budget_distribution/budget_distribution.txt b/erpnext/accounts/doctype/budget_distribution/budget_distribution.txt
index 5e224ee..ca9b869 100644
--- a/erpnext/accounts/doctype/budget_distribution/budget_distribution.txt
+++ b/erpnext/accounts/doctype/budget_distribution/budget_distribution.txt
@@ -3,79 +3,76 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:54',
+ 'creation': '2012-03-27 14:35:41',
'docstatus': 0,
- 'modified': '2010-12-29 18:20:37',
- 'modified_by': 'umair@iwebnotes.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:41',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
'allow_trash': 1,
- 'autoname': 'field:distribution_id',
- 'colour': 'White:FFF',
+ 'autoname': u'field:distribution_id',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
- 'name_case': 'Title Case',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'name_case': u'Title Case',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 24
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Budget Distribution',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Budget Distribution',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Budget Distribution',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Budget Distribution',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Budget Distribution
{
'doctype': 'DocType',
- 'name': 'Budget Distribution'
+ 'name': u'Budget Distribution'
},
# DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 3,
+ 'doctype': u'DocPerm',
'permlevel': 2,
- 'role': 'System Manager'
+ 'role': u'System Manager'
},
# DocPerm
@@ -83,10 +80,9 @@
'amend': 0,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 4,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Accounts Manager',
+ 'role': u'Accounts Manager',
'submit': 0,
'write': 1
},
@@ -96,71 +92,65 @@
'amend': 0,
'cancel': 0,
'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 5,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Accounts Manager',
+ 'role': u'Accounts Manager',
'submit': 0,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 6,
+ 'doctype': u'DocPerm',
'permlevel': 2,
- 'role': 'Accounts Manager'
+ 'role': u'Accounts Manager'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'distribution_id',
- 'fieldtype': 'Data',
- 'idx': 1,
- 'label': 'Distribution ID',
- 'oldfieldname': 'distribution_id',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'distribution_id',
+ 'fieldtype': u'Data',
+ 'label': u'Distribution ID',
+ 'oldfieldname': u'distribution_id',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'fiscal_year',
- 'fieldtype': 'Select',
- 'idx': 2,
+ 'doctype': u'DocField',
+ 'fieldname': u'fiscal_year',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Fiscal Year',
- 'oldfieldname': 'fiscal_year',
- 'oldfieldtype': 'Select',
- 'options': 'link:Fiscal Year',
+ 'label': u'Fiscal Year',
+ 'oldfieldname': u'fiscal_year',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:Fiscal Year',
'permlevel': 0,
'search_index': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'budget_distribution_details',
- 'fieldtype': 'Table',
- 'idx': 3,
- 'label': 'Budget Distribution Details',
- 'oldfieldname': 'budget_distribution_details',
- 'oldfieldtype': 'Table',
- 'options': 'Budget Distribution Detail',
+ 'doctype': u'DocField',
+ 'fieldname': u'budget_distribution_details',
+ 'fieldtype': u'Table',
+ 'label': u'Budget Distribution Details',
+ 'oldfieldname': u'budget_distribution_details',
+ 'oldfieldtype': u'Table',
+ 'options': u'Budget Distribution Detail',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'idx': 4,
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
}
]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt b/erpnext/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt
index cc872a9..d0912be 100644
--- a/erpnext/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt
+++ b/erpnext/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt
@@ -3,76 +3,73 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:54',
+ 'creation': '2012-03-27 14:35:41',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'umair@iwebnotes.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:41',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'autoname': 'BDD/.#####',
- 'colour': 'White:FFF',
+ 'autoname': u'BDD/.#####',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
- 'section_style': 'Tray',
- 'server_code_error': ' ',
+ 'section_style': u'Tray',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 6
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Budget Distribution Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Budget Distribution Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# DocType, Budget Distribution Detail
{
'doctype': 'DocType',
- 'name': 'Budget Distribution Detail'
+ 'name': u'Budget Distribution Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'month',
- 'fieldtype': 'Data',
- 'idx': 1,
- 'label': 'Month',
- 'oldfieldname': 'month',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'month',
+ 'fieldtype': u'Data',
+ 'label': u'Month',
+ 'oldfieldname': u'month',
+ 'oldfieldtype': u'Data',
'permlevel': 2,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'percentage_allocation',
- 'fieldtype': 'Currency',
- 'idx': 2,
- 'label': 'Percentage Allocation',
- 'oldfieldname': 'percentage_allocation',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'percentage_allocation',
+ 'fieldtype': u'Currency',
+ 'label': u'Percentage Allocation',
+ 'oldfieldname': u'percentage_allocation',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'aggregate_percentage',
- 'fieldtype': 'Currency',
- 'idx': 3,
- 'label': 'Aggregate Percentage',
- 'oldfieldname': 'aggregate_percentage',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'aggregate_percentage',
+ 'fieldtype': u'Currency',
+ 'label': u'Aggregate Percentage',
+ 'oldfieldname': u'aggregate_percentage',
+ 'oldfieldtype': u'Currency',
'permlevel': 2
}
]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/c_form/c_form.txt b/erpnext/accounts/doctype/c_form/c_form.txt
index 987bc9a..503992e 100644
--- a/erpnext/accounts/doctype/c_form/c_form.txt
+++ b/erpnext/accounts/doctype/c_form/c_form.txt
@@ -3,188 +3,191 @@
# These values are common in all dictionaries
{
- 'creation': '2011-12-07 16:16:16',
+ 'creation': '2012-03-27 14:35:41',
'docstatus': 0,
- 'modified': '2011-12-07 17:50:17',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:41',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1323255350',
- 'colour': 'White:FFF',
+ '_last_update': u'1323255350',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 11
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'C-Form',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'C-Form',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'C-Form',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'C-Form',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, C-Form
{
'doctype': 'DocType',
- 'name': 'C-Form'
+ 'name': u'C-Form'
},
# DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Accounts User',
+ 'role': u'Accounts User',
'write': 1
},
# DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Accounts Manager',
+ 'role': u'Accounts Manager',
'submit': 0,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'All'
+ 'role': u'All'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'width': '50%'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'naming_series',
- 'fieldtype': 'Select',
- 'label': 'Series',
- 'options': '\nC-FORM/',
+ 'doctype': u'DocField',
+ 'fieldname': u'naming_series',
+ 'fieldtype': u'Select',
+ 'label': u'Series',
+ 'options': u'\nC-FORM/',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'c_form_no',
- 'fieldtype': 'Data',
- 'label': 'C-Form No',
+ 'doctype': u'DocField',
+ 'fieldname': u'c_form_no',
+ 'fieldtype': u'Data',
+ 'label': u'C-Form No',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'received_date',
- 'fieldtype': 'Date',
- 'label': 'Received Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'received_date',
+ 'fieldtype': u'Date',
+ 'label': u'Received Date',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'customer',
- 'fieldtype': 'Link',
- 'label': 'Customer',
- 'options': 'Customer',
+ 'doctype': u'DocField',
+ 'fieldname': u'customer',
+ 'fieldtype': u'Link',
+ 'label': u'Customer',
+ 'options': u'Customer',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'width': '50%'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break',
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'company',
- 'fieldtype': 'Select',
- 'label': 'Company',
- 'options': 'link:Company'
+ 'doctype': u'DocField',
+ 'fieldname': u'company',
+ 'fieldtype': u'Select',
+ 'label': u'Company',
+ 'options': u'link:Company'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'fiscal_year',
- 'fieldtype': 'Select',
- 'label': 'Fiscal Year',
- 'options': 'link:Fiscal Year',
+ 'doctype': u'DocField',
+ 'fieldname': u'fiscal_year',
+ 'fieldtype': u'Select',
+ 'label': u'Fiscal Year',
+ 'options': u'link:Fiscal Year',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'quarter',
- 'fieldtype': 'Select',
- 'label': 'Quarter',
- 'options': '\nI\nII\nIII\nIV'
+ 'doctype': u'DocField',
+ 'fieldname': u'quarter',
+ 'fieldtype': u'Select',
+ 'label': u'Quarter',
+ 'options': u'\nI\nII\nIII\nIV'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'total_amount',
- 'fieldtype': 'Currency',
- 'label': 'Total Amount',
+ 'doctype': u'DocField',
+ 'fieldname': u'total_amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Total Amount',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'state',
- 'fieldtype': 'Select',
- 'label': 'State',
- 'options': "link:State\ncountry='India'",
+ 'doctype': u'DocField',
+ 'fieldname': u'state',
+ 'fieldtype': u'Select',
+ 'label': u'State',
+ 'options': u"link:State\ncountry='India'",
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break'
+ 'doctype': u'DocField',
+ 'fieldname': u'section_break0',
+ 'fieldtype': u'Section Break'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'invoice_details',
- 'fieldtype': 'Table',
- 'label': 'Invoice Details',
- 'options': 'C-Form Invoice Detail'
+ 'doctype': u'DocField',
+ 'fieldname': u'invoice_details',
+ 'fieldtype': u'Table',
+ 'label': u'Invoice Details',
+ 'options': u'C-Form Invoice Detail'
}
]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt b/erpnext/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt
index d6be6c0d..db53ef7 100644
--- a/erpnext/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt
+++ b/erpnext/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt
@@ -3,89 +3,89 @@
# These values are common in all dictionaries
{
- 'creation': '2011-12-07 16:15:39',
+ 'creation': '2012-03-27 14:35:41',
'docstatus': 0,
- 'modified': '2011-12-07 16:21:55',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:41',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 5
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'C-Form Invoice Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'C-Form Invoice Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# DocType, C-Form Invoice Detail
{
'doctype': 'DocType',
- 'name': 'C-Form Invoice Detail'
+ 'name': u'C-Form Invoice Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'invoice_no',
- 'fieldtype': 'Link',
- 'label': 'Invoice No',
- 'options': 'Receivable Voucher',
+ 'doctype': u'DocField',
+ 'fieldname': u'invoice_no',
+ 'fieldtype': u'Link',
+ 'label': u'Invoice No',
+ 'options': u'Receivable Voucher',
'permlevel': 0,
- 'width': '160px'
+ 'width': u'160px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'invoice_date',
- 'fieldtype': 'Date',
- 'label': 'Invoice Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'invoice_date',
+ 'fieldtype': u'Date',
+ 'label': u'Invoice Date',
'permlevel': 1,
- 'width': '120px'
+ 'width': u'120px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'territory',
- 'fieldtype': 'Link',
- 'label': 'Territory',
- 'options': 'Territory',
+ 'doctype': u'DocField',
+ 'fieldname': u'territory',
+ 'fieldtype': u'Link',
+ 'label': u'Territory',
+ 'options': u'Territory',
'permlevel': 1,
- 'width': '120px'
+ 'width': u'120px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'net_total',
- 'fieldtype': 'Currency',
- 'label': 'Net Total',
+ 'doctype': u'DocField',
+ 'fieldname': u'net_total',
+ 'fieldtype': u'Currency',
+ 'label': u'Net Total',
'permlevel': 1,
- 'width': '120px'
+ 'width': u'120px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'grand_total',
- 'fieldtype': 'Currency',
- 'label': 'Grand Total',
+ 'doctype': u'DocField',
+ 'fieldname': u'grand_total',
+ 'fieldtype': u'Currency',
+ 'label': u'Grand Total',
'permlevel': 1,
- 'width': '120px'
+ 'width': u'120px'
}
]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/cost_center/cost_center.txt b/erpnext/accounts/doctype/cost_center/cost_center.txt
index 94fb02b..b02d909 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.txt
+++ b/erpnext/accounts/doctype/cost_center/cost_center.txt
@@ -3,56 +3,56 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:56',
+ 'creation': '2012-03-27 14:35:41',
'docstatus': 0,
- 'modified': '2011-10-10 12:05:07',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:41',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1317365120',
+ '_last_update': u'1317365120',
'allow_copy': 1,
'allow_trash': 1,
- 'autoname': 'field:cost_center_name',
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'autoname': u'field:cost_center_name',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
- 'document_type': 'Master',
+ 'document_type': u'Master',
'in_create': 1,
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
- 'search_fields': 'name,parent_cost_center',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'search_fields': u'name,parent_cost_center',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 109
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Cost Center',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Cost Center',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Cost Center',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Cost Center',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Cost Center
{
'doctype': 'DocType',
- 'name': 'Cost Center'
+ 'name': u'Cost Center'
},
# DocPerm
@@ -60,9 +60,38 @@
'amend': 0,
'cancel': 0,
'create': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Accounts User',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 1,
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'System Manager',
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Accounts Manager',
+ 'role': u'All'
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Accounts Manager',
'submit': 0,
'write': 0
},
@@ -72,9 +101,9 @@
'amend': 0,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Accounts Manager',
+ 'role': u'Accounts Manager',
'submit': 0,
'write': 1
},
@@ -84,63 +113,34 @@
'amend': 0,
'cancel': 0,
'create': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Accounts User',
+ 'role': u'Accounts User',
'submit': 0,
'write': 0
},
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'permlevel': 0,
- 'role': 'Accounts User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 1,
- 'create': 1,
- 'doctype': 'DocPerm',
- 'permlevel': 0,
- 'role': 'System Manager',
- 'write': 1
- },
-
- # DocPerm
- {
- 'doctype': 'DocPerm',
- 'permlevel': 1,
- 'role': 'All'
- },
-
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'cost_center_name',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'cost_center_name',
+ 'fieldtype': u'Data',
'in_filter': 0,
- 'label': 'Cost Center Name',
+ 'label': u'Cost Center Name',
'no_copy': 1,
- 'oldfieldname': 'cost_center_name',
- 'oldfieldtype': 'Data',
+ 'oldfieldname': u'cost_center_name',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1,
'search_index': 0
@@ -148,119 +148,121 @@
# DocField
{
- 'description': 'Select company name first.',
- 'doctype': 'DocField',
- 'fieldname': 'parent_cost_center',
- 'fieldtype': 'Link',
- 'label': 'Parent Cost Center',
- 'oldfieldname': 'parent_cost_center',
- 'oldfieldtype': 'Link',
- 'options': 'Cost Center',
+ 'description': u'Select company name first.',
+ 'doctype': u'DocField',
+ 'fieldname': u'parent_cost_center',
+ 'fieldtype': u'Link',
+ 'label': u'Parent Cost Center',
+ 'oldfieldname': u'parent_cost_center',
+ 'oldfieldtype': u'Link',
+ 'options': u'Cost Center',
'permlevel': 0,
'reqd': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'company_name',
- 'fieldtype': 'Link',
- 'label': 'Company',
- 'oldfieldname': 'company_name',
- 'oldfieldtype': 'Link',
- 'options': 'Company',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'company_name',
+ 'fieldtype': u'Link',
+ 'label': u'Company',
+ 'oldfieldname': u'company_name',
+ 'oldfieldtype': u'Link',
+ 'options': u'Company',
'permlevel': 0,
'reqd': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'company_abbr',
- 'fieldtype': 'Data',
- 'label': 'Company Abbr',
- 'oldfieldname': 'company_abbr',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'company_abbr',
+ 'fieldtype': u'Data',
+ 'label': u'Company Abbr',
+ 'oldfieldname': u'company_abbr',
+ 'oldfieldtype': u'Data',
'permlevel': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'group_or_ledger',
- 'fieldtype': 'Select',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'group_or_ledger',
+ 'fieldtype': u'Select',
'hidden': 0,
- 'label': 'Group or Ledger',
+ 'label': u'Group or Ledger',
'no_copy': 1,
- 'oldfieldname': 'group_or_ledger',
- 'oldfieldtype': 'Select',
- 'options': '\nGroup\nLedger',
+ 'oldfieldname': u'group_or_ledger',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nGroup\nLedger',
'permlevel': 0,
'print_hide': 1,
'report_hide': 1,
'reqd': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Convert to Group',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'convert_to_group',
+ 'fieldtype': u'Button',
+ 'label': u'Convert to Group',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Convert to Ledger',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'convert_to_ledger',
+ 'fieldtype': u'Button',
+ 'label': u'Convert to Ledger',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'distribution_id',
- 'fieldtype': 'Link',
- 'label': 'Distribution Id',
- 'oldfieldname': 'distribution_id',
- 'oldfieldtype': 'Link',
- 'options': 'Budget Distribution',
+ 'doctype': u'DocField',
+ 'fieldname': u'distribution_id',
+ 'fieldtype': u'Link',
+ 'label': u'Distribution Id',
+ 'oldfieldname': u'distribution_id',
+ 'oldfieldtype': u'Link',
+ 'options': u'Budget Distribution',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'budget_details',
- 'fieldtype': 'Table',
- 'label': 'Budget Details',
- 'oldfieldname': 'budget_details',
- 'oldfieldtype': 'Table',
- 'options': 'Budget Detail',
+ 'doctype': u'DocField',
+ 'fieldname': u'budget_details',
+ 'fieldtype': u'Table',
+ 'label': u'Budget Details',
+ 'oldfieldname': u'budget_details',
+ 'oldfieldtype': u'Table',
+ 'options': u'Budget Detail',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'lft',
- 'fieldtype': 'Int',
+ 'doctype': u'DocField',
+ 'fieldname': u'lft',
+ 'fieldtype': u'Int',
'hidden': 1,
'in_filter': 1,
- 'label': 'lft',
+ 'label': u'lft',
'no_copy': 1,
- 'oldfieldname': 'lft',
- 'oldfieldtype': 'Int',
+ 'oldfieldname': u'lft',
+ 'oldfieldtype': u'Int',
'permlevel': 0,
'print_hide': 1,
'report_hide': 1,
@@ -269,15 +271,15 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'rgt',
- 'fieldtype': 'Int',
+ 'doctype': u'DocField',
+ 'fieldname': u'rgt',
+ 'fieldtype': u'Int',
'hidden': 1,
'in_filter': 1,
- 'label': 'rgt',
+ 'label': u'rgt',
'no_copy': 1,
- 'oldfieldname': 'rgt',
- 'oldfieldtype': 'Int',
+ 'oldfieldname': u'rgt',
+ 'oldfieldtype': u'Int',
'permlevel': 0,
'print_hide': 1,
'report_hide': 1,
@@ -287,15 +289,15 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'old_parent',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'old_parent',
+ 'fieldtype': u'Link',
'hidden': 1,
- 'label': 'old_parent',
+ 'label': u'old_parent',
'no_copy': 1,
- 'oldfieldname': 'old_parent',
- 'oldfieldtype': 'Data',
- 'options': 'Cost Center',
+ 'oldfieldname': u'old_parent',
+ 'oldfieldtype': u'Data',
+ 'options': u'Cost Center',
'permlevel': 0,
'print_hide': 1,
'report_hide': 1
diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.txt b/erpnext/accounts/doctype/fiscal_year/fiscal_year.txt
index 2834878..ae4c5a0 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.txt
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:02',
+ 'creation': '2012-03-27 14:35:41',
'docstatus': 0,
- 'modified': '2012-03-21 12:54:40',
+ 'modified': '2012-03-27 14:35:41',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -59,19 +59,20 @@
# DocPerm
{
+ 'doctype': u'DocPerm'
+ },
+
+ # DocPerm
+ {
'amend': 0,
'doctype': u'DocPerm',
'submit': 0
},
- # DocPerm
- {
- 'doctype': u'DocPerm'
- },
-
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'year_details',
'fieldtype': u'Section Break',
'label': u'Year Details',
'oldfieldtype': u'Section Break',
@@ -143,6 +144,7 @@
'colour': u'White:FFF',
'description': u"Click on the button below to reset balances from your previous year's closing and repost your balances. You can use this if your previous year balance sheet has been changed and you wish to update your current accounts.",
'doctype': u'DocField',
+ 'fieldname': u'repost_accounts',
'fieldtype': u'Section Break',
'label': u'Repost Accounts',
'oldfieldtype': u'Section Break',
@@ -178,6 +180,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'repost_account_balances',
'fieldtype': u'Button',
'label': u'Repost Account Balances',
'oldfieldtype': u'Button',
@@ -188,6 +191,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'repost_voucher_outstanding',
'fieldtype': u'Button',
'label': u'Repost Voucher Outstanding',
'oldfieldtype': u'Button',
diff --git a/erpnext/accounts/doctype/form_16a/form_16a.txt b/erpnext/accounts/doctype/form_16a/form_16a.txt
index 530d410..62e239c 100644
--- a/erpnext/accounts/doctype/form_16a/form_16a.txt
+++ b/erpnext/accounts/doctype/form_16a/form_16a.txt
@@ -3,61 +3,50 @@
# These values are common in all dictionaries
{
- 'creation': '2010-09-27 15:56:52',
+ 'creation': '2012-03-27 14:35:41',
'docstatus': 0,
- 'modified': '2011-06-15 13:07:17',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
- },
-
- # These values are common for all DocField
- {
- 'doctype': 'DocField',
- 'name': '__common__',
- 'parent': 'Form 16A',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'modified': '2012-03-27 14:35:41',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1308123438',
- 'colour': 'White:FFF',
+ '_last_update': u'1308123438',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'in_create': 0,
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 75
},
- # These values are common for all DocFormat
+ # These values are common for all DocField
{
- 'doctype': 'DocFormat',
- 'format': 'Form 16A Print Format',
- 'idx': 1,
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Form 16A',
- 'parentfield': 'formats',
- 'parenttype': 'DocType'
+ 'parent': u'Form 16A',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Form 16A',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Form 16A',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Form 16A
{
'doctype': 'DocType',
- 'name': 'Form 16A'
+ 'name': u'Form 16A'
},
# DocPerm
@@ -65,10 +54,9 @@
'amend': 0,
'cancel': 0,
'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Accounts Manager',
+ 'role': u'Accounts Manager',
'submit': 0,
'write': 0
},
@@ -78,10 +66,9 @@
'amend': 0,
'cancel': 0,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 2,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Accounts Manager',
+ 'role': u'Accounts Manager',
'submit': 0,
'write': 1
},
@@ -91,10 +78,9 @@
'amend': 0,
'cancel': 0,
'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 3,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Accounts User',
+ 'role': u'Accounts User',
'submit': 0,
'write': 0
},
@@ -104,10 +90,9 @@
'amend': 0,
'cancel': 0,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 4,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Accounts User',
+ 'role': u'Accounts User',
'submit': 0,
'write': 1
},
@@ -115,168 +100,153 @@
# DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 5,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 6,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'System Manager'
- },
-
- # DocFormat
- {
- 'doctype': 'DocFormat'
+ 'role': u'System Manager'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 1,
- 'label': 'Basic Info',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'basic_info',
+ 'fieldtype': u'Section Break',
+ 'label': u'Basic Info',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 2,
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'from_date',
- 'fieldtype': 'Date',
- 'idx': 3,
- 'label': 'From Date',
- 'oldfieldname': 'from_date',
- 'oldfieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'from_date',
+ 'fieldtype': u'Date',
+ 'label': u'From Date',
+ 'oldfieldname': u'from_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'to_date',
- 'fieldtype': 'Date',
- 'idx': 4,
- 'label': 'To Date',
- 'oldfieldname': 'to_date',
- 'oldfieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'to_date',
+ 'fieldtype': u'Date',
+ 'label': u'To Date',
+ 'oldfieldname': u'to_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'reqd': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'tds_category',
- 'fieldtype': 'Link',
- 'idx': 5,
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'tds_category',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'TDS Category',
- 'oldfieldname': 'tds_category',
- 'oldfieldtype': 'Link',
- 'options': 'TDS Category',
+ 'label': u'TDS Category',
+ 'oldfieldname': u'tds_category',
+ 'oldfieldtype': u'Link',
+ 'options': u'TDS Category',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'party_name',
- 'fieldtype': 'Link',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'party_name',
+ 'fieldtype': u'Link',
'hidden': 0,
- 'idx': 6,
'in_filter': 1,
- 'label': 'Party Name',
- 'oldfieldname': 'party_name',
- 'oldfieldtype': 'Link',
- 'options': 'Account',
+ 'label': u'Party Name',
+ 'oldfieldname': u'party_name',
+ 'oldfieldtype': u'Link',
+ 'options': u'Account',
'permlevel': 0,
'reqd': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'party_address',
- 'fieldtype': 'Small Text',
- 'idx': 7,
- 'label': 'Address',
- 'oldfieldname': 'party_address',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'party_address',
+ 'fieldtype': u'Small Text',
+ 'label': u'Address',
+ 'oldfieldname': u'party_address',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1,
'reqd': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'pan_number',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'pan_number',
+ 'fieldtype': u'Data',
'hidden': 0,
- 'idx': 8,
- 'label': 'PAN No',
- 'oldfieldname': 'pan_number',
- 'oldfieldtype': 'Data',
+ 'label': u'PAN No',
+ 'oldfieldname': u'pan_number',
+ 'oldfieldtype': u'Data',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 9,
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'fiscal_year',
- 'fieldtype': 'Select',
- 'idx': 10,
- 'label': 'Fiscal Year',
- 'oldfieldname': 'fiscal_year',
- 'oldfieldtype': 'Select',
- 'options': 'link:Fiscal Year',
+ 'doctype': u'DocField',
+ 'fieldname': u'fiscal_year',
+ 'fieldtype': u'Select',
+ 'label': u'Fiscal Year',
+ 'oldfieldname': u'fiscal_year',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:Fiscal Year',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'company',
- 'fieldtype': 'Link',
- 'idx': 11,
+ 'doctype': u'DocField',
+ 'fieldname': u'company',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Company ',
- 'oldfieldname': 'company',
- 'oldfieldtype': 'Link',
- 'options': 'Company',
+ 'label': u'Company ',
+ 'oldfieldname': u'company',
+ 'oldfieldtype': u'Link',
+ 'options': u'Company',
'permlevel': 0,
'reqd': 1,
'search_index': 1
@@ -284,194 +254,184 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'company_address',
- 'fieldtype': 'Small Text',
- 'idx': 12,
- 'label': 'Company Address',
- 'oldfieldname': 'company_address',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'company_address',
+ 'fieldtype': u'Small Text',
+ 'label': u'Company Address',
+ 'oldfieldname': u'company_address',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'registration_details',
- 'fieldtype': 'Small Text',
- 'idx': 13,
- 'label': 'Registration Details',
- 'oldfieldname': 'registration_details',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'registration_details',
+ 'fieldtype': u'Small Text',
+ 'label': u'Registration Details',
+ 'oldfieldname': u'registration_details',
+ 'oldfieldtype': u'Small Text',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 14,
- 'label': 'Return Details',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'return_details',
+ 'fieldtype': u'Section Break',
+ 'label': u'Return Details',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'idx': 15,
- 'label': 'Get Return Details',
- 'oldfieldtype': 'Button',
- 'options': 'get_return_ack_details',
+ 'doctype': u'DocField',
+ 'fieldname': u'get_return_details',
+ 'fieldtype': u'Button',
+ 'label': u'Get Return Details',
+ 'oldfieldtype': u'Button',
+ 'options': u'get_return_ack_details',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'form_16A_ack_details',
- 'fieldtype': 'Table',
- 'idx': 16,
- 'label': 'Form 16A Ack Details',
- 'oldfieldname': 'form_16A_ack_details',
- 'oldfieldtype': 'Table',
- 'options': 'Form 16A Ack Detail',
+ 'doctype': u'DocField',
+ 'fieldname': u'form_16A_ack_details',
+ 'fieldtype': u'Table',
+ 'label': u'Form 16A Ack Details',
+ 'oldfieldname': u'form_16A_ack_details',
+ 'oldfieldtype': u'Table',
+ 'options': u'Form 16A Ack Detail',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 17,
- 'label': 'Payment Details',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'payment_details',
+ 'fieldtype': u'Section Break',
+ 'label': u'Payment Details',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'idx': 18,
- 'label': 'Get TDS',
- 'oldfieldtype': 'Button',
- 'options': 'get_tds',
+ 'doctype': u'DocField',
+ 'fieldname': u'get_tds',
+ 'fieldtype': u'Button',
+ 'label': u'Get TDS',
+ 'oldfieldtype': u'Button',
+ 'options': u'get_tds',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'form_16A_tax_details',
- 'fieldtype': 'Table',
- 'idx': 19,
- 'label': 'Tax Details',
- 'oldfieldname': 'form_16A_tax_details',
- 'oldfieldtype': 'Table',
- 'options': 'Form 16A Tax Detail',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'form_16A_tax_details',
+ 'fieldtype': u'Table',
+ 'label': u'Tax Details',
+ 'oldfieldname': u'form_16A_tax_details',
+ 'oldfieldtype': u'Table',
+ 'options': u'Form 16A Tax Detail',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'total_amount',
- 'fieldtype': 'Currency',
- 'idx': 20,
- 'label': 'Total Amount',
- 'oldfieldname': 'total_amount',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'total_amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Total Amount',
+ 'oldfieldname': u'total_amount',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'in_words',
- 'fieldtype': 'Data',
- 'idx': 21,
- 'label': 'In Words',
+ 'doctype': u'DocField',
+ 'fieldname': u'in_words',
+ 'fieldtype': u'Data',
+ 'label': u'In Words',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 22,
- 'oldfieldtype': 'Section Break',
- 'options': 'Simple',
+ 'doctype': u'DocField',
+ 'fieldname': u'section_break0',
+ 'fieldtype': u'Section Break',
+ 'oldfieldtype': u'Section Break',
+ 'options': u'Simple',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 23,
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break2',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'place',
- 'fieldtype': 'Data',
- 'idx': 24,
- 'label': 'Place',
- 'oldfieldname': 'place',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'place',
+ 'fieldtype': u'Data',
+ 'label': u'Place',
+ 'oldfieldname': u'place',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'dt',
- 'fieldtype': 'Date',
- 'idx': 25,
- 'label': 'Date',
- 'oldfieldname': 'dt',
- 'oldfieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'dt',
+ 'fieldtype': u'Date',
+ 'label': u'Date',
+ 'oldfieldname': u'dt',
+ 'oldfieldtype': u'Date',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 26,
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break3',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'full_name',
- 'fieldtype': 'Data',
- 'idx': 27,
- 'label': 'Full Name',
- 'oldfieldname': 'full_name',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'full_name',
+ 'fieldtype': u'Data',
+ 'label': u'Full Name',
+ 'oldfieldname': u'full_name',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'designation',
- 'fieldtype': 'Data',
- 'idx': 28,
- 'label': 'Designation',
- 'oldfieldname': 'designation',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'designation',
+ 'fieldtype': u'Data',
+ 'label': u'Designation',
+ 'oldfieldname': u'designation',
+ 'oldfieldtype': u'Data',
'permlevel': 0
}
]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/form_16a_ack_detail/form_16a_ack_detail.txt b/erpnext/accounts/doctype/form_16a_ack_detail/form_16a_ack_detail.txt
index 0f2c188..b3d1546 100644
--- a/erpnext/accounts/doctype/form_16a_ack_detail/form_16a_ack_detail.txt
+++ b/erpnext/accounts/doctype/form_16a_ack_detail/form_16a_ack_detail.txt
@@ -3,61 +3,59 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:02',
+ 'creation': '2012-03-27 14:35:42',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:42',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
- 'section_style': 'Tray',
+ 'section_style': u'Tray',
'show_in_menu': 0,
'version': 1
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Form 16A Ack Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Form 16A Ack Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, Form 16A Ack Detail
{
'doctype': 'DocType',
- 'name': 'Form 16A Ack Detail'
+ 'name': u'Form 16A Ack Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'quarter',
- 'fieldtype': 'Select',
- 'idx': 1,
- 'label': 'Quarter',
- 'oldfieldname': 'quarter',
- 'oldfieldtype': 'Select',
- 'options': '\nApr-Jun\nJul-Sept\nOct-Dec\nJan-Mar'
+ 'doctype': u'DocField',
+ 'fieldname': u'quarter',
+ 'fieldtype': u'Select',
+ 'label': u'Quarter',
+ 'oldfieldname': u'quarter',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nApr-Jun\nJul-Sept\nOct-Dec\nJan-Mar'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'ack_no',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Acknowledgement No.',
- 'oldfieldname': 'ack_no',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'ack_no',
+ 'fieldtype': u'Data',
+ 'label': u'Acknowledgement No.',
+ 'oldfieldname': u'ack_no',
+ 'oldfieldtype': u'Data'
}
]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/form_16a_tax_detail/form_16a_tax_detail.txt b/erpnext/accounts/doctype/form_16a_tax_detail/form_16a_tax_detail.txt
index 86a25da..c0a0c73 100644
--- a/erpnext/accounts/doctype/form_16a_tax_detail/form_16a_tax_detail.txt
+++ b/erpnext/accounts/doctype/form_16a_tax_detail/form_16a_tax_detail.txt
@@ -3,148 +3,138 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:02',
+ 'creation': '2012-03-27 14:35:42',
'docstatus': 0,
- 'modified': '2010-09-27 16:53:54',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:42',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
- 'section_style': 'Tray',
+ 'section_style': u'Tray',
'show_in_menu': 0,
'version': 1
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Form 16A Tax Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Form 16A Tax Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, Form 16A Tax Detail
{
'doctype': 'DocType',
- 'name': 'Form 16A Tax Detail'
+ 'name': u'Form 16A Tax Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amount_paid',
- 'fieldtype': 'Currency',
- 'idx': 1,
- 'label': 'Amount paid / credited',
- 'oldfieldname': 'amount_paid',
- 'oldfieldtype': 'Currency'
+ 'doctype': u'DocField',
+ 'fieldname': u'amount_paid',
+ 'fieldtype': u'Currency',
+ 'label': u'Amount paid / credited',
+ 'oldfieldname': u'amount_paid',
+ 'oldfieldtype': u'Currency'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'date_of_payment',
- 'fieldtype': 'Date',
- 'idx': 2,
- 'label': 'Date of payment / credit',
- 'oldfieldname': 'date_of_payment',
- 'oldfieldtype': 'Date'
+ 'doctype': u'DocField',
+ 'fieldname': u'date_of_payment',
+ 'fieldtype': u'Date',
+ 'label': u'Date of payment / credit',
+ 'oldfieldname': u'date_of_payment',
+ 'oldfieldtype': u'Date'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'tds_main',
- 'fieldtype': 'Currency',
- 'idx': 3,
- 'label': 'TDS(Main)',
- 'oldfieldname': 'tds_main',
- 'oldfieldtype': 'Currency'
+ 'doctype': u'DocField',
+ 'fieldname': u'tds_main',
+ 'fieldtype': u'Currency',
+ 'label': u'TDS(Main)',
+ 'oldfieldname': u'tds_main',
+ 'oldfieldtype': u'Currency'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'surcharge',
- 'fieldtype': 'Currency',
- 'idx': 4,
- 'label': 'Surcharge',
- 'oldfieldname': 'surcharge',
- 'oldfieldtype': 'Currency'
+ 'doctype': u'DocField',
+ 'fieldname': u'surcharge',
+ 'fieldtype': u'Currency',
+ 'label': u'Surcharge',
+ 'oldfieldname': u'surcharge',
+ 'oldfieldtype': u'Currency'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'cess_on_tds',
- 'fieldtype': 'Currency',
- 'idx': 5,
- 'label': 'Cess on TDS',
- 'oldfieldname': 'cess_on_tds',
- 'oldfieldtype': 'Currency'
+ 'doctype': u'DocField',
+ 'fieldname': u'cess_on_tds',
+ 'fieldtype': u'Currency',
+ 'label': u'Cess on TDS',
+ 'oldfieldname': u'cess_on_tds',
+ 'oldfieldtype': u'Currency'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'total_tax_deposited',
- 'fieldtype': 'Currency',
- 'idx': 8,
- 'label': 'Total Tax Deposited',
- 'oldfieldname': 'total_tax_deposited',
- 'oldfieldtype': 'Currency'
+ 'doctype': u'DocField',
+ 'fieldname': u'total_tax_deposited',
+ 'fieldtype': u'Currency',
+ 'label': u'Total Tax Deposited',
+ 'oldfieldname': u'total_tax_deposited',
+ 'oldfieldtype': u'Currency'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'cheque_no',
- 'fieldtype': 'Data',
- 'idx': 9,
- 'label': 'Cheque / DD No.',
- 'oldfieldname': 'cheque_no',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'cheque_no',
+ 'fieldtype': u'Data',
+ 'label': u'Cheque / DD No.',
+ 'oldfieldname': u'cheque_no',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'bsr_code',
- 'fieldtype': 'Data',
- 'idx': 10,
- 'label': 'BSR Code',
- 'oldfieldname': 'bsr_code',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'bsr_code',
+ 'fieldtype': u'Data',
+ 'label': u'BSR Code',
+ 'oldfieldname': u'bsr_code',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'tax_deposited_date',
- 'fieldtype': 'Date',
- 'idx': 11,
- 'label': 'Tax Deposited Date',
- 'oldfieldname': 'tax_deposited_date',
- 'oldfieldtype': 'Date'
+ 'doctype': u'DocField',
+ 'fieldname': u'tax_deposited_date',
+ 'fieldtype': u'Date',
+ 'label': u'Tax Deposited Date',
+ 'oldfieldname': u'tax_deposited_date',
+ 'oldfieldtype': u'Date'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'challan_no',
- 'fieldtype': 'Data',
- 'idx': 12,
- 'label': 'Challan No.',
- 'oldfieldname': 'challan_no',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'challan_no',
+ 'fieldtype': u'Data',
+ 'label': u'Challan No.',
+ 'oldfieldname': u'challan_no',
+ 'oldfieldtype': u'Data'
}
]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/gl_control/gl_control.txt b/erpnext/accounts/doctype/gl_control/gl_control.txt
index f31b64d..d75ff16 100644
--- a/erpnext/accounts/doctype/gl_control/gl_control.txt
+++ b/erpnext/accounts/doctype/gl_control/gl_control.txt
@@ -3,22 +3,22 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:03',
+ 'creation': '2012-03-27 14:35:42',
'docstatus': 0,
- 'modified': '2010-12-29 12:57:24',
- 'modified_by': 'umair@iwebnotes.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:42',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'issingle': 1,
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 288
},
@@ -26,6 +26,6 @@
# DocType, GL Control
{
'doctype': 'DocType',
- 'name': 'GL Control'
+ 'name': u'GL Control'
}
]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.txt b/erpnext/accounts/doctype/gl_entry/gl_entry.txt
index 1d84e1d..76d7fdb 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.txt
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.txt
@@ -3,303 +3,301 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:03',
+ 'creation': '2012-03-27 14:35:42',
'docstatus': 0,
- 'modified': '2011-11-24 15:03:45',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:42',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1319016431',
- 'autoname': 'GL.#######',
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ '_last_update': u'1319016431',
+ 'autoname': u'GL.#######',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
'in_create': 1,
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
- 'search_fields': 'voucher_no,account,posting_date,against_voucher',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'search_fields': u'voucher_no,account,posting_date,against_voucher',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 103
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'GL Entry',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'GL Entry',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'create': 0,
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'GL Entry',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
- 'read': 1
+ 'parent': u'GL Entry',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
+ 'read': 1,
+ 'write': 0
},
# DocType, GL Entry
{
'doctype': 'DocType',
- 'name': 'GL Entry'
+ 'name': u'GL Entry'
},
# DocPerm
{
'amend': 0,
'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'role': 'Accounts User',
- 'submit': 0,
- 'write': 0
+ 'doctype': u'DocPerm',
+ 'role': u'Accounts User',
+ 'submit': 0
},
# DocPerm
{
'amend': 0,
'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Accounts Manager',
- 'submit': 0,
- 'write': 0
+ 'role': u'Accounts Manager',
+ 'submit': 0
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager'
+ 'role': u'System Manager'
},
# DocField
{
- 'description': 'The date at which current entry will get or has actually executed.',
- 'doctype': 'DocField',
- 'fieldname': 'posting_date',
- 'fieldtype': 'Date',
+ 'description': u'The date at which current entry will get or has actually executed.',
+ 'doctype': u'DocField',
+ 'fieldname': u'posting_date',
+ 'fieldtype': u'Date',
'in_filter': 1,
- 'label': 'Posting Date',
- 'oldfieldname': 'posting_date',
- 'oldfieldtype': 'Date',
+ 'label': u'Posting Date',
+ 'oldfieldname': u'posting_date',
+ 'oldfieldtype': u'Date',
'search_index': 1
},
# DocField
{
- 'description': 'The date at which current entry is made in system.',
- 'doctype': 'DocField',
- 'fieldname': 'transaction_date',
- 'fieldtype': 'Date',
- 'label': 'Transaction Date',
- 'oldfieldname': 'transaction_date',
- 'oldfieldtype': 'Date'
+ 'description': u'The date at which current entry is made in system.',
+ 'doctype': u'DocField',
+ 'fieldname': u'transaction_date',
+ 'fieldtype': u'Date',
+ 'label': u'Transaction Date',
+ 'oldfieldname': u'transaction_date',
+ 'oldfieldtype': u'Date'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'aging_date',
- 'fieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'aging_date',
+ 'fieldtype': u'Date',
'in_filter': 1,
- 'label': 'Aging Date',
- 'oldfieldname': 'aging_date',
- 'oldfieldtype': 'Date',
+ 'label': u'Aging Date',
+ 'oldfieldname': u'aging_date',
+ 'oldfieldtype': u'Date',
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'account',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'account',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Account',
- 'oldfieldname': 'account',
- 'oldfieldtype': 'Link',
- 'options': 'Account',
+ 'label': u'Account',
+ 'oldfieldname': u'account',
+ 'oldfieldtype': u'Link',
+ 'options': u'Account',
'search_index': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'cost_center',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'cost_center',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Cost Center',
- 'oldfieldname': 'cost_center',
- 'oldfieldtype': 'Link',
- 'options': 'Cost Center',
+ 'label': u'Cost Center',
+ 'oldfieldname': u'cost_center',
+ 'oldfieldtype': u'Link',
+ 'options': u'Cost Center',
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'debit',
- 'fieldtype': 'Currency',
- 'label': 'Debit Amt',
- 'oldfieldname': 'debit',
- 'oldfieldtype': 'Currency'
+ 'doctype': u'DocField',
+ 'fieldname': u'debit',
+ 'fieldtype': u'Currency',
+ 'label': u'Debit Amt',
+ 'oldfieldname': u'debit',
+ 'oldfieldtype': u'Currency'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'credit',
- 'fieldtype': 'Currency',
- 'label': 'Credit Amt',
- 'oldfieldname': 'credit',
- 'oldfieldtype': 'Currency'
+ 'doctype': u'DocField',
+ 'fieldname': u'credit',
+ 'fieldtype': u'Currency',
+ 'label': u'Credit Amt',
+ 'oldfieldname': u'credit',
+ 'oldfieldtype': u'Currency'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'against',
- 'fieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'against',
+ 'fieldtype': u'Text',
'in_filter': 1,
- 'label': 'Against',
- 'oldfieldname': 'against',
- 'oldfieldtype': 'Text'
+ 'label': u'Against',
+ 'oldfieldname': u'against',
+ 'oldfieldtype': u'Text'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'against_voucher',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'against_voucher',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Against Voucher',
- 'oldfieldname': 'against_voucher',
- 'oldfieldtype': 'Data',
+ 'label': u'Against Voucher',
+ 'oldfieldname': u'against_voucher',
+ 'oldfieldtype': u'Data',
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'against_voucher_type',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'against_voucher_type',
+ 'fieldtype': u'Data',
'in_filter': 0,
- 'label': 'Against Voucher Type',
- 'oldfieldname': 'against_voucher_type',
- 'oldfieldtype': 'Data',
+ 'label': u'Against Voucher Type',
+ 'oldfieldname': u'against_voucher_type',
+ 'oldfieldtype': u'Data',
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'voucher_type',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'voucher_type',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Voucher Type',
- 'oldfieldname': 'voucher_type',
- 'oldfieldtype': 'Select',
- 'options': 'Journal Voucher\nReceivable Voucher\nPayable Voucher',
+ 'label': u'Voucher Type',
+ 'oldfieldname': u'voucher_type',
+ 'oldfieldtype': u'Select',
+ 'options': u'Journal Voucher\nReceivable Voucher\nPayable Voucher',
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'voucher_no',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'voucher_no',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Voucher No',
- 'oldfieldname': 'voucher_no',
- 'oldfieldtype': 'Data',
+ 'label': u'Voucher No',
+ 'oldfieldname': u'voucher_no',
+ 'oldfieldtype': u'Data',
'search_index': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'remarks',
- 'fieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'remarks',
+ 'fieldtype': u'Text',
'in_filter': 1,
- 'label': 'Remarks',
+ 'label': u'Remarks',
'no_copy': 1,
- 'oldfieldname': 'remarks',
- 'oldfieldtype': 'Text',
+ 'oldfieldname': u'remarks',
+ 'oldfieldtype': u'Text',
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'is_cancelled',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'is_cancelled',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Is Cancelled',
- 'oldfieldname': 'is_cancelled',
- 'oldfieldtype': 'Select',
- 'options': 'No\nYes',
+ 'label': u'Is Cancelled',
+ 'oldfieldname': u'is_cancelled',
+ 'oldfieldtype': u'Select',
+ 'options': u'No\nYes',
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'is_opening',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'is_opening',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Is Opening',
- 'oldfieldname': 'is_opening',
- 'oldfieldtype': 'Select',
- 'options': 'No\nYes',
+ 'label': u'Is Opening',
+ 'oldfieldname': u'is_opening',
+ 'oldfieldtype': u'Select',
+ 'options': u'No\nYes',
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'is_advance',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'is_advance',
+ 'fieldtype': u'Select',
'in_filter': 0,
- 'label': 'Is Advance',
- 'oldfieldname': 'is_advance',
- 'oldfieldtype': 'Select',
- 'options': 'No\nYes',
+ 'label': u'Is Advance',
+ 'oldfieldname': u'is_advance',
+ 'oldfieldtype': u'Select',
+ 'options': u'No\nYes',
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'fiscal_year',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'fiscal_year',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Fiscal Year',
- 'oldfieldname': 'fiscal_year',
- 'oldfieldtype': 'Select',
- 'options': 'link:Fiscal Year',
+ 'label': u'Fiscal Year',
+ 'oldfieldname': u'fiscal_year',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:Fiscal Year',
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'company',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'company',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Company',
- 'oldfieldname': 'company',
- 'oldfieldtype': 'Link',
- 'options': 'Company',
+ 'label': u'Company',
+ 'oldfieldname': u'company',
+ 'oldfieldtype': u'Link',
+ 'options': u'Company',
'search_index': 0
}
]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/internal_reconciliation/internal_reconciliation.txt b/erpnext/accounts/doctype/internal_reconciliation/internal_reconciliation.txt
index 7114987..0e5bb4d 100644
--- a/erpnext/accounts/doctype/internal_reconciliation/internal_reconciliation.txt
+++ b/erpnext/accounts/doctype/internal_reconciliation/internal_reconciliation.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2011-08-30 11:45:50',
+ 'creation': '2012-03-27 14:35:42',
'docstatus': 0,
- 'modified': '2012-03-21 12:55:31',
+ 'modified': '2012-03-27 14:35:42',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -88,6 +88,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'column_break0',
'fieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
@@ -127,6 +128,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break1',
'fieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
@@ -154,6 +156,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'payment_entries',
'fieldtype': u'Section Break',
'label': u'Payment Entries',
'permlevel': 0
@@ -163,6 +166,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'column_break2',
'fieldtype': u'Column Break',
'label': u"<div class = 'field_description'>Filter payment entries based on date:</div>",
'permlevel': 0,
@@ -191,6 +195,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'column_break3',
'fieldtype': u'Column Break',
'label': u"<div class = 'field_description'>Filter payment entries based on amount:</div>",
'permlevel': 0,
@@ -219,6 +224,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'section_break0',
'fieldtype': u'Section Break',
'options': u'Simple',
'permlevel': 0
@@ -227,6 +233,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'pull_payment_entries',
'fieldtype': u'Button',
'label': u'Pull Payment Entries',
'options': u'get_payment_entries',
@@ -247,6 +254,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'reconcile_html',
'fieldtype': u'HTML',
'label': u'Reconcile HTML',
'options': u"<div class='field_description'>Select Payment Voucher and Amount to Reconcile in the above table and then click Reconcile button</div>",
@@ -257,6 +265,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'reconcile',
'fieldtype': u'Button',
'label': u'Reconcile',
'options': u'reconcile',
diff --git a/erpnext/accounts/doctype/ir_payment_detail/ir_payment_detail.txt b/erpnext/accounts/doctype/ir_payment_detail/ir_payment_detail.txt
index b35c497..9c2e426 100644
--- a/erpnext/accounts/doctype/ir_payment_detail/ir_payment_detail.txt
+++ b/erpnext/accounts/doctype/ir_payment_detail/ir_payment_detail.txt
@@ -3,127 +3,127 @@
# These values are common in all dictionaries
{
- 'creation': '2011-08-30 11:57:48',
+ 'creation': '2012-03-27 14:35:43',
'docstatus': 0,
- 'modified': '2011-09-20 15:18:02',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:43',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 14
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'IR Payment Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'IR Payment Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# DocType, IR Payment Detail
{
'doctype': 'DocType',
- 'name': 'IR Payment Detail'
+ 'name': u'IR Payment Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'selected',
- 'fieldtype': 'Check',
- 'label': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'selected',
+ 'fieldtype': u'Check',
+ 'label': u'Select',
'permlevel': 0,
'reqd': 1,
- 'width': '60px'
+ 'width': u'60px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'voucher_no',
- 'fieldtype': 'Link',
- 'label': 'Voucher No',
- 'options': 'Journal Voucher',
+ 'doctype': u'DocField',
+ 'fieldname': u'voucher_no',
+ 'fieldtype': u'Link',
+ 'label': u'Voucher No',
+ 'options': u'Journal Voucher',
'permlevel': 1,
'reqd': 0,
- 'width': '140px'
+ 'width': u'140px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amt_due',
- 'fieldtype': 'Currency',
- 'label': 'Amt Due',
+ 'doctype': u'DocField',
+ 'fieldname': u'amt_due',
+ 'fieldtype': u'Currency',
+ 'label': u'Amt Due',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amt_to_be_reconciled',
- 'fieldtype': 'Currency',
- 'label': 'Amt to be reconciled',
+ 'doctype': u'DocField',
+ 'fieldname': u'amt_to_be_reconciled',
+ 'fieldtype': u'Currency',
+ 'label': u'Amt to be reconciled',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'posting_date',
- 'fieldtype': 'Date',
- 'label': 'Posting Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'posting_date',
+ 'fieldtype': u'Date',
+ 'label': u'Posting Date',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'total_amt',
- 'fieldtype': 'Currency',
- 'label': 'Total Amt',
+ 'doctype': u'DocField',
+ 'fieldname': u'total_amt',
+ 'fieldtype': u'Currency',
+ 'label': u'Total Amt',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'against_account',
- 'fieldtype': 'Data',
- 'label': 'Against Account',
+ 'doctype': u'DocField',
+ 'fieldname': u'against_account',
+ 'fieldtype': u'Data',
+ 'label': u'Against Account',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'remarks',
- 'fieldtype': 'Small Text',
- 'label': 'Remarks',
+ 'doctype': u'DocField',
+ 'fieldname': u'remarks',
+ 'fieldtype': u'Small Text',
+ 'label': u'Remarks',
'permlevel': 1,
- 'width': '200px'
+ 'width': u'200px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'voucher_detail_no',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'voucher_detail_no',
+ 'fieldtype': u'Data',
'hidden': 1,
- 'label': 'Voucher Detail No',
+ 'label': u'Voucher Detail No',
'no_column': 0,
'permlevel': 1,
'print_hide': 1,
diff --git a/erpnext/accounts/doctype/journal_voucher/journal_voucher.txt b/erpnext/accounts/doctype/journal_voucher/journal_voucher.txt
index 0d67374..dedd2f9 100644
--- a/erpnext/accounts/doctype/journal_voucher/journal_voucher.txt
+++ b/erpnext/accounts/doctype/journal_voucher/journal_voucher.txt
@@ -3,74 +3,54 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:06',
+ 'creation': '2012-03-27 14:35:43',
'docstatus': 0,
- 'modified': '2012-01-19 14:15:53',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
- },
-
- # These values are common for all DocField
- {
- 'doctype': 'DocField',
- 'name': '__common__',
- 'parent': 'Journal Voucher',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'modified': '2012-03-27 14:45:48',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1311251040',
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ '_last_update': u'1311251040',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
- 'module': 'Accounts',
+ 'is_submittable': 1,
+ 'module': u'Accounts',
'name': '__common__',
- 'search_fields': 'voucher_type,posting_date, due_date, cheque_no',
- 'section_style': 'Tabbed',
- 'server_code_error': ' ',
+ 'search_fields': u'voucher_type,posting_date, due_date, cheque_no',
+ 'section_style': u'Tabbed',
+ 'server_code_error': u' ',
'show_in_menu': 0,
- 'subject': ' ',
- 'tag_fields': 'voucher_type',
+ 'subject': u' ',
+ 'tag_fields': u'voucher_type',
'version': 311
},
- # These values are common for all DocFormat
+ # These values are common for all DocField
{
- 'doctype': 'DocFormat',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Journal Voucher',
- 'parentfield': 'formats',
- 'parenttype': 'DocType'
+ 'parent': u'Journal Voucher',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Journal Voucher',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Journal Voucher',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Journal Voucher
{
'doctype': 'DocType',
- 'name': 'Journal Voucher'
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'permlevel': 1,
- 'role': 'Accounts Manager',
- 'submit': 0,
- 'write': 0
+ 'name': u'Journal Voucher'
},
# DocPerm
@@ -78,21 +58,9 @@
'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Accounts Manager',
- 'submit': 1,
- 'write': 1
- },
-
- # DocPerm
- {
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- 'doctype': 'DocPerm',
- 'permlevel': 0,
- 'role': 'Accounts User',
+ 'role': u'Accounts User',
'submit': 1,
'write': 1
},
@@ -102,63 +70,78 @@
'amend': 0,
'cancel': 0,
'create': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Accounts User',
+ 'role': u'Accounts User',
'submit': 0,
'write': 0
},
- # DocFormat
+ # DocPerm
{
- 'doctype': 'DocFormat',
- 'format': 'Payment Receipt Voucher'
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Accounts Manager',
+ 'submit': 0,
+ 'write': 0
},
- # DocFormat
+ # DocPerm
{
- 'doctype': 'DocFormat',
- 'format': 'Cheque Printing Format'
- },
-
- # DocField
- {
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Basic Info',
- 'oldfieldtype': 'Section Break',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': '1. Select Series and Dates',
- 'oldfieldtype': 'Section Break',
- 'options': 'Simple',
- 'permlevel': 0
- },
-
- # DocField
- {
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'oldfieldtype': 'Column Break',
+ 'amend': 1,
+ 'cancel': 1,
+ 'create': 1,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'width': '50%'
+ 'role': u'Accounts Manager',
+ 'submit': 1,
+ 'write': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'voucher_type',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'basic_info',
+ 'fieldtype': u'Section Break',
+ 'label': u'Basic Info',
+ 'oldfieldtype': u'Section Break',
+ 'permlevel': 0
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
+ 'fieldname': u'1_select_series_and_dates',
+ 'fieldtype': u'Section Break',
+ 'label': u'1. Select Series and Dates',
+ 'oldfieldtype': u'Section Break',
+ 'options': u'Simple',
+ 'permlevel': 0
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
+ 'permlevel': 0,
+ 'width': u'50%'
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
+ 'fieldname': u'voucher_type',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Voucher Type',
- 'oldfieldname': 'voucher_type',
- 'oldfieldtype': 'Select',
- 'options': '\nJournal Entry\nBank Voucher\nCash Voucher\nCredit Card Voucher\nDebit Note\nCredit Note\nContra Voucher\nExcise Voucher\nWrite Off Voucher',
+ 'label': u'Voucher Type',
+ 'oldfieldname': u'voucher_type',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nJournal Entry\nBank Voucher\nCash Voucher\nCredit Card Voucher\nDebit Note\nCredit Note\nContra Voucher\nExcise Voucher\nWrite Off Voucher',
'permlevel': 0,
'print_hide': 0,
'search_index': 1
@@ -166,12 +149,12 @@
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': "eval:doc.voucher_type == 'Write Off Voucher'",
- 'doctype': 'DocField',
- 'fieldname': 'write_off_amount',
- 'fieldtype': 'Currency',
- 'label': 'Write Off Amount <=',
+ 'colour': u'White:FFF',
+ 'depends_on': u"eval:doc.voucher_type == 'Write Off Voucher'",
+ 'doctype': u'DocField',
+ 'fieldname': u'write_off_amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Write Off Amount <=',
'permlevel': 0,
'print_hide': 1,
'report_hide': 1
@@ -179,14 +162,14 @@
# DocField
{
- 'colour': 'White:FFF',
- 'default': 'Accounts Receivable',
- 'depends_on': "eval:doc.voucher_type == 'Write Off Voucher'",
- 'doctype': 'DocField',
- 'fieldname': 'write_off_based_on',
- 'fieldtype': 'Select',
- 'label': 'Write Off Based On',
- 'options': 'Accounts Receivable\nAccounts Payable',
+ 'colour': u'White:FFF',
+ 'default': u'Accounts Receivable',
+ 'depends_on': u"eval:doc.voucher_type == 'Write Off Voucher'",
+ 'doctype': u'DocField',
+ 'fieldname': u'write_off_based_on',
+ 'fieldtype': u'Select',
+ 'label': u'Write Off Based On',
+ 'options': u'Accounts Receivable\nAccounts Payable',
'permlevel': 0,
'print_hide': 1,
'report_hide': 1
@@ -194,16 +177,16 @@
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'To manage multiple series please go to Setup > Manage Series',
- 'doctype': 'DocField',
- 'fieldname': 'naming_series',
- 'fieldtype': 'Select',
- 'label': 'Series',
+ 'colour': u'White:FFF',
+ 'description': u'To manage multiple series please go to Setup > Manage Series',
+ 'doctype': u'DocField',
+ 'fieldname': u'naming_series',
+ 'fieldtype': u'Select',
+ 'label': u'Series',
'no_copy': 1,
- 'oldfieldname': 'naming_series',
- 'oldfieldtype': 'Select',
- 'options': 'JV',
+ 'oldfieldname': u'naming_series',
+ 'oldfieldtype': u'Select',
+ 'options': u'JV',
'permlevel': 0,
'print_hide': 1,
'reqd': 1
@@ -211,16 +194,16 @@
# DocField
{
- 'colour': 'White:FFF',
- 'default': 'Today',
- 'doctype': 'DocField',
- 'fieldname': 'voucher_date',
- 'fieldtype': 'Date',
+ 'colour': u'White:FFF',
+ 'default': u'Today',
+ 'doctype': u'DocField',
+ 'fieldname': u'voucher_date',
+ 'fieldtype': u'Date',
'in_filter': 1,
- 'label': 'Voucher Date',
+ 'label': u'Voucher Date',
'no_copy': 1,
- 'oldfieldname': 'voucher_date',
- 'oldfieldtype': 'Date',
+ 'oldfieldname': u'voucher_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'print_hide': 0,
'reqd': 1,
@@ -229,15 +212,15 @@
# DocField
{
- 'description': 'The date at which current entry will get or has actually executed.',
- 'doctype': 'DocField',
- 'fieldname': 'posting_date',
- 'fieldtype': 'Date',
+ 'description': u'The date at which current entry will get or has actually executed.',
+ 'doctype': u'DocField',
+ 'fieldname': u'posting_date',
+ 'fieldtype': u'Date',
'in_filter': 1,
- 'label': 'Posting Date',
+ 'label': u'Posting Date',
'no_copy': 1,
- 'oldfieldname': 'posting_date',
- 'oldfieldtype': 'Date',
+ 'oldfieldname': u'posting_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'reqd': 1,
'search_index': 1
@@ -245,102 +228,104 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'due_date',
- 'fieldtype': 'Date',
- 'label': 'Due Date',
- 'oldfieldname': 'due_date',
- 'oldfieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'due_date',
+ 'fieldtype': u'Date',
+ 'label': u'Due Date',
+ 'oldfieldname': u'due_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'print_hide': 0
},
# DocField
{
- 'description': 'The date at which current entry is corrected in the system.',
- 'doctype': 'DocField',
- 'fieldname': 'amendment_date',
- 'fieldtype': 'Date',
- 'label': 'Amendment Date',
+ 'description': u'The date at which current entry is corrected in the system.',
+ 'doctype': u'DocField',
+ 'fieldname': u'amendment_date',
+ 'fieldtype': u'Date',
+ 'label': u'Amendment Date',
'no_copy': 1,
- 'oldfieldname': 'amendment_date',
- 'oldfieldtype': 'Date',
+ 'oldfieldname': u'amendment_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amended_from',
- 'fieldtype': 'Link',
- 'label': 'Amended From',
+ 'doctype': u'DocField',
+ 'fieldname': u'amended_from',
+ 'fieldtype': u'Link',
+ 'label': u'Amended From',
'no_copy': 1,
- 'oldfieldname': 'amended_from',
- 'oldfieldtype': 'Link',
- 'options': 'Journal Voucher',
+ 'oldfieldname': u'amended_from',
+ 'oldfieldtype': u'Link',
+ 'options': u'Journal Voucher',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': "eval:doc.voucher_type == 'Write Off Voucher'",
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Get Outstanding Invoices',
- 'options': 'get_outstanding_invoices',
+ 'colour': u'White:FFF',
+ 'depends_on': u"eval:doc.voucher_type == 'Write Off Voucher'",
+ 'doctype': u'DocField',
+ 'fieldname': u'get_outstanding_invoices',
+ 'fieldtype': u'Button',
+ 'label': u'Get Outstanding Invoices',
+ 'options': u'get_outstanding_invoices',
'permlevel': 0,
'print_hide': 1,
- 'trigger': 'Server'
+ 'trigger': u'Server'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'cheque_no',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'cheque_no',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Cheque No',
+ 'label': u'Cheque No',
'no_copy': 1,
- 'oldfieldname': 'cheque_no',
- 'oldfieldtype': 'Data',
+ 'oldfieldname': u'cheque_no',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'search_index': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'cheque_date',
- 'fieldtype': 'Date',
- 'label': 'Cheque Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'cheque_date',
+ 'fieldtype': u'Date',
+ 'label': u'Cheque Date',
'no_copy': 1,
- 'oldfieldname': 'cheque_date',
- 'oldfieldtype': 'Date',
+ 'oldfieldname': u'cheque_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'clearance_date',
- 'fieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'clearance_date',
+ 'fieldtype': u'Date',
'in_filter': 1,
- 'label': 'Clearance Date',
+ 'label': u'Clearance Date',
'no_copy': 1,
- 'oldfieldname': 'clearance_date',
- 'oldfieldtype': 'Date',
+ 'oldfieldname': u'clearance_date',
+ 'oldfieldtype': u'Date',
'permlevel': 1,
'print_hide': 0,
'search_index': 1
@@ -348,197 +333,201 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'user_remark',
- 'fieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'user_remark',
+ 'fieldtype': u'Small Text',
'in_filter': 1,
- 'label': 'User Remark',
+ 'label': u'User Remark',
'no_copy': 1,
- 'oldfieldname': 'user_remark',
- 'oldfieldtype': 'Small Text',
+ 'oldfieldname': u'user_remark',
+ 'oldfieldtype': u'Small Text',
'permlevel': 0
},
# DocField
{
- 'description': 'User Remark will be added to Auto Remark',
- 'doctype': 'DocField',
- 'fieldname': 'remark',
- 'fieldtype': 'Small Text',
- 'label': 'Remark',
+ 'description': u'User Remark will be added to Auto Remark',
+ 'doctype': u'DocField',
+ 'fieldname': u'remark',
+ 'fieldtype': u'Small Text',
+ 'label': u'Remark',
'no_copy': 1,
- 'oldfieldname': 'remark',
- 'oldfieldtype': 'Small Text',
+ 'oldfieldname': u'remark',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1,
'reqd': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': '2. Add / Edit GL Entries',
- 'oldfieldtype': 'Section Break',
- 'options': 'Simple',
+ 'doctype': u'DocField',
+ 'fieldname': u'2_add_edit_gl_entries',
+ 'fieldtype': u'Section Break',
+ 'label': u'2. Add / Edit GL Entries',
+ 'oldfieldtype': u'Section Break',
+ 'options': u'Simple',
'permlevel': 0
},
# DocField
{
'allow_on_submit': 1,
- 'doctype': 'DocField',
- 'fieldname': 'entries',
- 'fieldtype': 'Table',
- 'label': 'Entries',
- 'oldfieldname': 'entries',
- 'oldfieldtype': 'Table',
- 'options': 'Journal Voucher Detail',
+ 'doctype': u'DocField',
+ 'fieldname': u'entries',
+ 'fieldtype': u'Table',
+ 'label': u'Entries',
+ 'oldfieldname': u'entries',
+ 'oldfieldtype': u'Table',
+ 'options': u'Journal Voucher Detail',
'permlevel': 0,
'print_hide': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Get Balance',
- 'oldfieldtype': 'Button',
+ 'doctype': u'DocField',
+ 'fieldname': u'get_balance',
+ 'fieldtype': u'Button',
+ 'label': u'Get Balance',
+ 'oldfieldtype': u'Button',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'total_debit',
- 'fieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'total_debit',
+ 'fieldtype': u'Currency',
'in_filter': 1,
- 'label': 'Total Debit',
+ 'label': u'Total Debit',
'no_copy': 1,
- 'oldfieldname': 'total_debit',
- 'oldfieldtype': 'Currency',
+ 'oldfieldname': u'total_debit',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'total_credit',
- 'fieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'total_credit',
+ 'fieldtype': u'Currency',
'in_filter': 1,
- 'label': 'Total Credit',
+ 'label': u'Total Credit',
'no_copy': 1,
- 'oldfieldname': 'total_credit',
- 'oldfieldtype': 'Currency',
+ 'oldfieldname': u'total_credit',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'difference',
- 'fieldtype': 'Currency',
- 'label': 'Difference',
+ 'doctype': u'DocField',
+ 'fieldname': u'difference',
+ 'fieldtype': u'Currency',
+ 'label': u'Difference',
'no_copy': 1,
- 'oldfieldname': 'difference',
- 'oldfieldtype': 'Currency',
+ 'oldfieldname': u'difference',
+ 'oldfieldtype': u'Currency',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Addtional Info',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'addtional_info',
+ 'fieldtype': u'Section Break',
+ 'label': u'Addtional Info',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break2',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'bill_no',
- 'fieldtype': 'Data',
- 'label': 'Bill No',
- 'oldfieldname': 'bill_no',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'bill_no',
+ 'fieldtype': u'Data',
+ 'label': u'Bill No',
+ 'oldfieldname': u'bill_no',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'bill_date',
- 'fieldtype': 'Date',
- 'label': 'Bill Date',
- 'oldfieldname': 'bill_date',
- 'oldfieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'bill_date',
+ 'fieldtype': u'Date',
+ 'label': u'Bill Date',
+ 'oldfieldname': u'bill_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'default': 'No',
- 'doctype': 'DocField',
- 'fieldname': 'is_opening',
- 'fieldtype': 'Select',
+ 'colour': u'White:FFF',
+ 'default': u'No',
+ 'doctype': u'DocField',
+ 'fieldname': u'is_opening',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Is Opening',
- 'oldfieldname': 'is_opening',
- 'oldfieldtype': 'Select',
- 'options': 'No\nYes',
+ 'label': u'Is Opening',
+ 'oldfieldname': u'is_opening',
+ 'oldfieldtype': u'Select',
+ 'options': u'No\nYes',
'permlevel': 0,
'print_hide': 1,
'search_index': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'aging_date',
- 'fieldtype': 'Date',
- 'label': 'Aging Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'aging_date',
+ 'fieldtype': u'Date',
+ 'label': u'Aging Date',
'no_copy': 0,
- 'oldfieldname': 'aging_date',
- 'oldfieldtype': 'Date',
+ 'oldfieldname': u'aging_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'cancel_reason',
- 'fieldtype': 'Data',
- 'label': 'Cancel Reason',
+ 'doctype': u'DocField',
+ 'fieldname': u'cancel_reason',
+ 'fieldtype': u'Data',
+ 'label': u'Cancel Reason',
'no_copy': 1,
- 'oldfieldname': 'cancel_reason',
- 'oldfieldtype': 'Data',
+ 'oldfieldname': u'cancel_reason',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'pay_to_recd_from',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'pay_to_recd_from',
+ 'fieldtype': u'Data',
'hidden': 0,
- 'label': 'Pay To / Recd From',
+ 'label': u'Pay To / Recd From',
'no_copy': 1,
'permlevel': 0,
'print_hide': 1,
@@ -547,11 +536,11 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'total_amount',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'total_amount',
+ 'fieldtype': u'Data',
'hidden': 0,
- 'label': 'Total Amount',
+ 'label': u'Total Amount',
'no_copy': 1,
'permlevel': 1,
'print_hide': 1,
@@ -560,11 +549,11 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'total_amount_in_words',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'total_amount_in_words',
+ 'fieldtype': u'Data',
'hidden': 0,
- 'label': 'Total Amount in Words',
+ 'label': u'Total Amount in Words',
'no_copy': 1,
'permlevel': 1,
'print_hide': 1,
@@ -573,23 +562,24 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break3',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'fiscal_year',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'fiscal_year',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Fiscal Year',
- 'oldfieldname': 'fiscal_year',
- 'oldfieldtype': 'Select',
- 'options': 'link:Fiscal Year',
+ 'label': u'Fiscal Year',
+ 'oldfieldname': u'fiscal_year',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:Fiscal Year',
'permlevel': 0,
'print_hide': 1,
'reqd': 1,
@@ -598,14 +588,14 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'company',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'company',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Company',
- 'oldfieldname': 'company',
- 'oldfieldtype': 'Link',
- 'options': 'Company',
+ 'label': u'Company',
+ 'oldfieldname': u'company',
+ 'oldfieldtype': u'Link',
+ 'options': u'Company',
'permlevel': 0,
'print_hide': 1,
'reqd': 1,
@@ -615,64 +605,67 @@
# DocField
{
'allow_on_submit': 1,
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'select_print_heading',
- 'fieldtype': 'Link',
- 'label': 'Select Print Heading',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'select_print_heading',
+ 'fieldtype': u'Link',
+ 'label': u'Select Print Heading',
'no_copy': 1,
- 'oldfieldname': 'select_print_heading',
- 'oldfieldtype': 'Link',
- 'options': 'Print Heading',
+ 'oldfieldname': u'select_print_heading',
+ 'oldfieldtype': u'Link',
+ 'options': u'Print Heading',
'permlevel': 0,
'print_hide': 1,
'report_hide': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'oldfieldtype': 'Section Break',
- 'options': 'Simple',
+ 'doctype': u'DocField',
+ 'fieldname': u'section_break0',
+ 'fieldtype': u'Section Break',
+ 'oldfieldtype': u'Section Break',
+ 'options': u'Simple',
'permlevel': 0
},
# DocField
{
'allow_on_submit': 1,
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'View Ledger Entry',
- 'oldfieldtype': 'Button',
+ 'doctype': u'DocField',
+ 'fieldname': u'view_ledger_entry',
+ 'fieldtype': u'Button',
+ 'label': u'View Ledger Entry',
+ 'oldfieldtype': u'Button',
'permlevel': 0,
'print_hide': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'TDS',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'tds',
+ 'fieldtype': u'Section Break',
+ 'label': u'TDS',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0,
'print_hide': 0
},
# DocField
{
- 'default': 'No',
- 'doctype': 'DocField',
- 'fieldname': 'tds_applicable',
- 'fieldtype': 'Select',
+ 'default': u'No',
+ 'doctype': u'DocField',
+ 'fieldname': u'tds_applicable',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'TDS Applicable',
+ 'label': u'TDS Applicable',
'no_copy': 1,
- 'oldfieldname': 'tds_applicable',
- 'oldfieldtype': 'Select',
- 'options': '\nYes\nNo',
+ 'oldfieldname': u'tds_applicable',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nYes\nNo',
'permlevel': 0,
'print_hide': 1,
'search_index': 1
@@ -680,93 +673,94 @@
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'tds_category',
- 'fieldtype': 'Select',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'tds_category',
+ 'fieldtype': u'Select',
'hidden': 0,
'in_filter': 1,
- 'label': 'TDS Category',
+ 'label': u'TDS Category',
'no_copy': 1,
- 'oldfieldname': 'tds_category',
- 'oldfieldtype': 'Select',
- 'options': 'link:TDS Category',
+ 'oldfieldname': u'tds_category',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:TDS Category',
'permlevel': 0,
'print_hide': 1,
'search_index': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'supplier_account',
- 'fieldtype': 'Link',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'supplier_account',
+ 'fieldtype': u'Link',
'hidden': 0,
- 'label': 'Supplier Account',
+ 'label': u'Supplier Account',
'no_copy': 1,
- 'oldfieldname': 'supplier_account',
- 'oldfieldtype': 'Link',
- 'options': 'Account',
+ 'oldfieldname': u'supplier_account',
+ 'oldfieldtype': u'Link',
+ 'options': u'Account',
'permlevel': 0,
'print_hide': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Get TDS',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'get_tds',
+ 'fieldtype': u'Button',
+ 'label': u'Get TDS',
'no_copy': 0,
- 'oldfieldtype': 'Button',
+ 'oldfieldtype': u'Button',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Tax Code will be populated based on account head mentioned in TDS Category master',
- 'doctype': 'DocField',
- 'fieldname': 'tax_code',
- 'fieldtype': 'Link',
- 'label': 'TDS Account Head',
+ 'colour': u'White:FFF',
+ 'description': u'Tax Code will be populated based on account head mentioned in TDS Category master',
+ 'doctype': u'DocField',
+ 'fieldname': u'tax_code',
+ 'fieldtype': u'Link',
+ 'label': u'TDS Account Head',
'no_copy': 1,
- 'oldfieldname': 'tax_code',
- 'oldfieldtype': 'Link',
- 'options': 'Account',
+ 'oldfieldname': u'tax_code',
+ 'oldfieldtype': u'Link',
+ 'options': u'Account',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'rate',
- 'fieldtype': 'Currency',
- 'label': 'Rate',
+ 'doctype': u'DocField',
+ 'fieldname': u'rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Rate',
'no_copy': 1,
- 'oldfieldname': 'rate',
- 'oldfieldtype': 'Currency',
+ 'oldfieldname': u'rate',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'print_hide': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'ded_amount',
- 'fieldtype': 'Currency',
- 'label': 'Amount',
+ 'doctype': u'DocField',
+ 'fieldname': u'ded_amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Amount',
'no_copy': 1,
- 'oldfieldname': 'ded_amount',
- 'oldfieldtype': 'Currency',
+ 'oldfieldname': u'ded_amount',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'print_hide': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
}
]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/journal_voucher/listview.js b/erpnext/accounts/doctype/journal_voucher/listview.js
new file mode 100644
index 0000000..5d7f85a
--- /dev/null
+++ b/erpnext/accounts/doctype/journal_voucher/listview.js
@@ -0,0 +1,34 @@
+wn.doclistviews['Journal Voucher'] = wn.views.ListView.extend({
+ init: function(d) {
+ this._super(d);
+ this.fields = this.fields.concat([
+ '`tabJournal Voucher`.voucher_type',
+ '`tabJournal Voucher`.remark',
+ '`tabJournal Voucher`.total_debit'
+ ]);
+ this.stats = this.stats.concat(['voucher_type']);
+ },
+ prepare_data: function(data) {
+ this._super(data);
+ if(!data.remark) data.remark = '';
+ if(data.remark.length> 30) {
+ data.remark = '<span title="'+data.remark+'">' + data.remark.substr(0,30)
+ + '...</span>';
+ }
+ },
+ columns: [
+ {width: '5%', content:'avatar'},
+ {width: '3%', content:'docstatus'},
+ {width: '12%', content:'name'},
+ {width: '15%', content:'voucher_type'},
+ {width: '38%', content:'tags+remark', css: {'color':'#aaa'}},
+ {
+ width: '18%',
+ content: function(parent, data) {
+ $(parent).html(sys_defaults.currency + ' ' + fmt_money(data.total_debit))
+ },
+ css: {'text-align':'right'}
+ },
+ {width: '12%', content:'modified', css: {'text-align': 'right', 'color':'#777'}}
+ ],
+});
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt b/erpnext/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
index 3b1e932..8360d13 100644
--- a/erpnext/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
+++ b/erpnext/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:06',
+ 'creation': '2012-03-27 14:35:43',
'docstatus': 0,
- 'modified': '2012-03-21 12:26:17',
+ 'modified': '2012-03-27 14:35:43',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/accounts/doctype/lease_agreement/lease_agreement.txt b/erpnext/accounts/doctype/lease_agreement/lease_agreement.txt
index a221a6c..e2d06cc 100644
--- a/erpnext/accounts/doctype/lease_agreement/lease_agreement.txt
+++ b/erpnext/accounts/doctype/lease_agreement/lease_agreement.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2011-07-27 13:14:28',
+ 'creation': '2012-03-27 14:35:44',
'docstatus': 0,
- 'modified': '2012-03-21 12:43:53',
+ 'modified': '2012-03-27 14:35:44',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -34,12 +34,14 @@
# These values are common for all DocPerm
{
+ 'create': 1,
'doctype': u'DocPerm',
'name': '__common__',
'parent': u'Lease Agreement',
'parentfield': u'permissions',
'parenttype': u'DocType',
- 'read': 1
+ 'read': 1,
+ 'role': u'Accounts Manager'
},
# DocType, Lease Agreement
@@ -50,30 +52,9 @@
# DocPerm
{
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Accounts User',
- 'submit': 1,
- 'write': 1
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Accounts User'
- },
-
- # DocPerm
- {
'amend': 1,
'cancel': 1,
- 'create': 0,
'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Accounts Manager',
'submit': 1,
'write': 1
},
@@ -82,10 +63,7 @@
{
'amend': 0,
'cancel': 0,
- 'create': 0,
'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Accounts Manager',
'submit': 0,
'write': 0
},
@@ -105,6 +83,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'lessee_info',
'fieldtype': u'Section Break',
'label': u'Lessee Info.',
'permlevel': 0
@@ -160,6 +139,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'vehicle_info',
'fieldtype': u'Section Break',
'label': u'Vehicle Info.',
'permlevel': 0
@@ -195,6 +175,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'invoice_and_payment_info',
'fieldtype': u'Section Break',
'label': u'Invoice and Payment Info.',
'permlevel': 0
@@ -265,6 +246,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'generate',
'fieldtype': u'Button',
'label': u'Generate',
'permlevel': 0,
@@ -286,6 +268,7 @@
'allow_on_submit': 1,
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'installment_reciept',
'fieldtype': u'Button',
'label': u'Installment Reciept',
'permlevel': 0
diff --git a/erpnext/accounts/doctype/lease_installment/lease_installment.txt b/erpnext/accounts/doctype/lease_installment/lease_installment.txt
index 2434a78..475d226 100644
--- a/erpnext/accounts/doctype/lease_installment/lease_installment.txt
+++ b/erpnext/accounts/doctype/lease_installment/lease_installment.txt
@@ -3,89 +3,84 @@
# These values are common in all dictionaries
{
- 'creation': '2011-07-22 17:49:33',
+ 'creation': '2012-03-27 14:35:44',
'docstatus': 0,
- 'modified': '2011-07-22 17:49:33',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:44',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 5
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Lease Installment',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Lease Installment',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# DocType, Lease Installment
{
'doctype': 'DocType',
- 'name': 'Lease Installment'
+ 'name': u'Lease Installment'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amount',
- 'fieldtype': 'Currency',
- 'idx': 1,
- 'label': 'Amount',
+ 'doctype': u'DocField',
+ 'fieldname': u'amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Amount',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'due_date',
- 'fieldtype': 'Date',
- 'idx': 2,
- 'label': 'Due Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'due_date',
+ 'fieldtype': u'Date',
+ 'label': u'Due Date',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'cheque_number',
- 'fieldtype': 'Data',
- 'idx': 3,
- 'label': 'Cheque Number',
+ 'doctype': u'DocField',
+ 'fieldname': u'cheque_number',
+ 'fieldtype': u'Data',
+ 'label': u'Cheque Number',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'cheque_date',
- 'fieldtype': 'Date',
- 'idx': 4,
- 'label': 'Cheque Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'cheque_date',
+ 'fieldtype': u'Date',
+ 'label': u'Cheque Date',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'jv_number',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'jv_number',
+ 'fieldtype': u'Link',
'hidden': 0,
- 'idx': 5,
- 'label': 'JV Number',
- 'options': 'Journal Voucher',
+ 'label': u'JV Number',
+ 'options': u'Journal Voucher',
'permlevel': 1
}
]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/ledger_balance_export/ledger_balance_export.txt b/erpnext/accounts/doctype/ledger_balance_export/ledger_balance_export.txt
index 251588c..1f83e96 100755
--- a/erpnext/accounts/doctype/ledger_balance_export/ledger_balance_export.txt
+++ b/erpnext/accounts/doctype/ledger_balance_export/ledger_balance_export.txt
@@ -3,49 +3,49 @@
# These values are common in all dictionaries
{
- 'creation': '2011-05-24 14:41:08',
+ 'creation': '2012-03-27 14:35:44',
'docstatus': 0,
- 'modified': '2011-05-24 15:22:43',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:44',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1306229235',
+ '_last_update': u'1306229235',
'allow_copy': 1,
'allow_email': 1,
'allow_print': 1,
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Other',
+ 'document_type': u'Other',
'hide_heading': 0,
'issingle': 1,
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 9
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Ledger Balance Export',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Ledger Balance Export',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Ledger Balance Export',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Ledger Balance Export',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
'write': 1
@@ -54,76 +54,71 @@
# DocType, Ledger Balance Export
{
'doctype': 'DocType',
- 'name': 'Ledger Balance Export'
+ 'name': u'Ledger Balance Export'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'role': 'Accounts Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'Accounts Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'role': 'Accounts User'
+ 'doctype': u'DocPerm',
+ 'role': u'Accounts User'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 1,
- 'label': 'Select Date Range'
+ 'doctype': u'DocField',
+ 'fieldname': u'select_date_range',
+ 'fieldtype': u'Column Break',
+ 'label': u'Select Date Range'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'from_date',
- 'fieldtype': 'Date',
- 'idx': 2,
- 'label': 'From Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'from_date',
+ 'fieldtype': u'Date',
+ 'label': u'From Date',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'to_date',
- 'fieldtype': 'Date',
- 'idx': 3,
- 'label': 'To Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'to_date',
+ 'fieldtype': u'Date',
+ 'label': u'To Date',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 4,
- 'label': 'Select ledgers'
+ 'doctype': u'DocField',
+ 'fieldname': u'select_ledgers',
+ 'fieldtype': u'Column Break',
+ 'label': u'Select ledgers'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'ledger_details',
- 'fieldtype': 'Table',
- 'idx': 5,
- 'label': 'Ledger Details',
- 'options': 'Ledger Detail'
+ 'doctype': u'DocField',
+ 'fieldname': u'ledger_details',
+ 'fieldtype': u'Table',
+ 'label': u'Ledger Details',
+ 'options': u'Ledger Detail'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'idx': 6,
- 'label': 'Export Report',
- 'trigger': 'Client'
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'export_report',
+ 'fieldtype': u'Button',
+ 'label': u'Export Report',
+ 'trigger': u'Client'
}
]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/ledger_detail/ledger_detail.txt b/erpnext/accounts/doctype/ledger_detail/ledger_detail.txt
index f4d1084..0d76a9d 100755
--- a/erpnext/accounts/doctype/ledger_detail/ledger_detail.txt
+++ b/erpnext/accounts/doctype/ledger_detail/ledger_detail.txt
@@ -3,50 +3,49 @@
# These values are common in all dictionaries
{
- 'creation': '2011-05-24 14:50:42',
+ 'creation': '2012-03-27 14:35:44',
'docstatus': 0,
- 'modified': '2011-05-24 15:24:03',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:44',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 3
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'account',
- 'fieldtype': 'Link',
- 'idx': 1,
- 'label': 'Account',
+ 'doctype': u'DocField',
+ 'fieldname': u'account',
+ 'fieldtype': u'Link',
+ 'label': u'Account',
'name': '__common__',
- 'options': 'Account',
- 'parent': 'Ledger Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'options': u'Account',
+ 'parent': u'Ledger Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0,
'reqd': 1,
- 'width': '300px'
+ 'width': u'300px'
},
# DocType, Ledger Detail
{
'doctype': 'DocType',
- 'name': 'Ledger Detail'
+ 'name': u'Ledger Detail'
},
# DocField
{
- 'doctype': 'DocField'
+ 'doctype': u'DocField'
}
]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.txt b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.txt
index ac11016..cf7d740 100644
--- a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.txt
+++ b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.txt
@@ -3,39 +3,38 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:10',
+ 'creation': '2012-03-27 14:35:44',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'harshada@webnotestech.com'
+ 'modified': '2012-03-27 14:35:44',
+ 'modified_by': u'Administrator',
+ 'owner': u'harshada@webnotestech.com'
},
# These values are common for all DocType
{
- 'autoname': 'field:mode_of_payment',
- 'colour': 'White:FFF',
+ 'autoname': u'field:mode_of_payment',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'Accounts',
+ 'document_type': u'Master',
+ 'module': u'Accounts',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 3
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'mode_of_payment',
- 'fieldtype': 'Data',
- 'idx': 1,
- 'label': 'Mode of Payment',
+ 'doctype': u'DocField',
+ 'fieldname': u'mode_of_payment',
+ 'fieldtype': u'Data',
+ 'label': u'Mode of Payment',
'name': '__common__',
- 'oldfieldname': 'mode_of_payment',
- 'oldfieldtype': 'Data',
- 'parent': 'Mode of Payment',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'oldfieldname': u'mode_of_payment',
+ 'oldfieldtype': u'Data',
+ 'parent': u'Mode of Payment',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0,
'reqd': 1
},
@@ -43,31 +42,30 @@
# These values are common for all DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Mode of Payment',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Mode of Payment',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
- 'role': 'Accounts Manager',
+ 'role': u'Accounts Manager',
'write': 1
},
# DocType, Mode of Payment
{
'doctype': 'DocType',
- 'name': 'Mode of Payment'
+ 'name': u'Mode of Payment'
},
# DocPerm
{
- 'doctype': 'DocPerm'
+ 'doctype': u'DocPerm'
},
# DocField
{
- 'doctype': 'DocField'
+ 'doctype': u'DocField'
}
]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payable_voucher/payable_voucher.js b/erpnext/accounts/doctype/payable_voucher/payable_voucher.js
index 0bba213..057abca 100644
--- a/erpnext/accounts/doctype/payable_voucher/payable_voucher.js
+++ b/erpnext/accounts/doctype/payable_voucher/payable_voucher.js
@@ -17,8 +17,8 @@
cur_frm.cscript.tname = "PV Detail";
cur_frm.cscript.fname = "entries";
cur_frm.cscript.other_fname = "purchase_tax_details";
-$import(Purchase Other Charges)
-$import(Purchase Common)
+wn.require('erpnext/buying/doctype/purchase_other_charges/purchase_other_charges.js');
+wn.require('erpnext/buying/doctype/purchase_common/purchase_common.js');
// On Load
// --------
diff --git a/erpnext/accounts/doctype/payable_voucher/payable_voucher.txt b/erpnext/accounts/doctype/payable_voucher/payable_voucher.txt
index f7d66ea..d264b0d 100755
--- a/erpnext/accounts/doctype/payable_voucher/payable_voucher.txt
+++ b/erpnext/accounts/doctype/payable_voucher/payable_voucher.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:11',
+ 'creation': '2012-03-27 14:35:45',
'docstatus': 0,
- 'modified': '2012-03-02 12:28:23',
+ 'modified': '2012-03-27 14:45:49',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -16,6 +16,7 @@
'colour': u'White:FFF',
'default_print_format': u'Standard',
'doctype': 'DocType',
+ 'is_submittable': 1,
'module': u'Accounts',
'name': '__common__',
'read_only_onload': 1,
@@ -54,42 +55,18 @@
# DocPerm
{
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Accounts Manager',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
'amend': 1,
'cancel': 1,
'create': 1,
'doctype': u'DocPerm',
'permlevel': 0,
- 'role': u'Accounts Manager',
+ 'role': u'Accounts User',
'submit': 1,
'write': 1
},
# DocPerm
{
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Accounts User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
'doctype': u'DocPerm',
'permlevel': 1,
'role': u'Purchase User'
@@ -109,28 +86,53 @@
# DocPerm
{
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Accounts User',
- 'submit': 1,
- 'write': 1
- },
-
- # DocPerm
- {
'doctype': u'DocPerm',
'match': u'supplier',
'permlevel': 0,
'role': u'Supplier'
},
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Accounts Manager',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 1,
+ 'cancel': 1,
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Accounts Manager',
+ 'submit': 1,
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Accounts User',
+ 'submit': 0,
+ 'write': 0
+ },
+
# DocField
{
'allow_on_submit': 0,
'doctype': u'DocField',
+ 'fieldname': u'basic_info',
'fieldtype': u'Section Break',
'label': u'Basic Info',
'oldfieldtype': u'Section Break',
@@ -140,6 +142,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break0',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -283,6 +286,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break1',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -383,6 +387,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'items',
'fieldtype': u'Section Break',
'label': u'Items',
'oldfieldtype': u'Section Break',
@@ -420,6 +425,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break2',
'fieldtype': u'Column Break',
'permlevel': 0
},
@@ -460,6 +466,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'get_items',
'fieldtype': u'Button',
'label': u'Get Items',
'oldfieldtype': u'Button',
@@ -470,6 +477,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'section_break0',
'fieldtype': u'Section Break',
'permlevel': 0
},
@@ -490,6 +498,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'recalculate',
'fieldtype': u'Button',
'label': u'Recalculate',
'oldfieldtype': u'Button',
@@ -515,6 +524,7 @@
'colour': u'White:FFF',
'description': u'Add / Edit taxes and other charges',
'doctype': u'DocField',
+ 'fieldname': u'taxes',
'fieldtype': u'Section Break',
'label': u'Taxes',
'oldfieldtype': u'Section Break',
@@ -537,6 +547,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'get_tax_detail',
'fieldtype': u'Button',
'label': u'Get Tax Detail',
'oldfieldtype': u'Button',
@@ -560,6 +571,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'calculate_tax',
'fieldtype': u'Button',
'label': u'Calculate Tax',
'oldfieldtype': u'Button',
@@ -571,6 +583,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'tax_calculation',
'fieldtype': u'HTML',
'label': u'Tax Calculation',
'oldfieldtype': u'HTML',
@@ -593,6 +606,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'more_info',
'fieldtype': u'Section Break',
'label': u'More Info',
'oldfieldtype': u'Section Break',
@@ -603,6 +617,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break3',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -662,6 +677,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break4',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -731,6 +747,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'advances',
'fieldtype': u'Section Break',
'label': u'Advances',
'oldfieldtype': u'Section Break',
@@ -741,6 +758,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'get_advances_paid',
'fieldtype': u'Button',
'label': u'Get Advances Paid',
'oldfieldtype': u'Button',
@@ -767,6 +785,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'tds',
'fieldtype': u'Section Break',
'label': u'TDS',
'oldfieldtype': u'Section Break',
@@ -777,6 +796,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break5',
'fieldtype': u'Column Break',
'permlevel': 0,
'print_hide': 1,
@@ -813,6 +833,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'get_tds',
'fieldtype': u'Button',
'label': u'Get TDS',
'oldfieldtype': u'Button',
@@ -824,6 +845,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break6',
'fieldtype': u'Column Break',
'permlevel': 0,
'print_hide': 1,
@@ -870,6 +892,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'totals',
'fieldtype': u'Section Break',
'label': u'Totals',
'oldfieldtype': u'Section Break',
@@ -879,6 +902,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break7',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -982,6 +1006,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break8',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -1081,6 +1106,7 @@
'colour': u'White:FFF',
'depends_on': u'eval:!doc.__islocal',
'doctype': u'DocField',
+ 'fieldname': u'actions',
'fieldtype': u'Section Break',
'label': u'Actions',
'oldfieldtype': u'Section Break',
@@ -1092,6 +1118,7 @@
{
'allow_on_submit': 1,
'doctype': u'DocField',
+ 'fieldname': u'repair_outstanding_amt',
'fieldtype': u'Button',
'label': u'Repair Outstanding Amt',
'oldfieldtype': u'Button',
diff --git a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.txt b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.txt
index e432aac..54e458e 100644
--- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.txt
+++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-10-25 17:25:22',
+ 'creation': '2012-03-27 14:35:46',
'docstatus': 0,
- 'modified': '2012-03-21 12:39:36',
+ 'modified': '2012-03-27 14:45:49',
'modified_by': u'Administrator',
'owner': u'jai@webnotestech.com'
},
@@ -17,6 +17,7 @@
'colour': u'White:FFF',
'default_print_format': u'Standard',
'doctype': 'DocType',
+ 'is_submittable': 1,
'module': u'Accounts',
'name': '__common__',
'search_fields': u'posting_date, fiscal_year',
@@ -81,6 +82,20 @@
# DocPerm
{
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'System Manager'
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Accounts Manager'
+ },
+
+ # DocPerm
+ {
'amend': 1,
'cancel': 1,
'create': 1,
@@ -102,9 +117,24 @@
'write': 1
},
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'System Manager'
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Accounts Manager'
+ },
+
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break0',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -187,6 +217,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break1',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0
@@ -210,6 +241,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'coa_help',
'fieldtype': u'HTML',
'label': u'CoA Help',
'oldfieldtype': u'HTML',
@@ -246,6 +278,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'repost_account_balances',
'fieldtype': u'Section Break',
'label': u'Repost Account Balances',
'oldfieldtype': u'Section Break',
@@ -271,6 +304,7 @@
'allow_on_submit': 1,
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'repost',
'fieldtype': u'Button',
'label': u'Repost',
'oldfieldtype': u'Button',
diff --git a/erpnext/accounts/doctype/pos_setting/pos_setting.txt b/erpnext/accounts/doctype/pos_setting/pos_setting.txt
index fa79a58..2931617 100755
--- a/erpnext/accounts/doctype/pos_setting/pos_setting.txt
+++ b/erpnext/accounts/doctype/pos_setting/pos_setting.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-12-15 08:39:23',
+ 'creation': '2012-03-27 14:35:46',
'docstatus': 0,
- 'modified': '2012-03-21 12:39:49',
+ 'modified': '2012-03-27 14:35:46',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -170,6 +170,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break0',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break'
},
diff --git a/erpnext/accounts/doctype/purchase_tax_detail/purchase_tax_detail.txt b/erpnext/accounts/doctype/purchase_tax_detail/purchase_tax_detail.txt
index 2c5dc07..d4cd669 100644
--- a/erpnext/accounts/doctype/purchase_tax_detail/purchase_tax_detail.txt
+++ b/erpnext/accounts/doctype/purchase_tax_detail/purchase_tax_detail.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:16',
+ 'creation': '2012-03-27 14:35:46',
'docstatus': 0,
- 'modified': '2012-02-27 18:28:24',
+ 'modified': '2012-03-27 14:35:46',
'modified_by': u'Administrator',
'owner': u'wasim@webnotestech.com'
},
diff --git a/erpnext/accounts/doctype/pv_detail/pv_detail.txt b/erpnext/accounts/doctype/pv_detail/pv_detail.txt
index 423f667..77b8218 100755
--- a/erpnext/accounts/doctype/pv_detail/pv_detail.txt
+++ b/erpnext/accounts/doctype/pv_detail/pv_detail.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:17',
+ 'creation': '2012-03-27 14:35:46',
'docstatus': 0,
- 'modified': '2012-03-05 15:02:25',
+ 'modified': '2012-03-27 14:35:46',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/accounts/doctype/receivable_voucher/listview.js b/erpnext/accounts/doctype/receivable_voucher/listview.js
new file mode 100644
index 0000000..d30431f
--- /dev/null
+++ b/erpnext/accounts/doctype/receivable_voucher/listview.js
@@ -0,0 +1,32 @@
+// render
+wn.doclistviews['Receivable Voucher'] = wn.views.ListView.extend({
+ init: function(d) {
+ this._super(d)
+ this.fields = this.fields.concat([
+ "`tabReceivable Voucher`.customer",
+ "ifnull(`tabReceivable Voucher`.outstanding_amount,0) as outstanding_amount",
+ "ifnull(`tabReceivable Voucher`.grand_total,0) as grand_total",
+ "`tabReceivable Voucher`.currency",
+ "ifnull(`tabReceivable Voucher`.grand_total_export,0) as grand_total_export"
+ ]);
+ },
+ prepare_data: function(data) {
+ this._super(data);
+ data.paid = flt((data.grand_total - data.outstanding_amount) / data.grand_total * 100, 2);
+ },
+ columns: [
+ {width: '5%', content:'avatar'},
+ {width: '3%', content:'docstatus'},
+ {width: '15%', content:'name'},
+ {width: '37%', content:'tags+customer', css: {color:'#aaa'}},
+ {
+ width: '18%',
+ content: function(parent, data) {
+ $(parent).html(data.currency + ' ' + fmt_money(data.grand_total_export))
+ },
+ css: {'text-align':'right'}
+ },
+ {width: '10%', content: 'paid', type:'bar-graph', label:'Paid'},
+ {width: '12%', content:'modified', css: {'text-align': 'right', 'color':'#777'}}
+ ]
+});
diff --git a/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.js b/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.js
index 7b3c6ef..6db3b52 100644
--- a/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.js
+++ b/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.js
@@ -22,9 +22,10 @@
// print heading
cur_frm.pformat.print_heading = 'Invoice';
-$import(Sales Common)
-$import(Other Charges)
-$import(SMS Control)
+wn.require('erpnext/selling/doctype/sales_common/sales_common.js');
+wn.require('erpnext/setup/doctype/other_charges/other_charges.js');
+wn.require('erpnext/utilities/doctype/sms_control/sms_control.js');
+wn.require('erpnext/setup/doctype/notification_control/notification_control.js');
// On Load
// -------
@@ -486,7 +487,6 @@
}
}
-$import(Notification Control)
cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
var args = {
type: 'Sales Invoice',
diff --git a/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.py b/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.py
index 446a116..b0d1e53 100644
--- a/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.py
+++ b/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.py
@@ -166,7 +166,8 @@
# Item Details
# -------------
def get_item_details(self, args=None):
- args = args and eval(args) or {}
+ import json
+ args = args and json.loads(args) or {}
if args.get('item_code'):
ret = get_obj('Sales Common').get_item_details(args, self)
return self.get_pos_details(args, ret)
diff --git a/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.txt b/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.txt
index 9d84f21..330ce97 100644
--- a/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.txt
+++ b/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.txt
@@ -3,22 +3,13 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:18',
+ 'creation': '2012-03-27 14:35:47',
'docstatus': 0,
- 'modified': '2012-03-06 11:05:53',
+ 'modified': '2012-03-27 18:44:28',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Receivable Voucher',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
# These values are common for all DocType
{
'_last_update': u'1330671142',
@@ -26,6 +17,7 @@
'colour': u'White:FFF',
'default_print_format': u'Standard',
'doctype': 'DocType',
+ 'is_submittable': 1,
'module': u'Accounts',
'name': '__common__',
'read_only_onload': 1,
@@ -34,15 +26,15 @@
'server_code_error': u' ',
'show_in_menu': 0,
'subject': u'To %(customer_name)s worth %(currency)s %(grand_total_export)s due on %(due_date)s | %(outstanding_amount)s outstanding',
- 'version': 416
+ 'version': 417
},
- # These values are common for all DocFormat
+ # These values are common for all DocField
{
- 'doctype': u'DocFormat',
+ 'doctype': u'DocField',
'name': '__common__',
'parent': u'Receivable Voucher',
- 'parentfield': u'formats',
+ 'parentfield': u'fields',
'parenttype': u'DocType'
},
@@ -64,30 +56,6 @@
# DocPerm
{
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Accounts Manager',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Accounts Manager',
- 'submit': 1,
- 'write': 1
- },
-
- # DocPerm
- {
'amend': 1,
'cancel': 1,
'create': 1,
@@ -116,46 +84,40 @@
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
- 'match': u'customer',
'permlevel': 0,
'role': u'Customer',
'submit': 0,
'write': 0
},
- # DocFormat
+ # DocPerm
{
- 'doctype': u'DocFormat',
- 'format': u'POS Invoice'
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Accounts Manager',
+ 'submit': 0,
+ 'write': 0
},
- # DocFormat
+ # DocPerm
{
- 'doctype': u'DocFormat',
- 'format': u'POS Invoice'
- },
-
- # DocFormat
- {
- 'doctype': u'DocFormat',
- 'format': u'Sales Invoice Classic'
- },
-
- # DocFormat
- {
- 'doctype': u'DocFormat',
- 'format': u'Sales Invoice Modern'
- },
-
- # DocFormat
- {
- 'doctype': u'DocFormat',
- 'format': u'Sales Invoice Spartan'
+ 'amend': 1,
+ 'cancel': 1,
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Accounts Manager',
+ 'submit': 1,
+ 'write': 1
},
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'basic_info',
'fieldtype': u'Section Break',
'label': u'Basic Info',
'oldfieldtype': u'Section Break',
@@ -166,6 +128,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break0',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -328,6 +291,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'column_break1',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0
@@ -454,6 +418,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'items',
'fieldtype': u'Section Break',
'label': u'Items',
'oldfieldtype': u'Section Break',
@@ -504,6 +469,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break2',
'fieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
@@ -572,6 +538,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'get_items',
'fieldtype': u'Button',
'label': u'Get Items',
'oldfieldtype': u'Button',
@@ -583,6 +550,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'section_break0',
'fieldtype': u'Section Break',
'options': u'Simple',
'permlevel': 0
@@ -606,6 +574,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'recalculate_values',
'fieldtype': u'Button',
'label': u'Re-Calculate Values',
'oldfieldtype': u'Button',
@@ -617,6 +586,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'section_break1',
'fieldtype': u'Section Break',
'permlevel': 0
},
@@ -624,6 +594,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break3',
'fieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
@@ -676,6 +647,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break4',
'fieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
@@ -722,6 +694,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'taxes',
'fieldtype': u'Section Break',
'label': u'Taxes',
'oldfieldtype': u'Section Break',
@@ -744,6 +717,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'get_charges',
'fieldtype': u'Button',
'label': u'Get Charges',
'oldfieldtype': u'Button',
@@ -769,6 +743,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'calculate_charges',
'fieldtype': u'Button',
'label': u'Calculate Charges',
'oldfieldtype': u'Button',
@@ -792,6 +767,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'other_charges_calculation',
'fieldtype': u'HTML',
'label': u'Other Charges Calculation',
'oldfieldtype': u'HTML',
@@ -803,6 +779,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'totals',
'fieldtype': u'Section Break',
'label': u'Totals',
'oldfieldtype': u'Section Break',
@@ -814,6 +791,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'column_break5',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -893,6 +871,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'column_break6',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -966,6 +945,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'terms_section_break',
'fieldtype': u'Section Break',
'label': u'Terms',
'oldfieldtype': u'Section Break',
@@ -989,6 +969,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'get_terms',
'fieldtype': u'Button',
'label': u'Get Terms',
'oldfieldtype': u'Button',
@@ -1002,6 +983,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'terms_html',
'fieldtype': u'HTML',
'label': u'Terms HTML',
'oldfieldtype': u'HTML',
@@ -1025,6 +1007,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'more_info',
'fieldtype': u'Section Break',
'label': u'More Info',
'oldfieldtype': u'Section Break',
@@ -1036,6 +1019,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'column_break7',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -1149,6 +1133,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'column_break8',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -1252,6 +1237,7 @@
'colour': u'White:FFF',
'depends_on': u'eval:!doc.is_pos',
'doctype': u'DocField',
+ 'fieldname': u'advances',
'fieldtype': u'Section Break',
'label': u'Advances',
'oldfieldtype': u'Section Break',
@@ -1262,6 +1248,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'get_advances_received',
'fieldtype': u'Button',
'label': u'Get Advances Received',
'oldfieldtype': u'Button',
@@ -1286,6 +1273,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'sales_team_section_break',
'fieldtype': u'Section Break',
'label': u'Sales Team',
'oldfieldtype': u'Section Break',
@@ -1297,6 +1285,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'column_break9',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -1323,6 +1312,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'column_break10',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -1360,6 +1350,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'section_break2',
'fieldtype': u'Section Break',
'options': u'Simple',
'permlevel': 0,
@@ -1383,6 +1374,7 @@
{
'depends_on': u'eval:doc.docstatus==1',
'doctype': u'DocField',
+ 'fieldname': u'recurring_invoice',
'fieldtype': u'Section Break',
'label': u'Recurring Invoice',
'permlevel': 0,
@@ -1392,6 +1384,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break11',
'fieldtype': u'Column Break',
'permlevel': 0,
'print_hide': 1,
@@ -1445,6 +1438,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break12',
'fieldtype': u'Column Break',
'no_copy': 0,
'permlevel': 0,
@@ -1511,6 +1505,7 @@
{
'allow_on_submit': 1,
'doctype': u'DocField',
+ 'fieldname': u'repair_outstanding_amt',
'fieldtype': u'Button',
'label': u'Repair Outstanding Amt',
'oldfieldtype': u'Button',
diff --git a/erpnext/accounts/doctype/rv_detail/rv_detail.txt b/erpnext/accounts/doctype/rv_detail/rv_detail.txt
index 314dcd7..aa4c8e5 100644
--- a/erpnext/accounts/doctype/rv_detail/rv_detail.txt
+++ b/erpnext/accounts/doctype/rv_detail/rv_detail.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:20',
+ 'creation': '2012-03-27 14:35:48',
'docstatus': 0,
- 'modified': '2012-03-05 15:01:04',
+ 'modified': '2012-03-27 14:35:48',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/accounts/doctype/rv_tax_detail/rv_tax_detail.txt b/erpnext/accounts/doctype/rv_tax_detail/rv_tax_detail.txt
index 4a4c68a..6dbdc40 100644
--- a/erpnext/accounts/doctype/rv_tax_detail/rv_tax_detail.txt
+++ b/erpnext/accounts/doctype/rv_tax_detail/rv_tax_detail.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:20',
+ 'creation': '2012-03-27 14:35:48',
'docstatus': 0,
- 'modified': '2012-02-23 15:49:43',
+ 'modified': '2012-03-27 14:35:48',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/accounts/doctype/tds_category/tds_category.txt b/erpnext/accounts/doctype/tds_category/tds_category.txt
index 509f177..caac059 100644
--- a/erpnext/accounts/doctype/tds_category/tds_category.txt
+++ b/erpnext/accounts/doctype/tds_category/tds_category.txt
@@ -3,46 +3,46 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:27',
+ 'creation': '2012-03-27 14:35:48',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:48',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1302586171',
- 'autoname': 'field:category_name',
- 'colour': 'White:FFF',
+ '_last_update': u'1302586171',
+ 'autoname': u'field:category_name',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
+ 'document_type': u'Master',
'in_create': 0,
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 8
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'TDS Category',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'TDS Category',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'TDS Category',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'TDS Category',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1
},
@@ -50,7 +50,26 @@
# DocType, TDS Category
{
'doctype': 'DocType',
- 'name': 'TDS Category'
+ 'name': u'TDS Category'
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'role': u'Accounts Manager',
+ 'submit': 0,
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'role': u'System Manager',
+ 'write': 1
},
# DocPerm
@@ -58,47 +77,24 @@
'amend': 0,
'cancel': 0,
'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'role': 'Accounts User',
+ 'doctype': u'DocPerm',
+ 'role': u'Accounts User',
'submit': 0,
'write': 0
},
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'role': 'Accounts Manager',
- 'submit': 0,
- 'write': 1
- },
-
- # DocPerm
- {
- 'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 3,
- 'role': 'System Manager',
- 'write': 1
- },
-
# DocField
{
- 'default': 'Accounts',
- 'doctype': 'DocField',
- 'fieldname': 'module',
- 'fieldtype': 'Link',
+ 'default': u'Accounts',
+ 'doctype': u'DocField',
+ 'fieldname': u'module',
+ 'fieldtype': u'Link',
'hidden': 0,
- 'idx': 1,
'in_filter': 0,
- 'label': 'Module',
- 'oldfieldname': 'module',
- 'oldfieldtype': 'Link',
- 'options': 'Module Def',
+ 'label': u'Module',
+ 'oldfieldname': u'module',
+ 'oldfieldtype': u'Link',
+ 'options': u'Module Def',
'print_hide': 0,
'report_hide': 0,
'search_index': 0
@@ -106,36 +102,34 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'idx': 2,
- 'label': 'Note HTML',
- 'oldfieldtype': 'HTML',
- 'options': '<b>Note:</b> You must first create the Accounts from the Chart of Accounts and then link it to this Category.'
+ 'doctype': u'DocField',
+ 'fieldname': u'note_html',
+ 'fieldtype': u'HTML',
+ 'label': u'Note HTML',
+ 'oldfieldtype': u'HTML',
+ 'options': u'<b>Note:</b> You must first create the Accounts from the Chart of Accounts and then link it to this Category.'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'category_name',
- 'fieldtype': 'Data',
- 'idx': 3,
- 'label': 'Category Name',
- 'oldfieldname': 'category_name',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'category_name',
+ 'fieldtype': u'Data',
+ 'label': u'Category Name',
+ 'oldfieldname': u'category_name',
+ 'oldfieldtype': u'Data',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'tds_sh_edu_cess_account',
- 'fieldtype': 'Table',
- 'idx': 4,
- 'label': 'TDS Account Detail',
- 'oldfieldname': 'tds_sh_edu_cess_account',
- 'oldfieldtype': 'Table',
- 'options': 'TDS Category Account',
+ 'doctype': u'DocField',
+ 'fieldname': u'tds_sh_edu_cess_account',
+ 'fieldtype': u'Table',
+ 'label': u'TDS Account Detail',
+ 'oldfieldname': u'tds_sh_edu_cess_account',
+ 'oldfieldtype': u'Table',
+ 'options': u'TDS Category Account',
'reqd': 0
}
]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/tds_category_account/tds_category_account.txt b/erpnext/accounts/doctype/tds_category_account/tds_category_account.txt
index 0106a09..522ef35 100644
--- a/erpnext/accounts/doctype/tds_category_account/tds_category_account.txt
+++ b/erpnext/accounts/doctype/tds_category_account/tds_category_account.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:27',
+ 'creation': '2012-03-27 14:35:48',
'docstatus': 0,
- 'modified': '2012-03-21 12:29:18',
+ 'modified': '2012-03-27 14:35:48',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/accounts/doctype/tds_control/tds_control.txt b/erpnext/accounts/doctype/tds_control/tds_control.txt
index 03f17b5..ca002eb 100644
--- a/erpnext/accounts/doctype/tds_control/tds_control.txt
+++ b/erpnext/accounts/doctype/tds_control/tds_control.txt
@@ -3,22 +3,22 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:27',
+ 'creation': '2012-03-27 14:35:48',
'docstatus': 0,
- 'modified': '2010-12-16 16:31:49',
- 'modified_by': 'Administrator',
- 'owner': 'wasim@webnotestech.com'
+ 'modified': '2012-03-27 14:35:48',
+ 'modified_by': u'Administrator',
+ 'owner': u'wasim@webnotestech.com'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'issingle': 1,
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 36
},
@@ -26,6 +26,6 @@
# DocType, TDS Control
{
'doctype': 'DocType',
- 'name': 'TDS Control'
+ 'name': u'TDS Control'
}
]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/tds_detail/tds_detail.txt b/erpnext/accounts/doctype/tds_detail/tds_detail.txt
index f24e32a..c248e73 100644
--- a/erpnext/accounts/doctype/tds_detail/tds_detail.txt
+++ b/erpnext/accounts/doctype/tds_detail/tds_detail.txt
@@ -3,131 +3,123 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:27',
+ 'creation': '2012-03-27 14:35:48',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'wasim@webnotestech.com'
+ 'modified': '2012-03-27 14:35:48',
+ 'modified_by': u'Administrator',
+ 'owner': u'wasim@webnotestech.com'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 2
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'TDS Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'TDS Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0,
- 'width': '150px'
+ 'width': u'150px'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'TDS Detail',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'TDS Detail',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, TDS Detail
{
'doctype': 'DocType',
- 'name': 'TDS Detail'
+ 'name': u'TDS Detail'
},
# DocPerm
{
'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'All',
+ 'role': u'All',
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'All'
+ 'role': u'All'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 3,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 4,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'System Manager'
+ 'role': u'System Manager'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'tds_category',
- 'fieldtype': 'Select',
- 'idx': 1,
- 'label': 'TDS Category',
- 'oldfieldname': 'tds_category',
- 'oldfieldtype': 'Select',
- 'options': 'link:TDS Category'
+ 'doctype': u'DocField',
+ 'fieldname': u'tds_category',
+ 'fieldtype': u'Select',
+ 'label': u'TDS Category',
+ 'oldfieldname': u'tds_category',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:TDS Category'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'special_tds_rate_applicable',
- 'fieldtype': 'Select',
- 'idx': 2,
- 'label': 'Special TDS Rate Applicable',
- 'oldfieldname': 'special_tds_rate_applicable',
- 'oldfieldtype': 'Select',
- 'options': '\nYes\nNo'
+ 'doctype': u'DocField',
+ 'fieldname': u'special_tds_rate_applicable',
+ 'fieldtype': u'Select',
+ 'label': u'Special TDS Rate Applicable',
+ 'oldfieldname': u'special_tds_rate_applicable',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nYes\nNo'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'special_tds_rate',
- 'fieldtype': 'Currency',
- 'idx': 3,
- 'label': 'Special TDS Rate(Section-197)\t',
- 'oldfieldname': 'special_tds_rate',
- 'oldfieldtype': 'Currency'
+ 'doctype': u'DocField',
+ 'fieldname': u'special_tds_rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Special TDS Rate(Section-197)\t',
+ 'oldfieldname': u'special_tds_rate',
+ 'oldfieldtype': u'Currency'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'special_tds_limit',
- 'fieldtype': 'Currency',
- 'idx': 4,
- 'label': 'Special TDS Limit',
- 'oldfieldname': 'special_tds_limit',
- 'oldfieldtype': 'Currency'
+ 'doctype': u'DocField',
+ 'fieldname': u'special_tds_limit',
+ 'fieldtype': u'Currency',
+ 'label': u'Special TDS Limit',
+ 'oldfieldname': u'special_tds_limit',
+ 'oldfieldtype': u'Currency'
}
]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/tds_payment/tds_payment.txt b/erpnext/accounts/doctype/tds_payment/tds_payment.txt
index 95d1967..506795e 100644
--- a/erpnext/accounts/doctype/tds_payment/tds_payment.txt
+++ b/erpnext/accounts/doctype/tds_payment/tds_payment.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:27',
+ 'creation': '2012-03-27 14:35:48',
'docstatus': 0,
- 'modified': '2012-03-21 12:29:51',
+ 'modified': '2012-03-27 14:45:52',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -16,6 +16,7 @@
'default_print_format': u'Standard',
'doctype': 'DocType',
'in_create': 0,
+ 'is_submittable': 1,
'module': u'Accounts',
'name': '__common__',
'section_style': u'Simple',
@@ -51,18 +52,6 @@
# DocPerm
{
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Accounts User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
'amend': 1,
'cancel': 1,
'create': 1,
@@ -75,6 +64,13 @@
# DocPerm
{
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'All'
+ },
+
+ # DocPerm
+ {
'amend': 1,
'cancel': 1,
'create': 1,
@@ -99,14 +95,20 @@
# DocPerm
{
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
- 'role': u'All'
+ 'role': u'Accounts User',
+ 'submit': 0,
+ 'write': 0
},
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break0',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -163,6 +165,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break1',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -229,6 +232,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'section_break0',
'fieldtype': u'Section Break',
'oldfieldtype': u'Section Break',
'permlevel': 0
@@ -237,6 +241,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break2',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -285,6 +290,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break3',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -294,6 +300,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'html0',
'fieldtype': u'HTML',
'oldfieldtype': u'HTML',
'options': u'<b>Please Update Cheque No., BSR Code, Challan ID no. after actual payment. Unless you do not get it in Form 16A.</b>',
@@ -352,6 +359,7 @@
{
'allow_on_submit': 1,
'doctype': u'DocField',
+ 'fieldname': u'update',
'fieldtype': u'Button',
'label': u'Update',
'oldfieldtype': u'Button',
@@ -363,6 +371,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'section_break1',
'fieldtype': u'Section Break',
'oldfieldtype': u'Section Break',
'permlevel': 0
@@ -371,6 +380,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'get_tds_list',
'fieldtype': u'Button',
'label': u'Get TDS List',
'oldfieldtype': u'Button',
@@ -393,6 +403,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'section_break2',
'fieldtype': u'Section Break',
'oldfieldtype': u'Section Break',
'permlevel': 0
@@ -413,6 +424,7 @@
{
'allow_on_submit': 1,
'doctype': u'DocField',
+ 'fieldname': u'make_bank_voucher',
'fieldtype': u'Button',
'label': u'Make Bank Voucher',
'oldfieldtype': u'Button',
diff --git a/erpnext/accounts/doctype/tds_payment_detail/tds_payment_detail.txt b/erpnext/accounts/doctype/tds_payment_detail/tds_payment_detail.txt
index d971509..4443090 100644
--- a/erpnext/accounts/doctype/tds_payment_detail/tds_payment_detail.txt
+++ b/erpnext/accounts/doctype/tds_payment_detail/tds_payment_detail.txt
@@ -3,116 +3,109 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:27',
+ 'creation': '2012-03-27 14:35:49',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:49',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
- 'section_style': 'Tray',
- 'server_code_error': ' ',
+ 'section_style': u'Tray',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 11
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'TDS Payment Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'TDS Payment Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, TDS Payment Detail
{
'doctype': 'DocType',
- 'name': 'TDS Payment Detail'
+ 'name': u'TDS Payment Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'voucher_no',
- 'fieldtype': 'Data',
- 'idx': 1,
- 'label': 'Voucher No',
- 'oldfieldname': 'voucher_no',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'voucher_no',
+ 'fieldtype': u'Data',
+ 'label': u'Voucher No',
+ 'oldfieldname': u'voucher_no',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'party_name',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Party Name',
- 'oldfieldname': 'party_name',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'party_name',
+ 'fieldtype': u'Data',
+ 'label': u'Party Name',
+ 'oldfieldname': u'party_name',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amount_paid',
- 'fieldtype': 'Currency',
- 'idx': 3,
- 'label': 'Amount paid / credited',
- 'oldfieldname': 'amount_paid',
- 'oldfieldtype': 'Currency'
+ 'doctype': u'DocField',
+ 'fieldname': u'amount_paid',
+ 'fieldtype': u'Currency',
+ 'label': u'Amount paid / credited',
+ 'oldfieldname': u'amount_paid',
+ 'oldfieldtype': u'Currency'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'date_of_payment',
- 'fieldtype': 'Date',
- 'idx': 4,
- 'label': 'Date of payment / credit',
- 'oldfieldname': 'date_of_payment',
- 'oldfieldtype': 'Date'
+ 'doctype': u'DocField',
+ 'fieldname': u'date_of_payment',
+ 'fieldtype': u'Date',
+ 'label': u'Date of payment / credit',
+ 'oldfieldname': u'date_of_payment',
+ 'oldfieldtype': u'Date'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'tds_amount',
- 'fieldtype': 'Currency',
- 'idx': 5,
- 'label': 'TDS',
- 'oldfieldname': 'tds_amount',
- 'oldfieldtype': 'Currency'
+ 'doctype': u'DocField',
+ 'fieldname': u'tds_amount',
+ 'fieldtype': u'Currency',
+ 'label': u'TDS',
+ 'oldfieldname': u'tds_amount',
+ 'oldfieldtype': u'Currency'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'cess_on_tds',
- 'fieldtype': 'Currency',
- 'idx': 6,
- 'label': 'Cess on TDS',
- 'oldfieldname': 'cess_on_tds',
- 'oldfieldtype': 'Currency'
+ 'doctype': u'DocField',
+ 'fieldname': u'cess_on_tds',
+ 'fieldtype': u'Currency',
+ 'label': u'Cess on TDS',
+ 'oldfieldname': u'cess_on_tds',
+ 'oldfieldtype': u'Currency'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'total_tax_amount',
- 'fieldtype': 'Currency',
- 'idx': 7,
- 'label': 'Total Tax Amount',
- 'oldfieldname': 'total_tax_amount',
- 'oldfieldtype': 'Currency'
+ 'doctype': u'DocField',
+ 'fieldname': u'total_tax_amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Total Tax Amount',
+ 'oldfieldname': u'total_tax_amount',
+ 'oldfieldtype': u'Currency'
}
]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/tds_rate_chart/tds_rate_chart.txt b/erpnext/accounts/doctype/tds_rate_chart/tds_rate_chart.txt
index 23e7b72..52d475d 100644
--- a/erpnext/accounts/doctype/tds_rate_chart/tds_rate_chart.txt
+++ b/erpnext/accounts/doctype/tds_rate_chart/tds_rate_chart.txt
@@ -3,45 +3,45 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:27',
+ 'creation': '2012-03-27 14:35:49',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:49',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'autoname': 'Prompt',
- 'colour': 'White:FFF',
+ 'autoname': u'Prompt',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'in_create': 1,
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
'read_only': 0,
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 11
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'TDS Rate Chart',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'TDS Rate Chart',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'TDS Rate Chart',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'TDS Rate Chart',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1
},
@@ -49,7 +49,7 @@
# DocType, TDS Rate Chart
{
'doctype': 'DocType',
- 'name': 'TDS Rate Chart'
+ 'name': u'TDS Rate Chart'
},
# DocPerm
@@ -57,21 +57,8 @@
'amend': 0,
'cancel': 0,
'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'role': 'Accounts User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'role': 'Accounts Manager',
+ 'doctype': u'DocPerm',
+ 'role': u'Accounts Manager',
'submit': 0,
'write': 0
},
@@ -79,49 +66,56 @@
# DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 3,
- 'role': 'System Manager',
+ 'doctype': u'DocPerm',
+ 'role': u'System Manager',
'write': 1
},
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'role': u'Accounts User',
+ 'submit': 0,
+ 'write': 0
+ },
+
# DocField
{
- 'default': 'Accounts',
- 'doctype': 'DocField',
- 'fieldname': 'module',
- 'fieldtype': 'Link',
+ 'default': u'Accounts',
+ 'doctype': u'DocField',
+ 'fieldname': u'module',
+ 'fieldtype': u'Link',
'hidden': 1,
- 'idx': 1,
- 'label': 'Module',
- 'oldfieldname': 'module',
- 'oldfieldtype': 'Link',
- 'options': 'Module Def',
+ 'label': u'Module',
+ 'oldfieldname': u'module',
+ 'oldfieldtype': u'Link',
+ 'options': u'Module Def',
'print_hide': 1,
'report_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'applicable_from',
- 'fieldtype': 'Date',
- 'idx': 2,
- 'label': 'Applicable From',
- 'oldfieldname': 'applicable_from',
- 'oldfieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'applicable_from',
+ 'fieldtype': u'Date',
+ 'label': u'Applicable From',
+ 'oldfieldname': u'applicable_from',
+ 'oldfieldtype': u'Date',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'rate_chart_detail',
- 'fieldtype': 'Table',
- 'idx': 3,
- 'label': 'Rate Chart Detail',
- 'oldfieldname': 'rate_chart_detail',
- 'oldfieldtype': 'Table',
- 'options': 'TDS Rate Detail'
+ 'doctype': u'DocField',
+ 'fieldname': u'rate_chart_detail',
+ 'fieldtype': u'Table',
+ 'label': u'Rate Chart Detail',
+ 'oldfieldname': u'rate_chart_detail',
+ 'oldfieldtype': u'Table',
+ 'options': u'TDS Rate Detail'
}
]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/tds_rate_detail/tds_rate_detail.txt b/erpnext/accounts/doctype/tds_rate_detail/tds_rate_detail.txt
index b7e19b1..d343286 100644
--- a/erpnext/accounts/doctype/tds_rate_detail/tds_rate_detail.txt
+++ b/erpnext/accounts/doctype/tds_rate_detail/tds_rate_detail.txt
@@ -3,86 +3,82 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:27',
+ 'creation': '2012-03-27 14:35:49',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:49',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
- 'section_style': 'Tray',
- 'server_code_error': ' ',
+ 'section_style': u'Tray',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 7
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'TDS Rate Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'TDS Rate Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, TDS Rate Detail
{
'doctype': 'DocType',
- 'name': 'TDS Rate Detail'
+ 'name': u'TDS Rate Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'category',
- 'fieldtype': 'Link',
- 'idx': 1,
- 'label': 'Category',
- 'oldfieldname': 'category',
- 'oldfieldtype': 'Link',
- 'options': 'TDS Category',
- 'width': '200px'
+ 'doctype': u'DocField',
+ 'fieldname': u'category',
+ 'fieldtype': u'Link',
+ 'label': u'Category',
+ 'oldfieldname': u'category',
+ 'oldfieldtype': u'Link',
+ 'options': u'TDS Category',
+ 'width': u'200px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'slab_from',
- 'fieldtype': 'Currency',
- 'idx': 2,
- 'label': 'Slab From',
- 'oldfieldname': 'slab_from',
- 'oldfieldtype': 'Currency'
+ 'doctype': u'DocField',
+ 'fieldname': u'slab_from',
+ 'fieldtype': u'Currency',
+ 'label': u'Slab From',
+ 'oldfieldname': u'slab_from',
+ 'oldfieldtype': u'Currency'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'rate',
- 'fieldtype': 'Currency',
- 'idx': 3,
- 'label': 'Rate',
- 'oldfieldname': 'rate',
- 'oldfieldtype': 'Currency',
- 'width': '50px'
+ 'doctype': u'DocField',
+ 'fieldname': u'rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Rate',
+ 'oldfieldname': u'rate',
+ 'oldfieldtype': u'Currency',
+ 'width': u'50px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'rate_without_pan',
- 'fieldtype': 'Currency',
- 'idx': 4,
- 'label': 'Rate without PAN',
- 'oldfieldname': 'rate_without_pan',
- 'oldfieldtype': 'Currency'
+ 'doctype': u'DocField',
+ 'fieldname': u'rate_without_pan',
+ 'fieldtype': u'Currency',
+ 'label': u'Rate without PAN',
+ 'oldfieldname': u'rate_without_pan',
+ 'oldfieldtype': u'Currency'
}
]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/tds_return_acknowledgement/tds_return_acknowledgement.txt b/erpnext/accounts/doctype/tds_return_acknowledgement/tds_return_acknowledgement.txt
index 769064d..4471ad59 100644
--- a/erpnext/accounts/doctype/tds_return_acknowledgement/tds_return_acknowledgement.txt
+++ b/erpnext/accounts/doctype/tds_return_acknowledgement/tds_return_acknowledgement.txt
@@ -3,32 +3,32 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:27',
+ 'creation': '2012-03-27 14:35:49',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'nabin@webnotestech.com'
+ 'modified': '2012-03-27 14:35:49',
+ 'modified_by': u'Administrator',
+ 'owner': u'nabin@webnotestech.com'
},
# These values are common for all DocType
{
- 'autoname': 'TDSR/.####',
- 'colour': 'White:FFF',
+ 'autoname': u'TDSR/.####',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'module': 'Accounts',
+ 'module': u'Accounts',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 13
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'TDS Return Acknowledgement',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'TDS Return Acknowledgement',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0,
'reqd': 1
},
@@ -36,11 +36,11 @@
# These values are common for all DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'TDS Return Acknowledgement',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'TDS Return Acknowledgement',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
'write': 1
@@ -49,80 +49,73 @@
# DocType, TDS Return Acknowledgement
{
'doctype': 'DocType',
- 'name': 'TDS Return Acknowledgement'
+ 'name': u'TDS Return Acknowledgement'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'role': 'Accounts User'
+ 'doctype': u'DocPerm',
+ 'role': u'Accounts User'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'role': 'Accounts Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'Accounts Manager'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'fiscal_year',
- 'fieldtype': 'Select',
- 'idx': 1,
- 'label': 'Fiscal Year',
- 'oldfieldname': 'fiscal_year',
- 'oldfieldtype': 'Select',
- 'options': 'link:Fiscal Year'
+ 'doctype': u'DocField',
+ 'fieldname': u'fiscal_year',
+ 'fieldtype': u'Select',
+ 'label': u'Fiscal Year',
+ 'oldfieldname': u'fiscal_year',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:Fiscal Year'
},
# DocField
{
'allow_on_submit': 0,
- 'doctype': 'DocField',
- 'fieldname': 'quarter',
- 'fieldtype': 'Select',
- 'idx': 2,
- 'label': 'Quarter',
- 'oldfieldname': 'quarter',
- 'oldfieldtype': 'Select',
- 'options': '\nApr-Jun\nJul-Sept\nOct-Dec\nJan-Mar',
- 'trigger': 'Client'
+ 'doctype': u'DocField',
+ 'fieldname': u'quarter',
+ 'fieldtype': u'Select',
+ 'label': u'Quarter',
+ 'oldfieldname': u'quarter',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nApr-Jun\nJul-Sept\nOct-Dec\nJan-Mar',
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'tds_category',
- 'fieldtype': 'Select',
- 'idx': 3,
- 'label': 'TDS Category',
- 'oldfieldname': 'tds_category',
- 'oldfieldtype': 'Select',
- 'options': 'link:TDS Category'
+ 'doctype': u'DocField',
+ 'fieldname': u'tds_category',
+ 'fieldtype': u'Select',
+ 'label': u'TDS Category',
+ 'oldfieldname': u'tds_category',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:TDS Category'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'acknowledgement_no',
- 'fieldtype': 'Data',
- 'idx': 4,
- 'label': 'Acknowledgement No',
- 'oldfieldname': 'acknowledgement_no',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'acknowledgement_no',
+ 'fieldtype': u'Data',
+ 'label': u'Acknowledgement No',
+ 'oldfieldname': u'acknowledgement_no',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'date_of_receipt',
- 'fieldtype': 'Date',
- 'idx': 5,
- 'label': 'Date of Receipt',
- 'oldfieldname': 'date_of_receipt',
- 'oldfieldtype': 'Date'
+ 'doctype': u'DocField',
+ 'fieldname': u'date_of_receipt',
+ 'fieldtype': u'Date',
+ 'label': u'Date of Receipt',
+ 'oldfieldname': u'date_of_receipt',
+ 'oldfieldtype': u'Date'
}
]
\ No newline at end of file
diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.html b/erpnext/accounts/page/accounts_browser/accounts_browser.html
index 8614f2c..8cfde8a 100644
--- a/erpnext/accounts/page/accounts_browser/accounts_browser.html
+++ b/erpnext/accounts/page/accounts_browser/accounts_browser.html
@@ -1,4 +1,4 @@
<div class="layout_wrapper">
<div id="ab_header"></div>
-<div id="ab_body" style="margin: 16px"></div>
+<div id="ab_body" style="margin: 16px;"></div>
</div>
\ No newline at end of file
diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.js b/erpnext/accounts/page/accounts_browser/accounts_browser.js
index 60c168d..49cbcb3 100644
--- a/erpnext/accounts/page/accounts_browser/accounts_browser.js
+++ b/erpnext/accounts/page/accounts_browser/accounts_browser.js
@@ -46,7 +46,7 @@
//================== table body======================================
var ac_main_grid = make_table($i('ab_body'),1,2,'100%',['60%','40%'],{border:"0px", padding:"4px",tableLayout: "fixed", borderCollapse: "collapse"});
$y($td(ac_main_grid,0,0),{border: "1px solid #dddddd", padding: "8px"});
- pscript.account_tree = $a($td(ac_main_grid,0,0),'div');
+ pscript.account_tree = $a($td(ac_main_grid,0,0),'div', '',{minHeight:'400px'});
$y($td(ac_main_grid,0,1),{border: "1px solid #DDD"});
pscript.la = $a($td(ac_main_grid,0,1),'div');
pscript.acc_period_bal = $a($td(ac_main_grid,0,1),'div');
diff --git a/erpnext/analysis/doctype/mis_control/mis_control.txt b/erpnext/analysis/doctype/mis_control/mis_control.txt
index 3149cde..bccfc7b 100644
--- a/erpnext/analysis/doctype/mis_control/mis_control.txt
+++ b/erpnext/analysis/doctype/mis_control/mis_control.txt
@@ -3,22 +3,22 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:10',
+ 'creation': '2012-03-27 14:35:49',
'docstatus': 0,
- 'modified': '2011-01-03 17:32:31',
- 'modified_by': 'umair@iwebnotes.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:49',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'issingle': 1,
- 'module': 'Analysis',
+ 'module': u'Analysis',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 120
},
@@ -26,6 +26,6 @@
# DocType, MIS Control
{
'doctype': 'DocType',
- 'name': 'MIS Control'
+ 'name': u'MIS Control'
}
]
\ No newline at end of file
diff --git a/erpnext/analysis/doctype/ta_control/ta_control.txt b/erpnext/analysis/doctype/ta_control/ta_control.txt
index d0b03d4..f3cbebc 100755
--- a/erpnext/analysis/doctype/ta_control/ta_control.txt
+++ b/erpnext/analysis/doctype/ta_control/ta_control.txt
@@ -3,30 +3,30 @@
# These values are common in all dictionaries
{
- 'creation': '2010-11-09 09:35:22',
+ 'creation': '2012-03-27 14:35:49',
'docstatus': 0,
- 'modified': '2010-12-02 18:00:30',
- 'modified_by': 'Administrator',
- 'owner': 'saumil@webnotestech.com'
+ 'modified': '2012-03-27 14:35:49',
+ 'modified_by': u'Administrator',
+ 'owner': u'saumil@webnotestech.com'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'in_create': 1,
'issingle': 1,
- 'module': 'Analysis',
+ 'module': u'Analysis',
'name': '__common__',
'read_only': 1,
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 11
},
# DocType, TA Control
{
'doctype': 'DocType',
- 'name': 'TA Control'
+ 'name': u'TA Control'
}
]
\ No newline at end of file
diff --git a/erpnext/buying/Module Def/Buying/Buying.txt b/erpnext/buying/Module Def/Buying/Buying.txt
deleted file mode 100644
index 16cae81..0000000
--- a/erpnext/buying/Module Def/Buying/Buying.txt
+++ /dev/null
@@ -1,155 +0,0 @@
-# Module Def, Buying
-[
-
- # These values are common in all dictionaries
- {
- 'creation': '2011-07-01 17:40:38',
- 'docstatus': 0,
- 'modified': '2012-01-10 17:52:19',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
- },
-
- # These values are common for all Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'name': '__common__',
- 'parent': 'Buying',
- 'parentfield': 'roles',
- 'parenttype': 'Module Def'
- },
-
- # These values are common for all Module Def Item
- {
- 'doctype': 'Module Def Item',
- 'name': '__common__',
- 'parent': 'Buying',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
-
- # These values are common for all Module Def
- {
- 'disabled': 'No',
- 'doctype': u'Module Def',
- 'doctype_list': 'DocType Mapper, Purchase Receipt-Payable Voucher\nDocType Mapper, Purchase Order-Payable Voucher\nDocType Mapper, Purchase Order-Purchase Receipt\nDocType Mapper, Indent-Purchase Order\nPrint Format, Purchase Order Format\nPrint Format, Purchase Receipt Format\nDocType Label, Indent',
- 'file_list': 'scm.gif,FileData/00209',
- 'is_hidden': 'No',
- 'module_desc': '<p>All details about your Suppliers and past transactions</p>',
- 'module_icon': 'Buying.gif',
- 'module_label': 'Buying',
- 'module_name': 'Buying',
- 'module_seq': 4,
- 'name': '__common__'
- },
-
- # Module Def, Buying
- {
- 'doctype': u'Module Def',
- 'name': 'Buying'
- },
-
- # Module Def Item
- {
- 'description': 'Your Supplier Database',
- 'display_name': 'Supplier',
- 'doc_name': 'Supplier',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'id\nsupplier_type\nsupplier_status\ncompany'
- },
-
- # Module Def Item
- {
- 'description': 'Buy requests from various people in your company',
- 'display_name': 'Indent',
- 'doc_name': 'Indent',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'status\ntransaction_date\nsales_order_no\nremark'
- },
-
- # Module Def Item
- {
- 'description': 'Orders you have placed to your suppliers',
- 'display_name': 'Purchase Order',
- 'doc_name': 'Purchase Order',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'status\nsupplier\ntransaction_date\ngrand_total'
- },
-
- # Module Def Item
- {
- 'display_name': 'Itemwise Receipt Details',
- 'doc_name': 'Purchase Receipt Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Purchase in Transit',
- 'doc_name': 'PV Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Pending PO Items To Receive',
- 'doc_name': 'PO Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Pending PO Items To Bill',
- 'doc_name': 'PO Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Itemwise Purchase Details',
- 'doc_name': 'PO Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'description': 'Ledger details of your creditors',
- 'display_name': "Creditor's Ledger",
- 'doc_name': 'GL Entry',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'icon': 'accept.gif'
- },
-
- # Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'role': 'Purchase User'
- },
-
- # Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'role': 'Purchase Manager'
- },
-
- # Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'role': 'Administrator'
- },
-
- # Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'role': 'Purchase Master Manager'
- }
-]
\ No newline at end of file
diff --git a/erpnext/buying/doctype/indent/indent.js b/erpnext/buying/doctype/indent/indent.js
index 570e06c..1940e5a 100644
--- a/erpnext/buying/doctype/indent/indent.js
+++ b/erpnext/buying/doctype/indent/indent.js
@@ -17,8 +17,8 @@
cur_frm.cscript.tname = "Indent Detail";
cur_frm.cscript.fname = "indent_details";
-$import(Purchase Common)
-$import(SMS Control)
+wn.require('erpnext/buying/doctype/purchase_common/purchase_common.js');
+wn.require('erpnext/utilities/doctype/sms_control/sms_control.js');
cur_frm.cscript.indent_doctype_label = get_doctype_label('Indent');
//========================== On Load =================================================
diff --git a/erpnext/buying/doctype/indent/indent.txt b/erpnext/buying/doctype/indent/indent.txt
index d73492b..6df6664 100644
--- a/erpnext/buying/doctype/indent/indent.txt
+++ b/erpnext/buying/doctype/indent/indent.txt
@@ -3,54 +3,55 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:04',
+ 'creation': '2012-03-27 14:35:49',
'docstatus': 0,
- 'modified': '2012-01-10 15:39:17',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 18:44:56',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1326190064',
+ '_last_update': u'1326190064',
'allow_print': 0,
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
- 'module': 'Buying',
+ 'is_submittable': 1,
+ 'module': u'Buying',
'name': '__common__',
'read_only_onload': 1,
- 'search_fields': 'status,transaction_date,sales_order_no',
- 'section_style': 'Tabbed',
- 'server_code_error': ' ',
+ 'search_fields': u'status,transaction_date,sales_order_no',
+ 'section_style': u'Tabbed',
+ 'server_code_error': u' ',
'show_in_menu': 0,
- 'subject': '%(per_ordered)s% ordered',
- 'version': 197
+ 'subject': u'%(per_ordered)s% ordered',
+ 'version': 198
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Indent',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Indent',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Indent',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Indent',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Indent
{
'doctype': 'DocType',
- 'name': 'Indent'
+ 'name': u'Indent'
},
# DocPerm
@@ -58,21 +59,28 @@
'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Production Manager',
+ 'role': u'Purchase User',
'submit': 1,
'write': 1
},
# DocPerm
{
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Purchase User'
+ },
+
+ # DocPerm
+ {
'amend': 0,
'cancel': 0,
'create': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Purchase Manager',
+ 'role': u'Purchase Manager',
'submit': 0,
'write': 0
},
@@ -82,9 +90,9 @@
'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Purchase Manager',
+ 'role': u'Purchase Manager',
'submit': 1,
'write': 1
},
@@ -94,9 +102,9 @@
'amend': 0,
'cancel': 0,
'create': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Material Manager',
+ 'role': u'Material Manager',
'submit': 0,
'write': 0
},
@@ -106,9 +114,9 @@
'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Material Manager',
+ 'role': u'Material Manager',
'submit': 1,
'write': 1
},
@@ -118,9 +126,9 @@
'amend': 0,
'cancel': 0,
'create': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Material User',
+ 'role': u'Material User',
'submit': 0,
'write': 0
},
@@ -130,350 +138,334 @@
'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Material User',
+ 'role': u'Material User',
'submit': 1,
'write': 1
},
- # DocPerm
- {
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- 'doctype': 'DocPerm',
- 'permlevel': 0,
- 'role': 'Purchase User',
- 'submit': 1,
- 'write': 1
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'permlevel': 1,
- 'role': 'Purchase User',
- 'submit': 0,
- 'write': 0
- },
-
# DocField
{
- 'colour': 'White:FFF',
- 'default': 'Enter items and their details which are falling short in your warehouse and for which you want your purchase department to raise a purchase order.',
- 'description': 'Enter items and their details for which you want your purchase department to raise a purchase order.',
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Basic Info',
- 'oldfieldtype': 'Section Break',
+ 'colour': u'White:FFF',
+ 'default': u'Enter items and their details which are falling short in your warehouse and for which you want your purchase department to raise a purchase order.',
+ 'description': u'Enter items and their details for which you want your purchase department to raise a purchase order.',
+ 'doctype': u'DocField',
+ 'fieldname': u'basic_info',
+ 'fieldtype': u'Section Break',
+ 'label': u'Basic Info',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
'print_hide': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'To manage multiple series please go to Setup > Manage Series',
- 'doctype': 'DocField',
- 'fieldname': 'naming_series',
- 'fieldtype': 'Select',
- 'label': 'Series',
+ 'colour': u'White:FFF',
+ 'description': u'To manage multiple series please go to Setup > Manage Series',
+ 'doctype': u'DocField',
+ 'fieldname': u'naming_series',
+ 'fieldtype': u'Select',
+ 'label': u'Series',
'no_copy': 1,
- 'oldfieldname': 'naming_series',
- 'oldfieldtype': 'Select',
- 'options': 'IDT',
+ 'oldfieldname': u'naming_series',
+ 'oldfieldtype': u'Select',
+ 'options': u'IDT',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'status',
- 'fieldtype': 'Select',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'status',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Status',
+ 'label': u'Status',
'no_copy': 1,
- 'oldfieldname': 'status',
- 'oldfieldtype': 'Select',
- 'options': '\nDraft\nSubmitted\nStopped\nCancelled',
+ 'oldfieldname': u'status',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nDraft\nSubmitted\nStopped\nCancelled',
'permlevel': 1,
'reqd': 0,
'search_index': 1,
- 'width': '100px'
+ 'width': u'100px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'The date at which current entry is made in system.',
- 'doctype': 'DocField',
- 'fieldname': 'transaction_date',
- 'fieldtype': 'Date',
+ 'colour': u'White:FFF',
+ 'description': u'The date at which current entry is made in system.',
+ 'doctype': u'DocField',
+ 'fieldname': u'transaction_date',
+ 'fieldtype': u'Date',
'in_filter': 1,
- 'label': 'Transaction Date',
+ 'label': u'Transaction Date',
'no_copy': 1,
- 'oldfieldname': 'transaction_date',
- 'oldfieldtype': 'Date',
+ 'oldfieldname': u'transaction_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'reqd': 1,
'search_index': 1,
- 'trigger': 'Client',
- 'width': '100px'
+ 'trigger': u'Client',
+ 'width': u'100px'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': '% of materials ordered against this Purchase Requisition',
- 'doctype': 'DocField',
- 'fieldname': 'per_ordered',
- 'fieldtype': 'Currency',
- 'label': '% Ordered',
+ 'colour': u'White:FFF',
+ 'description': u'% of materials ordered against this Purchase Requisition',
+ 'doctype': u'DocField',
+ 'fieldname': u'per_ordered',
+ 'fieldtype': u'Currency',
+ 'label': u'% Ordered',
'no_copy': 1,
- 'oldfieldname': 'per_ordered',
- 'oldfieldtype': 'Currency',
+ 'oldfieldname': u'per_ordered',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Items',
- 'oldfieldtype': 'Section Break',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'items',
+ 'fieldtype': u'Section Break',
+ 'label': u'Items',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'One or multiple Sales Order no which generated this Purchase Requisition',
- 'doctype': 'DocField',
- 'fieldname': 'sales_order_no',
- 'fieldtype': 'Link',
- 'label': 'Sales Order No',
+ 'colour': u'White:FFF',
+ 'description': u'One or multiple Sales Order no which generated this Purchase Requisition',
+ 'doctype': u'DocField',
+ 'fieldname': u'sales_order_no',
+ 'fieldtype': u'Link',
+ 'label': u'Sales Order No',
'no_copy': 1,
- 'oldfieldname': 'sales_order_no',
- 'oldfieldtype': 'Data',
- 'options': 'Sales Order',
+ 'oldfieldname': u'sales_order_no',
+ 'oldfieldtype': u'Data',
+ 'options': u'Sales Order',
'permlevel': 0,
- 'width': '100px'
+ 'width': u'100px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Pull Sales Order Details',
- 'options': 'pull_so_details',
+ 'doctype': u'DocField',
+ 'fieldname': u'pull_sales_order_details',
+ 'fieldtype': u'Button',
+ 'label': u'Pull Sales Order Details',
+ 'options': u'pull_so_details',
'permlevel': 0
},
# DocField
{
'allow_on_submit': 1,
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'indent_details',
- 'fieldtype': 'Table',
- 'label': 'Purchase Requisition Details',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'indent_details',
+ 'fieldtype': u'Table',
+ 'label': u'Purchase Requisition Details',
'no_copy': 0,
- 'oldfieldname': 'indent_details',
- 'oldfieldtype': 'Table',
- 'options': 'Indent Detail',
+ 'oldfieldname': u'indent_details',
+ 'oldfieldtype': u'Table',
+ 'options': u'Indent Detail',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'default': 'Give additional details about the indent.',
- 'description': 'Filing in Additional Information about the Purchase Requisition will help you analyze your data better.',
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'More Info',
- 'oldfieldtype': 'Section Break',
+ 'colour': u'White:FFF',
+ 'default': u'Give additional details about the indent.',
+ 'description': u'Filing in Additional Information about the Purchase Requisition will help you analyze your data better.',
+ 'doctype': u'DocField',
+ 'fieldname': u'more_info',
+ 'fieldtype': u'Section Break',
+ 'label': u'More Info',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Select the relevant company name if you have multiple companies',
- 'doctype': 'DocField',
- 'fieldname': 'company',
- 'fieldtype': 'Link',
+ 'colour': u'White:FFF',
+ 'description': u'Select the relevant company name if you have multiple companies',
+ 'doctype': u'DocField',
+ 'fieldname': u'company',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Company',
- 'oldfieldname': 'company',
- 'oldfieldtype': 'Link',
- 'options': 'Company',
+ 'label': u'Company',
+ 'oldfieldname': u'company',
+ 'oldfieldtype': u'Link',
+ 'options': u'Company',
'permlevel': 0,
'print_hide': 1,
'reqd': 1,
'search_index': 1,
- 'width': '150px'
+ 'width': u'150px'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'fiscal_year',
- 'fieldtype': 'Select',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'fiscal_year',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Fiscal Year',
- 'oldfieldname': 'fiscal_year',
- 'oldfieldtype': 'Select',
- 'options': 'link:Fiscal Year',
+ 'label': u'Fiscal Year',
+ 'oldfieldname': u'fiscal_year',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:Fiscal Year',
'permlevel': 0,
'print_hide': 1,
'reqd': 1,
'search_index': 1,
- 'width': '150px'
+ 'width': u'150px'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Name of the entity who has requested for the Purchase Requisition',
- 'doctype': 'DocField',
- 'fieldname': 'requested_by',
- 'fieldtype': 'Data',
- 'label': 'Requested By',
+ 'colour': u'White:FFF',
+ 'description': u'Name of the entity who has requested for the Purchase Requisition',
+ 'doctype': u'DocField',
+ 'fieldname': u'requested_by',
+ 'fieldtype': u'Data',
+ 'label': u'Requested By',
'no_copy': 1,
- 'oldfieldname': 'requested_by',
- 'oldfieldtype': 'Data',
+ 'oldfieldname': u'requested_by',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
- 'width': '100px'
+ 'width': u'100px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break2',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'remark',
- 'fieldtype': 'Small Text',
- 'label': 'Remarks',
+ 'doctype': u'DocField',
+ 'fieldname': u'remark',
+ 'fieldtype': u'Small Text',
+ 'label': u'Remarks',
'no_copy': 1,
- 'oldfieldname': 'remark',
- 'oldfieldtype': 'Small Text',
+ 'oldfieldname': u'remark',
+ 'oldfieldtype': u'Small Text',
'permlevel': 0,
'print_hide': 0,
- 'width': '150px'
+ 'width': u'150px'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'After cancelling the Purchase Requisition, a dialog box will ask you reason for cancellation which will be reflected in this field',
- 'doctype': 'DocField',
- 'fieldname': 'cancel_reason',
- 'fieldtype': 'Data',
- 'label': 'Cancel Reason',
+ 'colour': u'White:FFF',
+ 'description': u'After cancelling the Purchase Requisition, a dialog box will ask you reason for cancellation which will be reflected in this field',
+ 'doctype': u'DocField',
+ 'fieldname': u'cancel_reason',
+ 'fieldtype': u'Data',
+ 'label': u'Cancel Reason',
'no_copy': 1,
- 'oldfieldname': 'cancel_reason',
- 'oldfieldtype': 'Data',
+ 'oldfieldname': u'cancel_reason',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amended_from',
- 'fieldtype': 'Data',
- 'label': 'Amended From',
+ 'doctype': u'DocField',
+ 'fieldname': u'amended_from',
+ 'fieldtype': u'Data',
+ 'label': u'Amended From',
'no_copy': 1,
- 'oldfieldname': 'amended_from',
- 'oldfieldtype': 'Data',
+ 'oldfieldname': u'amended_from',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'print_hide': 1,
- 'width': '150px'
+ 'width': u'150px'
},
# DocField
{
- 'description': 'The date at which current entry is corrected in the system.',
- 'doctype': 'DocField',
- 'fieldname': 'amendment_date',
- 'fieldtype': 'Date',
- 'label': 'Amendment Date',
+ 'description': u'The date at which current entry is corrected in the system.',
+ 'doctype': u'DocField',
+ 'fieldname': u'amendment_date',
+ 'fieldtype': u'Date',
+ 'label': u'Amendment Date',
'no_copy': 1,
- 'oldfieldname': 'amendment_date',
- 'oldfieldtype': 'Date',
+ 'oldfieldname': u'amendment_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'print_hide': 1,
- 'width': '100px'
+ 'width': u'100px'
},
# DocField
{
- 'description': 'Add Terms and Conditions for the Purchase Requisition. You can also prepare a master Term Sheet and use the Template',
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Terms',
- 'oldfieldtype': 'Section Break',
+ 'description': u'Add Terms and Conditions for the Purchase Requisition. You can also prepare a master Term Sheet and use the Template',
+ 'doctype': u'DocField',
+ 'fieldname': u'terms_section_break',
+ 'fieldtype': u'Section Break',
+ 'label': u'Terms',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
'allow_on_submit': 1,
- 'doctype': 'DocField',
- 'fieldname': 'letter_head',
- 'fieldtype': 'Select',
- 'label': 'Letter Head',
- 'oldfieldname': 'letter_head',
- 'oldfieldtype': 'Select',
- 'options': 'link:Letter Head',
+ 'doctype': u'DocField',
+ 'fieldname': u'letter_head',
+ 'fieldtype': u'Select',
+ 'label': u'Letter Head',
+ 'oldfieldname': u'letter_head',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:Letter Head',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'tc_name',
- 'fieldtype': 'Link',
- 'label': 'Select Terms',
- 'oldfieldname': 'tc_name',
- 'oldfieldtype': 'Link',
- 'options': 'Term',
+ 'doctype': u'DocField',
+ 'fieldname': u'tc_name',
+ 'fieldtype': u'Link',
+ 'label': u'Select Terms',
+ 'oldfieldname': u'tc_name',
+ 'oldfieldtype': u'Link',
+ 'options': u'Term',
'permlevel': 0,
'print_hide': 1,
'report_hide': 1
@@ -481,41 +473,44 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Get Terms',
- 'oldfieldtype': 'Button',
- 'options': 'get_tc_details',
+ 'doctype': u'DocField',
+ 'fieldname': u'get_terms',
+ 'fieldtype': u'Button',
+ 'label': u'Get Terms',
+ 'oldfieldtype': u'Button',
+ 'options': u'get_tc_details',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'label': 'Terms HTML',
- 'oldfieldtype': 'HTML',
- 'options': 'You can add Terms and Notes that will be printed in the Transaction',
+ 'doctype': u'DocField',
+ 'fieldname': u'terms_html',
+ 'fieldtype': u'HTML',
+ 'label': u'Terms HTML',
+ 'oldfieldtype': u'HTML',
+ 'options': u'You can add Terms and Notes that will be printed in the Transaction',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'terms',
- 'fieldtype': 'Text Editor',
- 'label': 'Terms Content',
- 'oldfieldname': 'terms',
- 'oldfieldtype': 'Text Editor',
+ 'doctype': u'DocField',
+ 'fieldname': u'terms',
+ 'fieldtype': u'Text Editor',
+ 'label': u'Terms Content',
+ 'oldfieldname': u'terms',
+ 'oldfieldtype': u'Text Editor',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break3',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
'print_hide': 1
},
@@ -523,12 +518,13 @@
# DocField
{
'allow_on_submit': 1,
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Repair Purchase Requisition',
- 'oldfieldtype': 'Button',
- 'options': 'repair_indent',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'repair_purchase_requisition',
+ 'fieldtype': u'Button',
+ 'label': u'Repair Purchase Requisition',
+ 'oldfieldtype': u'Button',
+ 'options': u'repair_indent',
'permlevel': 0,
'print_hide': 1
}
diff --git a/erpnext/buying/doctype/indent_detail/indent_detail.txt b/erpnext/buying/doctype/indent_detail/indent_detail.txt
index 136237a..3727be9 100644
--- a/erpnext/buying/doctype/indent_detail/indent_detail.txt
+++ b/erpnext/buying/doctype/indent_detail/indent_detail.txt
@@ -3,145 +3,145 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:04',
+ 'creation': '2012-03-27 14:35:49',
'docstatus': 0,
- 'modified': '2011-10-12 13:02:13',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:49',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'autoname': 'IDTD/.#####',
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'autoname': u'IDTD/.#####',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Buying',
+ 'module': u'Buying',
'name': '__common__',
- 'section_style': 'Tray',
- 'server_code_error': ' ',
+ 'section_style': u'Tray',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 34
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Indent Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Indent Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# DocType, Indent Detail
{
'doctype': 'DocType',
- 'name': 'Indent Detail'
+ 'name': u'Indent Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'schedule_date',
- 'fieldtype': 'Date',
- 'label': 'Required Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'schedule_date',
+ 'fieldtype': u'Date',
+ 'label': u'Required Date',
'no_copy': 1,
- 'oldfieldname': 'schedule_date',
- 'oldfieldtype': 'Date',
+ 'oldfieldname': u'schedule_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'print_hide': 0,
'reqd': 1,
- 'width': '100px'
+ 'width': u'100px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'item_code',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'item_code',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Item Code',
- 'oldfieldname': 'item_code',
- 'oldfieldtype': 'Link',
- 'options': 'Item',
+ 'label': u'Item Code',
+ 'oldfieldname': u'item_code',
+ 'oldfieldtype': u'Link',
+ 'options': u'Item',
'permlevel': 0,
'reqd': 1,
'search_index': 1,
- 'trigger': 'Client',
- 'width': '100px'
+ 'trigger': u'Client',
+ 'width': u'100px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'item_name',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'item_name',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Item Name',
- 'oldfieldname': 'item_name',
- 'oldfieldtype': 'Data',
+ 'label': u'Item Name',
+ 'oldfieldname': u'item_name',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1,
'search_index': 1,
- 'width': '100px'
+ 'width': u'100px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Text',
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Text',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Text',
'permlevel': 0,
'reqd': 1,
- 'width': '300px'
+ 'width': u'300px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'warehouse',
- 'fieldtype': 'Link',
- 'label': 'Warehouse',
- 'oldfieldname': 'warehouse',
- 'oldfieldtype': 'Link',
- 'options': 'Warehouse',
+ 'doctype': u'DocField',
+ 'fieldname': u'warehouse',
+ 'fieldtype': u'Link',
+ 'label': u'Warehouse',
+ 'oldfieldname': u'warehouse',
+ 'oldfieldtype': u'Link',
+ 'options': u'Warehouse',
'permlevel': 0,
'print_hide': 0,
'reqd': 0,
- 'trigger': 'Client',
- 'width': '100px'
+ 'trigger': u'Client',
+ 'width': u'100px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'brand',
- 'fieldtype': 'Link',
- 'label': 'Brand',
- 'oldfieldname': 'brand',
- 'oldfieldtype': 'Link',
- 'options': 'Brand',
+ 'doctype': u'DocField',
+ 'fieldname': u'brand',
+ 'fieldtype': u'Link',
+ 'label': u'Brand',
+ 'oldfieldname': u'brand',
+ 'oldfieldtype': u'Link',
+ 'options': u'Brand',
'permlevel': 1,
'print_hide': 1,
- 'width': '100px'
+ 'width': u'100px'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'item_group',
- 'fieldtype': 'Link',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'item_group',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Item Group',
+ 'label': u'Item Group',
'no_copy': 0,
- 'oldfieldname': 'item_group',
- 'oldfieldtype': 'Link',
- 'options': 'Item Group',
+ 'oldfieldname': u'item_group',
+ 'oldfieldtype': u'Link',
+ 'options': u'Item Group',
'permlevel': 1,
'print_hide': 1,
'reqd': 0,
@@ -150,98 +150,98 @@
# DocField
{
- 'colour': 'White:FFF',
- 'default': '0.00',
- 'doctype': 'DocField',
- 'fieldname': 'qty',
- 'fieldtype': 'Currency',
- 'label': 'Quantity',
+ 'colour': u'White:FFF',
+ 'default': u'0.00',
+ 'doctype': u'DocField',
+ 'fieldname': u'qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Quantity',
'no_copy': 0,
- 'oldfieldname': 'qty',
- 'oldfieldtype': 'Currency',
+ 'oldfieldname': u'qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'reqd': 1,
- 'trigger': 'Client',
- 'width': '50px'
+ 'trigger': u'Client',
+ 'width': u'50px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'lead_time_date',
- 'fieldtype': 'Date',
- 'label': 'Lead Time Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'lead_time_date',
+ 'fieldtype': u'Date',
+ 'label': u'Lead Time Date',
'no_copy': 1,
- 'oldfieldname': 'lead_time_date',
- 'oldfieldtype': 'Date',
+ 'oldfieldname': u'lead_time_date',
+ 'oldfieldtype': u'Date',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'uom',
- 'fieldtype': 'Link',
- 'label': 'Stock UOM',
+ 'doctype': u'DocField',
+ 'fieldname': u'uom',
+ 'fieldtype': u'Link',
+ 'label': u'Stock UOM',
'no_copy': 0,
- 'oldfieldname': 'uom',
- 'oldfieldtype': 'Link',
- 'options': 'UOM',
+ 'oldfieldname': u'uom',
+ 'oldfieldtype': u'Link',
+ 'options': u'UOM',
'permlevel': 1,
'reqd': 1,
- 'width': '50px'
+ 'width': u'50px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'min_order_qty',
- 'fieldtype': 'Currency',
- 'label': 'Min Order Qty',
+ 'doctype': u'DocField',
+ 'fieldname': u'min_order_qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Min Order Qty',
'no_copy': 1,
- 'oldfieldname': 'min_order_qty',
- 'oldfieldtype': 'Currency',
+ 'oldfieldname': u'min_order_qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 1,
'print_hide': 1,
'reqd': 0,
- 'width': '70px'
+ 'width': u'70px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'projected_qty',
- 'fieldtype': 'Currency',
- 'label': 'Projected Qty',
+ 'doctype': u'DocField',
+ 'fieldname': u'projected_qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Projected Qty',
'no_copy': 1,
- 'oldfieldname': 'projected_qty',
- 'oldfieldtype': 'Currency',
+ 'oldfieldname': u'projected_qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 1,
'print_hide': 1,
- 'width': '70px'
+ 'width': u'70px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'ordered_qty',
- 'fieldtype': 'Currency',
- 'label': 'Ordered Qty',
+ 'doctype': u'DocField',
+ 'fieldname': u'ordered_qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Ordered Qty',
'no_copy': 1,
- 'oldfieldname': 'ordered_qty',
- 'oldfieldtype': 'Currency',
+ 'oldfieldname': u'ordered_qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'sales_order_no',
- 'fieldtype': 'Link',
- 'label': 'Sales Order No',
+ 'doctype': u'DocField',
+ 'fieldname': u'sales_order_no',
+ 'fieldtype': u'Link',
+ 'label': u'Sales Order No',
'no_copy': 1,
- 'options': 'Sales Order',
+ 'options': u'Sales Order',
'permlevel': 1,
'print_hide': 1
},
@@ -249,13 +249,13 @@
# DocField
{
'allow_on_submit': 1,
- 'doctype': 'DocField',
- 'fieldname': 'page_break',
- 'fieldtype': 'Check',
- 'label': 'Page Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'page_break',
+ 'fieldtype': u'Check',
+ 'label': u'Page Break',
'no_copy': 1,
- 'oldfieldname': 'page_break',
- 'oldfieldtype': 'Check',
+ 'oldfieldname': u'page_break',
+ 'oldfieldtype': u'Check',
'permlevel': 0,
'print_hide': 1
}
diff --git a/erpnext/buying/doctype/po_detail/po_detail.txt b/erpnext/buying/doctype/po_detail/po_detail.txt
index b625e4e..f8f32f9 100755
--- a/erpnext/buying/doctype/po_detail/po_detail.txt
+++ b/erpnext/buying/doctype/po_detail/po_detail.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:12',
+ 'creation': '2012-03-27 14:35:50',
'docstatus': 0,
- 'modified': '2012-03-05 15:01:31',
+ 'modified': '2012-03-27 14:35:50',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/buying/doctype/po_raw_material_detail/po_raw_material_detail.txt b/erpnext/buying/doctype/po_raw_material_detail/po_raw_material_detail.txt
index 64b97fb..f166a39 100644
--- a/erpnext/buying/doctype/po_raw_material_detail/po_raw_material_detail.txt
+++ b/erpnext/buying/doctype/po_raw_material_detail/po_raw_material_detail.txt
@@ -3,151 +3,142 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:12',
+ 'creation': '2012-03-27 14:35:50',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'sneha@webnotestech.com',
- 'owner': 'dhanalekshmi@webnotestech.com'
+ 'modified': '2012-03-27 14:35:50',
+ 'modified_by': u'Administrator',
+ 'owner': u'dhanalekshmi@webnotestech.com'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'hide_toolbar': 1,
'istable': 1,
- 'module': 'Buying',
+ 'module': u'Buying',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 1
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'PO Raw Material Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'PO Raw Material Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# DocType, PO Raw Material Detail
{
'doctype': 'DocType',
- 'name': 'PO Raw Material Detail'
+ 'name': u'PO Raw Material Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'reference_name',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'reference_name',
+ 'fieldtype': u'Data',
'hidden': 0,
- 'idx': 1,
'in_filter': 0,
- 'label': 'Reference Name',
- 'oldfieldname': 'reference_name',
- 'oldfieldtype': 'Data',
+ 'label': u'Reference Name',
+ 'oldfieldname': u'reference_name',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'bom_detail_no',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'BOM Detail No',
- 'oldfieldname': 'bom_detail_no',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'bom_detail_no',
+ 'fieldtype': u'Data',
+ 'label': u'BOM Detail No',
+ 'oldfieldname': u'bom_detail_no',
+ 'oldfieldtype': u'Data',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'main_item_code',
- 'fieldtype': 'Data',
- 'idx': 3,
- 'label': 'Item Code',
- 'oldfieldname': 'main_item_code',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'main_item_code',
+ 'fieldtype': u'Data',
+ 'label': u'Item Code',
+ 'oldfieldname': u'main_item_code',
+ 'oldfieldtype': u'Data',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'rm_item_code',
- 'fieldtype': 'Data',
- 'idx': 4,
- 'label': 'Raw Material Item Code',
- 'oldfieldname': 'rm_item_code',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'rm_item_code',
+ 'fieldtype': u'Data',
+ 'label': u'Raw Material Item Code',
+ 'oldfieldname': u'rm_item_code',
+ 'oldfieldtype': u'Data',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'required_qty',
- 'fieldtype': 'Currency',
- 'idx': 6,
- 'label': 'Required Qty',
- 'oldfieldname': 'required_qty',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'required_qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Required Qty',
+ 'oldfieldname': u'required_qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'rate',
- 'fieldtype': 'Currency',
- 'idx': 8,
- 'label': 'Rate',
- 'oldfieldname': 'rate',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Rate',
+ 'oldfieldname': u'rate',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amount',
- 'fieldtype': 'Currency',
- 'idx': 9,
- 'label': 'Amount',
- 'oldfieldname': 'amount',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Amount',
+ 'oldfieldname': u'amount',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'conversion_factor',
- 'fieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'conversion_factor',
+ 'fieldtype': u'Currency',
'hidden': 1,
- 'idx': 11,
- 'label': 'Conversion Factor',
- 'oldfieldname': 'conversion_factor',
- 'oldfieldtype': 'Currency',
+ 'label': u'Conversion Factor',
+ 'oldfieldname': u'conversion_factor',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'stock_uom',
- 'fieldtype': 'Data',
- 'idx': 12,
- 'label': 'Stock Uom',
- 'oldfieldname': 'stock_uom',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'stock_uom',
+ 'fieldtype': u'Data',
+ 'label': u'Stock Uom',
+ 'oldfieldname': u'stock_uom',
+ 'oldfieldtype': u'Data',
'permlevel': 1
}
]
\ No newline at end of file
diff --git a/erpnext/buying/doctype/pr_raw_material_detail/pr_raw_material_detail.txt b/erpnext/buying/doctype/pr_raw_material_detail/pr_raw_material_detail.txt
index fd28b85..47dc7ae 100644
--- a/erpnext/buying/doctype/pr_raw_material_detail/pr_raw_material_detail.txt
+++ b/erpnext/buying/doctype/pr_raw_material_detail/pr_raw_material_detail.txt
@@ -3,189 +3,177 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:13',
+ 'creation': '2012-03-27 14:35:50',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'sneha@webnotestech.com',
- 'owner': 'wasim@webnotestech.com'
+ 'modified': '2012-03-27 14:35:50',
+ 'modified_by': u'Administrator',
+ 'owner': u'wasim@webnotestech.com'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'hide_toolbar': 0,
'istable': 1,
- 'module': 'Buying',
+ 'module': u'Buying',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 17
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'PR Raw Material Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'PR Raw Material Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# DocType, PR Raw Material Detail
{
'doctype': 'DocType',
- 'name': 'PR Raw Material Detail'
+ 'name': u'PR Raw Material Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'reference_name',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'reference_name',
+ 'fieldtype': u'Data',
'hidden': 0,
- 'idx': 1,
'in_filter': 0,
- 'label': 'Reference Name',
- 'oldfieldname': 'reference_name',
- 'oldfieldtype': 'Data',
+ 'label': u'Reference Name',
+ 'oldfieldname': u'reference_name',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'bom_detail_no',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'BOM Detail No',
- 'oldfieldname': 'bom_detail_no',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'bom_detail_no',
+ 'fieldtype': u'Data',
+ 'label': u'BOM Detail No',
+ 'oldfieldname': u'bom_detail_no',
+ 'oldfieldtype': u'Data',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'main_item_code',
- 'fieldtype': 'Data',
- 'idx': 3,
- 'label': 'Item Code',
- 'oldfieldname': 'main_item_code',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'main_item_code',
+ 'fieldtype': u'Data',
+ 'label': u'Item Code',
+ 'oldfieldname': u'main_item_code',
+ 'oldfieldtype': u'Data',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'rm_item_code',
- 'fieldtype': 'Data',
- 'idx': 4,
- 'label': 'Raw Material Item Code',
- 'oldfieldname': 'rm_item_code',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'rm_item_code',
+ 'fieldtype': u'Data',
+ 'label': u'Raw Material Item Code',
+ 'oldfieldname': u'rm_item_code',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Data',
- 'idx': 5,
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Data',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
- 'width': '300px'
+ 'width': u'300px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'required_qty',
- 'fieldtype': 'Currency',
- 'idx': 7,
- 'label': 'Required Qty',
- 'oldfieldname': 'required_qty',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'required_qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Required Qty',
+ 'oldfieldname': u'required_qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'consumed_qty',
- 'fieldtype': 'Currency',
- 'idx': 8,
- 'label': 'Consumed Qty',
- 'oldfieldname': 'consumed_qty',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'consumed_qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Consumed Qty',
+ 'oldfieldname': u'consumed_qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'rate',
- 'fieldtype': 'Currency',
- 'idx': 10,
- 'label': 'Rate',
- 'oldfieldname': 'rate',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Rate',
+ 'oldfieldname': u'rate',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'conversion_factor',
- 'fieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'conversion_factor',
+ 'fieldtype': u'Currency',
'hidden': 1,
- 'idx': 11,
- 'label': 'Conversion Factor',
- 'oldfieldname': 'conversion_factor',
- 'oldfieldtype': 'Currency',
+ 'label': u'Conversion Factor',
+ 'oldfieldname': u'conversion_factor',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amount',
- 'fieldtype': 'Currency',
- 'idx': 11,
- 'label': 'Amount',
- 'oldfieldname': 'amount',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Amount',
+ 'oldfieldname': u'amount',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'stock_uom',
- 'fieldtype': 'Data',
- 'idx': 12,
- 'label': 'Stock Uom',
- 'oldfieldname': 'stock_uom',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'stock_uom',
+ 'fieldtype': u'Data',
+ 'label': u'Stock Uom',
+ 'oldfieldname': u'stock_uom',
+ 'oldfieldtype': u'Data',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'current_stock',
- 'fieldtype': 'Currency',
- 'idx': 12,
- 'label': 'Current Stock',
- 'oldfieldname': 'current_stock',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'current_stock',
+ 'fieldtype': u'Currency',
+ 'label': u'Current Stock',
+ 'oldfieldname': u'current_stock',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
}
]
\ No newline at end of file
diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js
index 89094e9..462a9ee 100644
--- a/erpnext/buying/doctype/purchase_common/purchase_common.js
+++ b/erpnext/buying/doctype/purchase_common/purchase_common.js
@@ -397,12 +397,12 @@
refresh_field('net_total');
refresh_field('net_total_import');
- cur_frm.cscript.val_cal_charges(doc, cdt, cdn, tname, fname, other_fname);
+ cur_frm.cscript.val_cal_charges(doc, tname, fname, other_fname);
}
//======== Function was broken away from cur_frm.cscript.calc_amount as PV has fieldname 'rate' instead of 'purchase_rate'===========
-cur_frm.cscript.val_cal_charges = function(doc, cdt, cdn, tname, fname, other_fname){
+cur_frm.cscript.val_cal_charges = function(doc, tname, fname, other_fname){
doc = locals[doc.doctype][doc.name]
if(flt(doc.net_total) > 0) {
@@ -420,7 +420,7 @@
}
cur_frm.cscript.calc_other_charges(doc , tname , fname , other_fname); // calculate other charges
}
- cur_frm.cscript.calc_doc_values(doc, cdt, cdn, tname, fname, other_fname); // calculates total amounts
+ cur_frm.cscript.calc_doc_values(doc, tname, fname, other_fname); // calculates total amounts
refresh_many(['net_total', 'grand_total', 'rounded_total', 'grand_total_import', 'rounded_total_import', 'in_words', 'in_words_import', 'purchase_tax_details', 'total_tax', 'other_charges_added', 'other_charges_deducted', 'net_total_import', 'other_charges_added_import', 'other_charges_deducted_import']);
@@ -549,9 +549,10 @@
// ******* Calculation of total amounts of document (item amount + other charges)****************
-cur_frm.cscript.calc_doc_values = function(doc, cdt, cdn, tname, fname, other_fname) {
+cur_frm.cscript.calc_doc_values = function(doc, tname, fname, other_fname) {
doc = locals[doc.doctype][doc.name];
- var net_total = 0; var total_tax = 0; var other_charges_added = 0; var other_charges_deducted = 0;
+ var net_total = 0; var total_tax = 0; var other_charges_added = 0;
+ var other_charges_deducted = 0;
var cl = getchildren(tname, doc.name, fname);
for(var i = 0; i<cl.length; i++){
net_total += flt(cl[i].amount);
diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.txt b/erpnext/buying/doctype/purchase_common/purchase_common.txt
index 689e42e..dc1e1f1 100644
--- a/erpnext/buying/doctype/purchase_common/purchase_common.txt
+++ b/erpnext/buying/doctype/purchase_common/purchase_common.txt
@@ -3,22 +3,22 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:15',
+ 'creation': '2012-03-27 14:35:51',
'docstatus': 0,
- 'modified': '2010-12-23 10:45:17',
- 'modified_by': 'sneha@webnotestech.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:51',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'issingle': 1,
- 'module': 'Buying',
+ 'module': u'Buying',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 187
},
@@ -26,6 +26,6 @@
# DocType, Purchase Common
{
'doctype': 'DocType',
- 'name': 'Purchase Common'
+ 'name': u'Purchase Common'
}
]
\ No newline at end of file
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index 7af1204..3588a52 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -17,9 +17,11 @@
cur_frm.cscript.tname = "PO Detail";
cur_frm.cscript.fname = "po_details";
cur_frm.cscript.other_fname = "purchase_tax_details";
-$import(Purchase Common)
-$import(Purchase Other Charges)
-$import(SMS Control)
+
+wn.require('erpnext/buying/doctype/purchase_other_charges/purchase_other_charges.js');
+wn.require('erpnext/buying/doctype/purchase_common/purchase_common.js');
+wn.require('erpnext/utilities/doctype/sms_control/sms_control.js');
+wn.require('erpnext/setup/doctype/notification_control/notification_control.js');
//========================== On Load =================================================
cur_frm.cscript.onload = function(doc, cdt, cdn) {
@@ -270,7 +272,6 @@
return out;
}
-$import(Notification Control)
cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
var args = {
type: 'Purchase Order',
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.txt b/erpnext/buying/doctype/purchase_order/purchase_order.txt
index 0239370..188a2e2 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.txt
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.txt
@@ -3,22 +3,13 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:15',
+ 'creation': '2012-03-27 14:35:51',
'docstatus': 0,
- 'modified': '2012-03-02 12:23:50',
+ 'modified': '2012-03-27 18:46:29',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Purchase Order',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
# These values are common for all DocType
{
'_last_update': u'1330339817',
@@ -26,6 +17,7 @@
'default_print_format': u'Standard',
'doctype': 'DocType',
'document_type': u'Transaction',
+ 'is_submittable': 1,
'is_transaction_doc': 1,
'module': u'Buying',
'name': '__common__',
@@ -35,15 +27,15 @@
'server_code_error': u' ',
'show_in_menu': 0,
'subject': u'To %(supplier_name)s on %(transaction_date)s | %(per_received)s% delivered',
- 'version': 501
+ 'version': 502
},
- # These values are common for all DocFormat
+ # These values are common for all DocField
{
- 'doctype': u'DocFormat',
+ 'doctype': u'DocField',
'name': '__common__',
'parent': u'Purchase Order',
- 'parentfield': u'formats',
+ 'parentfield': u'fields',
'parenttype': u'DocType'
},
@@ -70,33 +62,32 @@
'create': 1,
'doctype': u'DocPerm',
'permlevel': 0,
- 'role': u'Production Manager',
- 'submit': 0,
+ 'role': u'Purchase User',
+ 'submit': 1,
'write': 1
},
# DocPerm
{
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
- 'role': u'Material User',
- 'submit': 0,
- 'write': 0
+ 'role': u'All'
},
# DocPerm
{
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
'doctype': u'DocPerm',
+ 'match': u'supplier',
'permlevel': 0,
- 'role': u'Material User',
- 'submit': 0,
- 'write': 0
+ 'role': u'Supplier'
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 2,
+ 'role': u'All',
+ 'write': 1
},
# DocPerm
@@ -125,24 +116,12 @@
# DocPerm
{
- 'amend': 1,
- 'cancel': 0,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Purchase User',
- 'submit': 0,
- 'write': 1
- },
-
- # DocPerm
- {
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
- 'role': u'All',
+ 'role': u'Material User',
'submit': 0,
'write': 0
},
@@ -154,46 +133,17 @@
'create': 0,
'doctype': u'DocPerm',
'permlevel': 0,
- 'role': u'Supplier',
+ 'role': u'Material User',
'submit': 0,
'write': 0
},
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 2,
- 'role': u'All',
- 'submit': 0,
- 'write': 1
- },
-
- # DocFormat
- {
- 'doctype': u'DocFormat',
- 'format': u'Purchase Order Classic'
- },
-
- # DocFormat
- {
- 'doctype': u'DocFormat',
- 'format': u'Purchase Order Modern'
- },
-
- # DocFormat
- {
- 'doctype': u'DocFormat',
- 'format': u'Purchase Order Spartan'
- },
-
# DocField
{
'colour': u'White:FFF',
'description': u'Enter rates and quantity of items you want to purchase and send the purchase order to your supplier.',
'doctype': u'DocField',
+ 'fieldname': u'basic_info',
'fieldtype': u'Section Break',
'label': u'Basic Info',
'oldfieldtype': u'Section Break',
@@ -204,6 +154,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break0',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -319,6 +270,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break1',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -426,6 +378,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'items',
'fieldtype': u'Section Break',
'label': u'Items',
'oldfieldtype': u'Section Break',
@@ -435,6 +388,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break2',
'fieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
@@ -479,6 +433,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break3',
'fieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
@@ -504,6 +459,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'get_items',
'fieldtype': u'Button',
'hidden': 0,
'label': u'Get Items',
@@ -515,6 +471,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'section_break0',
'fieldtype': u'Section Break',
'permlevel': 0
},
@@ -537,6 +494,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'get_last_purchase_rate',
'fieldtype': u'Button',
'label': u'Get Last Purchase Rate',
'oldfieldtype': u'Button',
@@ -562,6 +520,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'recalculate_values',
'fieldtype': u'Button',
'label': u'Re-Calculate Values',
'oldfieldtype': u'Button',
@@ -573,6 +532,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'taxes',
'fieldtype': u'Section Break',
'label': u'Taxes',
'oldfieldtype': u'Section Break',
@@ -598,6 +558,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'get_tax_detail',
'fieldtype': u'Button',
'label': u'Get Tax Detail',
'oldfieldtype': u'Button',
@@ -622,6 +583,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'calculate_tax',
'fieldtype': u'Button',
'label': u'Calculate Tax',
'oldfieldtype': u'Button',
@@ -633,6 +595,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'tax_calculation',
'fieldtype': u'HTML',
'label': u'Tax Calculation',
'no_copy': 1,
@@ -658,6 +621,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'totals',
'fieldtype': u'Section Break',
'label': u'Totals',
'oldfieldtype': u'Section Break',
@@ -732,6 +696,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break4',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -809,6 +774,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'terms_section_break',
'fieldtype': u'Section Break',
'label': u'Terms',
'oldfieldtype': u'Section Break',
@@ -845,6 +811,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'get_terms',
'fieldtype': u'Button',
'label': u'Get Terms',
'oldfieldtype': u'Button',
@@ -855,6 +822,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'terms_html',
'fieldtype': u'HTML',
'label': u'Terms HTML',
'oldfieldtype': u'HTML',
@@ -877,6 +845,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'more_info',
'fieldtype': u'Section Break',
'label': u'More Info',
'oldfieldtype': u'Section Break',
@@ -994,6 +963,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break5',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -1049,6 +1019,7 @@
'colour': u'White:FFF',
'description': u'Required raw materials issued to the supplier for producing a sub - contracted item.',
'doctype': u'DocField',
+ 'fieldname': u'raw_material_details',
'fieldtype': u'Section Break',
'label': u'Raw Material Details',
'oldfieldtype': u'Section Break',
@@ -1075,6 +1046,7 @@
{
'allow_on_submit': 1,
'doctype': u'DocField',
+ 'fieldname': u'repair_purchase_order',
'fieldtype': u'Button',
'label': u'Repair Purchase Order',
'oldfieldtype': u'Button',
diff --git a/erpnext/buying/doctype/purchase_other_charges/purchase_other_charges.txt b/erpnext/buying/doctype/purchase_other_charges/purchase_other_charges.txt
index 8be1359..ce3fb8e 100644
--- a/erpnext/buying/doctype/purchase_other_charges/purchase_other_charges.txt
+++ b/erpnext/buying/doctype/purchase_other_charges/purchase_other_charges.txt
@@ -3,61 +3,61 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:15',
+ 'creation': '2012-03-27 14:35:51',
'docstatus': 0,
- 'modified': '2012-01-24 12:42:18',
- 'modified_by': 'Administrator',
- 'owner': 'wasim@webnotestech.com'
+ 'modified': '2012-03-27 14:35:51',
+ 'modified_by': u'Administrator',
+ 'owner': u'wasim@webnotestech.com'
},
# These values are common for all DocType
{
- '_last_update': '1325570646',
+ '_last_update': u'1325570646',
'allow_trash': 1,
- 'autoname': 'field:title',
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'autoname': u'field:title',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'Buying',
+ 'document_type': u'Master',
+ 'module': u'Buying',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 18
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Purchase Other Charges',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Purchase Other Charges',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Purchase Other Charges',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Purchase Other Charges',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Purchase Other Charges
{
'doctype': 'DocType',
- 'name': 'Purchase Other Charges'
+ 'name': u'Purchase Other Charges'
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'All'
+ 'role': u'All'
},
# DocPerm
@@ -65,9 +65,9 @@
'amend': 0,
'cancel': 0,
'create': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Purchase Manager',
+ 'role': u'Purchase Manager',
'submit': 0,
'write': 0
},
@@ -76,9 +76,9 @@
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 1
},
@@ -86,45 +86,45 @@
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Purchase Master Manager',
+ 'role': u'Purchase Master Manager',
'submit': 0,
'write': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'title',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'title',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Title',
- 'oldfieldname': 'title',
- 'oldfieldtype': 'Data',
+ 'label': u'Title',
+ 'oldfieldname': u'title',
+ 'oldfieldtype': u'Data',
'reqd': 1,
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'company',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'company',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Company',
- 'options': 'Company',
+ 'label': u'Company',
+ 'options': u'Company',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'purchase_tax_details',
- 'fieldtype': 'Table',
- 'label': 'Purchase Tax Details',
- 'oldfieldname': 'purchase_tax_details',
- 'oldfieldtype': 'Table',
- 'options': 'Purchase Tax Detail'
+ 'doctype': u'DocField',
+ 'fieldname': u'purchase_tax_details',
+ 'fieldtype': u'Table',
+ 'label': u'Purchase Tax Details',
+ 'oldfieldname': u'purchase_tax_details',
+ 'oldfieldtype': u'Table',
+ 'options': u'Purchase Tax Detail'
}
]
\ No newline at end of file
diff --git a/erpnext/buying/doctype/qa_inspection_report/qa_inspection_report.txt b/erpnext/buying/doctype/qa_inspection_report/qa_inspection_report.txt
index de88e16..54af464 100644
--- a/erpnext/buying/doctype/qa_inspection_report/qa_inspection_report.txt
+++ b/erpnext/buying/doctype/qa_inspection_report/qa_inspection_report.txt
@@ -3,54 +3,61 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:17',
+ 'creation': '2012-03-27 14:35:51',
'docstatus': 0,
- 'modified': '2011-10-06 10:22:41',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:45:50',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1317365120',
- 'autoname': 'QAI/.######',
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ '_last_update': u'1317365120',
+ 'autoname': u'QAI/.######',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
- 'module': 'Buying',
+ 'is_submittable': 1,
+ 'module': u'Buying',
'name': '__common__',
- 'print_outline': 'Yes',
- 'search_fields': 'item_code, report_date, purchase_receipt_no, delivery_note_no',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'print_outline': u'Yes',
+ 'search_fields': u'item_code, report_date, purchase_receipt_no, delivery_note_no',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 38
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'QA Inspection Report',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'QA Inspection Report',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'QA Inspection Report',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'QA Inspection Report',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1,
- 'role': 'Quality Manager'
+ 'role': u'Quality Manager'
},
# DocType, QA Inspection Report
{
'doctype': 'DocType',
- 'name': 'QA Inspection Report'
+ 'name': u'QA Inspection Report'
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 1
},
# DocPerm
@@ -58,74 +65,70 @@
'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
'submit': 1,
'write': 1
},
- # DocPerm
- {
- 'doctype': 'DocPerm',
- 'permlevel': 1
- },
-
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'QA Inspection',
+ 'doctype': u'DocField',
+ 'fieldname': u'qa_inspection',
+ 'fieldtype': u'Section Break',
+ 'label': u'QA Inspection',
'no_copy': 0,
- 'oldfieldtype': 'Section Break',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'naming_series',
- 'fieldtype': 'Select',
- 'label': 'Naming Series',
+ 'doctype': u'DocField',
+ 'fieldname': u'naming_series',
+ 'fieldtype': u'Select',
+ 'label': u'Naming Series',
'no_copy': 1,
- 'options': '\nQAI/11-12/',
+ 'options': u'\nQAI/11-12/',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'inspection_type',
- 'fieldtype': 'Select',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'inspection_type',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Inspection Type',
- 'oldfieldname': 'inspection_type',
- 'oldfieldtype': 'Select',
- 'options': '\nIncoming\nOutgoing\nIn Process',
+ 'label': u'Inspection Type',
+ 'oldfieldname': u'inspection_type',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nIncoming\nOutgoing\nIn Process',
'permlevel': 0,
'reqd': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'report_date',
- 'fieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'report_date',
+ 'fieldtype': u'Date',
'in_filter': 1,
- 'label': 'Report Date',
- 'oldfieldname': 'report_date',
- 'oldfieldtype': 'Date',
+ 'label': u'Report Date',
+ 'oldfieldname': u'report_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'reqd': 1,
'search_index': 1
@@ -133,31 +136,31 @@
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'item_code',
- 'fieldtype': 'Link',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'item_code',
+ 'fieldtype': u'Link',
'hidden': 0,
'in_filter': 1,
- 'label': 'Item Code',
- 'oldfieldname': 'item_code',
- 'oldfieldtype': 'Link',
- 'options': 'Item',
+ 'label': u'Item Code',
+ 'oldfieldname': u'item_code',
+ 'oldfieldtype': u'Link',
+ 'options': u'Item',
'permlevel': 0,
'reqd': 1,
'search_index': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'sample_size',
- 'fieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'sample_size',
+ 'fieldtype': u'Currency',
'in_filter': 0,
- 'label': 'Sample Size',
- 'oldfieldname': 'sample_size',
- 'oldfieldtype': 'Currency',
+ 'label': u'Sample Size',
+ 'oldfieldname': u'sample_size',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'reqd': 1,
'search_index': 0
@@ -165,82 +168,83 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Small Text',
'in_filter': 1,
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Small Text',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Small Text',
'permlevel': 0,
'search_index': 0,
- 'width': '300px'
+ 'width': u'300px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'item_serial_no',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'item_serial_no',
+ 'fieldtype': u'Link',
'hidden': 0,
- 'label': 'Item Serial No',
- 'oldfieldname': 'item_serial_no',
- 'oldfieldtype': 'Link',
- 'options': 'Serial No',
+ 'label': u'Item Serial No',
+ 'oldfieldname': u'item_serial_no',
+ 'oldfieldtype': u'Link',
+ 'options': u'Serial No',
'permlevel': 0,
'print_hide': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'batch_no',
- 'fieldtype': 'Link',
- 'label': 'Batch No',
- 'oldfieldname': 'batch_no',
- 'oldfieldtype': 'Link',
- 'options': 'Batch',
+ 'doctype': u'DocField',
+ 'fieldname': u'batch_no',
+ 'fieldtype': u'Link',
+ 'label': u'Batch No',
+ 'oldfieldname': u'batch_no',
+ 'oldfieldtype': u'Link',
+ 'options': u'Batch',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'purchase_receipt_no',
- 'fieldtype': 'Link',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'purchase_receipt_no',
+ 'fieldtype': u'Link',
'hidden': 0,
'in_filter': 1,
- 'label': 'Purchase Receipt No',
- 'oldfieldname': 'purchase_receipt_no',
- 'oldfieldtype': 'Link',
- 'options': 'Purchase Receipt',
+ 'label': u'Purchase Receipt No',
+ 'oldfieldname': u'purchase_receipt_no',
+ 'oldfieldtype': u'Link',
+ 'options': u'Purchase Receipt',
'permlevel': 0,
'search_index': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'delivery_note_no',
- 'fieldtype': 'Link',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'delivery_note_no',
+ 'fieldtype': u'Link',
'hidden': 0,
'in_filter': 1,
- 'label': 'Delivery Note No',
- 'oldfieldname': 'delivery_note_no',
- 'oldfieldtype': 'Link',
- 'options': 'Delivery Note',
+ 'label': u'Delivery Note No',
+ 'oldfieldname': u'delivery_note_no',
+ 'oldfieldtype': u'Link',
+ 'options': u'Delivery Note',
'permlevel': 0,
'print_hide': 0,
'search_index': 1
@@ -248,93 +252,95 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'inspected_by',
- 'fieldtype': 'Data',
- 'label': 'Inspected By',
- 'oldfieldname': 'inspected_by',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'inspected_by',
+ 'fieldtype': u'Data',
+ 'label': u'Inspected By',
+ 'oldfieldname': u'inspected_by',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'remarks',
- 'fieldtype': 'Text',
- 'label': 'Remarks',
+ 'doctype': u'DocField',
+ 'fieldname': u'remarks',
+ 'fieldtype': u'Text',
+ 'label': u'Remarks',
'no_copy': 1,
- 'oldfieldname': 'remarks',
- 'oldfieldtype': 'Text',
+ 'oldfieldname': u'remarks',
+ 'oldfieldtype': u'Text',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'verified_by',
- 'fieldtype': 'Data',
- 'label': 'Verified By',
- 'oldfieldname': 'verified_by',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'verified_by',
+ 'fieldtype': u'Data',
+ 'label': u'Verified By',
+ 'oldfieldname': u'verified_by',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amended_from',
- 'fieldtype': 'Data',
- 'label': 'Amended From',
+ 'doctype': u'DocField',
+ 'fieldname': u'amended_from',
+ 'fieldtype': u'Data',
+ 'label': u'Amended From',
'no_copy': 1,
- 'oldfieldname': 'amended_from',
- 'oldfieldtype': 'Data',
+ 'oldfieldname': u'amended_from',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amendment_date',
- 'fieldtype': 'Date',
- 'label': 'Amendment Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'amendment_date',
+ 'fieldtype': u'Date',
+ 'label': u'Amendment Date',
'no_copy': 1,
- 'oldfieldname': 'amendment_date',
- 'oldfieldtype': 'Date',
+ 'oldfieldname': u'amendment_date',
+ 'oldfieldtype': u'Date',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Specification Details',
- 'oldfieldtype': 'Section Break',
- 'options': 'Simple',
+ 'doctype': u'DocField',
+ 'fieldname': u'specification_details',
+ 'fieldtype': u'Section Break',
+ 'label': u'Specification Details',
+ 'oldfieldtype': u'Section Break',
+ 'options': u'Simple',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Get Specification Details',
- 'options': 'get_item_specification_details',
+ 'doctype': u'DocField',
+ 'fieldname': u'get_specification_details',
+ 'fieldtype': u'Button',
+ 'label': u'Get Specification Details',
+ 'options': u'get_item_specification_details',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'qa_specification_details',
- 'fieldtype': 'Table',
- 'label': 'QA Specification Details',
- 'oldfieldname': 'qa_specification_details',
- 'oldfieldtype': 'Table',
- 'options': 'QA Specification Detail',
+ 'doctype': u'DocField',
+ 'fieldname': u'qa_specification_details',
+ 'fieldtype': u'Table',
+ 'label': u'QA Specification Details',
+ 'oldfieldname': u'qa_specification_details',
+ 'oldfieldtype': u'Table',
+ 'options': u'QA Specification Detail',
'permlevel': 0
}
]
\ No newline at end of file
diff --git a/erpnext/buying/doctype/qa_specification_detail/qa_specification_detail.txt b/erpnext/buying/doctype/qa_specification_detail/qa_specification_detail.txt
index 07ccb03..d3a9b5a 100644
--- a/erpnext/buying/doctype/qa_specification_detail/qa_specification_detail.txt
+++ b/erpnext/buying/doctype/qa_specification_detail/qa_specification_detail.txt
@@ -3,186 +3,173 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:17',
+ 'creation': '2012-03-27 14:35:52',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:52',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'autoname': 'QASD/.#####',
- 'colour': 'White:FFF',
+ 'autoname': u'QASD/.#####',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Buying',
+ 'module': u'Buying',
'name': '__common__',
- 'section_style': 'Tray',
- 'server_code_error': ' ',
+ 'section_style': u'Tray',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 2
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'QA Specification Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'QA Specification Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, QA Specification Detail
{
'doctype': 'DocType',
- 'name': 'QA Specification Detail'
+ 'name': u'QA Specification Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'specification',
- 'fieldtype': 'Data',
- 'idx': 1,
- 'label': 'Parameter',
- 'oldfieldname': 'specification',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'specification',
+ 'fieldtype': u'Data',
+ 'label': u'Parameter',
+ 'oldfieldname': u'specification',
+ 'oldfieldtype': u'Data',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'value',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Acceptance Criteria',
- 'oldfieldname': 'value',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'value',
+ 'fieldtype': u'Data',
+ 'label': u'Acceptance Criteria',
+ 'oldfieldname': u'value',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'reading_1',
- 'fieldtype': 'Data',
- 'idx': 3,
- 'label': 'Reading 1',
- 'oldfieldname': 'reading_1',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'reading_1',
+ 'fieldtype': u'Data',
+ 'label': u'Reading 1',
+ 'oldfieldname': u'reading_1',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'reading_2',
- 'fieldtype': 'Data',
- 'idx': 4,
- 'label': 'Reading 2',
- 'oldfieldname': 'reading_2',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'reading_2',
+ 'fieldtype': u'Data',
+ 'label': u'Reading 2',
+ 'oldfieldname': u'reading_2',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'reading_3',
- 'fieldtype': 'Data',
- 'idx': 5,
- 'label': 'Reading 3',
- 'oldfieldname': 'reading_3',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'reading_3',
+ 'fieldtype': u'Data',
+ 'label': u'Reading 3',
+ 'oldfieldname': u'reading_3',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'reading_4',
- 'fieldtype': 'Data',
- 'idx': 6,
- 'label': 'Reading 4',
- 'oldfieldname': 'reading_4',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'reading_4',
+ 'fieldtype': u'Data',
+ 'label': u'Reading 4',
+ 'oldfieldname': u'reading_4',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'reading_5',
- 'fieldtype': 'Data',
- 'idx': 7,
- 'label': 'Reading 5',
- 'oldfieldname': 'reading_5',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'reading_5',
+ 'fieldtype': u'Data',
+ 'label': u'Reading 5',
+ 'oldfieldname': u'reading_5',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'reading_6',
- 'fieldtype': 'Data',
- 'idx': 8,
- 'label': 'Reading 6',
- 'oldfieldname': 'reading_6',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'reading_6',
+ 'fieldtype': u'Data',
+ 'label': u'Reading 6',
+ 'oldfieldname': u'reading_6',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'reading_7',
- 'fieldtype': 'Data',
- 'idx': 9,
- 'label': 'Reading 7',
- 'oldfieldname': 'reading_7',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'reading_7',
+ 'fieldtype': u'Data',
+ 'label': u'Reading 7',
+ 'oldfieldname': u'reading_7',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'reading_8',
- 'fieldtype': 'Data',
- 'idx': 10,
- 'label': 'Reading 8',
- 'oldfieldname': 'reading_8',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'reading_8',
+ 'fieldtype': u'Data',
+ 'label': u'Reading 8',
+ 'oldfieldname': u'reading_8',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'reading_9',
- 'fieldtype': 'Data',
- 'idx': 11,
- 'label': 'Reading 9',
- 'oldfieldname': 'reading_9',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'reading_9',
+ 'fieldtype': u'Data',
+ 'label': u'Reading 9',
+ 'oldfieldname': u'reading_9',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'reading_10',
- 'fieldtype': 'Data',
- 'idx': 12,
- 'label': 'Reading 10',
- 'oldfieldname': 'reading_10',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'reading_10',
+ 'fieldtype': u'Data',
+ 'label': u'Reading 10',
+ 'oldfieldname': u'reading_10',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'default': 'Accepted',
- 'doctype': 'DocField',
- 'fieldname': 'status',
- 'fieldtype': 'Select',
- 'idx': 13,
- 'label': 'Status',
- 'oldfieldname': 'status',
- 'oldfieldtype': 'Select',
- 'options': 'Accepted\nRejected'
+ 'default': u'Accepted',
+ 'doctype': u'DocField',
+ 'fieldname': u'status',
+ 'fieldtype': u'Select',
+ 'label': u'Status',
+ 'oldfieldname': u'status',
+ 'oldfieldtype': u'Select',
+ 'options': u'Accepted\nRejected'
}
]
\ No newline at end of file
diff --git a/erpnext/buying/doctype/raw_materials_supplied/raw_materials_supplied.txt b/erpnext/buying/doctype/raw_materials_supplied/raw_materials_supplied.txt
index 23dd235..2228ff8 100644
--- a/erpnext/buying/doctype/raw_materials_supplied/raw_materials_supplied.txt
+++ b/erpnext/buying/doctype/raw_materials_supplied/raw_materials_supplied.txt
@@ -3,146 +3,138 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:18',
+ 'creation': '2012-03-27 14:35:52',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:52',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'autoname': 'RMS/.######',
- 'colour': 'White:FFF',
+ 'autoname': u'RMS/.######',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Buying',
+ 'module': u'Buying',
'name': '__common__',
- 'section_style': 'Tray',
+ 'section_style': u'Tray',
'show_in_menu': 0,
'version': 8
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Raw Materials Supplied',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Raw Materials Supplied',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# DocType, Raw Materials Supplied
{
'doctype': 'DocType',
- 'name': 'Raw Materials Supplied'
+ 'name': u'Raw Materials Supplied'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'po_item',
- 'fieldtype': 'Select',
- 'idx': 1,
- 'label': 'PO Item',
- 'oldfieldname': 'po_item',
- 'oldfieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'po_item',
+ 'fieldtype': u'Select',
+ 'label': u'PO Item',
+ 'oldfieldname': u'po_item',
+ 'oldfieldtype': u'Select',
'permlevel': 0,
'reqd': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'raw_material',
- 'fieldtype': 'Link',
- 'idx': 2,
- 'label': 'Raw Material',
- 'oldfieldname': 'raw_material',
- 'oldfieldtype': 'Link',
- 'options': 'Item',
+ 'doctype': u'DocField',
+ 'fieldname': u'raw_material',
+ 'fieldtype': u'Link',
+ 'label': u'Raw Material',
+ 'oldfieldname': u'raw_material',
+ 'oldfieldtype': u'Link',
+ 'options': u'Item',
'permlevel': 0,
'reqd': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Small Text',
- 'idx': 3,
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Small Text',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Small Text',
'permlevel': 0,
- 'width': '300px'
+ 'width': u'300px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'source_warehouse',
- 'fieldtype': 'Select',
- 'idx': 5,
- 'label': 'Source Warehouse',
- 'oldfieldname': 'source_warehouse',
- 'oldfieldtype': 'Select',
- 'options': 'link:Warehouse',
+ 'doctype': u'DocField',
+ 'fieldname': u'source_warehouse',
+ 'fieldtype': u'Select',
+ 'label': u'Source Warehouse',
+ 'oldfieldname': u'source_warehouse',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:Warehouse',
'permlevel': 0,
'reqd': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'ma_valuation_rate',
- 'fieldtype': 'Currency',
- 'idx': 7,
- 'label': 'Valuation Rate (MA)',
+ 'doctype': u'DocField',
+ 'fieldname': u'ma_valuation_rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Valuation Rate (MA)',
'no_copy': 1,
- 'oldfieldname': 'ma_valuation_rate',
- 'oldfieldtype': 'Currency',
+ 'oldfieldname': u'ma_valuation_rate',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'fifo_valuation_rate',
- 'fieldtype': 'Currency',
- 'idx': 8,
- 'label': 'Valuation Rate (FIFO)',
- 'oldfieldname': 'fifo_valuation_rate',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'fifo_valuation_rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Valuation Rate (FIFO)',
+ 'oldfieldname': u'fifo_valuation_rate',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'qty',
- 'fieldtype': 'Currency',
- 'idx': 9,
- 'label': 'Qty',
- 'oldfieldname': 'qty',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Qty',
+ 'oldfieldname': u'qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'reqd': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'stock_uom',
- 'fieldtype': 'Data',
- 'idx': 12,
- 'label': 'Stock UOM',
- 'oldfieldname': 'stock_uom',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'stock_uom',
+ 'fieldtype': u'Data',
+ 'label': u'Stock UOM',
+ 'oldfieldname': u'stock_uom',
+ 'oldfieldtype': u'Data',
'permlevel': 1
}
]
\ No newline at end of file
diff --git a/erpnext/buying/doctype/supplier/supplier.js b/erpnext/buying/doctype/supplier/supplier.js
index 41889af..ebf3593 100644
--- a/erpnext/buying/doctype/supplier/supplier.js
+++ b/erpnext/buying/doctype/supplier/supplier.js
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-$import(Contact Control)
+wn.require('erpnext/setup/doctype/contact_control/contact_control.js');
cur_frm.cscript.onload = function(doc,dt,dn){
@@ -54,19 +54,10 @@
cur_frm.cscript.make_address = function() {
if(!cur_frm.address_list) {
- cur_frm.address_list = new wn.widgets.Listing({
+ cur_frm.address_list = new wn.ui.Listing({
parent: cur_frm.fields_dict['Address HTML'].wrapper,
page_length: 2,
new_doctype: "Address",
- new_doc_onload: function(dn) {
- ndoc = locals["Address"][dn];
- ndoc.supplier = cur_frm.doc.name;
- ndoc.supplier_name = cur_frm.doc.supplier_name;
- ndoc.address_type = 'Office';
- },
- new_doc_onsave: function(dn) {
- cur_frm.address_list.run()
- },
get_query: function() {
return "select name, address_type, address_line1, address_line2, city, state, country, pincode, fax, email_id, phone, is_primary_address, is_shipping_address from tabAddress where supplier='"+cur_frm.docname+"' and docstatus != 2 order by is_primary_address desc"
},
@@ -96,18 +87,10 @@
cur_frm.cscript.make_contact = function() {
if(!cur_frm.contact_list) {
- cur_frm.contact_list = new wn.widgets.Listing({
+ cur_frm.contact_list = new wn.ui.Listing({
parent: cur_frm.fields_dict['Contact HTML'].wrapper,
page_length: 2,
new_doctype: "Contact",
- new_doc_onload: function(dn) {
- ndoc = locals["Contact"][dn];
- ndoc.supplier = cur_frm.doc.name;
- ndoc.supplier_name = cur_frm.doc.supplier_name;
- },
- new_doc_onsave: function(dn) {
- cur_frm.contact_list.run()
- },
get_query: function() {
return "select name, first_name, last_name, email_id, phone, mobile_no, department, designation, is_primary_contact from tabContact where supplier='"+cur_frm.docname+"' and docstatus != 2 order by is_primary_contact desc"
},
@@ -128,6 +111,7 @@
// make purchase order list
cur_frm.cscript.make_po_list = function(parent, doc){
+ wn.require('lib/js/legacy/widgets/listing.js');
var lst = new Listing();
lst.colwidths = ['5%','25%','20%','25%','25%'];
lst.colnames = ['Sr.','Id','Status','PO Date','Grand Total'];
@@ -142,6 +126,7 @@
// make purchase receipt list
cur_frm.cscript.make_pr_list = function(parent,doc){
+ wn.require('lib/js/legacy/widgets/listing.js');
var lst = new Listing();
lst.colwidths = ['5%','20%','20%','20%','15%','20%'];
lst.colnames = ['Sr.','Id','Status','Receipt Date','% Billed','Grand Total'];
@@ -156,6 +141,7 @@
// make purchase invoice list
cur_frm.cscript.make_pi_list = function(parent,doc){
+ wn.require('lib/js/legacy/widgets/listing.js');
var lst = new Listing();
lst.colwidths = ['5%','20%','20%','20%','15%','20%'];
lst.colnames = ['Sr.','Id','Posting Date','Credit To','Bill Date','Grand Total'];
diff --git a/erpnext/buying/doctype/supplier/supplier.txt b/erpnext/buying/doctype/supplier/supplier.txt
index 0834898..10d5591 100644
--- a/erpnext/buying/doctype/supplier/supplier.txt
+++ b/erpnext/buying/doctype/supplier/supplier.txt
@@ -3,88 +3,61 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:26',
+ 'creation': '2012-03-27 14:35:52',
'docstatus': 0,
- 'modified': '2011-07-19 16:18:58',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:52',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1306471021',
+ '_last_update': u'1306471021',
'allow_trash': 1,
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'Buying',
+ 'document_type': u'Master',
+ 'module': u'Buying',
'name': '__common__',
- 'search_fields': 'supplier_name,supplier_type',
- 'section_style': 'Tabbed',
- 'server_code_error': ' ',
+ 'search_fields': u'supplier_name,supplier_type',
+ 'section_style': u'Tabbed',
+ 'server_code_error': u' ',
'show_in_menu': 0,
- 'subject': ' ',
- 'tag_fields': 'supplier_type',
+ 'subject': u' ',
+ 'tag_fields': u'supplier_type',
'version': 87
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Supplier',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Supplier',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Supplier',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Supplier',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Supplier
{
'doctype': 'DocType',
- 'name': 'Supplier'
+ 'name': u'Supplier'
},
# DocPerm
{
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Purchase Manager',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'permlevel': 0,
- 'role': 'Purchase Manager',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'doctype': 'DocPerm',
- 'idx': 3,
- 'permlevel': 1,
- 'role': 'Purchase Master Manager'
+ 'role': u'Purchase Master Manager'
},
# DocPerm
@@ -92,162 +65,181 @@
'amend': 0,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 4,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Purchase Master Manager',
+ 'role': u'Purchase Master Manager',
'submit': 0,
'write': 1
},
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Purchase Manager',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Purchase Manager',
+ 'submit': 0,
+ 'write': 0
+ },
+
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Note: You Can Manage Multiple Address or Contacts via Addresses & Contacts',
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 1,
- 'label': 'Basic Info',
- 'oldfieldtype': 'Section Break',
+ 'colour': u'White:FFF',
+ 'description': u'Note: You Can Manage Multiple Address or Contacts via Addresses & Contacts',
+ 'doctype': u'DocField',
+ 'fieldname': u'basic_info',
+ 'fieldtype': u'Section Break',
+ 'label': u'Basic Info',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'supplier_name',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Supplier Name',
+ 'doctype': u'DocField',
+ 'fieldname': u'supplier_name',
+ 'fieldtype': u'Data',
+ 'label': u'Supplier Name',
'no_copy': 1,
- 'oldfieldname': 'supplier_name',
- 'oldfieldtype': 'Data',
+ 'oldfieldname': u'supplier_name',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'supplier_type',
- 'fieldtype': 'Link',
- 'idx': 3,
- 'label': 'Supplier Type',
- 'oldfieldname': 'supplier_type',
- 'oldfieldtype': 'Link',
- 'options': 'Supplier Type',
+ 'doctype': u'DocField',
+ 'fieldname': u'supplier_type',
+ 'fieldtype': u'Link',
+ 'label': u'Supplier Type',
+ 'oldfieldname': u'supplier_type',
+ 'oldfieldtype': u'Link',
+ 'options': u'Supplier Type',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 4,
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'naming_series',
- 'fieldtype': 'Select',
- 'idx': 5,
- 'label': 'Series',
+ 'doctype': u'DocField',
+ 'fieldname': u'naming_series',
+ 'fieldtype': u'Select',
+ 'label': u'Series',
'no_copy': 1,
- 'oldfieldname': 'naming_series',
- 'oldfieldtype': 'Select',
- 'options': '\nSUPP\nSUPP/10-11/',
+ 'oldfieldname': u'naming_series',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nSUPP\nSUPP/10-11/',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 6,
- 'label': 'Address & Contacts',
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'address_contacts',
+ 'fieldtype': u'Section Break',
+ 'label': u'Address & Contacts',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': 'eval:doc.__islocal',
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'idx': 7,
- 'label': 'Address Desc',
- 'options': '<em>Addresses will appear only when you save the supplier</em>',
+ 'colour': u'White:FFF',
+ 'depends_on': u'eval:doc.__islocal',
+ 'doctype': u'DocField',
+ 'fieldname': u'address_desc',
+ 'fieldtype': u'HTML',
+ 'label': u'Address Desc',
+ 'options': u'<em>Addresses will appear only when you save the supplier</em>',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'idx': 8,
- 'label': 'Address HTML',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'address_html',
+ 'fieldtype': u'HTML',
+ 'label': u'Address HTML',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 9,
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': 'eval:doc.__islocal',
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'idx': 10,
- 'label': 'Contact Desc',
- 'options': '<em>Contact Details will appear only when you save the supplier</em>',
+ 'colour': u'White:FFF',
+ 'depends_on': u'eval:doc.__islocal',
+ 'doctype': u'DocField',
+ 'fieldname': u'contact_desc',
+ 'fieldtype': u'HTML',
+ 'label': u'Contact Desc',
+ 'options': u'<em>Contact Details will appear only when you save the supplier</em>',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'idx': 11,
- 'label': 'Contact HTML',
+ 'doctype': u'DocField',
+ 'fieldname': u'contact_html',
+ 'fieldtype': u'HTML',
+ 'label': u'Contact HTML',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 12,
- 'label': 'More Info',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'more_info',
+ 'fieldtype': u'Section Break',
+ 'label': u'More Info',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Enter the company name under which Account Head will be created for this Supplier',
- 'doctype': 'DocField',
- 'fieldname': 'company',
- 'fieldtype': 'Link',
- 'idx': 13,
+ 'colour': u'White:FFF',
+ 'description': u'Enter the company name under which Account Head will be created for this Supplier',
+ 'doctype': u'DocField',
+ 'fieldname': u'company',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Company',
- 'oldfieldname': 'company',
- 'oldfieldtype': 'Link',
- 'options': 'Company',
+ 'label': u'Company',
+ 'oldfieldname': u'company',
+ 'oldfieldtype': u'Link',
+ 'options': u'Company',
'permlevel': 0,
'reqd': 1,
'search_index': 0
@@ -255,82 +247,78 @@
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Statutory info and other general information about your Supplier',
- 'doctype': 'DocField',
- 'fieldname': 'supplier_details',
- 'fieldtype': 'Text',
- 'idx': 14,
- 'label': 'Supplier Details',
- 'oldfieldname': 'supplier_details',
- 'oldfieldtype': 'Code',
+ 'colour': u'White:FFF',
+ 'description': u'Statutory info and other general information about your Supplier',
+ 'doctype': u'DocField',
+ 'fieldname': u'supplier_details',
+ 'fieldtype': u'Text',
+ 'label': u'Supplier Details',
+ 'oldfieldname': u'supplier_details',
+ 'oldfieldtype': u'Code',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 15,
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break2',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'credit_days',
- 'fieldtype': 'Int',
- 'idx': 16,
- 'label': 'Credit Days',
+ 'doctype': u'DocField',
+ 'fieldname': u'credit_days',
+ 'fieldtype': u'Int',
+ 'label': u'Credit Days',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'website',
- 'fieldtype': 'Data',
- 'idx': 17,
- 'label': 'Website',
- 'oldfieldname': 'website',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'website',
+ 'fieldtype': u'Data',
+ 'label': u'Website',
+ 'oldfieldname': u'website',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': 'eval:!doc.__islocal',
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 18,
- 'label': 'Transaction History',
- 'oldfieldtype': 'Section Break',
+ 'colour': u'White:FFF',
+ 'depends_on': u'eval:!doc.__islocal',
+ 'doctype': u'DocField',
+ 'fieldname': u'transaction_history',
+ 'fieldtype': u'Section Break',
+ 'label': u'Transaction History',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': 'eval:!doc.__islocal',
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'idx': 19,
- 'label': 'History HTML',
- 'oldfieldtype': 'HTML',
+ 'colour': u'White:FFF',
+ 'depends_on': u'eval:!doc.__islocal',
+ 'doctype': u'DocField',
+ 'fieldname': u'history_html',
+ 'fieldtype': u'HTML',
+ 'label': u'History HTML',
+ 'oldfieldtype': u'HTML',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'idx': 20,
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
}
-]
+]
\ No newline at end of file
diff --git a/erpnext/home/doctype/company_control/company_control.py b/erpnext/home/doctype/company_control/company_control.py
index 63f8b71..567f9f6 100644
--- a/erpnext/home/doctype/company_control/company_control.py
+++ b/erpnext/home/doctype/company_control/company_control.py
@@ -71,7 +71,10 @@
pr.save(1)
# Update Membership Type at Gateway
- if cint(webnotes.conn.get_value('Control Panel', None, 'sync_with_gateway')):
+ import webnotes.defs
+ from webnotes.utils import cint
+ if hasattr(webnotes.defs, 'sync_with_gateway') and \
+ cint(webnotes.defs.sync_with_gateway) or 0:
if 'System Manager' in role_list : membership_type = 'Administrator'
else : membership_type = 'Member'
diff --git a/erpnext/home/doctype/company_control/company_control.txt b/erpnext/home/doctype/company_control/company_control.txt
index a83f4dd..90952d1 100644
--- a/erpnext/home/doctype/company_control/company_control.txt
+++ b/erpnext/home/doctype/company_control/company_control.txt
@@ -3,28 +3,28 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:55',
+ 'creation': '2012-03-27 14:35:52',
'docstatus': 0,
- 'modified': '2011-01-13 12:14:36',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:52',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'issingle': 1,
- 'module': 'Home',
+ 'module': u'Home',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 13
},
# DocType, Company Control
{
'doctype': 'DocType',
- 'name': 'Company Control'
+ 'name': u'Company Control'
}
]
\ No newline at end of file
diff --git a/erpnext/home/doctype/feed/feed.txt b/erpnext/home/doctype/feed/feed.txt
index 62d6633..2c33fcf 100644
--- a/erpnext/home/doctype/feed/feed.txt
+++ b/erpnext/home/doctype/feed/feed.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2011-04-06 18:11:38',
+ 'creation': '2012-03-27 14:35:52',
'docstatus': 0,
- 'modified': '2012-02-08 11:35:40',
+ 'modified': '2012-03-27 14:35:52',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/home/doctype/home_control/home_control.txt b/erpnext/home/doctype/home_control/home_control.txt
index fff9743..1d9098e 100644
--- a/erpnext/home/doctype/home_control/home_control.txt
+++ b/erpnext/home/doctype/home_control/home_control.txt
@@ -3,22 +3,22 @@
# These values are common in all dictionaries
{
- 'creation': '2009-07-09 16:32:49',
+ 'creation': '2012-03-27 14:35:53',
'docstatus': 0,
- 'modified': '2010-12-24 17:08:55',
- 'modified_by': 'nabin@webnotestech.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:53',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'issingle': 1,
- 'module': 'Home',
+ 'module': u'Home',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 6
},
@@ -26,30 +26,31 @@
# These values are common for all DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Home Control',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Home Control',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
- 'role': 'Guest',
'write': 1
},
# DocType, Home Control
{
'doctype': 'DocType',
- 'name': 'Home Control'
+ 'name': u'Home Control'
},
# DocPerm
{
- 'doctype': 'DocPerm'
+ 'doctype': u'DocPerm',
+ 'role': u'System Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm'
+ 'doctype': u'DocPerm',
+ 'role': u'Guest'
}
]
\ No newline at end of file
diff --git a/erpnext/home/doctype/widget_control/widget_control.txt b/erpnext/home/doctype/widget_control/widget_control.txt
index 1b6e606..4de278e 100644
--- a/erpnext/home/doctype/widget_control/widget_control.txt
+++ b/erpnext/home/doctype/widget_control/widget_control.txt
@@ -3,23 +3,23 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:30',
+ 'creation': '2012-03-27 14:35:53',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:53',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'issingle': 1,
'istable': 0,
- 'module': 'Home',
+ 'module': u'Home',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 27
},
@@ -27,6 +27,6 @@
# DocType, Widget Control
{
'doctype': 'DocType',
- 'name': 'Widget Control'
+ 'name': u'Widget Control'
}
]
\ No newline at end of file
diff --git a/erpnext/home/page/activity/activity.js b/erpnext/home/page/activity/activity.js
index 62604b7..83f018d 100644
--- a/erpnext/home/page/activity/activity.js
+++ b/erpnext/home/page/activity/activity.js
@@ -1,5 +1,5 @@
wn.pages['activity'].onload = function(wrapper) {
- var list = new wn.widgets.Listing({
+ var list = new wn.ui.Listing({
method: 'home.page.activity.activity.get_feed',
parent: $('#activity-list'),
render_row: function(row, data) {
diff --git a/erpnext/home/page/dashboard/dashboard.js b/erpnext/home/page/dashboard/dashboard.js
index 1d01ee9..072af25 100644
--- a/erpnext/home/page/dashboard/dashboard.js
+++ b/erpnext/home/page/dashboard/dashboard.js
@@ -16,12 +16,12 @@
pscript.onload_dashboard = function() {
// load jqplot
- wn.require('lib/css/jqplot.css');
- wn.require('lib/js/legacy/jquery/jquery.jqplot.min.js');
- wn.require('lib/js/legacy/jquery/jqplot-plugins/jqplot.barRenderer.js');
- wn.require('lib/js/legacy/jquery/jqplot-plugins/jqplot.canvasAxisTickRenderer.min.js');
- wn.require('lib/js/legacy/jquery/jqplot-plugins/jqplot.canvasTextRenderer.min.js');
- wn.require('lib/js/legacy/jquery/jqplot-plugins/jqplot.categoryAxisRenderer.min.js');
+ wn.require('lib/css/lib/jqplot.css');
+ wn.require('lib/js/lib/jqplot/jquery.jqplot.min.js');
+ wn.require('lib/js/lib/jqplot/jqplot-plugins/jqplot.barRenderer.js');
+ wn.require('lib/js/lib/jqplot/jqplot-plugins/jqplot.canvasAxisTickRenderer.min.js');
+ wn.require('lib/js/lib/jqplot/jqplot-plugins/jqplot.canvasTextRenderer.min.js');
+ wn.require('lib/js/lib/jqplot/jqplot-plugins/jqplot.categoryAxisRenderer.min.js');
pscript.dashboard_settings = {
diff --git a/erpnext/home/page/desktop/desktop.css b/erpnext/home/page/desktop/desktop.css
index cc6126e..59e50eb 100644
--- a/erpnext/home/page/desktop/desktop.css
+++ b/erpnext/home/page/desktop/desktop.css
@@ -46,10 +46,10 @@
width: 56px;
height: 56px;
border: 4px solid white;
- box-shadow: 0 0 10px 1px black;
- -moz-box-shadow: 0 0 10px 1px black;
- -webkit-box-shadow: 0 0 10px 1px black;
- -o-box-shadow: 0 0 10px 1px black;
+ box-shadow: 0 0 4px 1px black;
+ -moz-box-shadow: 0 0 4px 1px black;
+ -webkit-box-shadow: 0 0 4px 1px black;
+ -o-box-shadow: 0 0 4px 1px black;
margin: auto;
}
@@ -62,17 +62,16 @@
.case-label {
color: white;
- /*font-size: 12px;*/
padding-top: 10px;
text-align: center;
- text-shadow: 1px 1px 5px #000, 3px 3px 5px #000;
+ text-shadow: 1px 1px 2px #000, 1px 1px 2px #000, 1px 1px 2px #000, 0px 0px 2px #000;
}
/* Hover and click effects */
.case-border:hover, .circle:hover, .hover-effect {
- box-shadow: 0 0 2px 0px black, 0 0 10px 1px white !important;
- -moz-box-shadow: 0 0 2px 0px black, 0 0 10px 1px white !important;
- -webkit-box-shadow: 0 0 2px 0px black, 0 0 10px 1px white !important;
+ box-shadow: 0 0 2px 0px black, 0 0 4px 1px white !important;
+ -moz-box-shadow: 0 0 2px 0px black, 0 0 4px 1px white !important;
+ -webkit-box-shadow: 0 0 2px 0px black, 0 0 4px 1px white !important;
-o-box-shadow: 0 0 2px 0px black, 0 0 10px 1px white !important;
}
@@ -105,10 +104,10 @@
margin-top: -74px;
margin-right: 10px;
border: 2px solid white;
- box-shadow: 0 0 10px 1px black;
- -moz-box-shadow: 0 0 10px 1px black;
- -webkit-box-shadow: 0 0 10px 1px black;
- -o-box-shadow: 0 0 10px 1px black;
+ box-shadow: 0 0 4px 1px black;
+ -moz-box-shadow: 0 0 4px 1px black;
+ -webkit-box-shadow: 0 0 4px 1px black;
+ -o-box-shadow: 0 0 4px 1px black;
}
.circle-text {
diff --git a/erpnext/home/page/desktop/desktop.js b/erpnext/home/page/desktop/desktop.js
index 7852ab2..93acd08 100644
--- a/erpnext/home/page/desktop/desktop.js
+++ b/erpnext/home/page/desktop/desktop.js
@@ -79,7 +79,7 @@
for(var i in wn.boot.modules_list) {
var m = wn.boot.modules_list[i];
- if(m!='Setup' && wn.boot.profile.allow_modules.indexOf(m)!=-1)
+ if(!in_list(['Setup', 'Dashboard'], m) && wn.boot.profile.allow_modules.indexOf(m)!=-1)
add_icon(m);
}
diff --git a/erpnext/home/page/event_updates/event_updates.js b/erpnext/home/page/event_updates/event_updates.js
index b2825f3..797d8e9 100644
--- a/erpnext/home/page/event_updates/event_updates.js
+++ b/erpnext/home/page/event_updates/event_updates.js
@@ -470,7 +470,7 @@
var me = this;
this.list_area = $a(this.wrapper,'div')
- this.list = new wn.widgets.Listing({
+ this.list = new wn.ui.Listing({
parent: this.list_area,
query: repl('select \
distinct t1.name, t1.feed_type, t1.doc_type, t1.doc_name, t1.subject, t1.modified_by, \
@@ -600,7 +600,7 @@
// get values
$c_page('home', 'event_updates', 'get_status_details', user,
function(r,rt) {
- //page_body.wntoolbar.set_new_comments(r.message.unread_messages);
+ //wn.container.wntoolbar.set_new_comments(r.message.unread_messages);
// render online users
pscript.online_users_obj.render(r.message.online_users);
diff --git a/erpnext/home/page/my_company/my_company.js b/erpnext/home/page/my_company/my_company.js
index 8217cc7..7b198df 100644
--- a/erpnext/home/page/my_company/my_company.js
+++ b/erpnext/home/page/my_company/my_company.js
@@ -179,7 +179,7 @@
var me = this;
this.lst_area = $a(this.list_wrapper, 'div');
- this.lst = new wn.widgets.Listing({
+ this.lst = new wn.ui.Listing({
parent: this.lst_area,
as_dict: 1,
get_query: function() {
@@ -692,7 +692,7 @@
this.my_messages_box = $a(this.lst_area, 'div', 'my-company-conversation-head', {marginBottom:'7px'}, 'Messages by everyone to me<br>To send a message, click on the user on the left')
}
- this.lst = new wn.widgets.Listing({
+ this.lst = new wn.ui.Listing({
parent: this.lst_area,
as_dict: 1,
no_result_message: (user==uid
diff --git a/erpnext/home/page/my_company/my_company.py b/erpnext/home/page/my_company/my_company.py
index d3a7bc7..f2a2522 100644
--- a/erpnext/home/page/my_company/my_company.py
+++ b/erpnext/home/page/my_company/my_company.py
@@ -54,7 +54,10 @@
args = json.loads(args)
webnotes.conn.sql("update tabProfile set enabled=0, docstatus=2 where name=%s", args['user'])
# erpnext-saas
- if cint(webnotes.conn.get_value('Control Panel', None, 'sync_with_gateway')):
+ import webnotes.defs
+ from webnotes.utils import cint
+ if hasattr(webnotes.defs, 'sync_with_gateway') and \
+ cint(webnotes.defs.sync_with_gateway) or 0:
from server_tools.gateway_utils import remove_user_gateway
remove_user_gateway(args['user'])
@@ -65,7 +68,10 @@
def add_user(args):
args = json.loads(args)
# erpnext-saas
- if cint(webnotes.conn.get_value('Control Panel', None, 'sync_with_gateway')):
+ import webnotes.defs
+ from webnotes.utils import cint
+ if hasattr(webnotes.defs, 'sync_with_gateway') and \
+ cint(webnotes.defs.sync_with_gateway) or 0:
from server_tools.gateway_utils import add_user_gateway
add_user_gateway(args)
@@ -183,7 +189,10 @@
webnotes.conn.set_value('Profile', args['user'], 'login_before', args.get('login_before'))
if 'new_password' in args:
- if cint(webnotes.conn.get_value('Control Panel',None,'sync_with_gateway')):
+ import webnotes.defs
+ from webnotes.utils import cint
+ if hasattr(webnotes.defs, 'sync_with_gateway') and \
+ cint(webnotes.defs.sync_with_gateway) or 0:
import server_tools.gateway_utils
res = server_tools.gateway_utils.change_password('', args['new_password'], args['user'], args['sys_admin_pwd'])
if 'Traceback' not in res['message']:
diff --git a/erpnext/home/page/profile_settings/profile_settings.py b/erpnext/home/page/profile_settings/profile_settings.py
index fb633fd..9b9f890 100644
--- a/erpnext/home/page/profile_settings/profile_settings.py
+++ b/erpnext/home/page/profile_settings/profile_settings.py
@@ -27,8 +27,11 @@
if not webnotes.conn.sql('select name from tabProfile where name=%s and password=password(%s)', (webnotes.session['user'], arg['old_password'])):
webnotes.msgprint('Old password is not correct', raise_exception=1)
-
- if cint(webnotes.conn.get_value('Control Panel',None,'sync_with_gateway')):
+
+ import webnotes.defs
+ from webnotes.utils import cint
+ if hasattr(webnotes.defs, 'sync_with_gateway') and \
+ cint(webnotes.defs.sync_with_gateway) or 0:
import server_tools.gateway_utils
webnotes.msgprint(server_tools.gateway_utils.change_password(arg['old_password'], arg['new_password'])['message'])
diff --git a/erpnext/hr/doctype/absent_days_detail/absent_days_detail.txt b/erpnext/hr/doctype/absent_days_detail/absent_days_detail.txt
index 2e6f58a..712b943 100644
--- a/erpnext/hr/doctype/absent_days_detail/absent_days_detail.txt
+++ b/erpnext/hr/doctype/absent_days_detail/absent_days_detail.txt
@@ -3,44 +3,43 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:51',
+ 'creation': '2012-03-27 14:35:53',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:53',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'HR',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 5
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Absent Days Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Absent Days Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Absent Days Detail',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Absent Days Detail',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
'write': 1
@@ -49,89 +48,82 @@
# DocType, Absent Days Detail
{
'doctype': 'DocType',
- 'name': 'Absent Days Detail'
+ 'name': u'Absent Days Detail'
},
# DocPerm
{
- 'doctype': 'DocPerm'
+ 'doctype': u'DocPerm'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'leave_type',
- 'fieldtype': 'Select',
- 'idx': 1,
- 'label': 'Leave Type',
- 'oldfieldname': 'leave_type',
- 'oldfieldtype': 'Select',
- 'options': 'link:Leave Type'
+ 'doctype': u'DocField',
+ 'fieldname': u'leave_type',
+ 'fieldtype': u'Select',
+ 'label': u'Leave Type',
+ 'oldfieldname': u'leave_type',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:Leave Type'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'no_of_leave_days',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'No of leave days',
- 'oldfieldname': 'no_of_leave_days',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'no_of_leave_days',
+ 'fieldtype': u'Data',
+ 'label': u'No of leave days',
+ 'oldfieldname': u'no_of_leave_days',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'from_date',
- 'fieldtype': 'Date',
- 'idx': 3,
- 'label': 'From Date',
- 'oldfieldname': 'from_date',
- 'oldfieldtype': 'Date'
+ 'doctype': u'DocField',
+ 'fieldname': u'from_date',
+ 'fieldtype': u'Date',
+ 'label': u'From Date',
+ 'oldfieldname': u'from_date',
+ 'oldfieldtype': u'Date'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'to_date',
- 'fieldtype': 'Date',
- 'idx': 4,
- 'label': 'To Date',
- 'oldfieldname': 'to_date',
- 'oldfieldtype': 'Date'
+ 'doctype': u'DocField',
+ 'fieldname': u'to_date',
+ 'fieldtype': u'Date',
+ 'label': u'To Date',
+ 'oldfieldname': u'to_date',
+ 'oldfieldtype': u'Date'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'previous_balance',
- 'fieldtype': 'Data',
- 'idx': 5,
- 'label': 'Previous Balance',
- 'oldfieldname': 'previous_balance',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'previous_balance',
+ 'fieldtype': u'Data',
+ 'label': u'Previous Balance',
+ 'oldfieldname': u'previous_balance',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'current_balance',
- 'fieldtype': 'Data',
- 'idx': 6,
- 'label': 'Current Balance',
- 'oldfieldname': 'current_balance',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'current_balance',
+ 'fieldtype': u'Data',
+ 'label': u'Current Balance',
+ 'oldfieldname': u'current_balance',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'max_allowed',
- 'fieldtype': 'Data',
- 'idx': 7,
- 'label': 'Max. Allowed',
- 'oldfieldname': 'max_allowed',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'max_allowed',
+ 'fieldtype': u'Data',
+ 'label': u'Max. Allowed',
+ 'oldfieldname': u'max_allowed',
+ 'oldfieldtype': u'Data'
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/appraisal/appraisal.txt b/erpnext/hr/doctype/appraisal/appraisal.txt
index b10c434..4f71ba9 100644
--- a/erpnext/hr/doctype/appraisal/appraisal.txt
+++ b/erpnext/hr/doctype/appraisal/appraisal.txt
@@ -3,52 +3,53 @@
# These values are common in all dictionaries
{
- 'creation': '2010-09-01 15:48:05',
+ 'creation': '2012-03-27 14:35:53',
'docstatus': 0,
- 'modified': '2011-09-22 10:59:43',
- 'modified_by': 'Administrator',
- 'owner': 'ashwini@webnotestech.com'
+ 'modified': '2012-03-27 14:45:46',
+ 'modified_by': u'Administrator',
+ 'owner': u'ashwini@webnotestech.com'
},
# These values are common for all DocType
{
- '_last_update': '1316075905',
- 'autoname': 'APRSL.#####',
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ '_last_update': u'1316075905',
+ 'autoname': u'APRSL.#####',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
- 'module': 'HR',
+ 'is_submittable': 1,
+ 'module': u'HR',
'name': '__common__',
- 'search_fields': 'status, employee, employee_name',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'search_fields': u'status, employee, employee_name',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 161
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Appraisal',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Appraisal',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Appraisal',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Appraisal',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Appraisal
{
'doctype': 'DocType',
- 'name': 'Appraisal'
+ 'name': u'Appraisal'
},
# DocPerm
@@ -56,47 +57,9 @@
'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
- 'submit': 1,
- 'write': 1
- },
-
- # DocPerm
- {
- 'doctype': 'DocPerm',
- 'permlevel': 1,
- 'role': 'System Manager'
- },
-
- # DocPerm
- {
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- 'doctype': 'DocPerm',
- 'permlevel': 0,
- 'role': 'System Manager',
- 'submit': 1,
- 'write': 1
- },
-
- # DocPerm
- {
- 'doctype': 'DocPerm',
- 'permlevel': 1,
- 'role': 'System Manager'
- },
-
- # DocPerm
- {
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- 'doctype': 'DocPerm',
- 'permlevel': 0,
- 'role': 'HR Manager',
+ 'role': u'System Manager',
'submit': 1,
'write': 1
},
@@ -106,49 +69,75 @@
'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'HR User',
+ 'role': u'System Manager',
'submit': 1,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'permlevel': 1,
- 'role': 'HR Manager'
+ 'amend': 1,
+ 'cancel': 1,
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'HR Manager',
+ 'submit': 1,
+ 'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'amend': 1,
+ 'cancel': 1,
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'HR User',
+ 'submit': 1,
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'All',
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'HR User'
+ 'role': u'All'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Employee Details',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'employee_details',
+ 'fieldtype': u'Section Break',
+ 'label': u'Employee Details',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'default': 'Draft',
- 'doctype': 'DocField',
- 'fieldname': 'status',
- 'fieldtype': 'Select',
+ 'colour': u'White:FFF',
+ 'default': u'Draft',
+ 'doctype': u'DocField',
+ 'fieldname': u'status',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Status',
+ 'label': u'Status',
'no_copy': 1,
- 'oldfieldname': 'status',
- 'oldfieldtype': 'Select',
- 'options': '\nDraft\nSubmitted\nCompleted\nCancelled',
+ 'oldfieldname': u'status',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nDraft\nSubmitted\nCompleted\nCancelled',
'permlevel': 1,
'reqd': 1,
'search_index': 1
@@ -156,234 +145,240 @@
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'employee',
- 'fieldtype': 'Link',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'employee',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Employee',
- 'oldfieldname': 'employee',
- 'oldfieldtype': 'Link',
- 'options': 'Employee',
+ 'label': u'Employee',
+ 'oldfieldname': u'employee',
+ 'oldfieldtype': u'Link',
+ 'options': u'Employee',
'permlevel': 0,
'reqd': 1,
'search_index': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'employee_name',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'employee_name',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Employee Name',
- 'oldfieldname': 'employee_name',
- 'oldfieldtype': 'Data',
+ 'label': u'Employee Name',
+ 'oldfieldname': u'employee_name',
+ 'oldfieldtype': u'Data',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'fiscal_year',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'fiscal_year',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Fiscal Year',
- 'oldfieldname': 'fiscal_year',
- 'oldfieldtype': 'Select',
- 'options': 'link:Fiscal Year',
+ 'label': u'Fiscal Year',
+ 'oldfieldname': u'fiscal_year',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:Fiscal Year',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'company',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'company',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Company',
- 'oldfieldname': 'company',
- 'oldfieldtype': 'Link',
- 'options': 'link:Company',
+ 'label': u'Company',
+ 'oldfieldname': u'company',
+ 'oldfieldtype': u'Link',
+ 'options': u'link:Company',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'start_date',
- 'fieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'start_date',
+ 'fieldtype': u'Date',
'in_filter': 1,
- 'label': 'Start Date',
- 'oldfieldname': 'start_date',
- 'oldfieldtype': 'Date',
+ 'label': u'Start Date',
+ 'oldfieldname': u'start_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'end_date',
- 'fieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'end_date',
+ 'fieldtype': u'Date',
'in_filter': 1,
- 'label': 'End Date',
- 'oldfieldname': 'end_date',
- 'oldfieldtype': 'Date',
+ 'label': u'End Date',
+ 'oldfieldname': u'end_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'kra_approver',
- 'fieldtype': 'Select',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'kra_approver',
+ 'fieldtype': u'Select',
'in_filter': 0,
- 'label': 'Approver',
- 'oldfieldname': 'kra_approver',
- 'oldfieldtype': 'Select',
+ 'label': u'Approver',
+ 'oldfieldname': u'kra_approver',
+ 'oldfieldtype': u'Select',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amended_from',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'amended_from',
+ 'fieldtype': u'Data',
'hidden': 1,
- 'label': 'Amended From',
+ 'label': u'Amended From',
'no_copy': 1,
- 'oldfieldname': 'amended_from',
- 'oldfieldtype': 'Data',
+ 'oldfieldname': u'amended_from',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'print_hide': 1,
'report_hide': 1,
- 'width': '150px'
+ 'width': u'150px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amendment_date',
- 'fieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'amendment_date',
+ 'fieldtype': u'Date',
'hidden': 1,
- 'label': 'Amendment Date',
+ 'label': u'Amendment Date',
'no_copy': 1,
- 'oldfieldname': 'amendment_date',
- 'oldfieldtype': 'Date',
+ 'oldfieldname': u'amendment_date',
+ 'oldfieldtype': u'Date',
'permlevel': 1,
'print_hide': 1,
'report_hide': 1,
- 'width': '160px'
+ 'width': u'160px'
},
# DocField
{
'allow_on_submit': 1,
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Declare Completed',
- 'oldfieldtype': 'Button',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'declare_completed',
+ 'fieldtype': u'Button',
+ 'label': u'Declare Completed',
+ 'oldfieldtype': u'Button',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'oldfieldtype': 'Section Break',
- 'options': 'Simple',
+ 'doctype': u'DocField',
+ 'fieldname': u'section_break0',
+ 'fieldtype': u'Section Break',
+ 'oldfieldtype': u'Section Break',
+ 'options': u'Simple',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Select template from which you want to fetch KRA',
- 'doctype': 'DocField',
- 'fieldname': 'kra_template',
- 'fieldtype': 'Link',
- 'label': 'KRA Template',
- 'oldfieldname': 'kra_template',
- 'oldfieldtype': 'Link',
- 'options': 'KRA Template',
+ 'colour': u'White:FFF',
+ 'description': u'Select template from which you want to fetch KRA',
+ 'doctype': u'DocField',
+ 'fieldname': u'kra_template',
+ 'fieldtype': u'Link',
+ 'label': u'KRA Template',
+ 'oldfieldname': u'kra_template',
+ 'oldfieldtype': u'Link',
+ 'options': u'KRA Template',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Fetch Template',
- 'oldfieldtype': 'Button',
- 'options': 'fetch_kra',
+ 'doctype': u'DocField',
+ 'fieldname': u'fetch_template',
+ 'fieldtype': u'Button',
+ 'label': u'Fetch Template',
+ 'oldfieldtype': u'Button',
+ 'options': u'fetch_kra',
'permlevel': 0
},
# DocField
{
'allow_on_submit': 1,
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'update',
+ 'fieldtype': u'Button',
'hidden': 1,
- 'label': 'Update',
- 'oldfieldtype': 'Button',
+ 'label': u'Update',
+ 'oldfieldtype': u'Button',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
'allow_on_submit': 1,
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'appraisal_details',
- 'fieldtype': 'Table',
- 'label': 'Appraisal Details',
- 'oldfieldname': 'appraisal_details',
- 'oldfieldtype': 'Table',
- 'options': 'Appraisal Detail',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'appraisal_details',
+ 'fieldtype': u'Table',
+ 'label': u'Appraisal Details',
+ 'oldfieldname': u'appraisal_details',
+ 'oldfieldtype': u'Table',
+ 'options': u'Appraisal Detail',
'permlevel': 0
},
# DocField
{
'allow_on_submit': 1,
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Calculate Total Score',
- 'oldfieldtype': 'Button',
- 'options': 'calculate_total',
+ 'doctype': u'DocField',
+ 'fieldname': u'calculate_total_score',
+ 'fieldtype': u'Button',
+ 'label': u'Calculate Total Score',
+ 'oldfieldtype': u'Button',
+ 'options': u'calculate_total',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'total_score',
- 'fieldtype': 'Currency',
- 'label': 'Total Score (Out of 5)',
+ 'doctype': u'DocField',
+ 'fieldname': u'total_score',
+ 'fieldtype': u'Currency',
+ 'label': u'Total Score (Out of 5)',
'no_copy': 1,
- 'oldfieldname': 'total_score',
- 'oldfieldtype': 'Currency',
+ 'oldfieldname': u'total_score',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
}
-]
+]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/appraisal_detail/appraisal_detail.txt b/erpnext/hr/doctype/appraisal_detail/appraisal_detail.txt
index 06edc81..f715f07 100644
--- a/erpnext/hr/doctype/appraisal_detail/appraisal_detail.txt
+++ b/erpnext/hr/doctype/appraisal_detail/appraisal_detail.txt
@@ -3,64 +3,64 @@
# These values are common in all dictionaries
{
- 'creation': '2010-09-01 15:48:05',
+ 'creation': '2012-03-27 14:35:53',
'docstatus': 0,
- 'modified': '2011-09-22 10:45:37',
- 'modified_by': 'Administrator',
- 'owner': 'ashwini@webnotestech.com'
+ 'modified': '2012-03-27 14:35:53',
+ 'modified_by': u'Administrator',
+ 'owner': u'ashwini@webnotestech.com'
},
# These values are common for all DocType
{
- 'autoname': 'APRSLD.#####',
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'autoname': u'APRSLD.#####',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
'istable': 1,
- 'module': 'HR',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 15
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Appraisal Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Appraisal Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# DocType, Appraisal Detail
{
'doctype': 'DocType',
- 'name': 'Appraisal Detail'
+ 'name': u'Appraisal Detail'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Key Responsibility Area',
- 'doctype': 'DocField',
- 'fieldname': 'kra',
- 'fieldtype': 'Small Text',
- 'label': 'KRA',
- 'oldfieldname': 'kra',
- 'oldfieldtype': 'Small Text',
+ 'colour': u'White:FFF',
+ 'description': u'Key Responsibility Area',
+ 'doctype': u'DocField',
+ 'fieldname': u'kra',
+ 'fieldtype': u'Small Text',
+ 'label': u'KRA',
+ 'oldfieldname': u'kra',
+ 'oldfieldtype': u'Small Text',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'per_weightage',
- 'fieldtype': 'Currency',
- 'label': 'Weightage (%)',
- 'oldfieldname': 'per_weightage',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'per_weightage',
+ 'fieldtype': u'Currency',
+ 'label': u'Weightage (%)',
+ 'oldfieldname': u'per_weightage',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'reqd': 1
},
@@ -68,42 +68,42 @@
# DocField
{
'allow_on_submit': 1,
- 'doctype': 'DocField',
- 'fieldname': 'target_achieved',
- 'fieldtype': 'Small Text',
- 'label': 'Target Achieved',
+ 'doctype': u'DocField',
+ 'fieldname': u'target_achieved',
+ 'fieldtype': u'Small Text',
+ 'label': u'Target Achieved',
'no_copy': 1,
- 'oldfieldname': 'target_achieved',
- 'oldfieldtype': 'Small Text',
+ 'oldfieldname': u'target_achieved',
+ 'oldfieldtype': u'Small Text',
'permlevel': 0
},
# DocField
{
'allow_on_submit': 1,
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'score',
- 'fieldtype': 'Currency',
- 'label': 'Score (0-5)',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'score',
+ 'fieldtype': u'Currency',
+ 'label': u'Score (0-5)',
'no_copy': 1,
- 'oldfieldname': 'score',
- 'oldfieldtype': 'Select',
- 'options': '\n0\n1\n2\n3\n4\n5',
+ 'oldfieldname': u'score',
+ 'oldfieldtype': u'Select',
+ 'options': u'\n0\n1\n2\n3\n4\n5',
'permlevel': 0,
- 'trigger': 'Client',
- 'width': '60px'
+ 'trigger': u'Client',
+ 'width': u'60px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'score_earned',
- 'fieldtype': 'Currency',
- 'label': 'Score Earned',
+ 'doctype': u'DocField',
+ 'fieldname': u'score_earned',
+ 'fieldtype': u'Currency',
+ 'label': u'Score Earned',
'no_copy': 1,
- 'oldfieldname': 'score_earned',
- 'oldfieldtype': 'Currency',
+ 'oldfieldname': u'score_earned',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
}
-]
+]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/attendance/attendance.txt b/erpnext/hr/doctype/attendance/attendance.txt
index 9c795bb..ea57b75 100644
--- a/erpnext/hr/doctype/attendance/attendance.txt
+++ b/erpnext/hr/doctype/attendance/attendance.txt
@@ -3,48 +3,49 @@
# These values are common in all dictionaries
{
- 'creation': '2010-09-23 10:26:03',
+ 'creation': '2012-03-27 14:35:53',
'docstatus': 0,
- 'modified': '2011-12-19 14:11:15',
- 'modified_by': 'Administrator',
- 'owner': 'ashwini@webnotestech.com'
+ 'modified': '2012-03-27 14:45:46',
+ 'modified_by': u'Administrator',
+ 'owner': u'ashwini@webnotestech.com'
},
# These values are common for all DocType
{
- '_last_update': '1317365120',
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ '_last_update': u'1317365120',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'HR',
+ 'document_type': u'Master',
+ 'is_submittable': 1,
+ 'module': u'HR',
'name': '__common__',
- 'search_fields': 'employee, employee_name, att_date, status',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'search_fields': u'employee, employee_name, att_date, status',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 75
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Attendance',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
- 'permlevel': 0
+ 'parent': u'Attendance',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
+ 'amend': 0,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Attendance',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Attendance',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
'submit': 1,
@@ -54,151 +55,187 @@
# DocType, Attendance
{
'doctype': 'DocType',
- 'name': 'Attendance'
+ 'name': u'Attendance'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'role': 'HR User'
+ 'doctype': u'DocPerm',
+ 'role': u'System Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'role': 'HR Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'HR User'
},
# DocPerm
{
- 'amend': 0,
- 'doctype': 'DocPerm',
- 'role': 'System Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'HR Manager'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Attendance Details',
- 'oldfieldtype': 'Section Break',
- 'options': 'Simple'
+ 'doctype': u'DocField',
+ 'fieldname': u'attendance_details',
+ 'fieldtype': u'Section Break',
+ 'label': u'Attendance Details',
+ 'oldfieldtype': u'Section Break',
+ 'options': u'Simple',
+ 'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'naming_series',
- 'fieldtype': 'Select',
- 'label': 'Naming Series',
+ 'doctype': u'DocField',
+ 'fieldname': u'naming_series',
+ 'fieldtype': u'Select',
+ 'label': u'Naming Series',
'no_copy': 1,
- 'oldfieldname': 'naming_series',
- 'oldfieldtype': 'Select',
- 'options': 'ATT',
+ 'oldfieldname': u'naming_series',
+ 'oldfieldtype': u'Select',
+ 'options': u'ATT',
+ 'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'employee',
- 'fieldtype': 'Link',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'employee',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Employee',
- 'oldfieldname': 'employee',
- 'oldfieldtype': 'Link',
- 'options': 'Employee',
+ 'label': u'Employee',
+ 'oldfieldname': u'employee',
+ 'oldfieldtype': u'Link',
+ 'options': u'Employee',
+ 'permlevel': 0,
'reqd': 1,
'search_index': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'employee_name',
- 'fieldtype': 'Data',
- 'label': 'Employee Name',
- 'oldfieldname': 'employee_name',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'employee_name',
+ 'fieldtype': u'Data',
+ 'label': u'Employee Name',
+ 'oldfieldname': u'employee_name',
+ 'oldfieldtype': u'Data',
+ 'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'status',
- 'fieldtype': 'Select',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'status',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Status',
+ 'label': u'Status',
'no_copy': 1,
- 'oldfieldname': 'status',
- 'oldfieldtype': 'Select',
- 'options': '\nPresent\nAbsent\nHalf Day',
+ 'oldfieldname': u'status',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nPresent\nAbsent\nHalf Day',
+ 'permlevel': 0,
'reqd': 1,
'search_index': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'leave_type',
- 'fieldtype': 'Link',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'leave_type',
+ 'fieldtype': u'Link',
'hidden': 1,
- 'label': 'Leave Type',
- 'oldfieldname': 'leave_type',
- 'oldfieldtype': 'Link',
- 'options': 'Leave Type',
+ 'label': u'Leave Type',
+ 'oldfieldname': u'leave_type',
+ 'oldfieldtype': u'Link',
+ 'options': u'Leave Type',
+ 'permlevel': 0,
'print_hide': 1,
'report_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'oldfieldtype': 'Column Break',
- 'width': '50%'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
+ 'permlevel': 0,
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'att_date',
- 'fieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'att_date',
+ 'fieldtype': u'Date',
'in_filter': 1,
- 'label': 'Attendance Date',
- 'oldfieldname': 'att_date',
- 'oldfieldtype': 'Date',
+ 'label': u'Attendance Date',
+ 'oldfieldname': u'att_date',
+ 'oldfieldtype': u'Date',
+ 'permlevel': 0,
'reqd': 1,
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'fiscal_year',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'fiscal_year',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Fiscal Year',
- 'oldfieldname': 'fiscal_year',
- 'oldfieldtype': 'Select',
- 'options': 'link:Fiscal Year',
+ 'label': u'Fiscal Year',
+ 'oldfieldname': u'fiscal_year',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:Fiscal Year',
+ 'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'company',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'company',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Company',
- 'oldfieldname': 'company',
- 'oldfieldtype': 'Link',
- 'options': 'link:Company',
+ 'label': u'Company',
+ 'oldfieldname': u'company',
+ 'oldfieldtype': u'Link',
+ 'options': u'link:Company',
+ 'permlevel': 0,
'reqd': 1
+ },
+
+ # DocField
+ {
+ 'depends_on': u'eval:doc.amended_from',
+ 'description': u'The date at which current entry is corrected in the system.',
+ 'doctype': u'DocField',
+ 'fieldname': u'amendment_date',
+ 'fieldtype': u'Date',
+ 'label': u'Amendment Date',
+ 'no_copy': 1,
+ 'permlevel': 0,
+ 'print_hide': 1
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
+ 'fieldname': u'amended_from',
+ 'fieldtype': u'Link',
+ 'label': u'Amended From',
+ 'no_copy': 1,
+ 'options': u'Receivable Voucher',
+ 'permlevel': 1,
+ 'print_hide': 1
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/attendance_control_panel/attendance_control_panel.txt b/erpnext/hr/doctype/attendance_control_panel/attendance_control_panel.txt
index af30e04..78904db 100644
--- a/erpnext/hr/doctype/attendance_control_panel/attendance_control_panel.txt
+++ b/erpnext/hr/doctype/attendance_control_panel/attendance_control_panel.txt
@@ -3,227 +3,217 @@
# These values are common in all dictionaries
{
- 'creation': '2010-10-19 11:19:24',
+ 'creation': '2012-03-27 14:35:53',
'docstatus': 0,
- 'modified': '2011-01-04 13:33:33',
- 'modified_by': 'rahul@webnotestech.com',
- 'owner': 'harshada@webnotestech.com'
+ 'modified': '2012-03-27 14:35:53',
+ 'modified_by': u'Administrator',
+ 'owner': u'harshada@webnotestech.com'
},
# These values are common for all DocType
{
- '_last_update': '1294312182',
+ '_last_update': u'1294312182',
'allow_attach': 1,
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'issingle': 1,
'max_attachments': 1,
- 'module': 'HR',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 122
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Attendance Control Panel',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Attendance Control Panel',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Attendance Control Panel',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Attendance Control Panel',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Attendance Control Panel
{
'doctype': 'DocType',
- 'name': 'Attendance Control Panel'
+ 'name': u'Attendance Control Panel'
},
# DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 1
},
# DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 2,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'HR User',
+ 'role': u'HR User',
'write': 1
},
# DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 3,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'HR Manager',
+ 'role': u'HR Manager',
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 4,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'HR User'
+ 'role': u'HR User'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 5,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'HR Manager'
+ 'role': u'HR Manager'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': "Get the template of the Attendance for which you want to import in CSV (Comma seperated values) format.\nFill data in the template. Save the template in CSV format.\nAll attendance dates inbetween 'Attendance From Date' and 'Attendance To Date' will come in the template with employees list.",
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 1,
- 'label': 'Download Template',
+ 'colour': u'White:FFF',
+ 'description': u"Get the template of the Attendance for which you want to import in CSV (Comma seperated values) format.\nFill data in the template. Save the template in CSV format.\nAll attendance dates inbetween 'Attendance From Date' and 'Attendance To Date' will come in the template with employees list.",
+ 'doctype': u'DocField',
+ 'fieldname': u'download_template',
+ 'fieldtype': u'Section Break',
+ 'label': u'Download Template',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Selected Attendance date will comes in the attendance template.',
- 'doctype': 'DocField',
- 'fieldname': 'att_fr_date',
- 'fieldtype': 'Date',
- 'idx': 2,
- 'label': 'Attendance From Date',
- 'oldfieldname': 'attenadnce_date',
- 'oldfieldtype': 'Date',
+ 'colour': u'White:FFF',
+ 'description': u'Selected Attendance date will comes in the attendance template.',
+ 'doctype': u'DocField',
+ 'fieldname': u'att_fr_date',
+ 'fieldtype': u'Date',
+ 'label': u'Attendance From Date',
+ 'oldfieldname': u'attenadnce_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'idx': 3,
- 'label': 'Get Template',
- 'oldfieldtype': 'Button',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'get_template',
+ 'fieldtype': u'Button',
+ 'label': u'Get Template',
+ 'oldfieldtype': u'Button',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 4,
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'All attendance dates inbetween selected Attendance From Date and Attendance To Date will come in the template with employees list.',
- 'doctype': 'DocField',
- 'fieldname': 'att_to_date',
- 'fieldtype': 'Date',
- 'idx': 5,
- 'label': 'Attendance To Date',
+ 'colour': u'White:FFF',
+ 'description': u'All attendance dates inbetween selected Attendance From Date and Attendance To Date will come in the template with employees list.',
+ 'doctype': u'DocField',
+ 'fieldname': u'att_to_date',
+ 'fieldtype': u'Date',
+ 'label': u'Attendance To Date',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'To import attendance data, click on "Add" button, select the saved CSV file and click on "Upload".\nSelect the date format as attendance date format in CSV file.\nClick on "Import".',
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 6,
- 'label': 'Upload Attendance Data',
+ 'colour': u'White:FFF',
+ 'description': u'To import attendance data, click on "Add" button, select the saved CSV file and click on "Upload".\nSelect the date format as attendance date format in CSV file.\nClick on "Import".',
+ 'doctype': u'DocField',
+ 'fieldname': u'upload_attendance_data',
+ 'fieldtype': u'Section Break',
+ 'label': u'Upload Attendance Data',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'import_date_format',
- 'fieldtype': 'Select',
- 'idx': 7,
- 'label': 'Import Date Format ',
- 'options': 'yyyy-mm-dd\nmm/dd/yyyy\nmm/dd/yy\ndd-mm-yyyy\ndd/mm/yyyy',
+ 'doctype': u'DocField',
+ 'fieldname': u'import_date_format',
+ 'fieldtype': u'Select',
+ 'label': u'Import Date Format ',
+ 'options': u'yyyy-mm-dd\nmm/dd/yyyy\nmm/dd/yy\ndd-mm-yyyy\ndd/mm/yyyy',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'overwrite',
- 'fieldtype': 'Check',
- 'idx': 8,
- 'label': 'Overwrite',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'overwrite',
+ 'fieldtype': u'Check',
+ 'label': u'Overwrite',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'idx': 9,
- 'label': 'Import',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'import',
+ 'fieldtype': u'Button',
+ 'label': u'Import',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'file_list',
- 'fieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'file_list',
+ 'fieldtype': u'Text',
'hidden': 1,
- 'idx': 10,
- 'label': 'File List',
+ 'label': u'File List',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 11,
- 'label': 'Import Log',
+ 'doctype': u'DocField',
+ 'fieldname': u'import_log',
+ 'fieldtype': u'Section Break',
+ 'label': u'Import Log',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'idx': 12,
- 'label': 'Import Log1',
+ 'doctype': u'DocField',
+ 'fieldname': u'import_log1',
+ 'fieldtype': u'HTML',
+ 'label': u'Import Log1',
'permlevel': 0
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/branch/branch.txt b/erpnext/hr/doctype/branch/branch.txt
index f402474..2bf7c21 100644
--- a/erpnext/hr/doctype/branch/branch.txt
+++ b/erpnext/hr/doctype/branch/branch.txt
@@ -3,101 +3,94 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:53',
+ 'creation': '2012-03-27 14:35:54',
'docstatus': 0,
- 'modified': '2011-05-30 15:24:02',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:54',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
'allow_trash': 1,
- 'autoname': 'field:branch',
- 'colour': 'White:FFF',
+ 'autoname': u'field:branch',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'HR',
+ 'document_type': u'Master',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 11
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Branch',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Branch',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'amend': 0,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Branch',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Branch',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
- 'submit': 0,
'write': 1
},
# DocType, Branch
{
'doctype': 'DocType',
- 'name': 'Branch'
+ 'name': u'Branch'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'role': 'System Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'System Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'role': 'HR User'
+ 'doctype': u'DocPerm',
+ 'role': u'HR User'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 3,
- 'role': 'HR Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'HR Manager'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'branch',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Branch',
- 'oldfieldname': 'branch',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'branch',
+ 'fieldtype': u'Data',
+ 'label': u'Branch',
+ 'oldfieldname': u'branch',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
}
diff --git a/erpnext/hr/doctype/chapter_vi_a_detail/chapter_vi_a_detail.txt b/erpnext/hr/doctype/chapter_vi_a_detail/chapter_vi_a_detail.txt
index 60ce4b3..31c0ee0 100644
--- a/erpnext/hr/doctype/chapter_vi_a_detail/chapter_vi_a_detail.txt
+++ b/erpnext/hr/doctype/chapter_vi_a_detail/chapter_vi_a_detail.txt
@@ -3,143 +3,135 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:54',
+ 'creation': '2012-03-27 14:35:54',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'umair@iwebnotes.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:54',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'HR',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 9
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Chapter VI A Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Chapter VI A Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Chapter VI A Detail',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Chapter VI A Detail',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1,
- 'role': 'System Manager'
+ 'role': u'System Manager'
},
# DocType, Chapter VI A Detail
{
'doctype': 'DocType',
- 'name': 'Chapter VI A Detail'
+ 'name': u'Chapter VI A Detail'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'permlevel': 0,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
+ 'doctype': u'DocPerm',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'particulars3',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'Particulars',
- 'oldfieldname': 'particulars3',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'particulars3',
+ 'fieldtype': u'Small Text',
+ 'label': u'Particulars',
+ 'oldfieldname': u'particulars3',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1,
'reqd': 1,
- 'width': '300px'
+ 'width': u'300px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'under_section3',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Under Section',
- 'oldfieldname': 'under_section3',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'under_section3',
+ 'fieldtype': u'Data',
+ 'label': u'Under Section',
+ 'oldfieldname': u'under_section3',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'max_limit3',
- 'fieldtype': 'Currency',
- 'idx': 3,
- 'label': 'Max. Limit',
- 'oldfieldname': 'max_limit3',
- 'oldfieldtype': 'Currency',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'max_limit3',
+ 'fieldtype': u'Currency',
+ 'label': u'Max. Limit',
+ 'oldfieldname': u'max_limit3',
+ 'oldfieldtype': u'Currency',
'permlevel': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'actual_amount3',
- 'fieldtype': 'Currency',
- 'idx': 4,
- 'label': 'Actual Amount',
- 'oldfieldname': 'actual_amount3',
- 'oldfieldtype': 'Currency',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'actual_amount3',
+ 'fieldtype': u'Currency',
+ 'label': u'Actual Amount',
+ 'oldfieldname': u'actual_amount3',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'eligible_amount3',
- 'fieldtype': 'Currency',
- 'idx': 5,
- 'label': 'Eligible Amount',
- 'oldfieldname': 'eligible_amount3',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'eligible_amount3',
+ 'fieldtype': u'Currency',
+ 'label': u'Eligible Amount',
+ 'oldfieldname': u'eligible_amount3',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'modified_amount3',
- 'fieldtype': 'Currency',
- 'idx': 6,
- 'label': 'Modified Amount',
- 'oldfieldname': 'modified_amount3',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'modified_amount3',
+ 'fieldtype': u'Currency',
+ 'label': u'Modified Amount',
+ 'oldfieldname': u'modified_amount3',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/declaration_detail/declaration_detail.txt b/erpnext/hr/doctype/declaration_detail/declaration_detail.txt
index 3c06cfd..49f5fe3 100644
--- a/erpnext/hr/doctype/declaration_detail/declaration_detail.txt
+++ b/erpnext/hr/doctype/declaration_detail/declaration_detail.txt
@@ -3,142 +3,134 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:57',
+ 'creation': '2012-03-27 14:35:54',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'umair@iwebnotes.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:54',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'HR',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 7
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Declaration Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Declaration Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Declaration Detail',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Declaration Detail',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1,
- 'role': 'System Manager'
+ 'role': u'System Manager'
},
# DocType, Declaration Detail
{
'doctype': 'DocType',
- 'name': 'Declaration Detail'
+ 'name': u'Declaration Detail'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'permlevel': 0,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
+ 'doctype': u'DocPerm',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'particulars1',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'Particulars',
- 'oldfieldname': 'particulars1',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'particulars1',
+ 'fieldtype': u'Small Text',
+ 'label': u'Particulars',
+ 'oldfieldname': u'particulars1',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1,
'reqd': 1,
- 'width': '200px'
+ 'width': u'200px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'under_section1',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Under Section',
- 'oldfieldname': 'under_section1',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'under_section1',
+ 'fieldtype': u'Data',
+ 'label': u'Under Section',
+ 'oldfieldname': u'under_section1',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'max_limit1',
- 'fieldtype': 'Currency',
- 'idx': 3,
- 'label': 'Max. Limit',
- 'oldfieldname': 'max_limit1',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'max_limit1',
+ 'fieldtype': u'Currency',
+ 'label': u'Max. Limit',
+ 'oldfieldname': u'max_limit1',
+ 'oldfieldtype': u'Currency',
'permlevel': 1,
'reqd': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'actual_amount1',
- 'fieldtype': 'Currency',
- 'idx': 4,
- 'label': 'Actual Amount',
- 'oldfieldname': 'actual_amount1',
- 'oldfieldtype': 'Currency',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'actual_amount1',
+ 'fieldtype': u'Currency',
+ 'label': u'Actual Amount',
+ 'oldfieldname': u'actual_amount1',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'eligible_amount1',
- 'fieldtype': 'Currency',
- 'idx': 5,
- 'label': 'Eligible Amount',
- 'oldfieldname': 'eligible_amount1',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'eligible_amount1',
+ 'fieldtype': u'Currency',
+ 'label': u'Eligible Amount',
+ 'oldfieldname': u'eligible_amount1',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'modified_amount1',
- 'fieldtype': 'Currency',
- 'idx': 6,
- 'label': 'Modified Amount',
- 'oldfieldname': 'modified_amount1',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'modified_amount1',
+ 'fieldtype': u'Currency',
+ 'label': u'Modified Amount',
+ 'oldfieldname': u'modified_amount1',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/deduction_detail/deduction_detail.txt b/erpnext/hr/doctype/deduction_detail/deduction_detail.txt
index ee24d79..74f3f985 100644
--- a/erpnext/hr/doctype/deduction_detail/deduction_detail.txt
+++ b/erpnext/hr/doctype/deduction_detail/deduction_detail.txt
@@ -3,75 +3,72 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:57',
+ 'creation': '2012-03-27 14:35:54',
'docstatus': 0,
- 'modified': '2010-11-02 20:44:58',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:54',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'HR',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 14
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Deduction Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Deduction Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, Deduction Detail
{
'doctype': 'DocType',
- 'name': 'Deduction Detail'
+ 'name': u'Deduction Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'd_type',
- 'fieldtype': 'Link',
- 'idx': 1,
- 'label': 'Type',
- 'oldfieldname': 'd_type',
- 'oldfieldtype': 'Select',
- 'options': 'Deduction Type',
+ 'doctype': u'DocField',
+ 'fieldname': u'd_type',
+ 'fieldtype': u'Link',
+ 'label': u'Type',
+ 'oldfieldname': u'd_type',
+ 'oldfieldtype': u'Select',
+ 'options': u'Deduction Type',
'reqd': 1,
- 'width': '200px'
+ 'width': u'200px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'd_modified_amt',
- 'fieldtype': 'Currency',
- 'idx': 3,
- 'label': 'Amount',
- 'oldfieldname': 'd_modified_amt',
- 'oldfieldtype': 'Currency'
+ 'doctype': u'DocField',
+ 'fieldname': u'd_modified_amt',
+ 'fieldtype': u'Currency',
+ 'label': u'Amount',
+ 'oldfieldname': u'd_modified_amt',
+ 'oldfieldtype': u'Currency'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'depend_on_lwp',
- 'fieldtype': 'Check',
- 'idx': 4,
- 'label': 'Depend on LWP',
- 'oldfieldname': 'depend_on_lwp',
- 'oldfieldtype': 'Check'
+ 'doctype': u'DocField',
+ 'fieldname': u'depend_on_lwp',
+ 'fieldtype': u'Check',
+ 'label': u'Depend on LWP',
+ 'oldfieldname': u'depend_on_lwp',
+ 'oldfieldtype': u'Check'
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/deduction_type/deduction_type.txt b/erpnext/hr/doctype/deduction_type/deduction_type.txt
index c54836f..4d3bbdd 100644
--- a/erpnext/hr/doctype/deduction_type/deduction_type.txt
+++ b/erpnext/hr/doctype/deduction_type/deduction_type.txt
@@ -3,46 +3,46 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:57',
+ 'creation': '2012-03-27 14:35:54',
'docstatus': 0,
- 'modified': '2010-10-12 17:19:47',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:54',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
'allow_trash': 1,
- 'autoname': 'field:deduction_name',
- 'colour': 'White:FFF',
+ 'autoname': u'field:deduction_name',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'HR',
+ 'document_type': u'Master',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 10
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Deduction Type',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Deduction Type',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Deduction Type',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Deduction Type',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
'write': 1
@@ -51,65 +51,59 @@
# DocType, Deduction Type
{
'doctype': 'DocType',
- 'name': 'Deduction Type'
+ 'name': u'Deduction Type'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'role': 'System Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'System Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'role': 'HR User'
+ 'doctype': u'DocPerm',
+ 'role': u'HR User'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 3,
- 'role': 'HR Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'HR Manager'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'deduction_name',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Name',
- 'oldfieldname': 'deduction_name',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'deduction_name',
+ 'fieldtype': u'Data',
+ 'label': u'Name',
+ 'oldfieldname': u'deduction_name',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Small Text',
- 'idx': 3,
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Small Text',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Small Text',
'permlevel': 0,
- 'width': '300px'
+ 'width': u'300px'
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/department/department.txt b/erpnext/hr/doctype/department/department.txt
index aae0127..8d56347 100644
--- a/erpnext/hr/doctype/department/department.txt
+++ b/erpnext/hr/doctype/department/department.txt
@@ -3,46 +3,46 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:58',
+ 'creation': '2012-03-27 14:35:54',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:54',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
'allow_trash': 1,
- 'autoname': 'field:department_name',
- 'colour': 'White:FFF',
+ 'autoname': u'field:department_name',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'HR',
+ 'document_type': u'Master',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 7
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Department',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Department',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Department',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Department',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
'write': 1
@@ -51,51 +51,46 @@
# DocType, Department
{
'doctype': 'DocType',
- 'name': 'Department'
+ 'name': u'Department'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'role': 'System Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'System Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'role': 'HR User'
+ 'doctype': u'DocPerm',
+ 'role': u'HR User'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 3,
- 'role': 'HR Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'HR Manager'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'department_name',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Department',
- 'oldfieldname': 'department_name',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'department_name',
+ 'fieldtype': u'Data',
+ 'label': u'Department',
+ 'oldfieldname': u'department_name',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
}
diff --git a/erpnext/hr/doctype/designation/designation.txt b/erpnext/hr/doctype/designation/designation.txt
index 8a8f4d3..0d9ca32 100644
--- a/erpnext/hr/doctype/designation/designation.txt
+++ b/erpnext/hr/doctype/designation/designation.txt
@@ -3,46 +3,46 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:58',
+ 'creation': '2012-03-27 14:35:54',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:54',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
'allow_trash': 1,
- 'autoname': 'field:designation_name',
- 'colour': 'White:FFF',
+ 'autoname': u'field:designation_name',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'HR',
+ 'document_type': u'Master',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 7
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Designation',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Designation',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Designation',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Designation',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
'write': 1
@@ -51,51 +51,46 @@
# DocType, Designation
{
'doctype': 'DocType',
- 'name': 'Designation'
+ 'name': u'Designation'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'role': 'System Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'System Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'role': 'HR User'
+ 'doctype': u'DocPerm',
+ 'role': u'HR User'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 3,
- 'role': 'HR Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'HR Manager'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'designation_name',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Designation',
- 'oldfieldname': 'designation_name',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'designation_name',
+ 'fieldtype': u'Data',
+ 'label': u'Designation',
+ 'oldfieldname': u'designation_name',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
}
diff --git a/erpnext/hr/doctype/earn_deduction_detail/earn_deduction_detail.txt b/erpnext/hr/doctype/earn_deduction_detail/earn_deduction_detail.txt
index 8b05961..da4a4f6 100644
--- a/erpnext/hr/doctype/earn_deduction_detail/earn_deduction_detail.txt
+++ b/erpnext/hr/doctype/earn_deduction_detail/earn_deduction_detail.txt
@@ -3,114 +3,108 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:59',
+ 'creation': '2012-03-27 14:35:54',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:54',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'HR',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 4
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Earn Deduction Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Earn Deduction Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Earn Deduction Detail',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Earn Deduction Detail',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
- 'role': 'All',
+ 'role': u'All',
'write': 1
},
# DocType, Earn Deduction Detail
{
'doctype': 'DocType',
- 'name': 'Earn Deduction Detail'
+ 'name': u'Earn Deduction Detail'
},
# DocPerm
{
- 'doctype': 'DocPerm'
+ 'doctype': u'DocPerm'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'earn_deduction_name',
- 'fieldtype': 'Data',
- 'idx': 1,
- 'label': 'Earn/Deduction Name',
- 'oldfieldname': 'earn_deduction_name',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'earn_deduction_name',
+ 'fieldtype': u'Data',
+ 'label': u'Earn/Deduction Name',
+ 'oldfieldname': u'earn_deduction_name',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'mode',
- 'fieldtype': 'Select',
- 'idx': 2,
- 'label': 'Mode',
- 'oldfieldname': 'mode',
- 'oldfieldtype': 'Select',
- 'options': '\n%\nRs'
+ 'doctype': u'DocField',
+ 'fieldname': u'mode',
+ 'fieldtype': u'Select',
+ 'label': u'Mode',
+ 'oldfieldname': u'mode',
+ 'oldfieldtype': u'Select',
+ 'options': u'\n%\nRs'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'per',
- 'fieldtype': 'Data',
- 'idx': 3,
- 'label': 'Per.(%)',
- 'oldfieldname': 'per',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'per',
+ 'fieldtype': u'Data',
+ 'label': u'Per.(%)',
+ 'oldfieldname': u'per',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amount',
- 'fieldtype': 'Data',
- 'idx': 4,
- 'label': 'Amount',
- 'oldfieldname': 'amount',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'amount',
+ 'fieldtype': u'Data',
+ 'label': u'Amount',
+ 'oldfieldname': u'amount',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'type',
- 'fieldtype': 'Data',
- 'idx': 5,
- 'label': 'Type',
- 'oldfieldname': 'type',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'type',
+ 'fieldtype': u'Data',
+ 'label': u'Type',
+ 'oldfieldname': u'type',
+ 'oldfieldtype': u'Data'
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/earning_detail/earning_detail.txt b/erpnext/hr/doctype/earning_detail/earning_detail.txt
index 399c6cb..905190c 100644
--- a/erpnext/hr/doctype/earning_detail/earning_detail.txt
+++ b/erpnext/hr/doctype/earning_detail/earning_detail.txt
@@ -3,78 +3,75 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:59',
+ 'creation': '2012-03-27 14:35:54',
'docstatus': 0,
- 'modified': '2011-02-09 13:02:55',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:54',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'hide_heading': 0,
'hide_toolbar': 0,
'istable': 1,
- 'module': 'HR',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 26
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Earning Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Earning Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, Earning Detail
{
'doctype': 'DocType',
- 'name': 'Earning Detail'
+ 'name': u'Earning Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'e_type',
- 'fieldtype': 'Link',
- 'idx': 1,
- 'label': 'Type',
- 'oldfieldname': 'e_type',
- 'oldfieldtype': 'Data',
- 'options': 'Earning Type',
+ 'doctype': u'DocField',
+ 'fieldname': u'e_type',
+ 'fieldtype': u'Link',
+ 'label': u'Type',
+ 'oldfieldname': u'e_type',
+ 'oldfieldtype': u'Data',
+ 'options': u'Earning Type',
'reqd': 1,
- 'width': '200px'
+ 'width': u'200px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'modified_value',
- 'fieldtype': 'Currency',
- 'idx': 2,
- 'label': 'Amount',
- 'oldfieldname': 'modified_value',
- 'oldfieldtype': 'Currency',
- 'trigger': 'Client'
+ 'doctype': u'DocField',
+ 'fieldname': u'modified_value',
+ 'fieldtype': u'Currency',
+ 'label': u'Amount',
+ 'oldfieldname': u'modified_value',
+ 'oldfieldtype': u'Currency',
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'depend_on_lwp',
- 'fieldtype': 'Check',
- 'idx': 3,
- 'label': 'Depend on LWP',
- 'oldfieldname': 'depend_on_lwp',
- 'oldfieldtype': 'Check'
+ 'doctype': u'DocField',
+ 'fieldname': u'depend_on_lwp',
+ 'fieldtype': u'Check',
+ 'label': u'Depend on LWP',
+ 'oldfieldname': u'depend_on_lwp',
+ 'oldfieldtype': u'Check'
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/earning_type/earning_type.txt b/erpnext/hr/doctype/earning_type/earning_type.txt
index 203f8b5..f5588f1 100644
--- a/erpnext/hr/doctype/earning_type/earning_type.txt
+++ b/erpnext/hr/doctype/earning_type/earning_type.txt
@@ -3,46 +3,46 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:59',
+ 'creation': '2012-03-27 14:35:54',
'docstatus': 0,
- 'modified': '2010-10-12 17:15:46',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:54',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
'allow_trash': 1,
- 'autoname': 'field:earning_name',
- 'colour': 'White:FFF',
+ 'autoname': u'field:earning_name',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'HR',
+ 'document_type': u'Master',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 13
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Earning Type',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Earning Type',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Earning Type',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Earning Type',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
'write': 1
@@ -51,97 +51,89 @@
# DocType, Earning Type
{
'doctype': 'DocType',
- 'name': 'Earning Type'
+ 'name': u'Earning Type'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'role': 'System Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'System Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'role': 'HR User'
+ 'doctype': u'DocPerm',
+ 'role': u'HR User'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 3,
- 'role': 'HR Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'HR Manager'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'earning_name',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Name',
- 'oldfieldname': 'earning_name',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'earning_name',
+ 'fieldtype': u'Data',
+ 'label': u'Name',
+ 'oldfieldname': u'earning_name',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Small Text',
- 'idx': 3,
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Small Text',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Small Text',
'permlevel': 0,
'reqd': 0,
- 'width': '300px'
+ 'width': u'300px'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'taxable',
- 'fieldtype': 'Select',
- 'idx': 4,
- 'label': 'Taxable',
- 'oldfieldname': 'taxable',
- 'oldfieldtype': 'Select',
- 'options': '\nYes\nNo',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'taxable',
+ 'fieldtype': u'Select',
+ 'label': u'Taxable',
+ 'oldfieldname': u'taxable',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nYes\nNo',
'permlevel': 0,
'reqd': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': "eval:doc.taxable=='No'",
- 'doctype': 'DocField',
- 'fieldname': 'exemption_limit',
- 'fieldtype': 'Currency',
+ 'colour': u'White:FFF',
+ 'depends_on': u"eval:doc.taxable=='No'",
+ 'doctype': u'DocField',
+ 'fieldname': u'exemption_limit',
+ 'fieldtype': u'Currency',
'hidden': 1,
- 'idx': 5,
- 'label': 'Exemption Limit',
- 'oldfieldname': 'exemption_limit',
- 'oldfieldtype': 'Currency',
+ 'label': u'Exemption Limit',
+ 'oldfieldname': u'exemption_limit',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/educational_qualifications/educational_qualifications.txt b/erpnext/hr/doctype/educational_qualifications/educational_qualifications.txt
index 76776d2..d45c009 100644
--- a/erpnext/hr/doctype/educational_qualifications/educational_qualifications.txt
+++ b/erpnext/hr/doctype/educational_qualifications/educational_qualifications.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:59',
+ 'creation': '2012-03-27 14:35:54',
'docstatus': 0,
- 'modified': '2012-03-21 14:48:02',
+ 'modified': '2012-03-27 14:35:54',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/hr/doctype/educational_qualifications_detail/educational_qualifications_detail.txt b/erpnext/hr/doctype/educational_qualifications_detail/educational_qualifications_detail.txt
index 38067e0..df48fc3 100644
--- a/erpnext/hr/doctype/educational_qualifications_detail/educational_qualifications_detail.txt
+++ b/erpnext/hr/doctype/educational_qualifications_detail/educational_qualifications_detail.txt
@@ -3,107 +3,101 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:59',
+ 'creation': '2012-03-27 14:35:54',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:54',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'HR',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 5
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Educational Qualifications Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Educational Qualifications Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, Educational Qualifications Detail
{
'doctype': 'DocType',
- 'name': 'Educational Qualifications Detail'
+ 'name': u'Educational Qualifications Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'school_univ',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'School/University',
- 'oldfieldname': 'school_univ',
- 'oldfieldtype': 'Small Text'
+ 'doctype': u'DocField',
+ 'fieldname': u'school_univ',
+ 'fieldtype': u'Small Text',
+ 'label': u'School/University',
+ 'oldfieldname': u'school_univ',
+ 'oldfieldtype': u'Small Text'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'qualification',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Qualification',
- 'oldfieldname': 'qualification',
- 'oldfieldtype': 'Data',
- 'width': '100px'
+ 'doctype': u'DocField',
+ 'fieldname': u'qualification',
+ 'fieldtype': u'Data',
+ 'label': u'Qualification',
+ 'oldfieldname': u'qualification',
+ 'oldfieldtype': u'Data',
+ 'width': u'100px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'level',
- 'fieldtype': 'Select',
- 'idx': 3,
- 'label': 'Level',
- 'oldfieldname': 'level',
- 'oldfieldtype': 'Select',
- 'options': 'Graduate\nPost Graduate\nUnder Graduate'
+ 'doctype': u'DocField',
+ 'fieldname': u'level',
+ 'fieldtype': u'Select',
+ 'label': u'Level',
+ 'oldfieldname': u'level',
+ 'oldfieldtype': u'Select',
+ 'options': u'Graduate\nPost Graduate\nUnder Graduate'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'year_of_passing',
- 'fieldtype': 'Int',
- 'idx': 4,
- 'label': 'Year of Passing',
- 'oldfieldname': 'year_of_passing',
- 'oldfieldtype': 'Int'
+ 'doctype': u'DocField',
+ 'fieldname': u'year_of_passing',
+ 'fieldtype': u'Int',
+ 'label': u'Year of Passing',
+ 'oldfieldname': u'year_of_passing',
+ 'oldfieldtype': u'Int'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'class_per',
- 'fieldtype': 'Data',
- 'idx': 5,
- 'label': 'Class / Percentage',
- 'oldfieldname': 'class_per',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'class_per',
+ 'fieldtype': u'Data',
+ 'label': u'Class / Percentage',
+ 'oldfieldname': u'class_per',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'maj_opt_subj',
- 'fieldtype': 'Text',
- 'idx': 6,
- 'label': 'Major/Optional Subjects',
- 'oldfieldname': 'maj_opt_subj',
- 'oldfieldtype': 'Text'
+ 'doctype': u'DocField',
+ 'fieldname': u'maj_opt_subj',
+ 'fieldtype': u'Text',
+ 'label': u'Major/Optional Subjects',
+ 'oldfieldname': u'maj_opt_subj',
+ 'oldfieldtype': u'Text'
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee/employee.txt b/erpnext/hr/doctype/employee/employee.txt
index 98caa2c..3f330de 100644
--- a/erpnext/hr/doctype/employee/employee.txt
+++ b/erpnext/hr/doctype/employee/employee.txt
@@ -3,224 +3,260 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:59',
+ 'creation': '2012-03-27 14:35:55',
'docstatus': 0,
- 'modified': '2011-08-11 17:27:12',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:55',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1308918132',
+ '_last_update': u'1308918132',
'allow_attach': 1,
'allow_trash': 1,
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'HR',
+ 'document_type': u'Master',
+ 'module': u'HR',
'name': '__common__',
- 'search_fields': 'employee_name',
- 'section_style': 'Tabbed',
- 'server_code_error': ' ',
+ 'search_fields': u'employee_name',
+ 'section_style': u'Tabbed',
+ 'server_code_error': u' ',
'show_in_menu': 0,
- 'subject': '%(employee_name)s',
- 'tag_fields': 'status',
+ 'subject': u'%(employee_name)s',
+ 'tag_fields': u'status',
'version': 444
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Employee',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Employee',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'amend': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Employee',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
- 'read': 1,
- 'submit': 0
+ 'parent': u'Employee',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
+ 'read': 1
},
# DocType, Employee
{
'doctype': 'DocType',
- 'name': 'Employee'
+ 'name': u'Employee'
},
# DocPerm
{
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'permlevel': 0,
- 'role': 'Employee',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 2,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'All',
+ 'role': u'All'
+ },
+
+ # DocPerm
+ {
+ 'cancel': 1,
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'HR User',
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'cancel': 1,
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'HR Manager',
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'HR User'
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'HR Manager'
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'match': u'owner',
+ 'permlevel': 0,
+ 'submit': 0,
'write': 0
},
# DocPerm
{
- 'cancel': 1,
- 'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 3,
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'match': u'owner',
'permlevel': 0,
- 'role': 'HR User',
- 'write': 1
+ 'submit': 0,
+ 'write': 0
},
# DocPerm
{
- 'cancel': 1,
- 'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 4,
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'match': u'owner',
'permlevel': 0,
- 'role': 'HR Manager',
- 'write': 1
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'match': u'owner',
+ 'permlevel': 0,
+ 'submit': 0,
+ 'write': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 1,
- 'label': 'Basic Information',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'basic_information',
+ 'fieldtype': u'Section Break',
+ 'label': u'Basic Information',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 2,
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'description': 'To manage multiple series please go to Setup > Manage Series',
- 'doctype': 'DocField',
- 'fieldname': 'naming_series',
- 'fieldtype': 'Select',
- 'idx': 3,
- 'label': 'Naming Series',
+ 'description': u'To manage multiple series please go to Setup > Manage Series',
+ 'doctype': u'DocField',
+ 'fieldname': u'naming_series',
+ 'fieldtype': u'Select',
+ 'label': u'Naming Series',
'no_copy': 1,
- 'oldfieldname': 'naming_series',
- 'oldfieldtype': 'Select',
- 'options': 'EMP/',
+ 'oldfieldname': u'naming_series',
+ 'oldfieldtype': u'Select',
+ 'options': u'EMP/',
'permlevel': 0,
'reqd': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'salutation',
- 'fieldtype': 'Select',
- 'idx': 4,
- 'label': 'Salutation',
- 'oldfieldname': 'salutation',
- 'oldfieldtype': 'Select',
- 'options': '\nMr\nMs',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'salutation',
+ 'fieldtype': u'Select',
+ 'label': u'Salutation',
+ 'oldfieldname': u'salutation',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nMr\nMs',
'permlevel': 0,
'search_index': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'employee_name',
- 'fieldtype': 'Data',
- 'idx': 5,
- 'label': 'Employee Name',
- 'oldfieldname': 'employee_name',
- 'oldfieldtype': 'Data',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'employee_name',
+ 'fieldtype': u'Data',
+ 'label': u'Employee Name',
+ 'oldfieldname': u'employee_name',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'employee_number',
- 'fieldtype': 'Data',
- 'idx': 6,
+ 'doctype': u'DocField',
+ 'fieldname': u'employee_number',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Employee Number',
- 'oldfieldname': 'employee_number',
- 'oldfieldtype': 'Data',
+ 'label': u'Employee Number',
+ 'oldfieldname': u'employee_number',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'search_index': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'date_of_joining',
- 'fieldtype': 'Date',
- 'idx': 7,
- 'label': 'Date of Joining',
- 'oldfieldname': 'date_of_joining',
- 'oldfieldtype': 'Date',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'date_of_joining',
+ 'fieldtype': u'Date',
+ 'label': u'Date of Joining',
+ 'oldfieldname': u'date_of_joining',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'date_of_birth',
- 'fieldtype': 'Date',
- 'idx': 8,
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'date_of_birth',
+ 'fieldtype': u'Date',
'in_filter': 1,
- 'label': 'Date of Birth',
- 'oldfieldname': 'date_of_birth',
- 'oldfieldtype': 'Date',
+ 'label': u'Date of Birth',
+ 'oldfieldname': u'date_of_birth',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'reqd': 1,
'search_index': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'gender',
- 'fieldtype': 'Select',
- 'idx': 9,
+ 'doctype': u'DocField',
+ 'fieldname': u'gender',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Gender',
- 'oldfieldname': 'gender',
- 'oldfieldtype': 'Select',
- 'options': '\nMale\nFemale',
+ 'label': u'Gender',
+ 'oldfieldname': u'gender',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nMale\nFemale',
'permlevel': 0,
'reqd': 1,
'search_index': 0
@@ -228,13 +264,12 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'company',
- 'fieldtype': 'Select',
- 'idx': 10,
+ 'doctype': u'DocField',
+ 'fieldname': u'company',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Company',
- 'options': 'link:Company',
+ 'label': u'Company',
+ 'options': u'link:Company',
'permlevel': 0,
'print_hide': 1,
'reqd': 1
@@ -242,26 +277,25 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 11,
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'default': 'Active',
- 'doctype': 'DocField',
- 'fieldname': 'status',
- 'fieldtype': 'Select',
- 'idx': 12,
+ 'colour': u'White:FFF',
+ 'default': u'Active',
+ 'doctype': u'DocField',
+ 'fieldname': u'status',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Status',
- 'oldfieldname': 'status',
- 'oldfieldtype': 'Select',
- 'options': '\nActive\nLeft',
+ 'label': u'Status',
+ 'oldfieldname': u'status',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nActive\nLeft',
'permlevel': 0,
'reqd': 1,
'search_index': 1
@@ -269,149 +303,140 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'employment_type',
- 'fieldtype': 'Link',
- 'idx': 13,
+ 'doctype': u'DocField',
+ 'fieldname': u'employment_type',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Employment Type',
- 'oldfieldname': 'employment_type',
- 'oldfieldtype': 'Link',
- 'options': 'Employment Type',
+ 'label': u'Employment Type',
+ 'oldfieldname': u'employment_type',
+ 'oldfieldtype': u'Link',
+ 'options': u'Employment Type',
'permlevel': 0,
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'scheduled_confirmation_date',
- 'fieldtype': 'Date',
- 'idx': 14,
+ 'doctype': u'DocField',
+ 'fieldname': u'scheduled_confirmation_date',
+ 'fieldtype': u'Date',
'in_filter': 1,
- 'label': 'Scheduled Confirmation Date',
- 'oldfieldname': 'scheduled_confirmation_date',
- 'oldfieldtype': 'Date',
+ 'label': u'Scheduled Confirmation Date',
+ 'oldfieldname': u'scheduled_confirmation_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'final_confirmation_date',
- 'fieldtype': 'Date',
- 'idx': 15,
- 'label': 'Final Confirmation Date',
- 'oldfieldname': 'final_confirmation_date',
- 'oldfieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'final_confirmation_date',
+ 'fieldtype': u'Date',
+ 'label': u'Final Confirmation Date',
+ 'oldfieldname': u'final_confirmation_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'contract_end_date',
- 'fieldtype': 'Date',
- 'idx': 16,
+ 'doctype': u'DocField',
+ 'fieldname': u'contract_end_date',
+ 'fieldtype': u'Date',
'in_filter': 1,
- 'label': 'Contract End Date',
- 'oldfieldname': 'contract_end_date',
- 'oldfieldtype': 'Date',
+ 'label': u'Contract End Date',
+ 'oldfieldname': u'contract_end_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'date_of_retirement',
- 'fieldtype': 'Date',
- 'idx': 17,
- 'label': 'Date Of Retirement',
- 'oldfieldname': 'date_of_retirement',
- 'oldfieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'date_of_retirement',
+ 'fieldtype': u'Date',
+ 'label': u'Date Of Retirement',
+ 'oldfieldname': u'date_of_retirement',
+ 'oldfieldtype': u'Date',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Applicable Holiday List',
- 'doctype': 'DocField',
- 'fieldname': 'holiday_list',
- 'fieldtype': 'Link',
- 'idx': 18,
- 'label': 'Holiday List',
- 'oldfieldname': 'holiday_list',
- 'oldfieldtype': 'Link',
- 'options': 'Holiday List',
+ 'colour': u'White:FFF',
+ 'description': u'Applicable Holiday List',
+ 'doctype': u'DocField',
+ 'fieldname': u'holiday_list',
+ 'fieldtype': u'Link',
+ 'label': u'Holiday List',
+ 'oldfieldname': u'holiday_list',
+ 'oldfieldtype': u'Link',
+ 'options': u'Holiday List',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 19,
- 'label': 'Job Profile',
+ 'doctype': u'DocField',
+ 'fieldname': u'job_profile',
+ 'fieldtype': u'Section Break',
+ 'label': u'Job Profile',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 20,
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break2',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'branch',
- 'fieldtype': 'Link',
- 'idx': 21,
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'branch',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Branch',
- 'oldfieldname': 'branch',
- 'oldfieldtype': 'Link',
- 'options': 'Branch',
+ 'label': u'Branch',
+ 'oldfieldname': u'branch',
+ 'oldfieldtype': u'Link',
+ 'options': u'Branch',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'department',
- 'fieldtype': 'Link',
- 'idx': 22,
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'department',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Department',
- 'oldfieldname': 'department',
- 'oldfieldtype': 'Link',
- 'options': 'Department',
+ 'label': u'Department',
+ 'oldfieldname': u'department',
+ 'oldfieldtype': u'Link',
+ 'options': u'Department',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'designation',
- 'fieldtype': 'Link',
- 'idx': 23,
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'designation',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Designation',
- 'oldfieldname': 'designation',
- 'oldfieldtype': 'Link',
- 'options': 'Designation',
+ 'label': u'Designation',
+ 'oldfieldname': u'designation',
+ 'oldfieldtype': u'Link',
+ 'options': u'Designation',
'permlevel': 0,
'reqd': 1,
'search_index': 1
@@ -419,666 +444,624 @@
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'grade',
- 'fieldtype': 'Link',
- 'idx': 24,
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'grade',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Grade',
- 'oldfieldname': 'grade',
- 'oldfieldtype': 'Link',
- 'options': 'Grade',
+ 'label': u'Grade',
+ 'oldfieldname': u'grade',
+ 'oldfieldtype': u'Link',
+ 'options': u'Grade',
'permlevel': 0,
'reqd': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'reports_to',
- 'fieldtype': 'Link',
- 'idx': 25,
- 'label': 'Reports to',
- 'oldfieldname': 'reports_to',
- 'oldfieldtype': 'Link',
- 'options': 'Employee',
+ 'doctype': u'DocField',
+ 'fieldname': u'reports_to',
+ 'fieldtype': u'Link',
+ 'label': u'Reports to',
+ 'oldfieldname': u'reports_to',
+ 'oldfieldtype': u'Link',
+ 'options': u'Employee',
'permlevel': 0
},
# DocField
{
- 'description': 'Provide email id registered in company',
- 'doctype': 'DocField',
- 'fieldname': 'company_email',
- 'fieldtype': 'Data',
- 'idx': 26,
+ 'description': u'Provide email id registered in company',
+ 'doctype': u'DocField',
+ 'fieldname': u'company_email',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Email (By company)',
- 'oldfieldname': 'company_email',
- 'oldfieldtype': 'Data',
+ 'label': u'Email (By company)',
+ 'oldfieldname': u'company_email',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 27,
- 'label': 'Salary Information',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'salary_information',
+ 'fieldtype': u'Column Break',
+ 'label': u'Salary Information',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'salary_mode',
- 'fieldtype': 'Select',
- 'idx': 28,
- 'label': 'Salary Mode',
- 'oldfieldname': 'salary_mode',
- 'oldfieldtype': 'Select',
- 'options': '\nBank\nCash\nCheque',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'salary_mode',
+ 'fieldtype': u'Select',
+ 'label': u'Salary Mode',
+ 'oldfieldname': u'salary_mode',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nBank\nCash\nCheque',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': "eval:doc.salary_mode == 'Bank'",
- 'doctype': 'DocField',
- 'fieldname': 'bank_name',
- 'fieldtype': 'Data',
+ 'colour': u'White:FFF',
+ 'depends_on': u"eval:doc.salary_mode == 'Bank'",
+ 'doctype': u'DocField',
+ 'fieldname': u'bank_name',
+ 'fieldtype': u'Data',
'hidden': 0,
- 'idx': 29,
'in_filter': 1,
- 'label': 'Bank Name',
- 'oldfieldname': 'bank_name',
- 'oldfieldtype': 'Link',
- 'options': 'Suggest',
+ 'label': u'Bank Name',
+ 'oldfieldname': u'bank_name',
+ 'oldfieldtype': u'Link',
+ 'options': u'Suggest',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': "eval:doc.salary_mode == 'Bank'",
- 'doctype': 'DocField',
- 'fieldname': 'bank_ac_no',
- 'fieldtype': 'Data',
+ 'colour': u'White:FFF',
+ 'depends_on': u"eval:doc.salary_mode == 'Bank'",
+ 'doctype': u'DocField',
+ 'fieldname': u'bank_ac_no',
+ 'fieldtype': u'Data',
'hidden': 0,
- 'idx': 30,
- 'label': 'Bank A/C No.',
- 'oldfieldname': 'bank_ac_no',
- 'oldfieldtype': 'Data',
+ 'label': u'Bank A/C No.',
+ 'oldfieldname': u'bank_ac_no',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'esic_card_no',
- 'fieldtype': 'Data',
- 'idx': 31,
- 'label': 'ESIC CARD No',
- 'oldfieldname': 'esic_card_no',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'esic_card_no',
+ 'fieldtype': u'Data',
+ 'label': u'ESIC CARD No',
+ 'oldfieldname': u'esic_card_no',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'pf_number',
- 'fieldtype': 'Data',
- 'idx': 32,
- 'label': 'PF Number',
- 'oldfieldname': 'pf_number',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'pf_number',
+ 'fieldtype': u'Data',
+ 'label': u'PF Number',
+ 'oldfieldname': u'pf_number',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'gratuity_lic_id',
- 'fieldtype': 'Data',
- 'idx': 33,
- 'label': 'Gratuity LIC ID',
- 'oldfieldname': 'gratuity_lic_id',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'gratuity_lic_id',
+ 'fieldtype': u'Data',
+ 'label': u'Gratuity LIC ID',
+ 'oldfieldname': u'gratuity_lic_id',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 34,
- 'label': 'Contact Details',
+ 'doctype': u'DocField',
+ 'fieldname': u'contact_details',
+ 'fieldtype': u'Section Break',
+ 'label': u'Contact Details',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 35,
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break3',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'cell_number',
- 'fieldtype': 'Data',
- 'idx': 36,
- 'label': 'Cell Number',
+ 'doctype': u'DocField',
+ 'fieldname': u'cell_number',
+ 'fieldtype': u'Data',
+ 'label': u'Cell Number',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'personal_email',
- 'fieldtype': 'Data',
- 'idx': 37,
- 'label': 'Personal Email',
+ 'doctype': u'DocField',
+ 'fieldname': u'personal_email',
+ 'fieldtype': u'Data',
+ 'label': u'Personal Email',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'notice_number_of_days',
- 'fieldtype': 'Int',
- 'idx': 38,
- 'label': 'Notice - Number of Days',
- 'oldfieldname': 'notice_number_of_days',
- 'oldfieldtype': 'Int',
+ 'doctype': u'DocField',
+ 'fieldname': u'notice_number_of_days',
+ 'fieldtype': u'Int',
+ 'label': u'Notice - Number of Days',
+ 'oldfieldname': u'notice_number_of_days',
+ 'oldfieldtype': u'Int',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'idx': 39,
- 'label': 'Emergency Contact Details',
- 'options': '<b>Emergency Contact Details</b>',
+ 'doctype': u'DocField',
+ 'fieldname': u'emergency_contact_details',
+ 'fieldtype': u'HTML',
+ 'label': u'Emergency Contact Details',
+ 'options': u'<b>Emergency Contact Details</b>',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'person_to_be_contacted',
- 'fieldtype': 'Data',
- 'idx': 40,
- 'label': 'Person To Be Contacted',
+ 'doctype': u'DocField',
+ 'fieldname': u'person_to_be_contacted',
+ 'fieldtype': u'Data',
+ 'label': u'Person To Be Contacted',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'relation',
- 'fieldtype': 'Data',
- 'idx': 41,
- 'label': 'Relation',
+ 'doctype': u'DocField',
+ 'fieldname': u'relation',
+ 'fieldtype': u'Data',
+ 'label': u'Relation',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'emergency_phone_number',
- 'fieldtype': 'Data',
- 'idx': 42,
- 'label': 'Emergency Phone Number',
+ 'doctype': u'DocField',
+ 'fieldname': u'emergency_phone_number',
+ 'fieldtype': u'Data',
+ 'label': u'Emergency Phone Number',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 43,
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break4',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'permanent_accommodation_type',
- 'fieldtype': 'Select',
- 'idx': 44,
- 'label': 'Permanent Accommodation Type',
- 'options': '\nRented\nOwned',
+ 'doctype': u'DocField',
+ 'fieldname': u'permanent_accommodation_type',
+ 'fieldtype': u'Select',
+ 'label': u'Permanent Accommodation Type',
+ 'options': u'\nRented\nOwned',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'permanent_address',
- 'fieldtype': 'Small Text',
- 'idx': 45,
- 'label': 'Permanent Address',
+ 'doctype': u'DocField',
+ 'fieldname': u'permanent_address',
+ 'fieldtype': u'Small Text',
+ 'label': u'Permanent Address',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'current_accommodation_type',
- 'fieldtype': 'Select',
- 'idx': 46,
- 'label': 'Current Accommodation Type',
- 'options': '\nRented\nOwned',
+ 'doctype': u'DocField',
+ 'fieldname': u'current_accommodation_type',
+ 'fieldtype': u'Select',
+ 'label': u'Current Accommodation Type',
+ 'options': u'\nRented\nOwned',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'current_address',
- 'fieldtype': 'Small Text',
- 'idx': 47,
- 'label': 'Current Address',
+ 'doctype': u'DocField',
+ 'fieldname': u'current_address',
+ 'fieldtype': u'Small Text',
+ 'label': u'Current Address',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 48,
- 'label': 'Personal Details',
+ 'doctype': u'DocField',
+ 'fieldname': u'personal_details',
+ 'fieldtype': u'Section Break',
+ 'label': u'Personal Details',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 49,
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break5',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'pan_number',
- 'fieldtype': 'Data',
- 'idx': 50,
- 'label': 'PAN Number',
+ 'doctype': u'DocField',
+ 'fieldname': u'pan_number',
+ 'fieldtype': u'Data',
+ 'label': u'PAN Number',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'passport_number',
- 'fieldtype': 'Data',
- 'idx': 51,
- 'label': 'Passport Number',
+ 'doctype': u'DocField',
+ 'fieldname': u'passport_number',
+ 'fieldtype': u'Data',
+ 'label': u'Passport Number',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'employee_profile',
+ 'fieldtype': u'Button',
'hidden': 1,
- 'idx': 52,
- 'label': 'Employee Profile',
- 'oldfieldtype': 'Button',
+ 'label': u'Employee Profile',
+ 'oldfieldtype': u'Button',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'date_of_issue',
- 'fieldtype': 'Date',
- 'idx': 53,
- 'label': 'Date of Issue',
+ 'doctype': u'DocField',
+ 'fieldname': u'date_of_issue',
+ 'fieldtype': u'Date',
+ 'label': u'Date of Issue',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'valid_upto',
- 'fieldtype': 'Date',
- 'idx': 54,
- 'label': 'Valid Upto',
+ 'doctype': u'DocField',
+ 'fieldname': u'valid_upto',
+ 'fieldtype': u'Date',
+ 'label': u'Valid Upto',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'salary_structure',
+ 'fieldtype': u'Button',
'hidden': 1,
- 'idx': 55,
- 'label': 'Salary Structure',
- 'oldfieldtype': 'Button',
+ 'label': u'Salary Structure',
+ 'oldfieldtype': u'Button',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'place_of_issue',
- 'fieldtype': 'Data',
- 'idx': 56,
- 'label': 'Place of Issue',
+ 'doctype': u'DocField',
+ 'fieldname': u'place_of_issue',
+ 'fieldtype': u'Data',
+ 'label': u'Place of Issue',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'marital_status',
- 'fieldtype': 'Select',
- 'idx': 57,
- 'label': 'Marital Status',
- 'options': '\nSingle\nMarried\nDivorced\nWidowed',
+ 'doctype': u'DocField',
+ 'fieldname': u'marital_status',
+ 'fieldtype': u'Select',
+ 'label': u'Marital Status',
+ 'options': u'\nSingle\nMarried\nDivorced\nWidowed',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'blood_group',
- 'fieldtype': 'Select',
- 'idx': 58,
- 'label': 'Blood Group',
- 'options': '\nA+\nA-\nB+\nB-\nAB+\nAB-\nO+\nO-',
+ 'doctype': u'DocField',
+ 'fieldname': u'blood_group',
+ 'fieldtype': u'Select',
+ 'label': u'Blood Group',
+ 'options': u'\nA+\nA-\nB+\nB-\nAB+\nAB-\nO+\nO-',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 59,
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break6',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Here you can maintain family details like name and occupation of parent, spouse and children',
- 'doctype': 'DocField',
- 'fieldname': 'family_background',
- 'fieldtype': 'Small Text',
- 'idx': 60,
- 'label': 'Family Background',
+ 'colour': u'White:FFF',
+ 'description': u'Here you can maintain family details like name and occupation of parent, spouse and children',
+ 'doctype': u'DocField',
+ 'fieldname': u'family_background',
+ 'fieldtype': u'Small Text',
+ 'label': u'Family Background',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Here you can maintain height, weight, allergies, medical concerns etc',
- 'doctype': 'DocField',
- 'fieldname': 'health_details',
- 'fieldtype': 'Small Text',
- 'idx': 61,
- 'label': 'Health Details',
+ 'colour': u'White:FFF',
+ 'description': u'Here you can maintain height, weight, allergies, medical concerns etc',
+ 'doctype': u'DocField',
+ 'fieldname': u'health_details',
+ 'fieldtype': u'Small Text',
+ 'label': u'Health Details',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 62,
- 'label': 'Educational Qualification',
+ 'doctype': u'DocField',
+ 'fieldname': u'educational_qualification',
+ 'fieldtype': u'Section Break',
+ 'label': u'Educational Qualification',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'educational_qualification_details',
- 'fieldtype': 'Table',
- 'idx': 63,
- 'label': 'Educational Qualification Details',
- 'options': 'Educational Qualifications Detail',
+ 'doctype': u'DocField',
+ 'fieldname': u'educational_qualification_details',
+ 'fieldtype': u'Table',
+ 'label': u'Educational Qualification Details',
+ 'options': u'Educational Qualifications Detail',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 64,
- 'label': 'Career History',
+ 'doctype': u'DocField',
+ 'fieldname': u'career_history',
+ 'fieldtype': u'Section Break',
+ 'label': u'Career History',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 65,
- 'label': 'Previous Work Experience',
- 'options': 'Simple',
+ 'doctype': u'DocField',
+ 'fieldname': u'previous_work_experience',
+ 'fieldtype': u'Section Break',
+ 'label': u'Previous Work Experience',
+ 'options': u'Simple',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'previous_experience_details',
- 'fieldtype': 'Table',
- 'idx': 66,
- 'label': 'Previous Experience Details',
- 'options': 'Previous Experience Detail',
+ 'doctype': u'DocField',
+ 'fieldname': u'previous_experience_details',
+ 'fieldtype': u'Table',
+ 'label': u'Previous Experience Details',
+ 'options': u'Previous Experience Detail',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 67,
- 'label': 'History In Company',
- 'options': 'Simple',
+ 'doctype': u'DocField',
+ 'fieldname': u'history_in_company',
+ 'fieldtype': u'Section Break',
+ 'label': u'History In Company',
+ 'options': u'Simple',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'experience_in_company_details',
- 'fieldtype': 'Table',
- 'idx': 68,
- 'label': 'Experience In Company Details',
- 'options': 'Experience In Company Detail',
+ 'doctype': u'DocField',
+ 'fieldname': u'experience_in_company_details',
+ 'fieldtype': u'Table',
+ 'label': u'Experience In Company Details',
+ 'options': u'Experience In Company Detail',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 69,
- 'label': 'Exit',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'exit',
+ 'fieldtype': u'Section Break',
+ 'label': u'Exit',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 70,
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break7',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'resignation_letter_date',
- 'fieldtype': 'Date',
- 'idx': 71,
- 'label': 'Resignation Letter Date',
- 'oldfieldname': 'resignation_letter_date',
- 'oldfieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'resignation_letter_date',
+ 'fieldtype': u'Date',
+ 'label': u'Resignation Letter Date',
+ 'oldfieldname': u'resignation_letter_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'relieving_date',
- 'fieldtype': 'Date',
- 'idx': 72,
+ 'doctype': u'DocField',
+ 'fieldname': u'relieving_date',
+ 'fieldtype': u'Date',
'in_filter': 1,
- 'label': 'Relieving Date',
- 'oldfieldname': 'relieving_date',
- 'oldfieldtype': 'Date',
+ 'label': u'Relieving Date',
+ 'oldfieldname': u'relieving_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'reason_for_leaving',
- 'fieldtype': 'Data',
- 'idx': 73,
- 'label': 'Reason for Leaving',
- 'oldfieldname': 'reason_for_leaving',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'reason_for_leaving',
+ 'fieldtype': u'Data',
+ 'label': u'Reason for Leaving',
+ 'oldfieldname': u'reason_for_leaving',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'leave_encashed',
- 'fieldtype': 'Select',
- 'idx': 74,
- 'label': 'Leave Encashed?',
- 'oldfieldname': 'leave_encashed',
- 'oldfieldtype': 'Select',
- 'options': '\nYes\nNo',
+ 'doctype': u'DocField',
+ 'fieldname': u'leave_encashed',
+ 'fieldtype': u'Select',
+ 'label': u'Leave Encashed?',
+ 'oldfieldname': u'leave_encashed',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nYes\nNo',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'encashment_date',
- 'fieldtype': 'Date',
- 'idx': 75,
- 'label': 'Encashment Date',
- 'oldfieldname': 'encashment_date',
- 'oldfieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'encashment_date',
+ 'fieldtype': u'Date',
+ 'label': u'Encashment Date',
+ 'oldfieldname': u'encashment_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 76,
- 'label': 'Exit Interview Details',
- 'oldfieldname': 'col_brk6',
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'exit_interview_details',
+ 'fieldtype': u'Column Break',
+ 'label': u'Exit Interview Details',
+ 'oldfieldname': u'col_brk6',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'held_on',
- 'fieldtype': 'Date',
- 'idx': 77,
- 'label': 'Held On',
- 'oldfieldname': 'held_on',
- 'oldfieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'held_on',
+ 'fieldtype': u'Date',
+ 'label': u'Held On',
+ 'oldfieldname': u'held_on',
+ 'oldfieldtype': u'Date',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'reason_for_resignation',
- 'fieldtype': 'Select',
- 'idx': 78,
- 'label': 'Reason for Resignation',
- 'oldfieldname': 'reason_for_resignation',
- 'oldfieldtype': 'Select',
- 'options': '\nBetter Prospects\nHealth Concerns',
+ 'doctype': u'DocField',
+ 'fieldname': u'reason_for_resignation',
+ 'fieldtype': u'Select',
+ 'label': u'Reason for Resignation',
+ 'oldfieldname': u'reason_for_resignation',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nBetter Prospects\nHealth Concerns',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'new_workplace',
- 'fieldtype': 'Data',
- 'idx': 79,
- 'label': 'New Workplace',
- 'oldfieldname': 'new_workplace',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'new_workplace',
+ 'fieldtype': u'Data',
+ 'label': u'New Workplace',
+ 'oldfieldname': u'new_workplace',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'feedback',
- 'fieldtype': 'Small Text',
- 'idx': 80,
- 'label': 'Feedback',
- 'oldfieldname': 'feedback',
- 'oldfieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'feedback',
+ 'fieldtype': u'Small Text',
+ 'label': u'Feedback',
+ 'oldfieldname': u'feedback',
+ 'oldfieldtype': u'Text',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'file_list',
- 'fieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'file_list',
+ 'fieldtype': u'Text',
'hidden': 1,
- 'idx': 81,
- 'label': 'File List',
+ 'label': u'File List',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'idx': 82,
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employment_type/employment_type.txt b/erpnext/hr/doctype/employment_type/employment_type.txt
index 67d54d1..5768382 100644
--- a/erpnext/hr/doctype/employment_type/employment_type.txt
+++ b/erpnext/hr/doctype/employment_type/employment_type.txt
@@ -3,46 +3,46 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:00',
+ 'creation': '2012-03-27 14:35:55',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:55',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
'allow_trash': 1,
- 'autoname': 'field:employee_type_name',
- 'colour': 'White:FFF',
+ 'autoname': u'field:employee_type_name',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'HR',
+ 'document_type': u'Master',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 16
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Employment Type',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Employment Type',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Employment Type',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Employment Type',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
'write': 1
@@ -51,52 +51,47 @@
# DocType, Employment Type
{
'doctype': 'DocType',
- 'name': 'Employment Type'
+ 'name': u'Employment Type'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'role': 'System Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'System Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'role': 'HR User'
+ 'doctype': u'DocPerm',
+ 'role': u'HR User'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 3,
- 'role': 'HR Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'HR Manager'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'employee_type_name',
- 'fieldtype': 'Data',
- 'idx': 1,
- 'label': 'Employment Type',
- 'oldfieldname': 'employee_type_name',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'employee_type_name',
+ 'fieldtype': u'Data',
+ 'label': u'Employment Type',
+ 'oldfieldname': u'employee_type_name',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'idx': 2,
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/expense_type/expense_type.txt b/erpnext/hr/doctype/expense_type/expense_type.txt
index ddf1104..e366161 100644
--- a/erpnext/hr/doctype/expense_type/expense_type.txt
+++ b/erpnext/hr/doctype/expense_type/expense_type.txt
@@ -3,44 +3,44 @@
# These values are common in all dictionaries
{
- 'creation': '2010-09-03 16:45:08',
+ 'creation': '2012-03-27 14:35:55',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'harshada@webnotestech.com'
+ 'modified': '2012-03-27 14:35:55',
+ 'modified_by': u'Administrator',
+ 'owner': u'harshada@webnotestech.com'
},
# These values are common for all DocType
{
- 'autoname': 'field:expense_type',
- 'colour': 'White:FFF',
+ 'autoname': u'field:expense_type',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'HR',
+ 'document_type': u'Master',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 5
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Expense Type',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Expense Type',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Expense Type',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Expense Type',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
'write': 1
@@ -49,53 +49,48 @@
# DocType, Expense Type
{
'doctype': 'DocType',
- 'name': 'Expense Type'
+ 'name': u'Expense Type'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'role': 'System Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'System Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'role': 'HR Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'HR Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 3,
- 'role': 'System Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'System Manager'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'expense_type',
- 'fieldtype': 'Data',
- 'idx': 1,
+ 'doctype': u'DocField',
+ 'fieldname': u'expense_type',
+ 'fieldtype': u'Data',
'in_filter': 0,
- 'label': 'Expense Type',
- 'oldfieldname': 'expense_type',
- 'oldfieldtype': 'Data',
+ 'label': u'Expense Type',
+ 'oldfieldname': u'expense_type',
+ 'oldfieldtype': u'Data',
'reqd': 1,
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Small Text',
- 'idx': 2,
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Small Text',
- 'width': '300px'
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Small Text',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Small Text',
+ 'width': u'300px'
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/expense_voucher/expense_voucher.js b/erpnext/hr/doctype/expense_voucher/expense_voucher.js
index 2e03567..2363dbd 100644
--- a/erpnext/hr/doctype/expense_voucher/expense_voucher.js
+++ b/erpnext/hr/doctype/expense_voucher/expense_voucher.js
@@ -100,7 +100,7 @@
cur_frm.cscript.calculate_total(doc,cdt,cdn);
}
-$import(Notification Control);
+wn.require('erpnext/setup/doctype/notification_control/notification_control.js');
cur_frm.cscript['Approve'] = function(doc,cdt,cdn){
@@ -244,7 +244,6 @@
});
}
-$import(Notification Control)
cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
var args = {
type: 'Expense Voucher',
diff --git a/erpnext/hr/doctype/expense_voucher/expense_voucher.txt b/erpnext/hr/doctype/expense_voucher/expense_voucher.txt
index ccc4cb4..ac2a90b 100644
--- a/erpnext/hr/doctype/expense_voucher/expense_voucher.txt
+++ b/erpnext/hr/doctype/expense_voucher/expense_voucher.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-09-03 16:45:08',
+ 'creation': '2012-03-27 14:35:56',
'docstatus': 0,
- 'modified': '2012-03-21 14:37:04',
+ 'modified': '2012-03-27 14:45:48',
'modified_by': u'Administrator',
'owner': u'harshada@webnotestech.com'
},
@@ -17,6 +17,7 @@
'colour': u'White:FFF',
'default_print_format': u'Standard',
'doctype': 'DocType',
+ 'is_submittable': 1,
'module': u'HR',
'name': '__common__',
'search_fields': u'approval_status,employee,employee_name',
@@ -55,13 +56,19 @@
# DocPerm
{
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'All'
+ },
+
+ # DocPerm
+ {
'amend': 1,
'cancel': 1,
'create': 1,
'doctype': u'DocPerm',
'match': u'owner',
'permlevel': 0,
- 'role': u'Employee',
'submit': 1,
'write': 1
},
@@ -90,16 +97,10 @@
'write': 1
},
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'All'
- },
-
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'details',
'fieldtype': u'Section Break',
'label': u'Details',
'oldfieldtype': u'Section Break',
@@ -185,6 +186,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break0',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -266,6 +268,7 @@
{
'allow_on_submit': 1,
'doctype': u'DocField',
+ 'fieldname': u'approve',
'fieldtype': u'Button',
'hidden': 1,
'label': u'Approve',
@@ -279,6 +282,7 @@
{
'allow_on_submit': 1,
'doctype': u'DocField',
+ 'fieldname': u'reject',
'fieldtype': u'Button',
'hidden': 1,
'label': u'Reject',
@@ -291,6 +295,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'expense_details',
'fieldtype': u'Section Break',
'label': u'Expense Details',
'oldfieldtype': u'Section Break',
@@ -302,6 +307,7 @@
'allow_on_submit': 1,
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'calculate_total_amount',
'fieldtype': u'Button',
'label': u'Calculate Total Amount',
'oldfieldtype': u'Button',
@@ -346,6 +352,7 @@
{
'allow_on_submit': 1,
'doctype': u'DocField',
+ 'fieldname': u'update_voucher',
'fieldtype': u'Button',
'hidden': 1,
'label': u'Update Voucher',
diff --git a/erpnext/hr/doctype/expense_voucher_detail/expense_voucher_detail.txt b/erpnext/hr/doctype/expense_voucher_detail/expense_voucher_detail.txt
index d6cb015..2ad3a98 100644
--- a/erpnext/hr/doctype/expense_voucher_detail/expense_voucher_detail.txt
+++ b/erpnext/hr/doctype/expense_voucher_detail/expense_voucher_detail.txt
@@ -3,106 +3,101 @@
# These values are common in all dictionaries
{
- 'creation': '2010-09-03 16:45:08',
+ 'creation': '2012-03-27 14:35:56',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'harshada@webnotestech.com'
+ 'modified': '2012-03-27 14:35:56',
+ 'modified_by': u'Administrator',
+ 'owner': u'harshada@webnotestech.com'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'HR',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 5
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Expense Voucher Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Expense Voucher Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, Expense Voucher Detail
{
'doctype': 'DocType',
- 'name': 'Expense Voucher Detail'
+ 'name': u'Expense Voucher Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'expense_date',
- 'fieldtype': 'Date',
- 'idx': 1,
- 'label': 'Expense Date',
- 'oldfieldname': 'expense_date',
- 'oldfieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'expense_date',
+ 'fieldtype': u'Date',
+ 'label': u'Expense Date',
+ 'oldfieldname': u'expense_date',
+ 'oldfieldtype': u'Date',
'reqd': 0,
- 'width': '150px'
+ 'width': u'150px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'expense_type',
- 'fieldtype': 'Link',
- 'idx': 2,
- 'label': 'Expense Type',
- 'oldfieldname': 'expense_type',
- 'oldfieldtype': 'Link',
- 'options': 'Expense Type',
+ 'doctype': u'DocField',
+ 'fieldname': u'expense_type',
+ 'fieldtype': u'Link',
+ 'label': u'Expense Type',
+ 'oldfieldname': u'expense_type',
+ 'oldfieldtype': u'Link',
+ 'options': u'Expense Type',
'reqd': 1,
- 'width': '150px'
+ 'width': u'150px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Small Text',
- 'idx': 3,
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Small Text',
- 'width': '300px'
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Small Text',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Small Text',
+ 'width': u'300px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'claim_amount',
- 'fieldtype': 'Currency',
- 'idx': 4,
- 'label': 'Claim Amount',
- 'oldfieldname': 'claim_amount',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'claim_amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Claim Amount',
+ 'oldfieldname': u'claim_amount',
+ 'oldfieldtype': u'Currency',
'reqd': 1,
- 'trigger': 'Client',
- 'width': '150px'
+ 'trigger': u'Client',
+ 'width': u'150px'
},
# DocField
{
'allow_on_submit': 1,
- 'doctype': 'DocField',
- 'fieldname': 'sanctioned_amount',
- 'fieldtype': 'Currency',
- 'idx': 5,
- 'label': 'Sanctioned Amount',
+ 'doctype': u'DocField',
+ 'fieldname': u'sanctioned_amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Sanctioned Amount',
'no_copy': 1,
- 'oldfieldname': 'sanctioned_amount',
- 'oldfieldtype': 'Currency',
- 'trigger': 'Client',
- 'width': '150px'
+ 'oldfieldname': u'sanctioned_amount',
+ 'oldfieldtype': u'Currency',
+ 'trigger': u'Client',
+ 'width': u'150px'
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/experience_in_company_detail/experience_in_company_detail.txt b/erpnext/hr/doctype/experience_in_company_detail/experience_in_company_detail.txt
index c1b826b..da66f24 100644
--- a/erpnext/hr/doctype/experience_in_company_detail/experience_in_company_detail.txt
+++ b/erpnext/hr/doctype/experience_in_company_detail/experience_in_company_detail.txt
@@ -3,108 +3,102 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:01',
+ 'creation': '2012-03-27 14:35:57',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:57',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'HR',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 6
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Experience In Company Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Experience In Company Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, Experience In Company Detail
{
'doctype': 'DocType',
- 'name': 'Experience In Company Detail'
+ 'name': u'Experience In Company Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'branch',
- 'fieldtype': 'Select',
- 'idx': 1,
- 'label': 'Branch',
- 'oldfieldname': 'branch',
- 'oldfieldtype': 'Select',
- 'options': 'link:Branch'
+ 'doctype': u'DocField',
+ 'fieldname': u'branch',
+ 'fieldtype': u'Select',
+ 'label': u'Branch',
+ 'oldfieldname': u'branch',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:Branch'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'department',
- 'fieldtype': 'Select',
- 'idx': 2,
- 'label': 'Department',
- 'oldfieldname': 'department',
- 'oldfieldtype': 'Select',
- 'options': 'link:Department'
+ 'doctype': u'DocField',
+ 'fieldname': u'department',
+ 'fieldtype': u'Select',
+ 'label': u'Department',
+ 'oldfieldname': u'department',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:Department'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'designation',
- 'fieldtype': 'Select',
- 'idx': 3,
- 'label': 'Designation',
- 'oldfieldname': 'designation',
- 'oldfieldtype': 'Select',
- 'options': 'link:Designation'
+ 'doctype': u'DocField',
+ 'fieldname': u'designation',
+ 'fieldtype': u'Select',
+ 'label': u'Designation',
+ 'oldfieldname': u'designation',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:Designation'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'grade',
- 'fieldtype': 'Select',
- 'idx': 4,
- 'label': 'Grade',
- 'oldfieldname': 'grade',
- 'oldfieldtype': 'Select',
- 'options': 'link:Grade'
+ 'doctype': u'DocField',
+ 'fieldname': u'grade',
+ 'fieldtype': u'Select',
+ 'label': u'Grade',
+ 'oldfieldname': u'grade',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:Grade'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'from_date',
- 'fieldtype': 'Date',
- 'idx': 5,
- 'label': 'From Date',
- 'oldfieldname': 'from_date',
- 'oldfieldtype': 'Date'
+ 'doctype': u'DocField',
+ 'fieldname': u'from_date',
+ 'fieldtype': u'Date',
+ 'label': u'From Date',
+ 'oldfieldname': u'from_date',
+ 'oldfieldtype': u'Date'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'to_date',
- 'fieldtype': 'Date',
- 'idx': 6,
- 'label': 'To Date',
- 'oldfieldname': 'to_date',
- 'oldfieldtype': 'Date'
+ 'doctype': u'DocField',
+ 'fieldname': u'to_date',
+ 'fieldtype': u'Date',
+ 'label': u'To Date',
+ 'oldfieldname': u'to_date',
+ 'oldfieldtype': u'Date'
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/grade/grade.txt b/erpnext/hr/doctype/grade/grade.txt
index afa74ad..2e14d9d 100644
--- a/erpnext/hr/doctype/grade/grade.txt
+++ b/erpnext/hr/doctype/grade/grade.txt
@@ -3,46 +3,46 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:03',
+ 'creation': '2012-03-27 14:35:57',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:57',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
'allow_trash': 1,
- 'autoname': 'field:grade_name',
- 'colour': 'White:FFF',
+ 'autoname': u'field:grade_name',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'HR',
+ 'document_type': u'Master',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 7
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Grade',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Grade',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Grade',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Grade',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
'write': 1
@@ -51,52 +51,47 @@
# DocType, Grade
{
'doctype': 'DocType',
- 'name': 'Grade'
+ 'name': u'Grade'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'role': 'System Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'System Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'role': 'HR User',
+ 'doctype': u'DocPerm',
+ 'role': u'HR User',
'submit': 0
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 3,
- 'role': 'HR Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'HR Manager'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'grade_name',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Grade',
- 'oldfieldname': 'grade_name',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'grade_name',
+ 'fieldtype': u'Data',
+ 'label': u'Grade',
+ 'oldfieldname': u'grade_name',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
}
diff --git a/erpnext/hr/doctype/holiday_list/holiday_list.txt b/erpnext/hr/doctype/holiday_list/holiday_list.txt
index f9407e3..c8026c6 100644
--- a/erpnext/hr/doctype/holiday_list/holiday_list.txt
+++ b/erpnext/hr/doctype/holiday_list/holiday_list.txt
@@ -3,129 +3,116 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:03',
+ 'creation': '2012-03-27 14:35:57',
'docstatus': 0,
- 'modified': '2011-02-12 13:37:12',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:57',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
'allow_trash': 1,
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'HR',
+ 'document_type': u'Master',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 17
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Holiday List',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Holiday List',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'cancel': 1,
+ 'create': 1,
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Holiday List',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Holiday List',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
+ 'permlevel': 0,
'read': 1,
- 'role': 'HR Manager'
+ 'role': u'HR Manager',
+ 'write': 1
},
# DocType, Holiday List
{
'doctype': 'DocType',
- 'name': 'Holiday List'
+ 'name': u'Holiday List'
},
# DocPerm
{
- 'cancel': 1,
- 'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'permlevel': 0,
- 'write': 1
+ 'doctype': u'DocPerm'
},
- # DocPerm
+ # DocField
{
- 'doctype': 'DocPerm',
- 'idx': 2,
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
- 'permlevel': 1
- },
-
- # DocField
- {
- 'doctype': 'DocField',
- 'fieldname': 'holiday_list_name',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Holiday List Name',
- 'oldfieldname': 'holiday_list_name',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'holiday_list_name',
+ 'fieldtype': u'Data',
+ 'label': u'Holiday List Name',
+ 'oldfieldname': u'holiday_list_name',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'is_default',
- 'fieldtype': 'Check',
- 'idx': 3,
- 'label': 'Default',
+ 'doctype': u'DocField',
+ 'fieldname': u'is_default',
+ 'fieldtype': u'Check',
+ 'label': u'Default',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'fiscal_year',
- 'fieldtype': 'Select',
- 'idx': 4,
+ 'doctype': u'DocField',
+ 'fieldname': u'fiscal_year',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Fiscal Year',
- 'oldfieldname': 'fiscal_year',
- 'oldfieldtype': 'Link',
- 'options': 'link:Fiscal Year',
+ 'label': u'Fiscal Year',
+ 'oldfieldname': u'fiscal_year',
+ 'oldfieldtype': u'Link',
+ 'options': u'link:Fiscal Year',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'weekly_off',
- 'fieldtype': 'Select',
- 'idx': 5,
- 'label': 'Weekly Off',
+ 'doctype': u'DocField',
+ 'fieldname': u'weekly_off',
+ 'fieldtype': u'Select',
+ 'label': u'Weekly Off',
'no_copy': 1,
- 'options': '\nSunday\nMonday\nTuesday\nWednesday\nThursday\nFriday\nSaturday',
+ 'options': u'\nSunday\nMonday\nTuesday\nWednesday\nThursday\nFriday\nSaturday',
'permlevel': 0,
'print_hide': 1,
'report_hide': 1
@@ -133,35 +120,34 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'idx': 6,
- 'label': 'Get Weekly Off Dates',
- 'options': 'get_weekly_off_dates',
+ 'doctype': u'DocField',
+ 'fieldname': u'get_weekly_off_dates',
+ 'fieldtype': u'Button',
+ 'label': u'Get Weekly Off Dates',
+ 'options': u'get_weekly_off_dates',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'holiday_list_details',
- 'fieldtype': 'Table',
- 'idx': 7,
- 'label': 'Holiday List Details',
- 'oldfieldname': 'holiday_list_details',
- 'oldfieldtype': 'Table',
- 'options': 'Holiday List Detail',
+ 'doctype': u'DocField',
+ 'fieldname': u'holiday_list_details',
+ 'fieldtype': u'Table',
+ 'label': u'Holiday List Details',
+ 'oldfieldname': u'holiday_list_details',
+ 'oldfieldtype': u'Table',
+ 'options': u'Holiday List Detail',
'permlevel': 0,
'reqd': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'idx': 8,
- 'label': 'Clear Table',
- 'options': 'clear_table',
+ 'doctype': u'DocField',
+ 'fieldname': u'clear_table',
+ 'fieldtype': u'Button',
+ 'label': u'Clear Table',
+ 'options': u'clear_table',
'permlevel': 0
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/holiday_list_detail/holiday_list_detail.txt b/erpnext/hr/doctype/holiday_list_detail/holiday_list_detail.txt
index cc7ba94..238ad75 100644
--- a/erpnext/hr/doctype/holiday_list_detail/holiday_list_detail.txt
+++ b/erpnext/hr/doctype/holiday_list_detail/holiday_list_detail.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:03',
+ 'creation': '2012-03-27 14:35:57',
'docstatus': 0,
- 'modified': '2012-03-21 14:36:29',
+ 'modified': '2012-03-27 14:35:57',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/hr/doctype/invest_80_declaration_detail/invest_80_declaration_detail.txt b/erpnext/hr/doctype/invest_80_declaration_detail/invest_80_declaration_detail.txt
index 841b21e..ccccdb0 100644
--- a/erpnext/hr/doctype/invest_80_declaration_detail/invest_80_declaration_detail.txt
+++ b/erpnext/hr/doctype/invest_80_declaration_detail/invest_80_declaration_detail.txt
@@ -3,141 +3,133 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:05',
+ 'creation': '2012-03-27 14:35:57',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'umair@iwebnotes.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:57',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'HR',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 10
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Invest 80 Declaration Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Invest 80 Declaration Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Invest 80 Declaration Detail',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Invest 80 Declaration Detail',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1,
- 'role': 'System Manager'
+ 'role': u'System Manager'
},
# DocType, Invest 80 Declaration Detail
{
'doctype': 'DocType',
- 'name': 'Invest 80 Declaration Detail'
+ 'name': u'Invest 80 Declaration Detail'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'permlevel': 0,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
+ 'doctype': u'DocPerm',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'particulars4',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'Particulars',
- 'oldfieldname': 'particulars4',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'particulars4',
+ 'fieldtype': u'Small Text',
+ 'label': u'Particulars',
+ 'oldfieldname': u'particulars4',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1,
'reqd': 1,
- 'width': '300px'
+ 'width': u'300px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'under_section4',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Under Section',
- 'oldfieldname': 'under_section4',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'under_section4',
+ 'fieldtype': u'Data',
+ 'label': u'Under Section',
+ 'oldfieldname': u'under_section4',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'max_limit4',
- 'fieldtype': 'Currency',
- 'idx': 3,
- 'label': 'Max. Limit',
- 'oldfieldname': 'max_limit4',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'max_limit4',
+ 'fieldtype': u'Currency',
+ 'label': u'Max. Limit',
+ 'oldfieldname': u'max_limit4',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'actual_amount4',
- 'fieldtype': 'Currency',
- 'idx': 4,
- 'label': 'Actual Amount',
- 'oldfieldname': 'actual_amount4',
- 'oldfieldtype': 'Currency',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'actual_amount4',
+ 'fieldtype': u'Currency',
+ 'label': u'Actual Amount',
+ 'oldfieldname': u'actual_amount4',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'eligible_amount4',
- 'fieldtype': 'Currency',
- 'idx': 5,
- 'label': 'Eligible Amount',
- 'oldfieldname': 'eligible_amount4',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'eligible_amount4',
+ 'fieldtype': u'Currency',
+ 'label': u'Eligible Amount',
+ 'oldfieldname': u'eligible_amount4',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'modified_amount4',
- 'fieldtype': 'Currency',
- 'idx': 6,
- 'label': 'Modified Amount',
- 'oldfieldname': 'modified_amount4',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'modified_amount4',
+ 'fieldtype': u'Currency',
+ 'label': u'Modified Amount',
+ 'oldfieldname': u'modified_amount4',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/it_checklist/it_checklist.txt b/erpnext/hr/doctype/it_checklist/it_checklist.txt
index b28e9df..1ccc09f 100644
--- a/erpnext/hr/doctype/it_checklist/it_checklist.txt
+++ b/erpnext/hr/doctype/it_checklist/it_checklist.txt
@@ -3,59 +3,58 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:05',
+ 'creation': '2012-03-27 14:35:57',
'docstatus': 0,
- 'modified': '2010-12-30 14:53:02',
- 'modified_by': 'umair@iwebnotes.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:57',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
'allow_trash': 1,
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'module': 'HR',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Tabbed',
- 'server_code_error': ' ',
+ 'section_style': u'Tabbed',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 455
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'IT Checklist',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'IT Checklist',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'IT Checklist',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'IT Checklist',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, IT Checklist
{
'doctype': 'DocType',
- 'name': 'IT Checklist'
+ 'name': u'IT Checklist'
},
# DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'submit': 0,
'write': 1
},
@@ -64,10 +63,9 @@
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 2,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'HR User',
+ 'role': u'HR User',
'write': 1
},
@@ -75,148 +73,138 @@
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 3,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'HR Manager',
+ 'role': u'HR Manager',
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 4,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'System Manager'
+ 'role': u'System Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 5,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'HR User'
+ 'role': u'HR User'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 6,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'HR Manager'
+ 'role': u'HR Manager'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'fiscal_year',
- 'fieldtype': 'Data',
- 'idx': 2,
+ 'doctype': u'DocField',
+ 'fieldname': u'fiscal_year',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Fiscal Year',
- 'oldfieldname': 'fiscal_year',
- 'oldfieldtype': 'Data',
+ 'label': u'Fiscal Year',
+ 'oldfieldname': u'fiscal_year',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 3,
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'default': 'Yes',
- 'doctype': 'DocField',
- 'fieldname': 'is_cheklist_active',
- 'fieldtype': 'Select',
- 'idx': 4,
- 'label': 'Is IT Cheklist Active?',
- 'oldfieldname': 'is_cheklist_active',
- 'oldfieldtype': 'Select',
- 'options': 'Yes\nNo',
+ 'colour': u'White:FFF',
+ 'default': u'Yes',
+ 'doctype': u'DocField',
+ 'fieldname': u'is_cheklist_active',
+ 'fieldtype': u'Select',
+ 'label': u'Is IT Cheklist Active?',
+ 'oldfieldname': u'is_cheklist_active',
+ 'oldfieldtype': u'Select',
+ 'options': u'Yes\nNo',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 5,
- 'label': 'Employee Information',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'employee_information',
+ 'fieldtype': u'Section Break',
+ 'label': u'Employee Information',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 6,
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'employee',
- 'fieldtype': 'Link',
- 'idx': 7,
- 'label': 'Employee',
- 'oldfieldname': 'employee',
- 'oldfieldtype': 'Link',
- 'options': 'Employee',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'employee',
+ 'fieldtype': u'Link',
+ 'label': u'Employee',
+ 'oldfieldname': u'employee',
+ 'oldfieldtype': u'Link',
+ 'options': u'Employee',
'permlevel': 0,
'reqd': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'employee_name',
- 'fieldtype': 'Data',
- 'idx': 8,
- 'label': 'Employee Name',
- 'oldfieldname': 'employee_name',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'employee_name',
+ 'fieldtype': u'Data',
+ 'label': u'Employee Name',
+ 'oldfieldname': u'employee_name',
+ 'oldfieldtype': u'Data',
'permlevel': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'hra_count',
- 'fieldtype': 'Currency',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'hra_count',
+ 'fieldtype': u'Currency',
'hidden': 1,
- 'idx': 9,
- 'label': 'HRA Count',
+ 'label': u'HRA Count',
'no_copy': 0,
- 'oldfieldname': 'hra_count',
- 'oldfieldtype': 'Currency',
+ 'oldfieldname': u'hra_count',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'print_hide': 1,
'report_hide': 1
@@ -224,414 +212,394 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'metro',
- 'fieldtype': 'Select',
- 'idx': 10,
- 'label': 'Is location a metro city?',
- 'oldfieldname': 'metro',
- 'oldfieldtype': 'Select',
- 'options': '\nYes\nNo',
+ 'doctype': u'DocField',
+ 'fieldname': u'metro',
+ 'fieldtype': u'Select',
+ 'label': u'Is location a metro city?',
+ 'oldfieldname': u'metro',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nYes\nNo',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'sr_citizen',
- 'fieldtype': 'Select',
- 'idx': 11,
- 'label': 'Is senior citizen?',
- 'oldfieldname': 'sr_citizen',
- 'oldfieldtype': 'Select',
- 'options': '\nYes\nNo',
+ 'doctype': u'DocField',
+ 'fieldname': u'sr_citizen',
+ 'fieldtype': u'Select',
+ 'label': u'Is senior citizen?',
+ 'oldfieldname': u'sr_citizen',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nYes\nNo',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'part_sr_citizen',
- 'fieldtype': 'Select',
- 'idx': 12,
- 'label': 'Parents are sr. citizen?',
- 'oldfieldname': 'part_sr_citizen',
- 'oldfieldtype': 'Select',
- 'options': '\nYes\nNo',
+ 'doctype': u'DocField',
+ 'fieldname': u'part_sr_citizen',
+ 'fieldtype': u'Select',
+ 'label': u'Parents are sr. citizen?',
+ 'oldfieldname': u'part_sr_citizen',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nYes\nNo',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'basic',
- 'fieldtype': 'Currency',
- 'idx': 13,
- 'label': 'Annual Basic',
- 'oldfieldname': 'basic',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'basic',
+ 'fieldtype': u'Currency',
+ 'label': u'Annual Basic',
+ 'oldfieldname': u'basic',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'sum of earning terms',
- 'doctype': 'DocField',
- 'fieldname': 'gross_income',
- 'fieldtype': 'Currency',
- 'idx': 14,
- 'label': 'Annual Gross Income',
- 'oldfieldname': 'gross_income',
- 'oldfieldtype': 'Currency',
+ 'colour': u'White:FFF',
+ 'description': u'sum of earning terms',
+ 'doctype': u'DocField',
+ 'fieldname': u'gross_income',
+ 'fieldtype': u'Currency',
+ 'label': u'Annual Gross Income',
+ 'oldfieldname': u'gross_income',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Please fill up all data then press "Done"',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'idx': 15,
- 'label': 'Done',
- 'oldfieldtype': 'Button',
+ 'colour': u'White:FFF',
+ 'description': u'Please fill up all data then press "Done"',
+ 'doctype': u'DocField',
+ 'fieldname': u'done',
+ 'fieldtype': u'Button',
+ 'label': u'Done',
+ 'oldfieldtype': u'Button',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 16,
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break2',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'rent_acc',
- 'fieldtype': 'Select',
- 'idx': 17,
- 'label': 'Having rented accomodation?',
- 'oldfieldname': 'rent_acc',
- 'oldfieldtype': 'Select',
- 'options': '\nYes\nNo',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'rent_acc',
+ 'fieldtype': u'Select',
+ 'label': u'Having rented accomodation?',
+ 'oldfieldname': u'rent_acc',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nYes\nNo',
'permlevel': 0,
'reqd': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'ann_rent',
- 'fieldtype': 'Currency',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'ann_rent',
+ 'fieldtype': u'Currency',
'hidden': 1,
- 'idx': 18,
- 'label': 'Enter annual rent paid',
- 'oldfieldname': 'ann_rent',
- 'oldfieldtype': 'Currency',
+ 'label': u'Enter annual rent paid',
+ 'oldfieldname': u'ann_rent',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Disability % of the Handicapped Dependents',
- 'doctype': 'DocField',
- 'fieldname': 'per_dep_dis',
- 'fieldtype': 'Select',
- 'idx': 19,
- 'label': 'Dependents Disability %',
- 'oldfieldname': 'per_dep_dis',
- 'oldfieldtype': 'Select',
- 'options': '\nLess than 80% disability\nMore than 80% disability',
+ 'colour': u'White:FFF',
+ 'description': u'Disability % of the Handicapped Dependents',
+ 'doctype': u'DocField',
+ 'fieldname': u'per_dep_dis',
+ 'fieldtype': u'Select',
+ 'label': u'Dependents Disability %',
+ 'oldfieldname': u'per_dep_dis',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nLess than 80% disability\nMore than 80% disability',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'per_self_dis',
- 'fieldtype': 'Select',
- 'idx': 20,
- 'label': 'Self disability %',
- 'oldfieldname': 'per_self_dis',
- 'oldfieldtype': 'Select',
- 'options': '\nLess than 80% disability\nMore than 80% disability',
+ 'doctype': u'DocField',
+ 'fieldname': u'per_self_dis',
+ 'fieldtype': u'Select',
+ 'label': u'Self disability %',
+ 'oldfieldname': u'per_self_dis',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nLess than 80% disability\nMore than 80% disability',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'pf',
- 'fieldtype': 'Currency',
- 'idx': 21,
- 'label': 'Annual PF',
- 'oldfieldname': 'pf',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'pf',
+ 'fieldtype': u'Currency',
+ 'label': u'Annual PF',
+ 'oldfieldname': u'pf',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 22,
- 'label': 'Exemptions',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'exemptions',
+ 'fieldtype': u'Section Break',
+ 'label': u'Exemptions',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'idx': 23,
- 'label': 'Exemptions1',
- 'oldfieldtype': 'HTML',
- 'options': '<b>Exemptions under section 10 & 17</b>',
+ 'doctype': u'DocField',
+ 'fieldname': u'exemptions1',
+ 'fieldtype': u'HTML',
+ 'label': u'Exemptions1',
+ 'oldfieldtype': u'HTML',
+ 'options': u'<b>Exemptions under section 10 & 17</b>',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'exe_declaration_details',
- 'fieldtype': 'Table',
- 'idx': 24,
- 'label': 'Exemption Detail',
- 'oldfieldname': 'exe_declaration_details',
- 'oldfieldtype': 'Table',
- 'options': 'Declaration Detail',
+ 'doctype': u'DocField',
+ 'fieldname': u'exe_declaration_details',
+ 'fieldtype': u'Table',
+ 'label': u'Exemption Detail',
+ 'oldfieldname': u'exe_declaration_details',
+ 'oldfieldtype': u'Table',
+ 'options': u'Declaration Detail',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 25,
- 'label': 'Other Income',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'other_income',
+ 'fieldtype': u'Section Break',
+ 'label': u'Other Income',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'oth_inc_decl_details',
- 'fieldtype': 'Table',
- 'idx': 26,
- 'label': 'Other Income Details',
- 'oldfieldname': 'oth_inc_decl_details',
- 'oldfieldtype': 'Table',
- 'options': 'Other Income Detail',
+ 'doctype': u'DocField',
+ 'fieldname': u'oth_inc_decl_details',
+ 'fieldtype': u'Table',
+ 'label': u'Other Income Details',
+ 'oldfieldname': u'oth_inc_decl_details',
+ 'oldfieldtype': u'Table',
+ 'options': u'Other Income Detail',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 27,
- 'label': 'Chapter VI A',
- 'oldfieldtype': 'Section Break',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'chapter_vi_a',
+ 'fieldtype': u'Section Break',
+ 'label': u'Chapter VI A',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'idx': 28,
- 'label': 'deduction chap via',
- 'oldfieldtype': 'HTML',
- 'options': '<b>Deduction under Chapter VI A</b>',
+ 'doctype': u'DocField',
+ 'fieldname': u'deduction_chap_via',
+ 'fieldtype': u'HTML',
+ 'label': u'deduction chap via',
+ 'oldfieldtype': u'HTML',
+ 'options': u'<b>Deduction under Chapter VI A</b>',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'chap_via_decl_details',
- 'fieldtype': 'Table',
- 'idx': 29,
- 'label': 'Chap VI A Details',
- 'oldfieldname': 'chap_via_decl_details',
- 'oldfieldtype': 'Table',
- 'options': 'Chapter VI A Detail',
+ 'doctype': u'DocField',
+ 'fieldname': u'chap_via_decl_details',
+ 'fieldtype': u'Table',
+ 'label': u'Chap VI A Details',
+ 'oldfieldname': u'chap_via_decl_details',
+ 'oldfieldtype': u'Table',
+ 'options': u'Chapter VI A Detail',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 30,
- 'label': '80 C',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'80_c',
+ 'fieldtype': u'Section Break',
+ 'label': u'80 C',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'idx': 31,
- 'label': 'investment 80 C',
- 'oldfieldtype': 'HTML',
- 'options': '<b>Investment under Section 80 C & 80CCC qualifying for deduction upto RS. 1 Lac</b>',
+ 'doctype': u'DocField',
+ 'fieldname': u'investment_80_c',
+ 'fieldtype': u'HTML',
+ 'label': u'investment 80 C',
+ 'oldfieldtype': u'HTML',
+ 'options': u'<b>Investment under Section 80 C & 80CCC qualifying for deduction upto RS. 1 Lac</b>',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'invest_80_decl_details',
- 'fieldtype': 'Table',
- 'idx': 32,
- 'label': 'Invest 80 Decl Details',
- 'oldfieldname': 'invest_80_decl_details',
- 'oldfieldtype': 'Table',
- 'options': 'Invest 80 Declaration Detail',
+ 'doctype': u'DocField',
+ 'fieldname': u'invest_80_decl_details',
+ 'fieldtype': u'Table',
+ 'label': u'Invest 80 Decl Details',
+ 'oldfieldname': u'invest_80_decl_details',
+ 'oldfieldtype': u'Table',
+ 'options': u'Invest 80 Declaration Detail',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 33,
- 'label': 'Total Taxable Income',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'total_taxable_income',
+ 'fieldtype': u'Section Break',
+ 'label': u'Total Taxable Income',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'idx': 34,
- 'label': 'Calculate',
- 'oldfieldtype': 'Button',
- 'options': 'calculate_tax',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'calculate',
+ 'fieldtype': u'Button',
+ 'label': u'Calculate',
+ 'oldfieldtype': u'Button',
+ 'options': u'calculate_tax',
'permlevel': 0,
- 'trigger': 'Server'
+ 'trigger': u'Server'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'net_tot_tax_income',
- 'fieldtype': 'Currency',
- 'idx': 35,
- 'label': 'Net Total Taxable Income',
- 'oldfieldname': 'net_tot_tax_income',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'net_tot_tax_income',
+ 'fieldtype': u'Currency',
+ 'label': u'Net Total Taxable Income',
+ 'oldfieldname': u'net_tot_tax_income',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'tax_tot_income',
- 'fieldtype': 'Currency',
- 'idx': 36,
- 'label': 'Tax on Total Income',
- 'oldfieldname': 'tax_tot_income',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'tax_tot_income',
+ 'fieldtype': u'Currency',
+ 'label': u'Tax on Total Income',
+ 'oldfieldname': u'tax_tot_income',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'edu_cess',
- 'fieldtype': 'Currency',
- 'idx': 37,
- 'label': 'Education Cess',
- 'oldfieldname': 'edu_cess',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'edu_cess',
+ 'fieldtype': u'Currency',
+ 'label': u'Education Cess',
+ 'oldfieldname': u'edu_cess',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'applicable_from',
- 'fieldtype': 'Select',
- 'idx': 38,
- 'label': 'Applicable from ',
- 'oldfieldname': 'applicable_from',
- 'oldfieldtype': 'Select',
- 'options': '\nJanuary\nFebruary\nMarch\nApril\nMay\nJune\nJuly\nAugust\nSeptember\nOctober\nNovember\nDecember',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'applicable_from',
+ 'fieldtype': u'Select',
+ 'label': u'Applicable from ',
+ 'oldfieldname': u'applicable_from',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nJanuary\nFebruary\nMarch\nApril\nMay\nJune\nJuly\nAugust\nSeptember\nOctober\nNovember\nDecember',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'rem_months',
- 'fieldtype': 'Select',
- 'idx': 39,
- 'label': 'Remaining month in year',
- 'oldfieldname': 'rem_months',
- 'oldfieldtype': 'Select',
- 'options': '\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12',
+ 'doctype': u'DocField',
+ 'fieldname': u'rem_months',
+ 'fieldtype': u'Select',
+ 'label': u'Remaining month in year',
+ 'oldfieldname': u'rem_months',
+ 'oldfieldtype': u'Select',
+ 'options': u'\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 40,
- 'label': 'Calculate Tax',
- 'oldfieldtype': 'Section Break',
- 'options': 'Simple',
+ 'doctype': u'DocField',
+ 'fieldname': u'calculate_tax',
+ 'fieldtype': u'Section Break',
+ 'label': u'Calculate Tax',
+ 'oldfieldtype': u'Section Break',
+ 'options': u'Simple',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'idx': 41,
- 'label': 'Calculate Monthly Tax ',
- 'oldfieldtype': 'Button',
- 'options': 'calc_tax_pm',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'calculate_monthly_tax',
+ 'fieldtype': u'Button',
+ 'label': u'Calculate Monthly Tax ',
+ 'oldfieldtype': u'Button',
+ 'options': u'calc_tax_pm',
'permlevel': 0,
- 'trigger': 'Server'
+ 'trigger': u'Server'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'tax_per_month',
- 'fieldtype': 'Currency',
- 'idx': 42,
- 'label': 'Tax per Month',
- 'oldfieldname': 'tax_per_month',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'tax_per_month',
+ 'fieldtype': u'Currency',
+ 'label': u'Tax per Month',
+ 'oldfieldname': u'tax_per_month',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/kra_sheet/kra_sheet.txt b/erpnext/hr/doctype/kra_sheet/kra_sheet.txt
index a1e466b..6d11d5d 100644
--- a/erpnext/hr/doctype/kra_sheet/kra_sheet.txt
+++ b/erpnext/hr/doctype/kra_sheet/kra_sheet.txt
@@ -3,33 +3,33 @@
# These values are common in all dictionaries
{
- 'creation': '2010-09-01 15:48:06',
+ 'creation': '2012-03-27 14:35:58',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'ashwini@webnotestech.com'
+ 'modified': '2012-03-27 14:35:58',
+ 'modified_by': u'Administrator',
+ 'owner': u'ashwini@webnotestech.com'
},
# These values are common for all DocType
{
- 'autoname': 'KSHEET.#####',
- 'colour': 'White:FFF',
+ 'autoname': u'KSHEET.#####',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'HR',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 6
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'KRA Sheet',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'KRA Sheet',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0,
'reqd': 1
},
@@ -37,32 +37,30 @@
# DocType, KRA Sheet
{
'doctype': 'DocType',
- 'name': 'KRA Sheet'
+ 'name': u'KRA Sheet'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Key Performance Area',
- 'doctype': 'DocField',
- 'fieldname': 'kra',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'KRA',
- 'oldfieldname': 'kra',
- 'oldfieldtype': 'Small Text',
- 'width': '200px'
+ 'colour': u'White:FFF',
+ 'description': u'Key Performance Area',
+ 'doctype': u'DocField',
+ 'fieldname': u'kra',
+ 'fieldtype': u'Small Text',
+ 'label': u'KRA',
+ 'oldfieldname': u'kra',
+ 'oldfieldtype': u'Small Text',
+ 'width': u'200px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'per_weightage',
- 'fieldtype': 'Currency',
- 'idx': 2,
- 'label': 'Weightage (%)',
- 'oldfieldname': 'per_weightage',
- 'oldfieldtype': 'Currency',
- 'width': '100px'
+ 'doctype': u'DocField',
+ 'fieldname': u'per_weightage',
+ 'fieldtype': u'Currency',
+ 'label': u'Weightage (%)',
+ 'oldfieldname': u'per_weightage',
+ 'oldfieldtype': u'Currency',
+ 'width': u'100px'
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/kra_template/kra_template.txt b/erpnext/hr/doctype/kra_template/kra_template.txt
index 5518926..f93a400 100644
--- a/erpnext/hr/doctype/kra_template/kra_template.txt
+++ b/erpnext/hr/doctype/kra_template/kra_template.txt
@@ -3,44 +3,44 @@
# These values are common in all dictionaries
{
- 'creation': '2010-09-01 15:48:06',
+ 'creation': '2012-03-27 14:35:58',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'ashwini@webnotestech.com'
+ 'modified': '2012-03-27 14:35:58',
+ 'modified_by': u'Administrator',
+ 'owner': u'ashwini@webnotestech.com'
},
# These values are common for all DocType
{
- 'autoname': 'field:kra_title',
- 'colour': 'White:FFF',
+ 'autoname': u'field:kra_title',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'HR',
+ 'document_type': u'Master',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 3
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'KRA Template',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'KRA Template',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'KRA Template',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'KRA Template',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
'write': 1
@@ -49,67 +49,63 @@
# DocType, KRA Template
{
'doctype': 'DocType',
- 'name': 'KRA Template'
+ 'name': u'KRA Template'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'role': 'HR Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'System Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'role': 'HR User'
+ 'doctype': u'DocPerm',
+ 'role': u'HR Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'role': 'System Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'HR User'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'role': 'System Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'System Manager'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'kra_title',
- 'fieldtype': 'Data',
- 'idx': 1,
- 'label': 'KRA Title',
- 'oldfieldname': 'kra_title',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'kra_title',
+ 'fieldtype': u'Data',
+ 'label': u'KRA Title',
+ 'oldfieldname': u'kra_title',
+ 'oldfieldtype': u'Data',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Small Text',
- 'idx': 2,
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Small Text',
- 'width': '300px'
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Small Text',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Small Text',
+ 'width': u'300px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'kra_sheet',
- 'fieldtype': 'Table',
- 'idx': 3,
- 'label': 'KRA Sheet',
- 'oldfieldname': 'kra_sheet',
- 'oldfieldtype': 'Table',
- 'options': 'KRA Sheet'
+ 'doctype': u'DocField',
+ 'fieldname': u'kra_sheet',
+ 'fieldtype': u'Table',
+ 'label': u'KRA Sheet',
+ 'oldfieldname': u'kra_sheet',
+ 'oldfieldtype': u'Table',
+ 'options': u'KRA Sheet'
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.txt b/erpnext/hr/doctype/leave_allocation/leave_allocation.txt
index f461ca8..9045221 100644
--- a/erpnext/hr/doctype/leave_allocation/leave_allocation.txt
+++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2011-02-14 10:18:47',
+ 'creation': '2012-03-27 14:35:58',
'docstatus': 0,
- 'modified': '2012-03-21 12:49:25',
+ 'modified': '2012-03-27 14:45:49',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -17,6 +17,7 @@
'colour': u'White:FFF',
'default_print_format': u'Standard',
'doctype': 'DocType',
+ 'is_submittable': 1,
'module': u'HR',
'name': '__common__',
'search_fields': u'employee,employee_name,leave_type,total_leaves_allocated,fiscal_year',
@@ -83,110 +84,6 @@
'cancel': 1,
'create': 1,
'doctype': u'DocPerm',
- 'match': u'owner',
- 'permlevel': 0,
- 'role': u'HR User',
- 'submit': 1,
- 'write': 1
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'match': u'owner',
- 'permlevel': 0,
- 'role': u'HR User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'match': u'owner',
- 'permlevel': 0,
- 'role': u'HR User',
- 'submit': 1,
- 'write': 1
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'match': u'owner',
- 'permlevel': 0,
- 'role': u'HR User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'match': u'owner',
- 'permlevel': 0,
- 'role': u'HR User',
- 'submit': 1,
- 'write': 1
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'match': u'owner',
- 'permlevel': 0,
- 'role': u'HR User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'match': u'owner',
- 'permlevel': 0,
- 'role': u'HR User',
- 'submit': 1,
- 'write': 1
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'match': u'owner',
- 'permlevel': 0,
- 'role': u'HR User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
'permlevel': 0,
'role': u'HR Manager',
'submit': 1,
@@ -203,6 +100,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break0',
'fieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
@@ -304,6 +202,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break1',
'fieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
diff --git a/erpnext/hr/doctype/leave_application/leave_application.txt b/erpnext/hr/doctype/leave_application/leave_application.txt
index 06b4170..b2ce2ab 100644
--- a/erpnext/hr/doctype/leave_application/leave_application.txt
+++ b/erpnext/hr/doctype/leave_application/leave_application.txt
@@ -3,53 +3,54 @@
# These values are common in all dictionaries
{
- 'creation': '2011-02-10 14:10:08',
+ 'creation': '2012-03-27 14:35:58',
'docstatus': 0,
- 'modified': '2011-07-11 12:48:49',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:45:49',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1310019491',
- 'autoname': 'LAP/.#####',
- 'colour': 'White:FFF',
+ '_last_update': u'1310019491',
+ 'autoname': u'LAP/.#####',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Transaction',
- 'module': 'HR',
+ 'document_type': u'Transaction',
+ 'is_submittable': 1,
+ 'module': u'HR',
'name': '__common__',
- 'search_fields': 'employee,employee_name,leave_type,from_date,to_date,total_leave_days,fiscal_year',
- 'section_style': 'Simple',
+ 'search_fields': u'employee,employee_name,leave_type,from_date,to_date,total_leave_days,fiscal_year',
+ 'section_style': u'Simple',
'show_in_menu': 0,
- 'subject': 'From %(employee_name)s, %(designation)s',
- 'tag_fields': 'leave_type',
+ 'subject': u'From %(employee_name)s, %(designation)s',
+ 'tag_fields': u'leave_type',
'version': 17
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Leave Application',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Leave Application',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Leave Application',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Leave Application',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Leave Application
{
'doctype': 'DocType',
- 'name': 'Leave Application'
+ 'name': u'Leave Application'
},
# DocPerm
@@ -57,9 +58,8 @@
'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'match': 'owner',
+ 'doctype': u'DocPerm',
+ 'match': u'owner',
'permlevel': 0,
'submit': 1,
'write': 1
@@ -70,9 +70,8 @@
'amend': 0,
'cancel': 0,
'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'match': 'owner',
+ 'doctype': u'DocPerm',
+ 'match': u'owner',
'permlevel': 0,
'submit': 0,
'write': 0
@@ -83,10 +82,9 @@
'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 3,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'HR User',
+ 'role': u'HR User',
'submit': 1,
'write': 1
},
@@ -96,48 +94,54 @@
'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 4,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'HR Manager',
+ 'role': u'HR Manager',
'submit': 1,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 5,
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'HR User'
+ 'role': u'HR User',
+ 'submit': 0,
+ 'write': 0
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 6,
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'HR Manager'
+ 'role': u'HR Manager',
+ 'submit': 0,
+ 'write': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 1,
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'employee',
- 'fieldtype': 'Link',
- 'idx': 2,
+ 'doctype': u'DocField',
+ 'fieldname': u'employee',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Employee',
- 'options': 'Employee',
+ 'label': u'Employee',
+ 'options': u'Employee',
'permlevel': 0,
'reqd': 1,
'search_index': 1
@@ -145,25 +149,23 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'employee_name',
- 'fieldtype': 'Data',
- 'idx': 3,
+ 'doctype': u'DocField',
+ 'fieldname': u'employee_name',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Employee Name',
+ 'label': u'Employee Name',
'permlevel': 1,
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'leave_type',
- 'fieldtype': 'Select',
- 'idx': 4,
+ 'doctype': u'DocField',
+ 'fieldname': u'leave_type',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Leave Type',
- 'options': 'link:Leave Type',
+ 'label': u'Leave Type',
+ 'options': u'link:Leave Type',
'permlevel': 0,
'reqd': 1,
'search_index': 1
@@ -171,23 +173,21 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'leave_balance',
- 'fieldtype': 'Currency',
- 'idx': 5,
- 'label': 'Leave Balance',
+ 'doctype': u'DocField',
+ 'fieldname': u'leave_balance',
+ 'fieldtype': u'Currency',
+ 'label': u'Leave Balance',
'permlevel': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'default': 'Today',
- 'doctype': 'DocField',
- 'fieldname': 'posting_date',
- 'fieldtype': 'Date',
- 'idx': 6,
- 'label': 'Posting Date',
+ 'colour': u'White:FFF',
+ 'default': u'Today',
+ 'doctype': u'DocField',
+ 'fieldname': u'posting_date',
+ 'fieldtype': u'Date',
+ 'label': u'Posting Date',
'no_copy': 1,
'permlevel': 1,
'reqd': 1
@@ -195,13 +195,12 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'fiscal_year',
- 'fieldtype': 'Select',
- 'idx': 7,
+ 'doctype': u'DocField',
+ 'fieldname': u'fiscal_year',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Fiscal Year',
- 'options': 'link:Fiscal Year',
+ 'label': u'Fiscal Year',
+ 'options': u'link:Fiscal Year',
'permlevel': 0,
'reqd': 1,
'search_index': 0
@@ -209,100 +208,92 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 8,
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'half_day',
- 'fieldtype': 'Check',
- 'idx': 9,
- 'label': 'Half Day',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'half_day',
+ 'fieldtype': u'Check',
+ 'label': u'Half Day',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'from_date',
- 'fieldtype': 'Date',
- 'idx': 10,
- 'label': 'From Date',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'from_date',
+ 'fieldtype': u'Date',
+ 'label': u'From Date',
'permlevel': 0,
'search_index': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'to_date',
- 'fieldtype': 'Date',
- 'idx': 11,
- 'label': 'To Date',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'to_date',
+ 'fieldtype': u'Date',
+ 'label': u'To Date',
'permlevel': 0,
'search_index': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'total_leave_days',
- 'fieldtype': 'Currency',
- 'idx': 12,
- 'label': 'Total Leave Days',
+ 'doctype': u'DocField',
+ 'fieldname': u'total_leave_days',
+ 'fieldtype': u'Currency',
+ 'label': u'Total Leave Days',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Small Text',
- 'idx': 13,
- 'label': 'Description',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Small Text',
+ 'label': u'Description',
'permlevel': 0,
- 'width': '300px'
+ 'width': u'300px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'letter_head',
- 'fieldtype': 'Link',
- 'idx': 14,
- 'label': 'Letter Head',
- 'options': 'Letter Head',
+ 'doctype': u'DocField',
+ 'fieldname': u'letter_head',
+ 'fieldtype': u'Link',
+ 'label': u'Letter Head',
+ 'options': u'Letter Head',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amended_from',
- 'fieldtype': 'Data',
- 'idx': 15,
- 'label': 'Amended From',
+ 'doctype': u'DocField',
+ 'fieldname': u'amended_from',
+ 'fieldtype': u'Data',
+ 'label': u'Amended From',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amendment_date',
- 'fieldtype': 'Date',
- 'idx': 16,
- 'label': 'Amendment Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'amendment_date',
+ 'fieldtype': u'Date',
+ 'label': u'Amendment Date',
'permlevel': 1
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.txt b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.txt
index a044b16..9adc243 100644
--- a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.txt
+++ b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:08',
+ 'creation': '2012-03-27 14:35:59',
'docstatus': 0,
- 'modified': '2012-03-21 14:42:27',
+ 'modified': '2012-03-27 14:35:59',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -108,6 +108,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break0',
'fieldtype': u'Column Break',
'width': u'50%'
},
@@ -170,6 +171,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break1',
'fieldtype': u'Column Break',
'width': u'50%'
},
@@ -218,6 +220,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'allocate',
'fieldtype': u'Button',
'label': u'Allocate',
'options': u'allocate_leave',
diff --git a/erpnext/hr/doctype/leave_type/leave_type.txt b/erpnext/hr/doctype/leave_type/leave_type.txt
index fb9aafd..a6a1f2d 100644
--- a/erpnext/hr/doctype/leave_type/leave_type.txt
+++ b/erpnext/hr/doctype/leave_type/leave_type.txt
@@ -3,46 +3,46 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:08',
+ 'creation': '2012-03-27 14:35:59',
'docstatus': 0,
- 'modified': '2011-02-10 17:05:15',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:59',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
'allow_trash': 1,
- 'autoname': 'field:leave_type_name',
- 'colour': 'White:FFF',
+ 'autoname': u'field:leave_type_name',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'HR',
+ 'document_type': u'Master',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 23
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Leave Type',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Leave Type',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Leave Type',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Leave Type',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
'write': 1
@@ -51,90 +51,82 @@
# DocType, Leave Type
{
'doctype': 'DocType',
- 'name': 'Leave Type'
+ 'name': u'Leave Type'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'role': 'System Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'System Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'role': 'HR User'
+ 'doctype': u'DocPerm',
+ 'role': u'HR User'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 3,
- 'role': 'HR Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'HR Manager'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'leave_type_name',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Leave Type Name',
- 'oldfieldname': 'leave_type_name',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'leave_type_name',
+ 'fieldtype': u'Data',
+ 'label': u'Leave Type Name',
+ 'oldfieldname': u'leave_type_name',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'max_days_allowed',
- 'fieldtype': 'Data',
- 'idx': 3,
- 'label': 'Max Days Leave Allowed',
- 'oldfieldname': 'max_days_allowed',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'max_days_allowed',
+ 'fieldtype': u'Data',
+ 'label': u'Max Days Leave Allowed',
+ 'oldfieldname': u'max_days_allowed',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'is_carry_forward',
- 'fieldtype': 'Check',
- 'idx': 4,
- 'label': 'Is Carry Forward',
- 'oldfieldname': 'is_carry_forward',
- 'oldfieldtype': 'Check',
+ 'doctype': u'DocField',
+ 'fieldname': u'is_carry_forward',
+ 'fieldtype': u'Check',
+ 'label': u'Is Carry Forward',
+ 'oldfieldname': u'is_carry_forward',
+ 'oldfieldtype': u'Check',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'is_encash',
- 'fieldtype': 'Check',
+ 'doctype': u'DocField',
+ 'fieldname': u'is_encash',
+ 'fieldtype': u'Check',
'hidden': 1,
- 'idx': 5,
- 'label': 'Is Encash',
- 'oldfieldname': 'is_encash',
- 'oldfieldtype': 'Check',
+ 'label': u'Is Encash',
+ 'oldfieldname': u'is_encash',
+ 'oldfieldtype': u'Check',
'permlevel': 0,
'print_hide': 1,
'report_hide': 1
@@ -142,11 +134,10 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'is_lwp',
- 'fieldtype': 'Check',
- 'idx': 6,
- 'label': 'Is LWP',
+ 'doctype': u'DocField',
+ 'fieldname': u'is_lwp',
+ 'fieldtype': u'Check',
+ 'label': u'Is LWP',
'permlevel': 0
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/other_income_detail/other_income_detail.txt b/erpnext/hr/doctype/other_income_detail/other_income_detail.txt
index 232427d..93a9ea0 100644
--- a/erpnext/hr/doctype/other_income_detail/other_income_detail.txt
+++ b/erpnext/hr/doctype/other_income_detail/other_income_detail.txt
@@ -3,139 +3,131 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:11',
+ 'creation': '2012-03-27 14:35:59',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'umair@iwebnotes.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:59',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'HR',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 6
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Other Income Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Other Income Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Other Income Detail',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Other Income Detail',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1,
- 'role': 'System Manager'
+ 'role': u'System Manager'
},
# DocType, Other Income Detail
{
'doctype': 'DocType',
- 'name': 'Other Income Detail'
+ 'name': u'Other Income Detail'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'permlevel': 0,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
+ 'doctype': u'DocPerm',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'particulars2',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'Particulars',
- 'oldfieldname': 'particulars2',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'particulars2',
+ 'fieldtype': u'Small Text',
+ 'label': u'Particulars',
+ 'oldfieldname': u'particulars2',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1,
'reqd': 1,
- 'width': '200px'
+ 'width': u'200px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'under_section2',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Under Section',
- 'oldfieldname': 'under_section2',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'under_section2',
+ 'fieldtype': u'Data',
+ 'label': u'Under Section',
+ 'oldfieldname': u'under_section2',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'max_limit2',
- 'fieldtype': 'Currency',
- 'idx': 3,
- 'label': 'Max. Limit',
- 'oldfieldname': 'max_limit2',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'max_limit2',
+ 'fieldtype': u'Currency',
+ 'label': u'Max. Limit',
+ 'oldfieldname': u'max_limit2',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'actual_amount2',
- 'fieldtype': 'Currency',
- 'idx': 4,
- 'label': 'Actual Amount',
- 'oldfieldname': 'actual_amount2',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'actual_amount2',
+ 'fieldtype': u'Currency',
+ 'label': u'Actual Amount',
+ 'oldfieldname': u'actual_amount2',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'eligible_amount2',
- 'fieldtype': 'Currency',
- 'idx': 5,
- 'label': 'Eligible Amount',
- 'oldfieldname': 'eligible_amount2',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'eligible_amount2',
+ 'fieldtype': u'Currency',
+ 'label': u'Eligible Amount',
+ 'oldfieldname': u'eligible_amount2',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'modified_amount2',
- 'fieldtype': 'Currency',
- 'idx': 6,
- 'label': 'Modified Amount',
- 'oldfieldname': 'modified_amount2',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'modified_amount2',
+ 'fieldtype': u'Currency',
+ 'label': u'Modified Amount',
+ 'oldfieldname': u'modified_amount2',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/previous_experience_detail/previous_experience_detail.txt b/erpnext/hr/doctype/previous_experience_detail/previous_experience_detail.txt
index 4cce723..f571a6a 100644
--- a/erpnext/hr/doctype/previous_experience_detail/previous_experience_detail.txt
+++ b/erpnext/hr/doctype/previous_experience_detail/previous_experience_detail.txt
@@ -3,125 +3,118 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:13',
+ 'creation': '2012-03-27 14:35:59',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:59',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'HR',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 3
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Previous Experience Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Previous Experience Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Previous Experience Detail',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Previous Experience Detail',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
- 'role': 'All',
+ 'role': u'All',
'write': 1
},
# DocType, Previous Experience Detail
{
'doctype': 'DocType',
- 'name': 'Previous Experience Detail'
+ 'name': u'Previous Experience Detail'
},
# DocPerm
{
- 'doctype': 'DocPerm'
+ 'doctype': u'DocPerm'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'company_name',
- 'fieldtype': 'Data',
- 'idx': 1,
- 'label': 'Company',
- 'oldfieldname': 'company_name',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'company_name',
+ 'fieldtype': u'Data',
+ 'label': u'Company',
+ 'oldfieldname': u'company_name',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'designation',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Designation',
- 'oldfieldname': 'designation',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'designation',
+ 'fieldtype': u'Data',
+ 'label': u'Designation',
+ 'oldfieldname': u'designation',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'salary',
- 'fieldtype': 'Currency',
- 'idx': 3,
- 'label': 'Salary',
- 'oldfieldname': 'salary',
- 'oldfieldtype': 'Currency'
+ 'doctype': u'DocField',
+ 'fieldname': u'salary',
+ 'fieldtype': u'Currency',
+ 'label': u'Salary',
+ 'oldfieldname': u'salary',
+ 'oldfieldtype': u'Currency'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'address',
- 'fieldtype': 'Small Text',
- 'idx': 4,
- 'label': 'Address',
- 'oldfieldname': 'address',
- 'oldfieldtype': 'Small Text'
+ 'doctype': u'DocField',
+ 'fieldname': u'address',
+ 'fieldtype': u'Small Text',
+ 'label': u'Address',
+ 'oldfieldname': u'address',
+ 'oldfieldtype': u'Small Text'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'contact',
- 'fieldtype': 'Data',
- 'idx': 5,
- 'label': 'Contact',
- 'oldfieldname': 'contact',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'contact',
+ 'fieldtype': u'Data',
+ 'label': u'Contact',
+ 'oldfieldname': u'contact',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'total_experience',
- 'fieldtype': 'Data',
- 'idx': 6,
- 'label': 'Total Experience',
- 'oldfieldname': 'total_experience',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'total_experience',
+ 'fieldtype': u'Data',
+ 'label': u'Total Experience',
+ 'oldfieldname': u'total_experience',
+ 'oldfieldtype': u'Data'
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/professional_training_details/professional_training_details.txt b/erpnext/hr/doctype/professional_training_details/professional_training_details.txt
index c94c6c5..fca84f7 100644
--- a/erpnext/hr/doctype/professional_training_details/professional_training_details.txt
+++ b/erpnext/hr/doctype/professional_training_details/professional_training_details.txt
@@ -3,98 +3,93 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:14',
+ 'creation': '2012-03-27 14:35:59',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:59',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'HR',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 5
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Professional Training Details',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Professional Training Details',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, Professional Training Details
{
'doctype': 'DocType',
- 'name': 'Professional Training Details'
+ 'name': u'Professional Training Details'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'institute',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'Institute / Conducted By',
- 'oldfieldname': 'institute',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'institute',
+ 'fieldtype': u'Small Text',
+ 'label': u'Institute / Conducted By',
+ 'oldfieldname': u'institute',
+ 'oldfieldtype': u'Small Text',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'nature_of_training',
- 'fieldtype': 'Small Text',
- 'idx': 2,
- 'label': 'Program / Seminar Title',
- 'oldfieldname': 'nature_of_training',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'nature_of_training',
+ 'fieldtype': u'Small Text',
+ 'label': u'Program / Seminar Title',
+ 'oldfieldname': u'nature_of_training',
+ 'oldfieldtype': u'Small Text',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'duration',
- 'fieldtype': 'Data',
- 'idx': 3,
- 'label': 'Duration',
- 'oldfieldname': 'duration',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'duration',
+ 'fieldtype': u'Data',
+ 'label': u'Duration',
+ 'oldfieldname': u'duration',
+ 'oldfieldtype': u'Data',
'reqd': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'loc',
- 'fieldtype': 'Data',
- 'idx': 4,
- 'label': 'Location',
- 'oldfieldname': 'loc',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'loc',
+ 'fieldtype': u'Data',
+ 'label': u'Location',
+ 'oldfieldname': u'loc',
+ 'oldfieldtype': u'Data',
'reqd': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'certificate',
- 'fieldtype': 'Small Text',
- 'idx': 5,
- 'label': 'Certificate',
- 'oldfieldname': 'certificate',
- 'oldfieldtype': 'Small Text'
+ 'doctype': u'DocField',
+ 'fieldname': u'certificate',
+ 'fieldtype': u'Small Text',
+ 'label': u'Certificate',
+ 'oldfieldname': u'certificate',
+ 'oldfieldtype': u'Small Text'
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_manager/salary_manager.txt b/erpnext/hr/doctype/salary_manager/salary_manager.txt
index c1ca4c6..6eff0db 100644
--- a/erpnext/hr/doctype/salary_manager/salary_manager.txt
+++ b/erpnext/hr/doctype/salary_manager/salary_manager.txt
@@ -3,49 +3,49 @@
# These values are common in all dictionaries
{
- 'creation': '2011-08-11 16:40:04',
+ 'creation': '2012-03-27 14:35:59',
'docstatus': 0,
- 'modified': '2011-11-07 10:47:32',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:35:59',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1314253977',
+ '_last_update': u'1314253977',
'allow_copy': 1,
'allow_email': 1,
'allow_print': 1,
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
- 'document_type': 'Other',
+ 'document_type': u'Other',
'issingle': 1,
- 'module': 'HR',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 1,
'version': 30
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Salary Manager',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Salary Manager',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Salary Manager',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Salary Manager',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
'write': 1
@@ -54,201 +54,214 @@
# DocType, Salary Manager
{
'doctype': 'DocType',
- 'name': 'Salary Manager'
+ 'name': u'Salary Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'role': 'System Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'System Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'role': 'HR User'
+ 'doctype': u'DocPerm',
+ 'role': u'HR User'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'role': 'HR Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'HR Manager'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'label': 'Document Description',
- 'options': '<div class="field_description">You can generate multiple salary slips based on the selected criteria, submit and mail those to the employee directly from here</div>'
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'document_description',
+ 'fieldtype': u'HTML',
+ 'label': u'Document Description',
+ 'options': u'<div class="field_description">You can generate multiple salary slips based on the selected criteria, submit and mail those to the employee directly from here</div>'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break'
+ 'doctype': u'DocField',
+ 'fieldname': u'section_break0',
+ 'fieldtype': u'Section Break'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'width': '50%'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'company',
- 'fieldtype': 'Select',
- 'label': 'Company',
- 'options': 'link:Company',
+ 'doctype': u'DocField',
+ 'fieldname': u'company',
+ 'fieldtype': u'Select',
+ 'label': u'Company',
+ 'options': u'link:Company',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'branch',
- 'fieldtype': 'Link',
- 'label': 'Branch',
- 'options': 'Branch'
+ 'doctype': u'DocField',
+ 'fieldname': u'branch',
+ 'fieldtype': u'Link',
+ 'label': u'Branch',
+ 'options': u'Branch'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'department',
- 'fieldtype': 'Link',
- 'label': 'Department',
- 'options': 'Department'
+ 'doctype': u'DocField',
+ 'fieldname': u'department',
+ 'fieldtype': u'Link',
+ 'label': u'Department',
+ 'options': u'Department'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'designation',
- 'fieldtype': 'Link',
- 'label': 'Designation',
- 'options': 'Designation'
+ 'doctype': u'DocField',
+ 'fieldname': u'designation',
+ 'fieldtype': u'Link',
+ 'label': u'Designation',
+ 'options': u'Designation'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'width': '50%'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break',
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'grade',
- 'fieldtype': 'Select',
- 'label': 'Grade',
- 'options': 'link:Grade'
+ 'doctype': u'DocField',
+ 'fieldname': u'grade',
+ 'fieldtype': u'Select',
+ 'label': u'Grade',
+ 'options': u'link:Grade'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'fiscal_year',
- 'fieldtype': 'Select',
- 'label': 'Fiscal Year',
- 'options': 'link:Fiscal Year',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'fiscal_year',
+ 'fieldtype': u'Select',
+ 'label': u'Fiscal Year',
+ 'options': u'link:Fiscal Year',
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'month',
- 'fieldtype': 'Select',
- 'label': 'Month',
- 'options': '\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'month',
+ 'fieldtype': u'Select',
+ 'label': u'Month',
+ 'options': u'\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12',
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Check if you want to send salary slip in mail to each employee while submitting salary slip',
- 'doctype': 'DocField',
- 'fieldname': 'send_email',
- 'fieldtype': 'Check',
- 'label': 'Send Email'
+ 'colour': u'White:FFF',
+ 'description': u'Check if you want to send salary slip in mail to each employee while submitting salary slip',
+ 'doctype': u'DocField',
+ 'fieldname': u'send_email',
+ 'fieldtype': u'Check',
+ 'label': u'Send Email'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break'
+ 'doctype': u'DocField',
+ 'fieldname': u'section_break1',
+ 'fieldtype': u'Section Break'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'width': '50%'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break2',
+ 'fieldtype': u'Column Break',
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Creates salary slip for above mentioned criteria.',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Create Salary Slip',
- 'trigger': 'Client'
+ 'colour': u'White:FFF',
+ 'description': u'Creates salary slip for above mentioned criteria.',
+ 'doctype': u'DocField',
+ 'fieldname': u'create_salary_slip',
+ 'fieldtype': u'Button',
+ 'label': u'Create Salary Slip',
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'width': '25%'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break3',
+ 'fieldtype': u'Column Break',
+ 'width': u'25%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Submit all salary slips for the above selected criteria',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Submit Salary Slip',
- 'trigger': 'Client'
+ 'colour': u'White:FFF',
+ 'description': u'Submit all salary slips for the above selected criteria',
+ 'doctype': u'DocField',
+ 'fieldname': u'submit_salary_slip',
+ 'fieldtype': u'Button',
+ 'label': u'Submit Salary Slip',
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'width': '25%'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break4',
+ 'fieldtype': u'Column Break',
+ 'width': u'25%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Create Bank Voucher for the total salary paid for the above selected criteria',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Make Bank Voucher',
- 'trigger': 'Client'
+ 'colour': u'White:FFF',
+ 'description': u'Create Bank Voucher for the total salary paid for the above selected criteria',
+ 'doctype': u'DocField',
+ 'fieldname': u'make_bank_voucher',
+ 'fieldtype': u'Button',
+ 'label': u'Make Bank Voucher',
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break'
+ 'doctype': u'DocField',
+ 'fieldname': u'section_break2',
+ 'fieldtype': u'Section Break'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'label': 'Activity Log'
+ 'doctype': u'DocField',
+ 'fieldname': u'activity_log',
+ 'fieldtype': u'HTML',
+ 'label': u'Activity Log'
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.txt b/erpnext/hr/doctype/salary_slip/salary_slip.txt
index 423b6c0..ceff6fc 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.txt
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.txt
@@ -3,74 +3,60 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:20',
+ 'creation': '2012-03-27 14:36:00',
'docstatus': 0,
- 'modified': '2011-07-27 13:10:28',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:45:51',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1310019491',
- 'colour': 'White:FFF',
+ '_last_update': u'1310019491',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'module': 'HR',
+ 'is_submittable': 1,
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
- 'subject': 'For %(employee_name)s, %(designation)s',
+ 'subject': u'For %(employee_name)s, %(designation)s',
'version': 393
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Salary Slip',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Salary Slip',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Salary Slip',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Salary Slip',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Salary Slip
{
'doctype': 'DocType',
- 'name': 'Salary Slip'
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'match': 'owner',
- 'permlevel': 0,
- 'role': 'Employee',
- 'submit': 0,
- 'write': 0
+ 'name': u'Salary Slip'
},
# DocPerm
{
'amend': 0,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 2,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'HR User',
+ 'role': u'HR User',
'submit': 1,
'write': 1
},
@@ -80,62 +66,58 @@
'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 3,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'HR Manager',
+ 'role': u'HR Manager',
'submit': 1,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 4,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'HR User'
+ 'role': u'HR User'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 5,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'HR Manager'
+ 'role': u'HR Manager'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 1,
- 'label': 'Basic Info',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'basic_info',
+ 'fieldtype': u'Section Break',
+ 'label': u'Basic Info',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 2,
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'employee',
- 'fieldtype': 'Link',
- 'idx': 3,
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'employee',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Employee',
- 'oldfieldname': 'employee',
- 'oldfieldtype': 'Link',
- 'options': 'Employee',
+ 'label': u'Employee',
+ 'oldfieldname': u'employee',
+ 'oldfieldtype': u'Link',
+ 'options': u'Employee',
'permlevel': 0,
'reqd': 1,
'search_index': 1
@@ -143,29 +125,27 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'employee_name',
- 'fieldtype': 'Data',
- 'idx': 4,
+ 'doctype': u'DocField',
+ 'fieldname': u'employee_name',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Employee Name',
- 'oldfieldname': 'employee_name',
- 'oldfieldtype': 'Data',
+ 'label': u'Employee Name',
+ 'oldfieldname': u'employee_name',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'department',
- 'fieldtype': 'Link',
- 'idx': 5,
+ 'doctype': u'DocField',
+ 'fieldname': u'department',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Department',
- 'oldfieldname': 'department',
- 'oldfieldtype': 'Link',
- 'options': 'Department',
+ 'label': u'Department',
+ 'oldfieldname': u'department',
+ 'oldfieldtype': u'Link',
+ 'options': u'Department',
'permlevel': 1,
'reqd': 0,
'search_index': 0
@@ -173,106 +153,99 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'designation',
- 'fieldtype': 'Link',
- 'idx': 6,
+ 'doctype': u'DocField',
+ 'fieldname': u'designation',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Designation',
- 'oldfieldname': 'designation',
- 'oldfieldtype': 'Link',
- 'options': 'Designation',
+ 'label': u'Designation',
+ 'oldfieldname': u'designation',
+ 'oldfieldtype': u'Link',
+ 'options': u'Designation',
'permlevel': 1,
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'branch',
- 'fieldtype': 'Link',
- 'idx': 7,
+ 'doctype': u'DocField',
+ 'fieldname': u'branch',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Branch',
- 'oldfieldname': 'branch',
- 'oldfieldtype': 'Link',
- 'options': 'Branch',
+ 'label': u'Branch',
+ 'oldfieldname': u'branch',
+ 'oldfieldtype': u'Link',
+ 'options': u'Branch',
'permlevel': 1,
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'grade',
- 'fieldtype': 'Link',
- 'idx': 8,
+ 'doctype': u'DocField',
+ 'fieldname': u'grade',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Grade',
- 'oldfieldname': 'grade',
- 'oldfieldtype': 'Link',
- 'options': 'Grade',
+ 'label': u'Grade',
+ 'oldfieldname': u'grade',
+ 'oldfieldtype': u'Link',
+ 'options': u'Grade',
'permlevel': 1,
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'pf_no',
- 'fieldtype': 'Data',
- 'idx': 9,
- 'label': 'PF No.',
- 'oldfieldname': 'pf_no',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'pf_no',
+ 'fieldtype': u'Data',
+ 'label': u'PF No.',
+ 'oldfieldname': u'pf_no',
+ 'oldfieldtype': u'Data',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'esic_no',
- 'fieldtype': 'Data',
- 'idx': 10,
- 'label': 'ESIC No.',
- 'oldfieldname': 'esic_no',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'esic_no',
+ 'fieldtype': u'Data',
+ 'label': u'ESIC No.',
+ 'oldfieldname': u'esic_no',
+ 'oldfieldtype': u'Data',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'letter_head',
- 'fieldtype': 'Link',
- 'idx': 11,
- 'label': 'Letter Head',
- 'options': 'Letter Head',
+ 'doctype': u'DocField',
+ 'fieldname': u'letter_head',
+ 'fieldtype': u'Link',
+ 'label': u'Letter Head',
+ 'options': u'Letter Head',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 12,
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'fiscal_year',
- 'fieldtype': 'Link',
- 'idx': 13,
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'fiscal_year',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Fiscal Year',
- 'oldfieldname': 'fiscal_year',
- 'oldfieldtype': 'Data',
- 'options': 'Fiscal Year',
+ 'label': u'Fiscal Year',
+ 'oldfieldname': u'fiscal_year',
+ 'oldfieldtype': u'Data',
+ 'options': u'Fiscal Year',
'permlevel': 0,
'reqd': 1,
'search_index': 0
@@ -280,111 +253,103 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'company',
- 'fieldtype': 'Select',
- 'idx': 14,
+ 'doctype': u'DocField',
+ 'fieldname': u'company',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Company',
- 'options': 'link:Company',
+ 'label': u'Company',
+ 'options': u'link:Company',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'month',
- 'fieldtype': 'Select',
- 'idx': 15,
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'month',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Month',
- 'oldfieldname': 'month',
- 'oldfieldtype': 'Select',
- 'options': '\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12',
+ 'label': u'Month',
+ 'oldfieldname': u'month',
+ 'oldfieldtype': u'Select',
+ 'options': u'\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12',
'permlevel': 0,
'reqd': 1,
'search_index': 1,
- 'trigger': 'Client',
- 'width': '37%'
+ 'trigger': u'Client',
+ 'width': u'37%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'total_days_in_month',
- 'fieldtype': 'Data',
- 'idx': 16,
- 'label': 'Total days in month',
- 'oldfieldname': 'total_days_in_month',
- 'oldfieldtype': 'Int',
+ 'doctype': u'DocField',
+ 'fieldname': u'total_days_in_month',
+ 'fieldtype': u'Data',
+ 'label': u'Total days in month',
+ 'oldfieldname': u'total_days_in_month',
+ 'oldfieldtype': u'Int',
'permlevel': 1,
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'leave_without_pay',
- 'fieldtype': 'Currency',
- 'idx': 17,
- 'label': 'Leave Without Pay',
- 'oldfieldname': 'leave_without_pay',
- 'oldfieldtype': 'Currency',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'leave_without_pay',
+ 'fieldtype': u'Currency',
+ 'label': u'Leave Without Pay',
+ 'oldfieldname': u'leave_without_pay',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'payment_days',
- 'fieldtype': 'Float',
- 'idx': 18,
- 'label': 'Payment days',
- 'oldfieldname': 'payment_days',
- 'oldfieldtype': 'Float',
+ 'doctype': u'DocField',
+ 'fieldname': u'payment_days',
+ 'fieldtype': u'Float',
+ 'label': u'Payment days',
+ 'oldfieldname': u'payment_days',
+ 'oldfieldtype': u'Float',
'permlevel': 1,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'bank_name',
- 'fieldtype': 'Data',
- 'idx': 19,
- 'label': 'Bank Name',
- 'oldfieldname': 'bank_name',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'bank_name',
+ 'fieldtype': u'Data',
+ 'label': u'Bank Name',
+ 'oldfieldname': u'bank_name',
+ 'oldfieldtype': u'Data',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'bank_account_no',
- 'fieldtype': 'Data',
- 'idx': 20,
- 'label': 'Bank Account No.',
- 'oldfieldname': 'bank_account_no',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'bank_account_no',
+ 'fieldtype': u'Data',
+ 'label': u'Bank Account No.',
+ 'oldfieldname': u'bank_account_no',
+ 'oldfieldtype': u'Data',
'permlevel': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'email_check',
- 'fieldtype': 'Check',
- 'idx': 21,
- 'label': 'Email',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'email_check',
+ 'fieldtype': u'Check',
+ 'label': u'Email',
'no_copy': 1,
- 'oldfieldname': 'email_check',
- 'oldfieldtype': 'Check',
+ 'oldfieldname': u'email_check',
+ 'oldfieldtype': u'Check',
'permlevel': 0,
'print_hide': 1,
'report_hide': 1
@@ -392,15 +357,14 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amended_from',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'amended_from',
+ 'fieldtype': u'Data',
'hidden': 0,
- 'idx': 22,
- 'label': 'Amended From',
+ 'label': u'Amended From',
'no_copy': 1,
- 'oldfieldname': 'amended_from',
- 'oldfieldtype': 'Data',
+ 'oldfieldname': u'amended_from',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'print_hide': 1,
'report_hide': 0
@@ -408,15 +372,14 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amendment_date',
- 'fieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'amendment_date',
+ 'fieldtype': u'Date',
'hidden': 0,
- 'idx': 23,
- 'label': 'Amendment Date',
+ 'label': u'Amendment Date',
'no_copy': 1,
- 'oldfieldname': 'amendment_date',
- 'oldfieldtype': 'Date',
+ 'oldfieldname': u'amendment_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'print_hide': 1,
'report_hide': 0
@@ -424,179 +387,170 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 24,
- 'label': 'Earning & Deduction',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'earning_deduction',
+ 'fieldtype': u'Section Break',
+ 'label': u'Earning & Deduction',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 25,
- 'label': 'Earning',
- 'oldfieldtype': 'Column Break',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'earning',
+ 'fieldtype': u'Column Break',
+ 'label': u'Earning',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
'reqd': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'earning_details',
- 'fieldtype': 'Table',
- 'idx': 26,
- 'label': 'Earning Details',
- 'oldfieldname': 'earning_details',
- 'oldfieldtype': 'Table',
- 'options': 'SS Earning Detail',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'earning_details',
+ 'fieldtype': u'Table',
+ 'label': u'Earning Details',
+ 'oldfieldname': u'earning_details',
+ 'oldfieldtype': u'Table',
+ 'options': u'SS Earning Detail',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 27,
- 'label': 'Deduction',
- 'oldfieldtype': 'Column Break',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'deduction',
+ 'fieldtype': u'Column Break',
+ 'label': u'Deduction',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'deduction_details',
- 'fieldtype': 'Table',
- 'idx': 28,
- 'label': 'Deduction Details',
- 'oldfieldname': 'deduction_details',
- 'oldfieldtype': 'Table',
- 'options': 'SS Deduction Detail',
+ 'doctype': u'DocField',
+ 'fieldname': u'deduction_details',
+ 'fieldtype': u'Table',
+ 'label': u'Deduction Details',
+ 'oldfieldname': u'deduction_details',
+ 'oldfieldtype': u'Table',
+ 'options': u'SS Deduction Detail',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 29,
- 'label': 'Totals',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'totals',
+ 'fieldtype': u'Section Break',
+ 'label': u'Totals',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 30,
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break2',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'arrear_amount',
- 'fieldtype': 'Currency',
- 'idx': 31,
- 'label': 'Arrear Amount',
- 'oldfieldname': 'arrear_amount',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'arrear_amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Arrear Amount',
+ 'oldfieldname': u'arrear_amount',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'leave_encashment_amount',
- 'fieldtype': 'Currency',
- 'idx': 32,
- 'label': 'Leave Encashment Amount',
- 'oldfieldname': 'encashment_amount',
- 'oldfieldtype': 'Currency',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'leave_encashment_amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Leave Encashment Amount',
+ 'oldfieldname': u'encashment_amount',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'gross_pay',
- 'fieldtype': 'Currency',
- 'idx': 33,
- 'label': 'Gross Pay',
- 'oldfieldname': 'gross_pay',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'gross_pay',
+ 'fieldtype': u'Currency',
+ 'label': u'Gross Pay',
+ 'oldfieldname': u'gross_pay',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'total_deduction',
- 'fieldtype': 'Currency',
- 'idx': 34,
- 'label': 'Total Deduction',
- 'oldfieldname': 'total_deduction',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'total_deduction',
+ 'fieldtype': u'Currency',
+ 'label': u'Total Deduction',
+ 'oldfieldname': u'total_deduction',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 35,
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break3',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Gross Pay + Arrear Amount +Encashment Amount - Total Deduction',
- 'doctype': 'DocField',
- 'fieldname': 'net_pay',
- 'fieldtype': 'Currency',
- 'idx': 36,
- 'label': 'Net Pay',
- 'oldfieldname': 'net_pay',
- 'oldfieldtype': 'Currency',
+ 'colour': u'White:FFF',
+ 'description': u'Gross Pay + Arrear Amount +Encashment Amount - Total Deduction',
+ 'doctype': u'DocField',
+ 'fieldname': u'net_pay',
+ 'fieldtype': u'Currency',
+ 'label': u'Net Pay',
+ 'oldfieldname': u'net_pay',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'rounded_total',
- 'fieldtype': 'Currency',
- 'idx': 37,
- 'label': 'Rounded Total',
+ 'doctype': u'DocField',
+ 'fieldname': u'rounded_total',
+ 'fieldtype': u'Currency',
+ 'label': u'Rounded Total',
'permlevel': 1
},
# DocField
{
- 'description': 'Net Pay (in words) will be visible once you save the Salary Slip.',
- 'doctype': 'DocField',
- 'fieldname': 'total_in_words',
- 'fieldtype': 'Data',
- 'idx': 38,
- 'label': 'Total in words',
- 'oldfieldname': 'net_pay_in_words',
- 'oldfieldtype': 'Data',
+ 'description': u'Net Pay (in words) will be visible once you save the Salary Slip.',
+ 'doctype': u'DocField',
+ 'fieldname': u'total_in_words',
+ 'fieldtype': u'Data',
+ 'label': u'Total in words',
+ 'oldfieldname': u'net_pay_in_words',
+ 'oldfieldtype': u'Data',
'permlevel': 1
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.txt b/erpnext/hr/doctype/salary_structure/salary_structure.txt
index d9a9acd..704ea18 100644
--- a/erpnext/hr/doctype/salary_structure/salary_structure.txt
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.txt
@@ -3,425 +3,442 @@
# These values are common in all dictionaries
{
- 'creation': '2010-12-14 16:50:05',
+ 'creation': '2012-03-27 14:36:00',
'docstatus': 0,
- 'modified': '2011-08-11 16:56:38',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:00',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1311621379',
- 'colour': 'White:FFF',
+ '_last_update': u'1311621379',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'module': 'HR',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
- 'subject': 'For %(employee_name)s',
+ 'subject': u'For %(employee_name)s',
'version': 587
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Salary Structure',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Salary Structure',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'amend': 0,
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Salary Structure',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Salary Structure',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Salary Structure
{
'doctype': 'DocType',
- 'name': 'Salary Structure'
+ 'name': u'Salary Structure'
},
# DocPerm
{
- 'amend': 0,
'cancel': 0,
'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
+ 'match': u'owner',
'permlevel': 0,
- 'role': 'Employee',
'submit': 0,
'write': 0
},
# DocPerm
{
- 'amend': 0,
'cancel': 0,
'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 2,
+ 'doctype': u'DocPerm',
+ 'match': u'owner',
+ 'permlevel': 0,
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'match': u'owner',
+ 'permlevel': 0,
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'match': u'owner',
+ 'permlevel': 0,
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'All',
- 'submit': 0,
+ 'role': u'All',
'write': 0
},
# DocPerm
{
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 3,
- 'permlevel': 0,
- 'role': 'HR User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 1,
- 'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 4,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'HR Manager',
- 'submit': 1,
+ 'role': u'HR User',
'write': 1
},
+ # DocPerm
+ {
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'HR Manager',
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'HR Manager'
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'HR User'
+ },
+
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 1,
- 'label': 'Basic Info',
- 'oldfieldname': 'basic_info',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'basic_info',
+ 'fieldtype': u'Section Break',
+ 'label': u'Basic Info',
+ 'oldfieldname': u'basic_info',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 2,
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'employee',
- 'fieldtype': 'Link',
- 'idx': 3,
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'employee',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Employee',
- 'oldfieldname': 'employee',
- 'oldfieldtype': 'Link',
- 'options': 'Employee',
+ 'label': u'Employee',
+ 'oldfieldname': u'employee',
+ 'oldfieldtype': u'Link',
+ 'options': u'Employee',
'permlevel': 0,
'reqd': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'employee_name',
- 'fieldtype': 'Data',
- 'idx': 4,
- 'label': 'Employee Name',
- 'oldfieldname': 'employee_name',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'employee_name',
+ 'fieldtype': u'Data',
+ 'label': u'Employee Name',
+ 'oldfieldname': u'employee_name',
+ 'oldfieldtype': u'Data',
'permlevel': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'branch',
- 'fieldtype': 'Select',
- 'idx': 5,
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'branch',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Branch',
- 'oldfieldname': 'branch',
- 'oldfieldtype': 'Select',
- 'options': 'link:Branch',
+ 'label': u'Branch',
+ 'oldfieldname': u'branch',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:Branch',
'permlevel': 1,
'reqd': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'designation',
- 'fieldtype': 'Select',
- 'idx': 6,
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'designation',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Designation',
- 'oldfieldname': 'designation',
- 'oldfieldtype': 'Select',
- 'options': 'link:Designation',
+ 'label': u'Designation',
+ 'oldfieldname': u'designation',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:Designation',
'permlevel': 1,
'reqd': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'department',
- 'fieldtype': 'Select',
- 'idx': 7,
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'department',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Department',
- 'oldfieldname': 'department',
- 'oldfieldtype': 'Select',
- 'options': 'link:Department',
+ 'label': u'Department',
+ 'oldfieldname': u'department',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:Department',
'permlevel': 1,
'reqd': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'grade',
- 'fieldtype': 'Select',
- 'idx': 8,
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'grade',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Grade',
- 'oldfieldname': 'grade',
- 'oldfieldtype': 'Select',
- 'options': 'link:Grade',
+ 'label': u'Grade',
+ 'oldfieldname': u'grade',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:Grade',
'permlevel': 1,
'reqd': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 9,
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'default': 'Yes',
- 'doctype': 'DocField',
- 'fieldname': 'is_active',
- 'fieldtype': 'Select',
- 'idx': 10,
+ 'colour': u'White:FFF',
+ 'default': u'Yes',
+ 'doctype': u'DocField',
+ 'fieldname': u'is_active',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Is Active',
- 'oldfieldname': 'is_active',
- 'oldfieldtype': 'Select',
- 'options': '\nYes\nNo',
+ 'label': u'Is Active',
+ 'oldfieldname': u'is_active',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nYes\nNo',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'from_date',
- 'fieldtype': 'Date',
- 'idx': 11,
- 'label': 'From Date',
- 'oldfieldname': 'from_date',
- 'oldfieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'from_date',
+ 'fieldtype': u'Date',
+ 'label': u'From Date',
+ 'oldfieldname': u'from_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'to_date',
- 'fieldtype': 'Date',
- 'idx': 12,
- 'label': 'To Date',
- 'oldfieldname': 'to_date',
- 'oldfieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'to_date',
+ 'fieldtype': u'Date',
+ 'label': u'To Date',
+ 'oldfieldname': u'to_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Cost to Company',
- 'doctype': 'DocField',
- 'fieldname': 'ctc',
- 'fieldtype': 'Currency',
- 'idx': 13,
+ 'colour': u'White:FFF',
+ 'description': u'Cost to Company',
+ 'doctype': u'DocField',
+ 'fieldname': u'ctc',
+ 'fieldtype': u'Currency',
'in_filter': 1,
- 'label': 'CTC',
- 'oldfieldname': 'ctc',
- 'oldfieldtype': 'Currency',
+ 'label': u'CTC',
+ 'oldfieldname': u'ctc',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'company',
- 'fieldtype': 'Select',
- 'idx': 14,
+ 'doctype': u'DocField',
+ 'fieldname': u'company',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Company',
- 'options': 'link:Company',
+ 'label': u'Company',
+ 'options': u'link:Company',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'description': 'You can create more earning and deduction type from Setup --> HR',
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 15,
- 'label': 'Earning & Deduction',
- 'oldfieldname': 'earning_deduction',
- 'oldfieldtype': 'Section Break',
+ 'description': u'You can create more earning and deduction type from Setup --> HR',
+ 'doctype': u'DocField',
+ 'fieldname': u'earning_deduction',
+ 'fieldtype': u'Section Break',
+ 'label': u'Earning & Deduction',
+ 'oldfieldname': u'earning_deduction',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'earning',
+ 'fieldtype': u'Column Break',
'hidden': 0,
- 'idx': 16,
- 'label': 'Earning',
- 'oldfieldname': 'col_brk2',
- 'oldfieldtype': 'Column Break',
+ 'label': u'Earning',
+ 'oldfieldname': u'col_brk2',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'earning_details',
- 'fieldtype': 'Table',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'earning_details',
+ 'fieldtype': u'Table',
'hidden': 0,
- 'idx': 17,
- 'label': 'Earning1',
- 'oldfieldname': 'earning_details',
- 'oldfieldtype': 'Table',
- 'options': 'Earning Detail',
+ 'label': u'Earning1',
+ 'oldfieldname': u'earning_details',
+ 'oldfieldtype': u'Table',
+ 'options': u'Earning Detail',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'deduction',
+ 'fieldtype': u'Column Break',
'hidden': 0,
- 'idx': 18,
- 'label': 'Deduction',
- 'oldfieldname': 'col_brk3',
- 'oldfieldtype': 'Column Break',
+ 'label': u'Deduction',
+ 'oldfieldname': u'col_brk3',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'deduction_details',
- 'fieldtype': 'Table',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'deduction_details',
+ 'fieldtype': u'Table',
'hidden': 0,
- 'idx': 19,
- 'label': 'Deduction1',
- 'oldfieldname': 'deduction_details',
- 'oldfieldtype': 'Table',
- 'options': 'Deduction Detail',
+ 'label': u'Deduction1',
+ 'oldfieldname': u'deduction_details',
+ 'oldfieldtype': u'Table',
+ 'options': u'Deduction Detail',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 20,
- 'options': 'Simple',
+ 'doctype': u'DocField',
+ 'fieldname': u'section_break0',
+ 'fieldtype': u'Section Break',
+ 'options': u'Simple',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 21,
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break2',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'total_earning',
- 'fieldtype': 'Currency',
- 'idx': 22,
- 'label': 'Total Earning',
- 'oldfieldname': 'total_earning',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'total_earning',
+ 'fieldtype': u'Currency',
+ 'label': u'Total Earning',
+ 'oldfieldname': u'total_earning',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'total_deduction',
- 'fieldtype': 'Currency',
- 'idx': 23,
- 'label': 'Total Deduction',
- 'oldfieldname': 'total_deduction',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'total_deduction',
+ 'fieldtype': u'Currency',
+ 'label': u'Total Deduction',
+ 'oldfieldname': u'total_deduction',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 24,
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break3',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'net_pay',
- 'fieldtype': 'Currency',
- 'idx': 25,
- 'label': 'Net Pay',
+ 'doctype': u'DocField',
+ 'fieldname': u'net_pay',
+ 'fieldtype': u'Currency',
+ 'label': u'Net Pay',
'permlevel': 1
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/ss_deduction_detail/ss_deduction_detail.txt b/erpnext/hr/doctype/ss_deduction_detail/ss_deduction_detail.txt
index e760226..b94d480 100644
--- a/erpnext/hr/doctype/ss_deduction_detail/ss_deduction_detail.txt
+++ b/erpnext/hr/doctype/ss_deduction_detail/ss_deduction_detail.txt
@@ -3,107 +3,102 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:24',
+ 'creation': '2012-03-27 14:36:00',
'docstatus': 0,
- 'modified': '2011-02-12 18:24:31',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:00',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'HR',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 9
},
# These values are common for all DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'SS Deduction Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'SS Deduction Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'SS Deduction Detail',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'SS Deduction Detail',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 1
},
# DocType, SS Deduction Detail
{
'doctype': 'DocType',
- 'name': 'SS Deduction Detail'
+ 'name': u'SS Deduction Detail'
},
# DocPerm
{
- 'doctype': 'DocPerm'
+ 'doctype': u'DocPerm'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'd_type',
- 'fieldtype': 'Link',
- 'idx': 1,
- 'label': 'Type',
- 'oldfieldname': 'd_type',
- 'oldfieldtype': 'Data',
- 'options': 'Deduction Type',
+ 'doctype': u'DocField',
+ 'fieldname': u'd_type',
+ 'fieldtype': u'Link',
+ 'label': u'Type',
+ 'oldfieldname': u'd_type',
+ 'oldfieldtype': u'Data',
+ 'options': u'Deduction Type',
'permlevel': 0,
- 'width': '200px'
+ 'width': u'200px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'd_amount',
- 'fieldtype': 'Currency',
- 'idx': 2,
- 'label': 'Amount',
- 'oldfieldname': 'd_amount',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'd_amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Amount',
+ 'oldfieldname': u'd_amount',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'd_modified_amount',
- 'fieldtype': 'Currency',
- 'idx': 3,
- 'label': 'Modified Amount',
+ 'doctype': u'DocField',
+ 'fieldname': u'd_modified_amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Modified Amount',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'd_depends_on_lwp',
- 'fieldtype': 'Check',
- 'idx': 4,
- 'label': 'Depends on LWP',
+ 'doctype': u'DocField',
+ 'fieldname': u'd_depends_on_lwp',
+ 'fieldtype': u'Check',
+ 'label': u'Depends on LWP',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
}
]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/ss_earning_detail/ss_earning_detail.txt b/erpnext/hr/doctype/ss_earning_detail/ss_earning_detail.txt
index 10931d1..cf8bf9d 100644
--- a/erpnext/hr/doctype/ss_earning_detail/ss_earning_detail.txt
+++ b/erpnext/hr/doctype/ss_earning_detail/ss_earning_detail.txt
@@ -3,108 +3,103 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:24',
+ 'creation': '2012-03-27 14:36:00',
'docstatus': 0,
- 'modified': '2011-02-12 18:24:20',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:00',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'HR',
+ 'module': u'HR',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 7
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'SS Earning Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'SS Earning Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'SS Earning Detail',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'SS Earning Detail',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 1
},
# DocType, SS Earning Detail
{
'doctype': 'DocType',
- 'name': 'SS Earning Detail'
+ 'name': u'SS Earning Detail'
},
# DocPerm
{
- 'doctype': 'DocPerm'
+ 'doctype': u'DocPerm'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'e_type',
- 'fieldtype': 'Link',
- 'idx': 1,
- 'label': 'Type',
- 'oldfieldname': 'e_type',
- 'oldfieldtype': 'Data',
- 'options': 'Earning Type',
+ 'doctype': u'DocField',
+ 'fieldname': u'e_type',
+ 'fieldtype': u'Link',
+ 'label': u'Type',
+ 'oldfieldname': u'e_type',
+ 'oldfieldtype': u'Data',
+ 'options': u'Earning Type',
'permlevel': 0,
- 'width': '200px'
+ 'width': u'200px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'e_amount',
- 'fieldtype': 'Currency',
- 'idx': 2,
- 'label': 'Amount',
- 'oldfieldname': 'e_amount',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'e_amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Amount',
+ 'oldfieldname': u'e_amount',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'e_modified_amount',
- 'fieldtype': 'Currency',
- 'idx': 3,
- 'label': 'Modified Amount',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'e_modified_amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Modified Amount',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'e_depends_on_lwp',
- 'fieldtype': 'Check',
- 'idx': 4,
- 'label': 'Depends on LWP',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'e_depends_on_lwp',
+ 'fieldtype': u'Check',
+ 'label': u'Depends on LWP',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
}
]
\ No newline at end of file
diff --git a/erpnext/knowledge_base/doctype/answer/answer.txt b/erpnext/knowledge_base/doctype/answer/answer.txt
index 904e498..6d664f2 100644
--- a/erpnext/knowledge_base/doctype/answer/answer.txt
+++ b/erpnext/knowledge_base/doctype/answer/answer.txt
@@ -3,107 +3,100 @@
# These values are common in all dictionaries
{
- 'creation': '2011-05-04 11:09:49',
+ 'creation': '2012-03-27 14:36:01',
'docstatus': 0,
- 'modified': '2011-05-30 15:52:52',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:01',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
'allow_attach': 0,
'allow_trash': 1,
- 'autoname': '_ANS.#######',
- 'colour': 'White:FFF',
+ 'autoname': u'_ANS.#######',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'in_create': 1,
- 'module': 'Knowledge Base',
+ 'module': u'Knowledge Base',
'name': '__common__',
'read_only': 1,
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 3
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Answer',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Answer',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
- 'amend': 0,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Answer',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Answer',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
- 'role': 'All',
- 'submit': 0,
+ 'role': u'All',
'write': 1
},
# DocType, Answer
{
'doctype': 'DocType',
- 'name': 'Answer'
+ 'name': u'Answer'
},
# DocPerm
{
- 'doctype': 'DocPerm'
+ 'doctype': u'DocPerm'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'question',
- 'fieldtype': 'Link',
- 'idx': 1,
- 'label': 'Question',
- 'options': 'Question'
+ 'doctype': u'DocField',
+ 'fieldname': u'question',
+ 'fieldtype': u'Link',
+ 'label': u'Question',
+ 'options': u'Question'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'answer',
- 'fieldtype': 'Text',
- 'idx': 2,
- 'label': 'Answer',
- 'oldfieldname': 'question',
- 'oldfieldtype': 'Text'
+ 'doctype': u'DocField',
+ 'fieldname': u'answer',
+ 'fieldtype': u'Text',
+ 'label': u'Answer',
+ 'oldfieldname': u'question',
+ 'oldfieldtype': u'Text'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'points',
- 'fieldtype': 'Int',
- 'idx': 3,
- 'label': 'Points'
+ 'doctype': u'DocField',
+ 'fieldname': u'points',
+ 'fieldtype': u'Int',
+ 'label': u'Points'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': '_users_voted',
- 'fieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'_users_voted',
+ 'fieldtype': u'Text',
'hidden': 1,
- 'idx': 4,
- 'label': 'Users Voted',
+ 'label': u'Users Voted',
'print_hide': 1
}
]
\ No newline at end of file
diff --git a/erpnext/knowledge_base/doctype/question/question.txt b/erpnext/knowledge_base/doctype/question/question.txt
index 187789c..01a86ee 100644
--- a/erpnext/knowledge_base/doctype/question/question.txt
+++ b/erpnext/knowledge_base/doctype/question/question.txt
@@ -3,37 +3,37 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:17',
+ 'creation': '2012-03-27 14:36:01',
'docstatus': 0,
- 'modified': '2011-04-20 18:22:44',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:01',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
'allow_attach': 0,
'allow_trash': 1,
- 'autoname': 'QUES.#######',
- 'colour': 'White:FFF',
+ 'autoname': u'QUES.#######',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'in_create': 1,
- 'module': 'Knowledge Base',
+ 'module': u'Knowledge Base',
'name': '__common__',
'read_only': 1,
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 7
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Question',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Question',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
@@ -41,128 +41,118 @@
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Question',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Question',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
- 'role': 'All',
+ 'role': u'All',
'write': 1
},
# DocType, Question
{
'doctype': 'DocType',
- 'name': 'Question'
+ 'name': u'Question'
},
# DocPerm
{
- 'doctype': 'DocPerm'
+ 'doctype': u'DocPerm'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'question',
- 'fieldtype': 'Text',
- 'idx': 1,
- 'label': 'Question',
- 'oldfieldname': 'question',
- 'oldfieldtype': 'Text'
+ 'doctype': u'DocField',
+ 'fieldname': u'question',
+ 'fieldtype': u'Text',
+ 'label': u'Question',
+ 'oldfieldname': u'question',
+ 'oldfieldtype': u'Text'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'points',
- 'fieldtype': 'Int',
+ 'doctype': u'DocField',
+ 'fieldname': u'points',
+ 'fieldtype': u'Int',
'hidden': 1,
- 'idx': 2,
- 'label': 'Points'
+ 'label': u'Points'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'answer',
- 'fieldtype': 'Text Editor',
- 'idx': 3,
- 'label': 'Answer',
- 'oldfieldname': 'answer',
- 'oldfieldtype': 'Text Editor'
+ 'doctype': u'DocField',
+ 'fieldname': u'answer',
+ 'fieldtype': u'Text Editor',
+ 'label': u'Answer',
+ 'oldfieldname': u'answer',
+ 'oldfieldtype': u'Text Editor'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': '_user_tags',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'_user_tags',
+ 'fieldtype': u'Data',
'hidden': 1,
- 'idx': 4,
- 'label': 'User Tags'
+ 'label': u'User Tags'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'tag_1',
- 'fieldtype': 'Link',
- 'idx': 5,
- 'label': 'Tag 1',
- 'oldfieldname': 'tag_1',
- 'oldfieldtype': 'Link',
- 'options': 'Question Tag',
+ 'doctype': u'DocField',
+ 'fieldname': u'tag_1',
+ 'fieldtype': u'Link',
+ 'label': u'Tag 1',
+ 'oldfieldname': u'tag_1',
+ 'oldfieldtype': u'Link',
+ 'options': u'Question Tag',
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': '_users_voted',
- 'fieldtype': 'Text',
- 'idx': 6,
- 'label': 'Users Voted'
+ 'doctype': u'DocField',
+ 'fieldname': u'_users_voted',
+ 'fieldtype': u'Text',
+ 'label': u'Users Voted'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'tag_2',
- 'fieldtype': 'Link',
- 'idx': 7,
- 'label': 'Tag 2',
- 'oldfieldname': 'tag_2',
- 'oldfieldtype': 'Link',
- 'options': 'Question Tag',
+ 'doctype': u'DocField',
+ 'fieldname': u'tag_2',
+ 'fieldtype': u'Link',
+ 'label': u'Tag 2',
+ 'oldfieldname': u'tag_2',
+ 'oldfieldtype': u'Link',
+ 'options': u'Question Tag',
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'tag_3',
- 'fieldtype': 'Link',
- 'idx': 8,
- 'label': 'Tag 3',
- 'oldfieldname': 'tag_3',
- 'oldfieldtype': 'Link',
- 'options': 'Question Tag',
+ 'doctype': u'DocField',
+ 'fieldname': u'tag_3',
+ 'fieldtype': u'Link',
+ 'label': u'Tag 3',
+ 'oldfieldname': u'tag_3',
+ 'oldfieldtype': u'Link',
+ 'options': u'Question Tag',
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'file_list',
- 'fieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'file_list',
+ 'fieldtype': u'Text',
'hidden': 1,
- 'idx': 9,
- 'label': 'File List',
- 'oldfieldname': 'file_list',
- 'oldfieldtype': 'Text'
+ 'label': u'File List',
+ 'oldfieldname': u'file_list',
+ 'oldfieldtype': u'Text'
}
]
\ No newline at end of file
diff --git a/erpnext/knowledge_base/doctype/question_control/question_control.txt b/erpnext/knowledge_base/doctype/question_control/question_control.txt
index 42b491b..b144336 100644
--- a/erpnext/knowledge_base/doctype/question_control/question_control.txt
+++ b/erpnext/knowledge_base/doctype/question_control/question_control.txt
@@ -3,28 +3,28 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:17',
+ 'creation': '2012-03-27 14:36:02',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:02',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'issingle': 1,
- 'module': 'Knowledge Base',
+ 'module': u'Knowledge Base',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 1
},
# DocType, Question Control
{
'doctype': 'DocType',
- 'name': 'Question Control'
+ 'name': u'Question Control'
}
]
\ No newline at end of file
diff --git a/erpnext/knowledge_base/doctype/question_tag/question_tag.txt b/erpnext/knowledge_base/doctype/question_tag/question_tag.txt
index e6e3d35..2e85305 100644
--- a/erpnext/knowledge_base/doctype/question_tag/question_tag.txt
+++ b/erpnext/knowledge_base/doctype/question_tag/question_tag.txt
@@ -3,37 +3,36 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:17',
+ 'creation': '2012-03-27 14:36:02',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:02',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'autoname': 'field:tag_name',
- 'colour': 'White:FFF',
+ 'autoname': u'field:tag_name',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'module': 'Knowledge Base',
+ 'module': u'Knowledge Base',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'version': 1
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'tag_name',
- 'fieldtype': 'Data',
- 'idx': 1,
- 'label': 'Tag Name',
+ 'doctype': u'DocField',
+ 'fieldname': u'tag_name',
+ 'fieldtype': u'Data',
+ 'label': u'Tag Name',
'name': '__common__',
- 'oldfieldname': 'tag_name',
- 'oldfieldtype': 'Data',
- 'parent': 'Question Tag',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'oldfieldname': u'tag_name',
+ 'oldfieldtype': u'Data',
+ 'parent': u'Question Tag',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0,
'reqd': 1
},
@@ -41,31 +40,30 @@
# These values are common for all DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Question Tag',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Question Tag',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
- 'role': 'All',
+ 'role': u'All',
'write': 1
},
# DocType, Question Tag
{
'doctype': 'DocType',
- 'name': 'Question Tag'
+ 'name': u'Question Tag'
},
# DocPerm
{
- 'doctype': 'DocPerm'
+ 'doctype': u'DocPerm'
},
# DocField
{
- 'doctype': 'DocField'
+ 'doctype': u'DocField'
}
]
\ No newline at end of file
diff --git a/erpnext/knowledge_base/page/question_view/question_view.js b/erpnext/knowledge_base/page/question_view/question_view.js
index 5783471..879ee79 100644
--- a/erpnext/knowledge_base/page/question_view/question_view.js
+++ b/erpnext/knowledge_base/page/question_view/question_view.js
@@ -19,9 +19,9 @@
}
pscript['refresh_question-view'] = function() {
- $('.add-answer-area').empty();
// href
var qid = window.location.hash.split('/')[1];
+ console.log(qid)
if(qid) {
pscript.question_view(qid);
}
@@ -131,7 +131,7 @@
this.make_list = function() {
- this.list = new wn.widgets.Listing({
+ this.list = new wn.ui.Listing({
parent: me.parent,
as_dict: 1,
no_result_message: 'No answers yet, be the first one to answer!',
@@ -185,4 +185,4 @@
}
-$import(knowledge_base/page/kb_common/kb_common.js);
\ No newline at end of file
+wn.require('erpnext/knowledge_base/page/kb_common/kb_common.js');
\ No newline at end of file
diff --git a/erpnext/knowledge_base/page/questions/questions.js b/erpnext/knowledge_base/page/questions/questions.js
index 7261cd8..6b0ca25 100644
--- a/erpnext/knowledge_base/page/questions/questions.js
+++ b/erpnext/knowledge_base/page/questions/questions.js
@@ -107,7 +107,7 @@
this.list_area = $a(w, 'div', '', {marginRight:'13px'})
this.no_result = $a(w, 'div','help_box',{display:'none'},'No questions asked yet! Be the first one to ask')
- this.list = new wn.widgets.Listing({
+ this.list = new wn.ui.Listing({
parent: this.list_area,
no_results_message: 'No questions found. Ask a new question!',
as_dict: 1,
@@ -215,4 +215,4 @@
this.make()
}
-$import(knowledge_base/page/kb_common/kb_common.js);
\ No newline at end of file
+wn.require('erpnext/knowledge_base/page/kb_common/kb_common.js');
\ No newline at end of file
diff --git a/erpnext/patches/before_jan_2012/Discount_purchase_cycle.py b/erpnext/patches/before_jan_2012/Discount_purchase_cycle.py
index 8fee8c5..9f0a5c0 100644
--- a/erpnext/patches/before_jan_2012/Discount_purchase_cycle.py
+++ b/erpnext/patches/before_jan_2012/Discount_purchase_cycle.py
@@ -16,7 +16,7 @@
def execute():
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('accounts', 'doctype', 'pv_detail')
reload_doc('buying', 'doctype', 'po_detail')
diff --git a/erpnext/patches/before_jan_2012/accounts_default_form.py b/erpnext/patches/before_jan_2012/accounts_default_form.py
index 282ebf5..eb8f586 100644
--- a/erpnext/patches/before_jan_2012/accounts_default_form.py
+++ b/erpnext/patches/before_jan_2012/accounts_default_form.py
@@ -16,7 +16,7 @@
def execute():
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('setup', 'doctype', 'company')
reload_doc('setup', 'doctype', 'manage_account')
diff --git a/erpnext/patches/before_jan_2012/auto_indent.py b/erpnext/patches/before_jan_2012/auto_indent.py
index 7373c39..a472d80 100644
--- a/erpnext/patches/before_jan_2012/auto_indent.py
+++ b/erpnext/patches/before_jan_2012/auto_indent.py
@@ -16,7 +16,7 @@
def execute():
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('setup', 'doctype', 'manage_account')
reload_doc('stock', 'doctype', 'item')
webnotes.conn.sql("delete from `tabDocField` where fieldname='minimum_inventory_level' and parent='item'")
diff --git a/erpnext/patches/before_jan_2012/c_form_patch.py b/erpnext/patches/before_jan_2012/c_form_patch.py
index 8c00891..307dabc 100644
--- a/erpnext/patches/before_jan_2012/c_form_patch.py
+++ b/erpnext/patches/before_jan_2012/c_form_patch.py
@@ -16,7 +16,7 @@
def execute():
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('accounts', 'doctype', 'receivable_voucher')
reload_doc('accounts', 'doctype', 'c_form')
diff --git a/erpnext/patches/before_jan_2012/deploy_email_digest.py b/erpnext/patches/before_jan_2012/deploy_email_digest.py
index 5adeb97..8474b64 100644
--- a/erpnext/patches/before_jan_2012/deploy_email_digest.py
+++ b/erpnext/patches/before_jan_2012/deploy_email_digest.py
@@ -21,7 +21,7 @@
* Reload email_digest doctype
* Create default email digest
"""
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
# Minor fix in print_format doctype
#reload_doc('core', 'doctype', 'print_format')
diff --git a/erpnext/patches/before_jan_2012/employeewise_balance_leave_report.py b/erpnext/patches/before_jan_2012/employeewise_balance_leave_report.py
index bab119e..83f2143 100644
--- a/erpnext/patches/before_jan_2012/employeewise_balance_leave_report.py
+++ b/erpnext/patches/before_jan_2012/employeewise_balance_leave_report.py
@@ -22,7 +22,7 @@
"""
def execute():
from webnotes.model.doc import Document
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('hr', 'search_criteria', 'employeewise_balance_leave_report')
d = Document('Search Criteria', 'employeewise_balance_leave_report')
d.criteria_name = 'Employee Leave Balance Report'
diff --git a/erpnext/patches/before_jan_2012/erpnext_structure_cleanup.py b/erpnext/patches/before_jan_2012/erpnext_structure_cleanup.py
index aab64a0..a9dcd75 100644
--- a/erpnext/patches/before_jan_2012/erpnext_structure_cleanup.py
+++ b/erpnext/patches/before_jan_2012/erpnext_structure_cleanup.py
@@ -19,7 +19,7 @@
import webnotes
from webnotes.model import delete_doc
-from webnotes.modules.module_manager import reload_doc
+from webnotes.modules import reload_doc
from webnotes.modules.export_module import export_to_files
sql = webnotes.conn.sql
diff --git a/erpnext/patches/before_jan_2012/install_print_formats.py b/erpnext/patches/before_jan_2012/install_print_formats.py
index 3a18aae..ab0067c 100644
--- a/erpnext/patches/before_jan_2012/install_print_formats.py
+++ b/erpnext/patches/before_jan_2012/install_print_formats.py
@@ -68,7 +68,7 @@
"""
Install print formats
"""
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('core', 'doctype', 'print_format')
#copy_doctype_to_pfs()
diff --git a/erpnext/patches/before_jan_2012/lcw_patch.py b/erpnext/patches/before_jan_2012/lcw_patch.py
index b274069..27e9a56 100644
--- a/erpnext/patches/before_jan_2012/lcw_patch.py
+++ b/erpnext/patches/before_jan_2012/lcw_patch.py
@@ -16,7 +16,7 @@
def execute():
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('stock', 'doctype', 'landed_cost_wizard')
diff --git a/erpnext/patches/before_jan_2012/packing_slip.py b/erpnext/patches/before_jan_2012/packing_slip.py
index 23c34d9d..7fe2d5d 100644
--- a/erpnext/patches/before_jan_2012/packing_slip.py
+++ b/erpnext/patches/before_jan_2012/packing_slip.py
@@ -16,7 +16,7 @@
def execute():
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('stock', 'doctype', 'delivery_note_detail')
reload_doc('stock', 'Print Format', 'Delivery Note Packing List Wise')
diff --git a/erpnext/patches/before_jan_2012/price_list_patch.py b/erpnext/patches/before_jan_2012/price_list_patch.py
index ce2ff4a..6cd3f9b 100644
--- a/erpnext/patches/before_jan_2012/price_list_patch.py
+++ b/erpnext/patches/before_jan_2012/price_list_patch.py
@@ -16,7 +16,7 @@
def execute():
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('accounts', 'doctype', 'receivable_voucher')
reload_doc('stock', 'doctype', 'delivery_note')
diff --git a/erpnext/patches/before_jan_2012/project_patch.py b/erpnext/patches/before_jan_2012/project_patch.py
index f4b0ea6..df0e1e9 100644
--- a/erpnext/patches/before_jan_2012/project_patch.py
+++ b/erpnext/patches/before_jan_2012/project_patch.py
@@ -16,7 +16,7 @@
def execute():
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
sql = webnotes.conn.sql
# Reload item table
diff --git a/erpnext/patches/before_jan_2012/reload_address.py b/erpnext/patches/before_jan_2012/reload_address.py
index 3ef80d8..ae68f6f 100644
--- a/erpnext/patches/before_jan_2012/reload_address.py
+++ b/erpnext/patches/before_jan_2012/reload_address.py
@@ -16,6 +16,6 @@
def execute():
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('utilities', 'doctype', 'address')
diff --git a/erpnext/patches/before_jan_2012/reload_bom.py b/erpnext/patches/before_jan_2012/reload_bom.py
index f925bc6..cbacce1 100644
--- a/erpnext/patches/before_jan_2012/reload_bom.py
+++ b/erpnext/patches/before_jan_2012/reload_bom.py
@@ -16,6 +16,6 @@
def execute():
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('production', 'doctype', 'bill_of_materials')
diff --git a/erpnext/patches/before_jan_2012/reload_doclayer.py b/erpnext/patches/before_jan_2012/reload_doclayer.py
index 4ab077e..2c6e23e 100644
--- a/erpnext/patches/before_jan_2012/reload_doclayer.py
+++ b/erpnext/patches/before_jan_2012/reload_doclayer.py
@@ -18,7 +18,7 @@
Reload DocLayer, DocLayerField and Print Format doctypes
"""
def execute():
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('core', 'doctype', 'print_format')
reload_doc('core', 'doctype', 'doclayer')
reload_doc('core', 'doctype', 'doclayerfield')
diff --git a/erpnext/patches/before_jan_2012/reload_email_digest.py b/erpnext/patches/before_jan_2012/reload_email_digest.py
index 13a2614..15cbfc3 100644
--- a/erpnext/patches/before_jan_2012/reload_email_digest.py
+++ b/erpnext/patches/before_jan_2012/reload_email_digest.py
@@ -15,5 +15,5 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
def execute():
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('Setup', 'DocType', 'Email Digest')
diff --git a/erpnext/patches/before_jan_2012/reload_employeewise_balance_leave_report.py b/erpnext/patches/before_jan_2012/reload_employeewise_balance_leave_report.py
index b60d3d4..53183cb 100644
--- a/erpnext/patches/before_jan_2012/reload_employeewise_balance_leave_report.py
+++ b/erpnext/patches/before_jan_2012/reload_employeewise_balance_leave_report.py
@@ -16,5 +16,5 @@
def execute():
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('hr', 'search_criteria', 'employeewise_balance_leave_report')
diff --git a/erpnext/patches/before_jan_2012/reload_flat_bom.py b/erpnext/patches/before_jan_2012/reload_flat_bom.py
index a46ad5e..020bd7e 100644
--- a/erpnext/patches/before_jan_2012/reload_flat_bom.py
+++ b/erpnext/patches/before_jan_2012/reload_flat_bom.py
@@ -16,7 +16,7 @@
def execute():
from webnotes.modules import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('production', 'doctype', 'flat_bom_detail')
reload_doc('production', 'doctype', 'bom_material')
diff --git a/erpnext/patches/before_jan_2012/reload_gl_mapper.py b/erpnext/patches/before_jan_2012/reload_gl_mapper.py
index 27f2c58..c43ab67 100644
--- a/erpnext/patches/before_jan_2012/reload_gl_mapper.py
+++ b/erpnext/patches/before_jan_2012/reload_gl_mapper.py
@@ -16,7 +16,7 @@
def execute():
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
# reload jv gl mapper
reload_doc('accounts', 'GL Mapper', 'Journal Voucher')
diff --git a/erpnext/patches/before_jan_2012/reload_lc_wizard.py b/erpnext/patches/before_jan_2012/reload_lc_wizard.py
index 7645419..e3df031 100644
--- a/erpnext/patches/before_jan_2012/reload_lc_wizard.py
+++ b/erpnext/patches/before_jan_2012/reload_lc_wizard.py
@@ -16,7 +16,7 @@
def execute():
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
from webnotes.model import delete_doc
delete_doc('DocType', 'Landed Cost Wizard')
diff --git a/erpnext/patches/before_jan_2012/reload_print_format.py b/erpnext/patches/before_jan_2012/reload_print_format.py
index 37b83a6..9948beb 100644
--- a/erpnext/patches/before_jan_2012/reload_print_format.py
+++ b/erpnext/patches/before_jan_2012/reload_print_format.py
@@ -16,7 +16,7 @@
def execute():
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
from webnotes.model.doc import addchild
from webnotes.model.code import get_obj
reload_doc('stock', 'Print Format', 'Delivery Note Packing List Wise')
diff --git a/erpnext/patches/before_jan_2012/reload_project_task.py b/erpnext/patches/before_jan_2012/reload_project_task.py
index 14d39fd..f174603 100644
--- a/erpnext/patches/before_jan_2012/reload_project_task.py
+++ b/erpnext/patches/before_jan_2012/reload_project_task.py
@@ -18,6 +18,6 @@
Reload Task Doctype of Project Module
"""
def execute():
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('Projects', 'DocType', 'Ticket')
diff --git a/erpnext/patches/before_jan_2012/reload_reco.py b/erpnext/patches/before_jan_2012/reload_reco.py
index 9335992..782fc7f 100644
--- a/erpnext/patches/before_jan_2012/reload_reco.py
+++ b/erpnext/patches/before_jan_2012/reload_reco.py
@@ -16,7 +16,7 @@
def execute():
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('stock', 'doctype', 'stock_reconciliation')
webnotes.conn.sql("delete from `tabDocField` where (label in ('Validate Data', 'Attachment HTML', 'Attachment') or fieldname in ('next_step', 'company', 'fiscal_year', 'amendment_date')) and parent = 'Stock Reconciliation'")
diff --git a/erpnext/patches/before_jan_2012/reload_rv.py b/erpnext/patches/before_jan_2012/reload_rv.py
index f41db49..4365563 100644
--- a/erpnext/patches/before_jan_2012/reload_rv.py
+++ b/erpnext/patches/before_jan_2012/reload_rv.py
@@ -16,7 +16,7 @@
def execute():
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
from webnotes.model.code import get_obj
reload_doc('accounts', 'doctype', 'receivable_voucher')
diff --git a/erpnext/patches/before_jan_2012/reload_support_ticket.py b/erpnext/patches/before_jan_2012/reload_support_ticket.py
index 803754f..f889687 100644
--- a/erpnext/patches/before_jan_2012/reload_support_ticket.py
+++ b/erpnext/patches/before_jan_2012/reload_support_ticket.py
@@ -16,7 +16,7 @@
def execute():
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('Support', 'DocType', 'Support Ticket')
from webnotes.model.code import get_obj
get_obj('DocType', 'Support Ticket').validate()
diff --git a/erpnext/patches/before_jan_2012/sal_man_patch.py b/erpnext/patches/before_jan_2012/sal_man_patch.py
index b8f5301..626d2e3 100644
--- a/erpnext/patches/before_jan_2012/sal_man_patch.py
+++ b/erpnext/patches/before_jan_2012/sal_man_patch.py
@@ -17,7 +17,7 @@
def execute():
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
sql = webnotes.conn.sql
reload_doc('hr', 'doctype', 'salary_manager')
diff --git a/erpnext/patches/before_jan_2012/task_email_notification.py b/erpnext/patches/before_jan_2012/task_email_notification.py
index 8d1a078..9f7669a 100644
--- a/erpnext/patches/before_jan_2012/task_email_notification.py
+++ b/erpnext/patches/before_jan_2012/task_email_notification.py
@@ -16,5 +16,5 @@
def execute():
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('projects', 'doctype', 'ticket')
diff --git a/erpnext/patches/jan_mar_2012/allocated_to_profile.py b/erpnext/patches/jan_mar_2012/allocated_to_profile.py
index 32c7a2c..ef0ee97 100644
--- a/erpnext/patches/jan_mar_2012/allocated_to_profile.py
+++ b/erpnext/patches/jan_mar_2012/allocated_to_profile.py
@@ -32,5 +32,5 @@
AND label='Make Maintenance Visit'
""")
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('support', 'doctype', 'customer_issue')
diff --git a/erpnext/patches/jan_mar_2012/apps/todo_item.py b/erpnext/patches/jan_mar_2012/apps/todo_item.py
index 6eec6fd..bbef232 100644
--- a/erpnext/patches/jan_mar_2012/apps/todo_item.py
+++ b/erpnext/patches/jan_mar_2012/apps/todo_item.py
@@ -18,5 +18,5 @@
"""
* Reload ToDo Item
"""
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('utilities', 'doctype', 'todo_item')
diff --git a/erpnext/patches/jan_mar_2012/customer_address_contact_patch.py b/erpnext/patches/jan_mar_2012/customer_address_contact_patch.py
index 4671143..32a2125 100644
--- a/erpnext/patches/jan_mar_2012/customer_address_contact_patch.py
+++ b/erpnext/patches/jan_mar_2012/customer_address_contact_patch.py
@@ -26,7 +26,7 @@
patch_primary_address()
def reload_sc():
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('selling', 'search_criteria', 'customer_address_contact')
reload_doc('selling', 'Module Def', 'Selling')
diff --git a/erpnext/patches/jan_mar_2012/deploy_packing_slip.py b/erpnext/patches/jan_mar_2012/deploy_packing_slip.py
index 7a28ef8..653ff58 100644
--- a/erpnext/patches/jan_mar_2012/deploy_packing_slip.py
+++ b/erpnext/patches/jan_mar_2012/deploy_packing_slip.py
@@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import webnotes
-from webnotes.modules.module_manager import reload_doc
+from webnotes.modules import reload_doc
def execute():
delete_fields_dn_detail()
diff --git a/erpnext/patches/jan_mar_2012/doclabel_in_doclayer.py b/erpnext/patches/jan_mar_2012/doclabel_in_doclayer.py
index a6f7a7c..0b6f405 100644
--- a/erpnext/patches/jan_mar_2012/doclabel_in_doclayer.py
+++ b/erpnext/patches/jan_mar_2012/doclabel_in_doclayer.py
@@ -24,5 +24,5 @@
UPDATE `tabDocField` SET options=NULL
WHERE parent='DocLayer' AND fieldname='doc_type'
""")
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('core', 'doctype', 'doclayer')
diff --git a/erpnext/patches/jan_mar_2012/dt_map_fix.py b/erpnext/patches/jan_mar_2012/dt_map_fix.py
index f669009..37732df 100644
--- a/erpnext/patches/jan_mar_2012/dt_map_fix.py
+++ b/erpnext/patches/jan_mar_2012/dt_map_fix.py
@@ -1,6 +1,6 @@
def execute():
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
webnotes.conn.sql("delete from `tabField Mapper Detail` where from_field = 'transaction_date' and parent in ('Sales Order-Delivery Note', 'Purchase Order-Purchase Receipt')")
reload_doc('stock', 'DocType Mapper', 'Sales Order-Delivery Note')
diff --git a/erpnext/patches/jan_mar_2012/email_settings_reload.py b/erpnext/patches/jan_mar_2012/email_settings_reload.py
index ec6f05d..85c683e 100644
--- a/erpnext/patches/jan_mar_2012/email_settings_reload.py
+++ b/erpnext/patches/jan_mar_2012/email_settings_reload.py
@@ -25,5 +25,5 @@
WHERE parent = 'Email Settings' AND fieldname = 'mail_port'
""")
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('setup', 'doctype', 'email_settings')
diff --git a/erpnext/patches/jan_mar_2012/jan_production_patches.py b/erpnext/patches/jan_mar_2012/jan_production_patches.py
index d57fb9e..479cecb 100644
--- a/erpnext/patches/jan_mar_2012/jan_production_patches.py
+++ b/erpnext/patches/jan_mar_2012/jan_production_patches.py
@@ -20,7 +20,7 @@
Patch includes:
* Reload of Stock Entry Detail
"""
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('stock', 'doctype', 'stock_entry_detail')
reload_doc('stock', 'doctype', 'item_supplier')
diff --git a/erpnext/patches/jan_mar_2012/label_cleanup.py b/erpnext/patches/jan_mar_2012/label_cleanup.py
index b40f36f..f158495 100644
--- a/erpnext/patches/jan_mar_2012/label_cleanup.py
+++ b/erpnext/patches/jan_mar_2012/label_cleanup.py
@@ -1,7 +1,7 @@
def execute():
import webnotes
from webnotes.model import delete_doc
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
dt = {
'selling': ['quotation', 'sales_order', 'quotation_detail', 'sales_order_detail'],
diff --git a/erpnext/patches/jan_mar_2012/pending_patches.py b/erpnext/patches/jan_mar_2012/pending_patches.py
index 351200f..821a411 100644
--- a/erpnext/patches/jan_mar_2012/pending_patches.py
+++ b/erpnext/patches/jan_mar_2012/pending_patches.py
@@ -17,7 +17,7 @@
def execute():
import webnotes
from webnotes.model.code import get_obj
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
sql = webnotes.conn.sql
reload_doc('hr', 'doctype', 'appraisal')
diff --git a/erpnext/patches/jan_mar_2012/production_cleanup.py b/erpnext/patches/jan_mar_2012/production_cleanup.py
index d0a5879..e715f27 100644
--- a/erpnext/patches/jan_mar_2012/production_cleanup.py
+++ b/erpnext/patches/jan_mar_2012/production_cleanup.py
@@ -16,7 +16,7 @@
def execute():
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
from webnotes.model import delete_doc
sql = webnotes.conn.sql
diff --git a/erpnext/patches/jan_mar_2012/reload_doctype.py b/erpnext/patches/jan_mar_2012/reload_doctype.py
index 51241b8..957864b 100644
--- a/erpnext/patches/jan_mar_2012/reload_doctype.py
+++ b/erpnext/patches/jan_mar_2012/reload_doctype.py
@@ -16,5 +16,5 @@
def execute():
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('core', 'doctype', 'doctype')
diff --git a/erpnext/patches/jan_mar_2012/reload_item.py b/erpnext/patches/jan_mar_2012/reload_item.py
index c45b818..e42b50b 100644
--- a/erpnext/patches/jan_mar_2012/reload_item.py
+++ b/erpnext/patches/jan_mar_2012/reload_item.py
@@ -16,7 +16,7 @@
def execute():
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('stock', 'doctype', 'item')
webnotes.conn.sql("update `tabItem` set re_order_qty = min_order_qty")
diff --git a/erpnext/patches/jan_mar_2012/reload_po_pr_mapper.py b/erpnext/patches/jan_mar_2012/reload_po_pr_mapper.py
index 4ed252b..5866429 100644
--- a/erpnext/patches/jan_mar_2012/reload_po_pr_mapper.py
+++ b/erpnext/patches/jan_mar_2012/reload_po_pr_mapper.py
@@ -16,5 +16,5 @@
def execute():
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('stock', 'DocType Mapper', 'Purchase Order-Purchase Receipt')
diff --git a/erpnext/patches/jan_mar_2012/reload_table.py b/erpnext/patches/jan_mar_2012/reload_table.py
index 481b46f..28a597b 100644
--- a/erpnext/patches/jan_mar_2012/reload_table.py
+++ b/erpnext/patches/jan_mar_2012/reload_table.py
@@ -1,6 +1,6 @@
def execute():
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('selling', 'doctype', 'quotation_detail')
reload_doc('selling', 'doctype', 'sales_order_detail')
reload_doc('stock', 'doctype', 'delivery_note_detail')
diff --git a/erpnext/patches/jan_mar_2012/remove_get_tds_button.py b/erpnext/patches/jan_mar_2012/remove_get_tds_button.py
index fe804c0..8549e0d 100644
--- a/erpnext/patches/jan_mar_2012/remove_get_tds_button.py
+++ b/erpnext/patches/jan_mar_2012/remove_get_tds_button.py
@@ -26,5 +26,5 @@
AND fieldtype='Button'
""")
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('accounts', 'doctype', 'journal_voucher')
diff --git a/erpnext/patches/jan_mar_2012/rename_doctype_indent.py b/erpnext/patches/jan_mar_2012/rename_doctype_indent.py
index 01aeebf..4e026f7 100644
--- a/erpnext/patches/jan_mar_2012/rename_doctype_indent.py
+++ b/erpnext/patches/jan_mar_2012/rename_doctype_indent.py
@@ -47,7 +47,7 @@
* purchase_order
* po_detail
"""
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('buying', 'doctype', 'indent')
reload_doc('buying', 'doctype', 'purchase_order')
reload_doc('buying', 'doctype', 'po_detail')
diff --git a/erpnext/patches/jan_mar_2012/serial_no_add_opt.py b/erpnext/patches/jan_mar_2012/serial_no_add_opt.py
index 947c28d..ec45c27 100644
--- a/erpnext/patches/jan_mar_2012/serial_no_add_opt.py
+++ b/erpnext/patches/jan_mar_2012/serial_no_add_opt.py
@@ -30,5 +30,5 @@
webnotes.conn.commit()
webnotes.conn.begin()
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('stock', 'doctype', 'serial_no')
diff --git a/erpnext/patches/jan_mar_2012/stable_branch_shift_09_01_12.py b/erpnext/patches/jan_mar_2012/stable_branch_shift_09_01_12.py
index e4078aa..d155107 100644
--- a/erpnext/patches/jan_mar_2012/stable_branch_shift_09_01_12.py
+++ b/erpnext/patches/jan_mar_2012/stable_branch_shift_09_01_12.py
@@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import webnotes
-from webnotes.modules.module_manager import reload_doc
+from webnotes.modules import reload_doc
def execute():
"""
diff --git a/erpnext/patches/jan_mar_2012/website/domain_list.py b/erpnext/patches/jan_mar_2012/website/domain_list.py
index 25f50e2..26824a4 100644
--- a/erpnext/patches/jan_mar_2012/website/domain_list.py
+++ b/erpnext/patches/jan_mar_2012/website/domain_list.py
@@ -16,7 +16,7 @@
def execute():
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('website', 'doctype', 'website_settings')
res = webnotes.conn.sql("""\
diff --git a/erpnext/patches/mar_2012/add_fieldnames.py b/erpnext/patches/mar_2012/add_fieldnames.py
new file mode 100644
index 0000000..3f96380
--- /dev/null
+++ b/erpnext/patches/mar_2012/add_fieldnames.py
@@ -0,0 +1,42 @@
+# do not run this patch
+def execute():
+ import webnotes
+ import webnotes.modules
+ forbidden = ['%', "'", '"', '#', '*', '?', '`', '(', ')', '<', '>', '-',
+ '\\', '/', '.', '&', '!', '@', '$', '^', '+']
+ doctype_list = webnotes.conn.sql("SELECT name, module FROM `tabDocType`")
+ for doctype, module in doctype_list:
+ docfield_list = webnotes.conn.sql("""\
+ SELECT name, label, fieldtype FROM `tabDocField`
+ WHERE parent = %s AND IFNULL(fieldname, '') = ''""", doctype)
+ field_type_count = {}
+ count = 0
+ for name, label, fieldtype in docfield_list:
+ fieldname = None
+ if label:
+ temp_label = label
+ if len(temp_label)==1:
+ temp_label = fieldtype + temp_label
+
+ fieldname = temp_label.lower().replace(' ', '_')
+ if "<" in fieldname:
+ count = field_type_count.setdefault(fieldtype, 0)
+ fieldname = fieldtype.lower().replace(' ', '_') + str(count)
+ field_type_count[fieldtype] = count + 1
+ elif fieldtype:
+ count = field_type_count.setdefault(fieldtype, 0)
+ fieldname = fieldtype.lower().replace(' ', '_') + str(count)
+ field_type_count[fieldtype] = count + 1
+
+ if fieldname:
+ for f in forbidden: fieldname = fieldname.replace(f, '')
+ fieldname = fieldname.replace('__', '_')
+ if fieldname.endswith('_'):
+ fieldname = fieldname[:-1]
+ if fieldname.startswith('_'):
+ fieldname = fieldname[1:]
+ #print fieldname
+ webnotes.conn.sql("""\
+ UPDATE `tabDocField` SET fieldname = %s
+ WHERE name = %s""", (fieldname, name))
+ webnotes.modules.export_doc('DocType', doctype)
diff --git a/erpnext/patches/mar_2012/clean_property_setter.py b/erpnext/patches/mar_2012/clean_property_setter.py
new file mode 100644
index 0000000..12e0a9e
--- /dev/null
+++ b/erpnext/patches/mar_2012/clean_property_setter.py
@@ -0,0 +1,52 @@
+import webnotes
+
+def execute():
+ """
+ * Remove unnecessary doctype properties
+ * Remove docfield property setters if fieldname doesn't exist
+ * Remove prev_field properties if value fieldname doesn't exist
+ """
+ clean_doctype_properties()
+ clean_docfield_properties()
+
+def clean_doctype_properties():
+ desc = webnotes.conn.sql("DESC `tabDocType`", as_dict=1)
+ property_list = '", "'.join([d.get('Field') for d in desc])
+ webnotes.conn.sql("""\
+ DELETE FROM `tabProperty Setter`
+ WHERE doctype_or_field = 'DocType'
+ AND property NOT IN ("%s")""" % property_list)
+
+def clean_docfield_properties():
+ delete_list_1 = webnotes.conn.sql("""\
+ SELECT name FROM `tabProperty Setter` ps
+ WHERE doctype_or_field = 'DocField'
+ AND NOT EXISTS (
+ SELECT fieldname FROM `tabDocField` df
+ WHERE df.parent = ps.doc_type
+ AND df.fieldname = ps.field_name
+ ) AND NOT EXISTS (
+ SELECT fieldname FROM `tabCustom Field` cf
+ WHERE cf.dt = ps.doc_type
+ AND cf.fieldname = ps.field_name
+ )""")
+
+ delete_list_2 = webnotes.conn.sql("""\
+ SELECT name FROM `tabProperty Setter` ps
+ WHERE doctype_or_field = 'DocField'
+ AND property = 'previous_field'
+ AND NOT EXISTS (
+ SELECT fieldname FROM `tabDocField` df
+ WHERE df.parent = ps.doc_type
+ AND df.fieldname = ps.value
+ ) AND NOT EXISTS (
+ SELECT fieldname FROM `tabCustom Field` cf
+ WHERE cf.dt = ps.doc_type
+ AND cf.fieldname = ps.value
+ )""")
+
+ delete_list = [d[0] for d in delete_list_1] + [d[0] for d in delete_list_2]
+
+ webnotes.conn.sql("""\
+ DELETE FROM `tabProperty Setter`
+ WHERE NAME IN ("%s")""" % '", "'.join(delete_list))
diff --git a/erpnext/patches/mar_2012/cleanup_control_panel.py b/erpnext/patches/mar_2012/cleanup_control_panel.py
new file mode 100644
index 0000000..f26db15
--- /dev/null
+++ b/erpnext/patches/mar_2012/cleanup_control_panel.py
@@ -0,0 +1,7 @@
+import webnotes
+def execute():
+ webnotes.conn.sql("""\
+ DELETE FROM `tabSingles`
+ WHERE doctype = 'Control Panel'
+ AND field IN ("sync_with_gateway", "mail_password", "auto_email_id",
+ "mail_port", "outgoing_mail_server", "mail_login", "use_ssl")""")
diff --git a/erpnext/patches/mar_2012/delete_docformat.py b/erpnext/patches/mar_2012/delete_docformat.py
new file mode 100644
index 0000000..77a6c82
--- /dev/null
+++ b/erpnext/patches/mar_2012/delete_docformat.py
@@ -0,0 +1,8 @@
+def execute():
+ import webnotes
+ webnotes.conn.sql("DELETE FROM `tabDocField` WHERE options='DocFormat'")
+ webnotes.conn.sql("DELETE FROM `tabDocField` WHERE parent='DocFormat'")
+ webnotes.conn.sql("DELETE FROM `tabDocType` WHERE name='DocFormat'")
+ webnotes.conn.commit()
+ webnotes.conn.sql("DROP TABLE `tabDocFormat`")
+ webnotes.conn.begin()
diff --git a/erpnext/patches/mar_2012/doctype_get_refactor.py b/erpnext/patches/mar_2012/doctype_get_refactor.py
new file mode 100644
index 0000000..35f4085
--- /dev/null
+++ b/erpnext/patches/mar_2012/doctype_get_refactor.py
@@ -0,0 +1,161 @@
+import webnotes
+def execute():
+ """
+ * Custom Field changes
+ * Add file_list to required tables
+ * Change floats/currency to decimal(14, 6)
+ * Remove DocFormat from DocType's fields
+ * Remove 'no_column' from DocField
+ * Drop table DocFormat
+ """
+ change_property_setter_fieldnames()
+ handle_custom_fields()
+ #create_file_list()
+
+ # do at last - needs commit due to DDL statements
+ change_to_decimal()
+
+def change_property_setter_fieldnames():
+ docfield_list = webnotes.conn.sql("""\
+ SELECT name, fieldname FROM `tabDocField`""", as_list=1)
+ custom_field_list = webnotes.conn.sql("""\
+ SELECT name, fieldname FROM `tabCustom Field`""", as_list=1)
+ field_list = docfield_list + custom_field_list
+ property_setter_list = webnotes.conn.sql("""\
+ SELECT name, doc_name, value, property
+ FROM `tabProperty Setter`
+ WHERE doctype_or_field='DocField'""")
+ field_dict = dict(field_list)
+ for name, doc_name, value, prop in property_setter_list:
+ if doc_name in field_dict:
+ webnotes.conn.sql("""\
+ UPDATE `tabProperty Setter`
+ SET field_name = %s
+ WHERE name = %s""", (field_dict.get(doc_name), name))
+ if value in field_dict and prop=='previous_field':
+ webnotes.conn.sql("""\
+ UPDATE `tabProperty Setter`
+ SET value = %s
+ WHERE name = %s""", (field_dict.get(value), name))
+
+
+def handle_custom_fields():
+ """
+ * Assign idx to custom fields
+ * Create property setter entry of previous field
+ * Remove custom fields from tabDocField
+ """
+ cf = get_cf()
+ assign_idx(cf)
+ create_prev_field_prop_setter(cf)
+ remove_custom_from_docfield(cf)
+
+def get_cf():
+ return webnotes.conn.sql("""\
+ SELECT * FROM `tabCustom Field`
+ WHERE docstatus < 2""", as_dict=1)
+
+def assign_idx(cf):
+ from webnotes.model.doctype import get
+ from webnotes.utils import cint
+ for f in cf:
+ if f.get('idx'): continue
+ temp_doclist = get(f.get('dt'), form=0)
+ max_idx = max(d.idx for d in temp_doclist if d.doctype=='DocField')
+ if not max_idx: continue
+ webnotes.conn.sql("""\
+ UPDATE `tabCustom Field` SET idx=%s
+ WHERE name=%s""", (cint(max_idx)+1, f.get('name')))
+
+def create_prev_field_prop_setter(cf):
+ from webnotes.model.doc import Document
+ from core.doctype.custom_field.custom_field import get_fields_label
+ for f in cf:
+ idx_label_list, field_list = get_fields_label(f.get('dt'), 0)
+ temp_insert_after = (f.get('insert_after') or '').split(" - ")
+ if len(temp_insert_after)<=1: continue
+ similar_idx_label = [il for il in idx_label_list \
+ if temp_insert_after[0] in il]
+ if not similar_idx_label: continue
+ label_index = idx_label_list.index(similar_idx_label[0])
+ if label_index==-1: return
+
+ webnotes.conn.sql("""\
+ UPDATE `tabCustom Field`
+ SET insert_after = %s
+ WHERE name = %s""", (similar_idx_label[0], f.get('name')))
+
+ prev_field = field_list[label_index]
+ webnotes.conn.sql("""\
+ DELETE FROM `tabProperty Setter`
+ WHERE doc_type = %s
+ AND field_name = %s
+ AND property = 'previous_field'""", (f.get('dt'), f.get('fieldname')))
+
+ ps = Document('Property Setter', fielddata = {
+ 'doctype_or_field': 'DocField',
+ 'doc_type': f.get('dt'),
+ 'field_name': f.get('fieldname'),
+ 'property': 'previous_field',
+ 'value': prev_field,
+ 'property_type': 'Data',
+ 'select_doctype': f.get('dt')
+ })
+ ps.save(1)
+
+def remove_custom_from_docfield(cf):
+ for f in cf:
+ webnotes.conn.sql("""\
+ DELETE FROM `tabDocField`
+ WHERE parent=%s AND fieldname=%s""", (f.get('dt'),
+ f.get('fieldname')))
+
+def create_file_list():
+ should_exist = ['Website Settings', 'Web Page', 'Timesheet', 'Ticket',
+ 'Support Ticket', 'Supplier', 'Style Settings', 'Stock Reconciliation',
+ 'Stock Entry', 'Serial No', 'Sales Order', 'Receivable Voucher',
+ 'Quotation', 'Question', 'Purchase Receipt', 'Purchase Order',
+ 'Project', 'Profile', 'Production Order', 'Product', 'Print Format',
+ 'Price List', 'Payable Voucher', 'Page', 'Module Def',
+ 'Maintenance Visit', 'Maintenance Schedule', 'Letter Head',
+ 'Leave Application', 'Lead', 'Journal Voucher', 'Item', 'Indent',
+ 'Expense Voucher', 'Enquiry', 'Employee', 'Delivery Note',
+ 'Customer Issue', 'Customer', 'Contact Us Settings', 'Company',
+ 'Bulk Rename Tool', 'Blog', 'Bill Of Materials', 'About Us Settings']
+
+ from webnotes.model.code import get_obj
+
+ for dt in should_exist:
+ obj = get_obj('DocType', dt, with_children=1)
+ obj.doc.allow_attach = 1
+ obj.doc.save()
+ obj.make_file_list()
+ from webnotes.model.db_schema import updatedb
+ updatedb(obj.doc.name)
+ from webnotes.utils.cache import CacheItem
+ CacheItem(obj.doc.name).clear()
+
+def change_to_decimal():
+ webnotes.conn.commit()
+ tables = webnotes.conn.sql("SHOW TABLES")
+ alter_tables_list = []
+ for tab in tables:
+ if not tab: continue
+ desc = webnotes.conn.sql("DESC `%s`" % tab[0], as_dict=1)
+ flist = []
+ for d in desc:
+ if d.get('Type')=='decimal(14,2)':
+ flist.append(d.get('Field'))
+ if flist:
+ #print tab[0], flist
+ statements = ("MODIFY `%s` decimal(14,6)" % f for f in flist)
+ statements = ", \n".join(statements)
+ alter_tables_list.append("ALTER TABLE `%s` \n%s\n" % (tab[0],
+ statements))
+
+ #print "\n\n".join(alter_tables_list)
+ for at in alter_tables_list:
+ webnotes.conn.sql(at)
+
+ webnotes.conn.begin()
+
diff --git a/erpnext/patches/mar_2012/is_submittable_patch.py b/erpnext/patches/mar_2012/is_submittable_patch.py
new file mode 100644
index 0000000..d49160c
--- /dev/null
+++ b/erpnext/patches/mar_2012/is_submittable_patch.py
@@ -0,0 +1,23 @@
+# dont run this patch
+def execute():
+ import webnotes
+ import webnotes.model.doctype
+ from webnotes.utils import cint
+ from webnotes.model.doc import Document
+ from webnotes.model.code import get_obj
+ doctype_list = webnotes.conn.sql("SELECT name FROM `tabDocType`")
+ for dt in doctype_list:
+ doclist = webnotes.model.doctype.get(dt[0], form=0)
+ is_submittable = 0
+ for d in doclist:
+ if d.doctype == 'DocPerm' and d.fields.get('permlevel') == 0 \
+ and cint(d.fields.get('submit')) == 1:
+ is_submittable = 1
+ break
+ if is_submittable:
+ dt_doc = Document('DocType', doclist[0].name)
+ dt_doc.is_submittable = 1
+ dt_doc.save()
+ obj = get_obj(doc=dt_doc)
+ obj.make_amendable()
+ obj.on_update()
diff --git a/erpnext/patches/old_patches/customer_address.py b/erpnext/patches/old_patches/customer_address.py
index 44568ce..4757c02 100644
--- a/erpnext/patches/old_patches/customer_address.py
+++ b/erpnext/patches/old_patches/customer_address.py
@@ -21,7 +21,7 @@
from webnotes import msgprint, errprint
def make_address():
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('utilities','doctype','address')
from webnotes.model.db_schema import updatedb
@@ -128,7 +128,7 @@
# export_to_files(record_list=[['DocType',dt]])
def reload_doc_files():
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('utilities', 'doctype', 'contact')
reload_doc('selling', 'doctype', 'customer')
reload_doc('support', 'doctype', 'customer_issue')
@@ -149,7 +149,7 @@
reload_doc('buying', 'doctype', 'supplier')
def reload_mapper_files():
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('Mapper', 'DocType Mapper', 'Customer Issue-Maintenance Visit')
reload_doc('Mapper', 'DocType Mapper', 'Delivery Note-Installation Note')
reload_doc('Mapper', 'DocType Mapper', 'Delivery Note-Receivable Voucher')
diff --git a/erpnext/patches/old_patches/doctype_permission_patch.py b/erpnext/patches/old_patches/doctype_permission_patch.py
index 0953864..b23277a 100644
--- a/erpnext/patches/old_patches/doctype_permission_patch.py
+++ b/erpnext/patches/old_patches/doctype_permission_patch.py
@@ -21,7 +21,7 @@
# remove descriptions
webnotes.conn.sql("update tabDocType set description=null")
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('core','doctype','custom_script')
reload_doc('core','doctype','custom_field')
reload_doc('core','doctype','property_setter')
diff --git a/erpnext/patches/old_patches/feed_patch.py b/erpnext/patches/old_patches/feed_patch.py
index 1edac88..d1fa147 100644
--- a/erpnext/patches/old_patches/feed_patch.py
+++ b/erpnext/patches/old_patches/feed_patch.py
@@ -110,7 +110,7 @@
def support_patch():
# relaod support and other doctypes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
webnotes.model.delete_doc('DocType','Support Ticket')
reload_doc('setup','doctype','support_email_settings')
diff --git a/erpnext/patches/old_patches/patch_1.py b/erpnext/patches/old_patches/patch_1.py
index 4176bf5..9e9cb6f 100644
--- a/erpnext/patches/old_patches/patch_1.py
+++ b/erpnext/patches/old_patches/patch_1.py
@@ -781,12 +781,12 @@
except: pass
# import
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('event_updates','doctype','feed')
elif patch_no==185:
sql("delete from tabDocTrigger where method = 'webnotes.widgets.follow.on_docsave'")
elif patch_no==186:
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('event_updates','doctype','feed')
elif patch_no == 187:
sql("update tabDocType set autoname = '' where name = 'QA Inspection Report'")
@@ -807,7 +807,7 @@
sql("delete from `tabModule Def Item` where parent = 'SRM' and doc_name = 'Landed Cost Wizard' and display_name = 'Landed Cost Wizard'")
import_from_files(record_list = [['stock', 'Module Def', 'Material Management']])
elif patch_no == 195:
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('setup','doctype','manage_account')
elif patch_no == 196:
sql("update `tabModule Def` set module_page = null where name = 'Material Management'")
diff --git a/erpnext/patches/patch.py b/erpnext/patches/patch.py
index 744b102..5b9f7a0 100644
--- a/erpnext/patches/patch.py
+++ b/erpnext/patches/patch.py
@@ -24,7 +24,7 @@
def execute(patch_no):
return
import webnotes
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
from webnotes.model.code import get_obj
sql = webnotes.conn.sql
@@ -377,7 +377,7 @@
elif patch_no == 370:
sql("update `tabDocField` set `hidden` = 0 where fieldname = 'group_or_ledger' and parent = 'Cost Center'")
elif patch_no == 371:
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('setup', 'doctype','features_setup')
flds = ['page_break', 'projects', 'packing_details', 'discounts', 'brands', 'item_batch_nos', 'after_sales_installations', 'item_searial_nos', 'item_group_in_details', 'exports', 'imports', 'item_advanced', 'sales_extras', 'more_info', 'quality', 'manufacturing', 'pos', 'item_serial_nos']
@@ -393,7 +393,7 @@
get_obj('Features Setup', 'Features Setup').doc.save()
elif patch_no == 372:
- from webnotes.modules.module_manager import reload_doc
+ from webnotes.modules import reload_doc
reload_doc('setup', 'doctype','features_setup')
flds = ['page_break', 'projects', 'packing_details', 'discounts', 'brands', 'item_batch_nos', 'after_sales_installations', 'item_searial_nos', 'item_group_in_details', 'exports', 'imports', 'item_advanced', 'sales_extras', 'more_info', 'quality', 'manufacturing', 'pos', 'item_serial_nos']
diff --git a/erpnext/patches/patch_list.py b/erpnext/patches/patch_list.py
index 3099456..9f33c66 100644
--- a/erpnext/patches/patch_list.py
+++ b/erpnext/patches/patch_list.py
@@ -208,6 +208,30 @@
'description': 'Purpose SE: Others to Other'
},
{
+ 'patch_module': 'patches.mar_2012',
+ 'patch_file': 'pos_invoice_fix',
+ 'description': 'Reload POS Invoice'
+ },
+ {
+ 'patch_module': 'patches.mar_2012',
+ 'patch_file': 'cleanup_control_panel',
+ 'description': 'Remove email related fields from Control Panel'
+ },
+ {
+ 'patch_module': 'patches.mar_2012',
+ 'patch_file': 'doctype_get_refactor',
+ 'description': 'Patch related to doctype get refactoring'
+ },
+ {
+ 'patch_module': 'patches.mar_2012',
+ 'patch_file': 'clean_property_setter',
+ 'description': 'Cleanup Property Setter Entries'
+ },
+ {
+ 'patch_module': 'patches.mar_2012',
+ 'patch_file': 'delete_docformat',
+ 'description': 'Deletes DocFormat from database'
+ },
'patch_module': 'patches.jan_mar_2012',
'patch_file': 'reload_mapper',
'description': 'SO-DN, SO-Rv, DN-RV'
@@ -222,5 +246,4 @@
'patch_file': 'so_rv_mapper_fix',
'description': 'SO-RV duplicate mapper entry removal'
},
-
]
diff --git a/erpnext/production/doctype/bill_of_materials/bill_of_materials.txt b/erpnext/production/doctype/bill_of_materials/bill_of_materials.txt
index cc29380..3349275 100644
--- a/erpnext/production/doctype/bill_of_materials/bill_of_materials.txt
+++ b/erpnext/production/doctype/bill_of_materials/bill_of_materials.txt
@@ -3,233 +3,223 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:52',
+ 'creation': '2012-03-27 14:36:02',
'docstatus': 0,
- 'modified': '2012-01-24 19:49:00',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:45:46',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1326963484',
+ '_last_update': u'1326963484',
'allow_attach': 0,
'allow_copy': 0,
'allow_email': 0,
'allow_print': 0,
'allow_rename': 0,
'allow_trash': 1,
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
- 'document_type': 'Master',
+ 'document_type': u'Master',
'hide_heading': 0,
'hide_toolbar': 0,
'in_create': 0,
+ 'is_submittable': 1,
'issingle': 0,
'istable': 0,
- 'module': 'Production',
+ 'module': u'Production',
'name': '__common__',
'read_only': 0,
- 'search_fields': 'item',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'search_fields': u'item',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
- 'subject': '%(item)s',
+ 'subject': u'%(item)s',
'version': 196
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Bill Of Materials',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Bill Of Materials',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'amend': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Bill Of Materials',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Bill Of Materials',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Bill Of Materials
{
'doctype': 'DocType',
- 'name': 'Bill Of Materials'
+ 'name': u'Bill Of Materials'
},
# DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'submit': 1,
'write': 1
},
# DocPerm
{
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'System Manager',
- 'submit': 0,
- 'write': 0
+ 'role': u'System Manager'
},
# DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Production Manager',
+ 'role': u'Production Manager',
'submit': 1,
'write': 1
},
# DocPerm
{
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Production Manager',
- 'submit': 0,
- 'write': 0
+ 'role': u'Production Manager'
},
# DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Production User',
+ 'role': u'Production User',
'submit': 1,
'write': 1
},
# DocPerm
{
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Production User',
- 'submit': 0,
- 'write': 0
+ 'role': u'Production User'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Select the item code for which Bill of Material is being created',
- 'doctype': 'DocField',
- 'fieldname': 'item',
- 'fieldtype': 'Link',
+ 'colour': u'White:FFF',
+ 'description': u'Select the item code for which Bill of Material is being created',
+ 'doctype': u'DocField',
+ 'fieldname': u'item',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Item',
- 'oldfieldname': 'item',
- 'oldfieldtype': 'Link',
- 'options': 'Item',
+ 'label': u'Item',
+ 'oldfieldname': u'item',
+ 'oldfieldtype': u'Link',
+ 'options': u'Item',
'permlevel': 0,
'reqd': 1,
'search_index': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Total quantity of items for which raw materials required and operations done will be defined',
- 'doctype': 'DocField',
- 'fieldname': 'quantity',
- 'fieldtype': 'Currency',
- 'label': 'Quantity',
- 'oldfieldname': 'quantity',
- 'oldfieldtype': 'Currency',
+ 'colour': u'White:FFF',
+ 'description': u'Total quantity of items for which raw materials required and operations done will be defined',
+ 'doctype': u'DocField',
+ 'fieldname': u'quantity',
+ 'fieldtype': u'Currency',
+ 'label': u'Quantity',
+ 'oldfieldname': u'quantity',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'uom',
- 'fieldtype': 'Select',
- 'label': 'UOM',
- 'options': 'link:UOM',
+ 'doctype': u'DocField',
+ 'fieldname': u'uom',
+ 'fieldtype': u'Select',
+ 'label': u'UOM',
+ 'options': u'link:UOM',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Text',
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Text',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Text',
'permlevel': 0,
- 'width': '300px'
+ 'width': u'300px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'description': 'Select name of the project if Bill Of Materials need to be created against any project',
- 'doctype': 'DocField',
- 'fieldname': 'project_name',
- 'fieldtype': 'Link',
+ 'description': u'Select name of the project if Bill Of Materials need to be created against any project',
+ 'doctype': u'DocField',
+ 'fieldname': u'project_name',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Project Name',
- 'oldfieldname': 'project_name',
- 'oldfieldtype': 'Link',
- 'options': 'Project',
+ 'label': u'Project Name',
+ 'oldfieldname': u'project_name',
+ 'oldfieldtype': u'Link',
+ 'options': u'Project',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
'allow_on_submit': 1,
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'is_active',
- 'fieldtype': 'Select',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'is_active',
+ 'fieldtype': u'Select',
'hidden': 0,
- 'label': 'Is Active',
+ 'label': u'Is Active',
'no_copy': 1,
- 'oldfieldname': 'is_active',
- 'oldfieldtype': 'Select',
- 'options': '\nYes\nNo',
+ 'oldfieldname': u'is_active',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nYes\nNo',
'permlevel': 0,
'reqd': 1
},
@@ -237,204 +227,236 @@
# DocField
{
'allow_on_submit': 1,
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'is_default',
- 'fieldtype': 'Check',
- 'label': 'Is Default',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'is_default',
+ 'fieldtype': u'Check',
+ 'label': u'Is Default',
'no_copy': 1,
- 'oldfieldname': 'is_default',
- 'oldfieldtype': 'Check',
+ 'oldfieldname': u'is_default',
+ 'oldfieldtype': u'Check',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'maintained_by',
- 'fieldtype': 'Data',
- 'label': 'Maintained By',
- 'oldfieldname': 'maintained_by',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'maintained_by',
+ 'fieldtype': u'Data',
+ 'label': u'Maintained By',
+ 'oldfieldname': u'maintained_by',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'remarks',
- 'fieldtype': 'Text',
- 'label': 'Remarks',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'remarks',
+ 'fieldtype': u'Text',
+ 'label': u'Remarks',
'no_copy': 1,
- 'oldfieldname': 'remarks',
- 'oldfieldtype': 'Text',
+ 'oldfieldname': u'remarks',
+ 'oldfieldtype': u'Text',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Operations',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'operations',
+ 'fieldtype': u'Section Break',
+ 'label': u'Operations',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Specify the operations, operating cost and give a unique Operation no to your operations.',
- 'doctype': 'DocField',
- 'fieldname': 'bom_operations',
- 'fieldtype': 'Table',
- 'label': 'BOM Operations',
- 'oldfieldname': 'bom_operations',
- 'oldfieldtype': 'Table',
- 'options': 'BOM Operation',
+ 'colour': u'White:FFF',
+ 'description': u'Specify the operations, operating cost and give a unique Operation no to your operations.',
+ 'doctype': u'DocField',
+ 'fieldname': u'bom_operations',
+ 'fieldtype': u'Table',
+ 'label': u'BOM Operations',
+ 'oldfieldname': u'bom_operations',
+ 'oldfieldtype': u'Table',
+ 'options': u'BOM Operation',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Materials',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'materials',
+ 'fieldtype': u'Section Break',
+ 'label': u'Materials',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Enter the raw materials required to manufacture the BOM item. Specify the operation no as entered in the previous tab which will be performed on the raw materials entered.',
- 'doctype': 'DocField',
- 'fieldname': 'bom_materials',
- 'fieldtype': 'Table',
- 'label': 'BOM Material',
- 'oldfieldname': 'bom_materials',
- 'oldfieldtype': 'Table',
- 'options': 'BOM Material',
+ 'colour': u'White:FFF',
+ 'description': u'Enter the raw materials required to manufacture the BOM item. Specify the operation no as entered in the previous tab which will be performed on the raw materials entered.',
+ 'doctype': u'DocField',
+ 'fieldname': u'bom_materials',
+ 'fieldtype': u'Table',
+ 'label': u'BOM Material',
+ 'oldfieldname': u'bom_materials',
+ 'oldfieldtype': u'Table',
+ 'options': u'BOM Material',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Costing',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'costing',
+ 'fieldtype': u'Section Break',
+ 'label': u'Costing',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break2',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'rm_cost_as_per',
- 'fieldtype': 'Select',
- 'label': 'Consider Raw Material Cost As Per',
- 'options': 'Valuation Rate\nLast Purchase Rate\nStandard Rate',
+ 'doctype': u'DocField',
+ 'fieldname': u'rm_cost_as_per',
+ 'fieldtype': u'Select',
+ 'label': u'Consider Raw Material Cost As Per',
+ 'options': u'Valuation Rate\nLast Purchase Rate\nStandard Rate',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'costing_date',
- 'fieldtype': 'Date',
- 'label': 'Costing Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'costing_date',
+ 'fieldtype': u'Date',
+ 'label': u'Costing Date',
'permlevel': 1
},
# DocField
{
'allow_on_submit': 1,
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Update Cost as on today',
- 'options': 'calculate_cost',
+ 'doctype': u'DocField',
+ 'fieldname': u'update_cost_as_on_today',
+ 'fieldtype': u'Button',
+ 'label': u'Update Cost as on today',
+ 'options': u'calculate_cost',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break3',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'raw_material_cost',
- 'fieldtype': 'Float',
- 'label': 'Raw Material Cost',
+ 'doctype': u'DocField',
+ 'fieldname': u'raw_material_cost',
+ 'fieldtype': u'Float',
+ 'label': u'Raw Material Cost',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'operating_cost',
- 'fieldtype': 'Float',
- 'label': 'Operating Cost',
+ 'doctype': u'DocField',
+ 'fieldname': u'operating_cost',
+ 'fieldtype': u'Float',
+ 'label': u'Operating Cost',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'total_cost',
- 'fieldtype': 'Float',
- 'label': 'Total Cost',
+ 'doctype': u'DocField',
+ 'fieldname': u'total_cost',
+ 'fieldtype': u'Float',
+ 'label': u'Total Cost',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'section_break0',
+ 'fieldtype': u'Section Break',
'hidden': 1,
- 'options': 'Simple',
+ 'options': u'Simple',
'permlevel': 0,
'print_hide': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'default': 'No Toolbar',
- 'doctype': 'DocField',
- 'fieldname': 'flat_bom_details',
- 'fieldtype': 'Table',
+ 'colour': u'White:FFF',
+ 'default': u'No Toolbar',
+ 'doctype': u'DocField',
+ 'fieldname': u'flat_bom_details',
+ 'fieldtype': u'Table',
'hidden': 1,
- 'label': 'Flat BOM Detail',
+ 'label': u'Flat BOM Detail',
'no_copy': 1,
- 'oldfieldname': 'flat_bom_details',
- 'oldfieldtype': 'Table',
- 'options': 'Flat BOM Detail',
+ 'oldfieldname': u'flat_bom_details',
+ 'oldfieldtype': u'Table',
+ 'options': u'Flat BOM Detail',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
'hidden': 1,
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
+ },
+
+ # DocField
+ {
+ 'depends_on': u'eval:doc.amended_from',
+ 'description': u'The date at which current entry is corrected in the system.',
+ 'doctype': u'DocField',
+ 'fieldname': u'amendment_date',
+ 'fieldtype': u'Date',
+ 'label': u'Amendment Date',
+ 'no_copy': 1,
+ 'permlevel': 0,
+ 'print_hide': 1
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
+ 'fieldname': u'amended_from',
+ 'fieldtype': u'Link',
+ 'label': u'Amended From',
+ 'no_copy': 1,
+ 'options': u'Receivable Voucher',
+ 'permlevel': 1,
+ 'print_hide': 1
}
]
\ No newline at end of file
diff --git a/erpnext/production/doctype/bom_control/bom_control.txt b/erpnext/production/doctype/bom_control/bom_control.txt
index 127d997..3c322e1 100644
--- a/erpnext/production/doctype/bom_control/bom_control.txt
+++ b/erpnext/production/doctype/bom_control/bom_control.txt
@@ -3,22 +3,22 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:53',
+ 'creation': '2012-03-27 14:36:02',
'docstatus': 0,
- 'modified': '2012-01-24 20:56:54',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:02',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'issingle': 1,
- 'module': 'Production',
+ 'module': u'Production',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 108
},
@@ -26,6 +26,6 @@
# DocType, BOM Control
{
'doctype': 'DocType',
- 'name': 'BOM Control'
+ 'name': u'BOM Control'
}
]
\ No newline at end of file
diff --git a/erpnext/production/doctype/bom_material/bom_material.txt b/erpnext/production/doctype/bom_material/bom_material.txt
index ebef2b4..5345408 100644
--- a/erpnext/production/doctype/bom_material/bom_material.txt
+++ b/erpnext/production/doctype/bom_material/bom_material.txt
@@ -3,191 +3,191 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:53',
+ 'creation': '2012-03-27 14:36:02',
'docstatus': 0,
- 'modified': '2012-01-24 19:47:34',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:02',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Production',
+ 'module': u'Production',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 27
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'BOM Material',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'BOM Material',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'BOM Material',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'BOM Material',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1,
- 'role': 'System Manager'
+ 'role': u'System Manager'
},
# DocType, BOM Material
{
'doctype': 'DocType',
- 'name': 'BOM Material'
+ 'name': u'BOM Material'
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'operation_no',
- 'fieldtype': 'Data',
- 'label': 'Operation No',
- 'oldfieldname': 'operation_no',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'operation_no',
+ 'fieldtype': u'Data',
+ 'label': u'Operation No',
+ 'oldfieldname': u'operation_no',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'item_code',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'item_code',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Item Code',
- 'oldfieldname': 'item_code',
- 'oldfieldtype': 'Link',
- 'options': 'Item',
+ 'label': u'Item Code',
+ 'oldfieldname': u'item_code',
+ 'oldfieldtype': u'Link',
+ 'options': u'Item',
'permlevel': 0,
'reqd': 1,
'search_index': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'bom_no',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'bom_no',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'BOM No',
- 'oldfieldname': 'bom_no',
- 'oldfieldtype': 'Link',
- 'options': 'Bill Of Materials',
+ 'label': u'BOM No',
+ 'oldfieldname': u'bom_no',
+ 'oldfieldtype': u'Link',
+ 'options': u'Bill Of Materials',
'permlevel': 0,
'reqd': 0,
'search_index': 1,
- 'trigger': 'Client',
- 'width': '150px'
+ 'trigger': u'Client',
+ 'width': u'150px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'qty',
- 'fieldtype': 'Float',
- 'label': 'Qty',
- 'oldfieldname': 'qty',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'qty',
+ 'fieldtype': u'Float',
+ 'label': u'Qty',
+ 'oldfieldname': u'qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'reqd': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'stock_uom',
- 'fieldtype': 'Data',
- 'label': 'Stock UOM',
- 'oldfieldname': 'stock_uom',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'stock_uom',
+ 'fieldtype': u'Data',
+ 'label': u'Stock UOM',
+ 'oldfieldname': u'stock_uom',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'rate',
- 'fieldtype': 'Float',
- 'label': 'Rate',
+ 'doctype': u'DocField',
+ 'fieldname': u'rate',
+ 'fieldtype': u'Float',
+ 'label': u'Rate',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amount',
- 'fieldtype': 'Float',
- 'label': 'Amount',
- 'oldfieldname': 'amount_as_per_mar',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'amount',
+ 'fieldtype': u'Float',
+ 'label': u'Amount',
+ 'oldfieldname': u'amount_as_per_mar',
+ 'oldfieldtype': u'Currency',
'permlevel': 1,
- 'width': '150px'
+ 'width': u'150px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'scrap',
- 'fieldtype': 'Currency',
- 'label': 'Scrap %',
- 'oldfieldname': 'scrap',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'scrap',
+ 'fieldtype': u'Currency',
+ 'label': u'Scrap %',
+ 'oldfieldname': u'scrap',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Text',
- 'label': 'Item Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Text',
+ 'label': u'Item Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Text',
'permlevel': 0,
'reqd': 0,
- 'width': '250px'
+ 'width': u'250px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'qty_consumed_per_unit',
- 'fieldtype': 'Float',
+ 'doctype': u'DocField',
+ 'fieldname': u'qty_consumed_per_unit',
+ 'fieldtype': u'Float',
'hidden': 1,
- 'label': 'Qty Consumed Per Unit',
- 'oldfieldname': 'qty_consumed_per_unit',
- 'oldfieldtype': 'Float',
+ 'label': u'Qty Consumed Per Unit',
+ 'oldfieldname': u'qty_consumed_per_unit',
+ 'oldfieldtype': u'Float',
'permlevel': 1,
'print_hide': 1
}
diff --git a/erpnext/production/doctype/bom_operation/bom_operation.txt b/erpnext/production/doctype/bom_operation/bom_operation.txt
index f3cc659..1e5b93a 100644
--- a/erpnext/production/doctype/bom_operation/bom_operation.txt
+++ b/erpnext/production/doctype/bom_operation/bom_operation.txt
@@ -3,133 +3,133 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:53',
+ 'creation': '2012-03-27 14:36:02',
'docstatus': 0,
- 'modified': '2011-12-28 12:28:02',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:02',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Production',
+ 'module': u'Production',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 8
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'BOM Operation',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'BOM Operation',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'BOM Operation',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'BOM Operation',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1,
- 'role': 'System Manager'
+ 'role': u'System Manager'
},
# DocType, BOM Operation
{
'doctype': 'DocType',
- 'name': 'BOM Operation'
+ 'name': u'BOM Operation'
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'operation_no',
- 'fieldtype': 'Data',
- 'label': 'Operation No',
- 'oldfieldname': 'operation_no',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'operation_no',
+ 'fieldtype': u'Data',
+ 'label': u'Operation No',
+ 'oldfieldname': u'operation_no',
+ 'oldfieldtype': u'Data',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'opn_description',
- 'fieldtype': 'Text',
- 'label': 'Opn Description',
- 'oldfieldname': 'opn_description',
- 'oldfieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'opn_description',
+ 'fieldtype': u'Text',
+ 'label': u'Opn Description',
+ 'oldfieldname': u'opn_description',
+ 'oldfieldtype': u'Text',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'workstation',
- 'fieldtype': 'Link',
- 'label': 'Workstation',
- 'oldfieldname': 'workstation',
- 'oldfieldtype': 'Link',
- 'options': 'Workstation',
+ 'doctype': u'DocField',
+ 'fieldname': u'workstation',
+ 'fieldtype': u'Link',
+ 'label': u'Workstation',
+ 'oldfieldname': u'workstation',
+ 'oldfieldtype': u'Link',
+ 'options': u'Workstation',
'reqd': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'hour_rate',
- 'fieldtype': 'Currency',
- 'label': 'Hour Rate',
- 'oldfieldname': 'hour_rate',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'hour_rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Hour Rate',
+ 'oldfieldname': u'hour_rate',
+ 'oldfieldtype': u'Currency',
'reqd': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'time_in_mins',
- 'fieldtype': 'Currency',
- 'label': 'Operation Time (mins)',
- 'oldfieldname': 'time_in_mins',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'time_in_mins',
+ 'fieldtype': u'Currency',
+ 'label': u'Operation Time (mins)',
+ 'oldfieldname': u'time_in_mins',
+ 'oldfieldtype': u'Currency',
'reqd': 0
},
# DocField
{
'allow_on_submit': 0,
- 'doctype': 'DocField',
- 'fieldname': 'operating_cost',
- 'fieldtype': 'Currency',
- 'label': 'Operating Cost',
- 'oldfieldname': 'operating_cost',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'operating_cost',
+ 'fieldtype': u'Currency',
+ 'label': u'Operating Cost',
+ 'oldfieldname': u'operating_cost',
+ 'oldfieldtype': u'Currency',
'reqd': 0
}
]
\ No newline at end of file
diff --git a/erpnext/production/doctype/bom_replace_utility/bom_replace_utility.txt b/erpnext/production/doctype/bom_replace_utility/bom_replace_utility.txt
index f3e1412..c20e61e 100644
--- a/erpnext/production/doctype/bom_replace_utility/bom_replace_utility.txt
+++ b/erpnext/production/doctype/bom_replace_utility/bom_replace_utility.txt
@@ -3,396 +3,381 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:53',
+ 'creation': '2012-03-27 14:36:02',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'jai@webnotestech.com'
+ 'modified': '2012-03-27 14:36:02',
+ 'modified_by': u'Administrator',
+ 'owner': u'jai@webnotestech.com'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'issingle': 1,
- 'module': 'Production',
+ 'module': u'Production',
'name': '__common__',
- 'section_style': 'Tray',
- 'server_code_error': ' ',
+ 'section_style': u'Tray',
+ 'server_code_error': u' ',
'show_in_menu': 1,
'version': 56
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'BOM Replace Utility',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'BOM Replace Utility',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'BOM Replace Utility',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'BOM Replace Utility',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, BOM Replace Utility
{
'doctype': 'DocType',
- 'name': 'BOM Replace Utility'
+ 'name': u'BOM Replace Utility'
},
# DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'permlevel': 1,
- 'role': 'System Manager'
- },
-
- # DocPerm
- {
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 3,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Production User',
+ 'role': u'Production User',
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 4,
- 'permlevel': 1,
- 'role': 'Production User'
- },
-
- # DocPerm
- {
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 5,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Production Manager',
+ 'role': u'Production Manager',
'submit': 0,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 6,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Production Manager'
+ 'role': u'System Manager'
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Production User'
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Production Manager'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'create_new_bom',
- 'fieldtype': 'Check',
- 'idx': 1,
- 'label': 'Create New BOM'
+ 'doctype': u'DocField',
+ 'fieldname': u'create_new_bom',
+ 'fieldtype': u'Check',
+ 'label': u'Create New BOM'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 2,
- 'label': 'BOM Details'
+ 'doctype': u'DocField',
+ 'fieldname': u'bom_details',
+ 'fieldtype': u'Section Break',
+ 'label': u'BOM Details'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Select the relevant BOM to be replaced which is actually a raw material used for a parent BOM.',
- 'doctype': 'DocField',
- 'fieldname': 's_bom',
- 'fieldtype': 'Link',
- 'idx': 3,
- 'label': 'Select BOM',
- 'options': 'Bill Of Materials',
- 'trigger': 'Client'
+ 'colour': u'White:FFF',
+ 'description': u'Select the relevant BOM to be replaced which is actually a raw material used for a parent BOM.',
+ 'doctype': u'DocField',
+ 'fieldname': u's_bom',
+ 'fieldtype': u'Link',
+ 'label': u'Select BOM',
+ 'options': u'Bill Of Materials',
+ 'trigger': u'Client'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'idx': 4,
- 'label': 'Note 1',
- 'options': 'Click on the button "Search BOM" to fetch in the table below all the parent BOMs in which the above selected BOM is used as a raw material.'
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'note_1',
+ 'fieldtype': u'HTML',
+ 'label': u'Note 1',
+ 'options': u'Click on the button "Search BOM" to fetch in the table below all the parent BOMs in which the above selected BOM is used as a raw material.'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 5
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'idx': 6,
- 'label': 'Search BOM',
- 'options': 'search_parent_bom_of_bom'
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'search_bom',
+ 'fieldtype': u'Button',
+ 'label': u'Search BOM',
+ 'options': u'search_parent_bom_of_bom'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 7,
- 'options': 'Simple'
+ 'doctype': u'DocField',
+ 'fieldname': u'section_break0',
+ 'fieldtype': u'Section Break',
+ 'options': u'Simple'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Select the BOM by which you want the above sected BOM to be replaced.',
- 'doctype': 'DocField',
- 'fieldname': 'r_bom',
- 'fieldtype': 'Link',
- 'idx': 8,
- 'label': 'Replace Bom with',
- 'options': 'Bill Of Materials',
- 'trigger': 'Client'
+ 'colour': u'White:FFF',
+ 'description': u'Select the BOM by which you want the above sected BOM to be replaced.',
+ 'doctype': u'DocField',
+ 'fieldname': u'r_bom',
+ 'fieldtype': u'Link',
+ 'label': u'Replace Bom with',
+ 'options': u'Bill Of Materials',
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'idx': 9,
- 'label': 'Note 2',
- 'options': 'Click on the button "Replace BOM" after checking under the column Replace against relevant Parent BOMs'
+ 'doctype': u'DocField',
+ 'fieldname': u'note_2',
+ 'fieldtype': u'HTML',
+ 'label': u'Note 2',
+ 'options': u'Click on the button "Replace BOM" after checking under the column Replace against relevant Parent BOMs'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 10
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'idx': 11,
- 'label': 'Replace BOM',
- 'options': 'replace_bom'
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'replace_bom',
+ 'fieldtype': u'Button',
+ 'label': u'Replace BOM',
+ 'options': u'replace_bom'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 12,
- 'options': 'Simple'
+ 'doctype': u'DocField',
+ 'fieldname': u'section_break1',
+ 'fieldtype': u'Section Break',
+ 'options': u'Simple'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'replace_bom_details',
- 'fieldtype': 'Table',
- 'idx': 13,
- 'label': 'Replace BOM Detail',
- 'options': 'BOM Replace Utility Detail'
+ 'doctype': u'DocField',
+ 'fieldname': u'replace_bom_details',
+ 'fieldtype': u'Table',
+ 'label': u'Replace BOM Detail',
+ 'options': u'BOM Replace Utility Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 14,
- 'label': 'Item Details'
+ 'doctype': u'DocField',
+ 'fieldname': u'item_details',
+ 'fieldtype': u'Section Break',
+ 'label': u'Item Details'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Select the relevant item to be replaced which is actually a raw material used for a parent BOM.',
- 'doctype': 'DocField',
- 'fieldname': 's_item',
- 'fieldtype': 'Link',
- 'idx': 15,
- 'label': 'Select Item',
- 'options': 'Item',
- 'trigger': 'Client'
+ 'colour': u'White:FFF',
+ 'description': u'Select the relevant item to be replaced which is actually a raw material used for a parent BOM.',
+ 'doctype': u'DocField',
+ 'fieldname': u's_item',
+ 'fieldtype': u'Link',
+ 'label': u'Select Item',
+ 'options': u'Item',
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'idx': 16,
- 'label': 'Note 3',
- 'options': 'Click on the button "Search Item" to fetch in the table below all the parent BOMs in which the above selected item is used as a raw material.'
+ 'doctype': u'DocField',
+ 'fieldname': u'note_3',
+ 'fieldtype': u'HTML',
+ 'label': u'Note 3',
+ 'options': u'Click on the button "Search Item" to fetch in the table below all the parent BOMs in which the above selected item is used as a raw material.'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 17
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break2',
+ 'fieldtype': u'Column Break'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'idx': 18,
- 'label': 'Search Item',
- 'options': 'search_parent_bom_of_item'
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'search_item',
+ 'fieldtype': u'Button',
+ 'label': u'Search Item',
+ 'options': u'search_parent_bom_of_item'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 19,
- 'options': 'Simple'
+ 'doctype': u'DocField',
+ 'fieldname': u'section_break2',
+ 'fieldtype': u'Section Break',
+ 'options': u'Simple'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Select the item by which you want the above sected item to be replaced.',
- 'doctype': 'DocField',
- 'fieldname': 'r_item',
- 'fieldtype': 'Link',
- 'idx': 20,
- 'label': 'Replace Item with',
- 'options': 'Item',
- 'trigger': 'Client'
+ 'colour': u'White:FFF',
+ 'description': u'Select the item by which you want the above sected item to be replaced.',
+ 'doctype': u'DocField',
+ 'fieldname': u'r_item',
+ 'fieldtype': u'Link',
+ 'label': u'Replace Item with',
+ 'options': u'Item',
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'idx': 21,
- 'label': 'Note 4',
- 'options': 'Click on the button "Replace Item" after checking under the column Replace against relevant Parent BOMs'
+ 'doctype': u'DocField',
+ 'fieldname': u'note_4',
+ 'fieldtype': u'HTML',
+ 'label': u'Note 4',
+ 'options': u'Click on the button "Replace Item" after checking under the column Replace against relevant Parent BOMs'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 22
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break3',
+ 'fieldtype': u'Column Break'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'idx': 23,
- 'label': 'Replace Item',
- 'options': 'replace_item'
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'replace_item',
+ 'fieldtype': u'Button',
+ 'label': u'Replace Item',
+ 'options': u'replace_item'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 24,
- 'options': 'Simple'
+ 'doctype': u'DocField',
+ 'fieldname': u'section_break3',
+ 'fieldtype': u'Section Break',
+ 'options': u'Simple'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'replace_item_details',
- 'fieldtype': 'Table',
- 'idx': 25,
- 'label': 'Replace Item Detail',
- 'options': 'BOM Replace Utility Detail'
+ 'doctype': u'DocField',
+ 'fieldname': u'replace_item_details',
+ 'fieldtype': u'Table',
+ 'label': u'Replace Item Detail',
+ 'options': u'BOM Replace Utility Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 26,
- 'label': 'Update BOM Tree'
+ 'doctype': u'DocField',
+ 'fieldname': u'update_bom_tree',
+ 'fieldtype': u'Section Break',
+ 'label': u'Update BOM Tree'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Select the root Bill of Materials in which raw materials are replaced and click on the button below to update costs.',
- 'doctype': 'DocField',
- 'fieldname': 'fg_bom_no',
- 'fieldtype': 'Link',
- 'idx': 27,
- 'label': 'FG BOM No',
- 'options': 'Bill Of Materials'
+ 'colour': u'White:FFF',
+ 'description': u'Select the root Bill of Materials in which raw materials are replaced and click on the button below to update costs.',
+ 'doctype': u'DocField',
+ 'fieldname': u'fg_bom_no',
+ 'fieldtype': u'Link',
+ 'label': u'FG BOM No',
+ 'options': u'Bill Of Materials'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'idx': 28,
- 'label': 'Update',
- 'options': 'update_bom'
+ 'doctype': u'DocField',
+ 'fieldname': u'update',
+ 'fieldtype': u'Button',
+ 'label': u'Update',
+ 'options': u'update_bom'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 29,
- 'label': 'Update BOM'
+ 'doctype': u'DocField',
+ 'fieldname': u'update_bom',
+ 'fieldtype': u'Section Break',
+ 'label': u'Update BOM'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'bom',
- 'fieldtype': 'Link',
- 'idx': 30,
- 'label': 'BOM',
- 'options': 'Bill Of Materials'
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'bom',
+ 'fieldtype': u'Link',
+ 'label': u'BOM',
+ 'options': u'Bill Of Materials'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'idx': 31,
- 'label': 'Update Docstatus',
- 'options': 'update_docstatus'
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'update_docstatus',
+ 'fieldtype': u'Button',
+ 'label': u'Update Docstatus',
+ 'options': u'update_docstatus'
}
]
\ No newline at end of file
diff --git a/erpnext/production/doctype/bom_replace_utility_detail/bom_replace_utility_detail.txt b/erpnext/production/doctype/bom_replace_utility_detail/bom_replace_utility_detail.txt
index d36f26b..7f21ac6 100644
--- a/erpnext/production/doctype/bom_replace_utility_detail/bom_replace_utility_detail.txt
+++ b/erpnext/production/doctype/bom_replace_utility_detail/bom_replace_utility_detail.txt
@@ -3,102 +3,98 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:53',
+ 'creation': '2012-03-27 14:36:02',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'jai@webnotestech.com'
+ 'modified': '2012-03-27 14:36:02',
+ 'modified_by': u'Administrator',
+ 'owner': u'jai@webnotestech.com'
},
# These values are common for all DocType
{
- 'autoname': 'BRUD/.#####',
- 'colour': 'White:FFF',
+ 'autoname': u'BRUD/.#####',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'hide_toolbar': 1,
'in_create': 1,
'istable': 1,
- 'module': 'Production',
+ 'module': u'Production',
'name': '__common__',
'read_only': 1,
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 8
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'BOM Replace Utility Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'BOM Replace Utility Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'BOM Replace Utility Detail',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'BOM Replace Utility Detail',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 1
},
# DocType, BOM Replace Utility Detail
{
'doctype': 'DocType',
- 'name': 'BOM Replace Utility Detail'
+ 'name': u'BOM Replace Utility Detail'
},
# DocPerm
{
- 'doctype': 'DocPerm'
+ 'doctype': u'DocPerm'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'parent_bom',
- 'fieldtype': 'Link',
- 'idx': 1,
- 'label': 'Parent BOM',
- 'oldfieldname': 'parent_bom',
- 'oldfieldtype': 'Link',
- 'options': 'Bill Of Materials',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'parent_bom',
+ 'fieldtype': u'Link',
+ 'label': u'Parent BOM',
+ 'oldfieldname': u'parent_bom',
+ 'oldfieldtype': u'Link',
+ 'options': u'Bill Of Materials',
'permlevel': 1,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'replace',
- 'fieldtype': 'Check',
- 'idx': 2,
- 'label': 'Replace',
- 'oldfieldname': 'replace',
- 'oldfieldtype': 'Check',
+ 'doctype': u'DocField',
+ 'fieldname': u'replace',
+ 'fieldtype': u'Check',
+ 'label': u'Replace',
+ 'oldfieldname': u'replace',
+ 'oldfieldtype': u'Check',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'bom_created',
- 'fieldtype': 'Link',
- 'idx': 3,
- 'label': 'BOM Created',
- 'oldfieldname': 'bom_created',
- 'oldfieldtype': 'Link',
- 'options': 'Bill Of Materials',
+ 'doctype': u'DocField',
+ 'fieldname': u'bom_created',
+ 'fieldtype': u'Link',
+ 'label': u'BOM Created',
+ 'oldfieldname': u'bom_created',
+ 'oldfieldtype': u'Link',
+ 'options': u'Bill Of Materials',
'permlevel': 1,
'search_index': 0
}
diff --git a/erpnext/production/doctype/bom_report_detail/bom_report_detail.txt b/erpnext/production/doctype/bom_report_detail/bom_report_detail.txt
index 307fe7d..d74d9ba 100644
--- a/erpnext/production/doctype/bom_report_detail/bom_report_detail.txt
+++ b/erpnext/production/doctype/bom_report_detail/bom_report_detail.txt
@@ -3,158 +3,149 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:53',
+ 'creation': '2012-03-27 14:36:03',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:03',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Production',
+ 'module': u'Production',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 8
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'BOM Report Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'BOM Report Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'BOM Report Detail',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'BOM Report Detail',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1,
- 'role': 'System Manager'
+ 'role': u'System Manager'
},
# DocType, BOM Report Detail
{
'doctype': 'DocType',
- 'name': 'BOM Report Detail'
+ 'name': u'BOM Report Detail'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'permlevel': 0,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
+ 'doctype': u'DocPerm',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'item_code',
- 'fieldtype': 'Link',
- 'idx': 1,
+ 'doctype': u'DocField',
+ 'fieldname': u'item_code',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Item Code',
- 'oldfieldname': 'item_code',
- 'oldfieldtype': 'Link',
- 'options': 'Item',
+ 'label': u'Item Code',
+ 'oldfieldname': u'item_code',
+ 'oldfieldtype': u'Link',
+ 'options': u'Item',
'permlevel': 0,
'reqd': 1,
'search_index': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Text',
- 'idx': 2,
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Text',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Text',
'permlevel': 1,
'reqd': 0,
- 'width': '300px'
+ 'width': u'300px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'moving_avg_rate',
- 'fieldtype': 'Currency',
- 'idx': 5,
- 'label': 'Moving Avg Rate',
- 'oldfieldname': 'moving_avg_rate',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'moving_avg_rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Moving Avg Rate',
+ 'oldfieldname': u'moving_avg_rate',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amount',
- 'fieldtype': 'Currency',
- 'idx': 6,
- 'label': 'Amount',
- 'oldfieldname': 'amount',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Amount',
+ 'oldfieldname': u'amount',
+ 'oldfieldtype': u'Currency',
'permlevel': 1,
'reqd': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'last_purchase_rate',
- 'fieldtype': 'Currency',
- 'idx': 7,
- 'label': 'Last Purchase Rate',
- 'oldfieldname': 'last_purchase_rate',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'last_purchase_rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Last Purchase Rate',
+ 'oldfieldname': u'last_purchase_rate',
+ 'oldfieldtype': u'Currency',
'permlevel': 1,
- 'width': '150px'
+ 'width': u'150px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'qty',
- 'fieldtype': 'Data',
- 'idx': 9,
- 'label': 'Qty',
- 'oldfieldname': 'qty',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'qty',
+ 'fieldtype': u'Data',
+ 'label': u'Qty',
+ 'oldfieldname': u'qty',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'reqd': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'stock_uom',
- 'fieldtype': 'Data',
- 'idx': 12,
- 'label': 'Stock UOM',
- 'oldfieldname': 'stock_uom',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'stock_uom',
+ 'fieldtype': u'Data',
+ 'label': u'Stock UOM',
+ 'oldfieldname': u'stock_uom',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'reqd': 0
}
diff --git a/erpnext/production/doctype/flat_bom_detail/flat_bom_detail.txt b/erpnext/production/doctype/flat_bom_detail/flat_bom_detail.txt
index 1c2d76e..6618d28 100644
--- a/erpnext/production/doctype/flat_bom_detail/flat_bom_detail.txt
+++ b/erpnext/production/doctype/flat_bom_detail/flat_bom_detail.txt
@@ -3,136 +3,136 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:02',
+ 'creation': '2012-03-27 14:36:03',
'docstatus': 0,
- 'modified': '2012-01-11 14:32:31',
- 'modified_by': 'Administrator',
- 'owner': 'jai@webnotestech.com'
+ 'modified': '2012-03-27 14:36:03',
+ 'modified_by': u'Administrator',
+ 'owner': u'jai@webnotestech.com'
},
# These values are common for all DocType
{
- 'autoname': 'FBD/.######',
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'autoname': u'FBD/.######',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Production',
+ 'module': u'Production',
'name': '__common__',
'read_only': 0,
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 24
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Flat BOM Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Flat BOM Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, Flat BOM Detail
{
'doctype': 'DocType',
- 'name': 'Flat BOM Detail'
+ 'name': u'Flat BOM Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'item_code',
- 'fieldtype': 'Link',
- 'label': 'Item Code',
- 'oldfieldname': 'item_code',
- 'oldfieldtype': 'Link',
- 'options': 'Item'
+ 'doctype': u'DocField',
+ 'fieldname': u'item_code',
+ 'fieldtype': u'Link',
+ 'label': u'Item Code',
+ 'oldfieldname': u'item_code',
+ 'oldfieldtype': u'Link',
+ 'options': u'Item'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Text',
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Text',
- 'width': '300px'
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Text',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Text',
+ 'width': u'300px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'qty',
- 'fieldtype': 'Float',
- 'label': 'Qty',
- 'oldfieldname': 'qty',
- 'oldfieldtype': 'Currency'
+ 'doctype': u'DocField',
+ 'fieldname': u'qty',
+ 'fieldtype': u'Float',
+ 'label': u'Qty',
+ 'oldfieldname': u'qty',
+ 'oldfieldtype': u'Currency'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'rate',
- 'fieldtype': 'Float',
- 'label': 'Rate',
- 'oldfieldname': 'standard_rate',
- 'oldfieldtype': 'Currency'
+ 'doctype': u'DocField',
+ 'fieldname': u'rate',
+ 'fieldtype': u'Float',
+ 'label': u'Rate',
+ 'oldfieldname': u'standard_rate',
+ 'oldfieldtype': u'Currency'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amount',
- 'fieldtype': 'Float',
- 'label': 'Amount',
- 'oldfieldname': 'amount_as_per_sr',
- 'oldfieldtype': 'Currency'
+ 'doctype': u'DocField',
+ 'fieldname': u'amount',
+ 'fieldtype': u'Float',
+ 'label': u'Amount',
+ 'oldfieldname': u'amount_as_per_sr',
+ 'oldfieldtype': u'Currency'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'stock_uom',
- 'fieldtype': 'Link',
- 'label': 'Stock UOM',
- 'oldfieldname': 'stock_uom',
- 'oldfieldtype': 'Link',
- 'options': 'UOM'
+ 'doctype': u'DocField',
+ 'fieldname': u'stock_uom',
+ 'fieldtype': u'Link',
+ 'label': u'Stock UOM',
+ 'oldfieldname': u'stock_uom',
+ 'oldfieldtype': u'Link',
+ 'options': u'UOM'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'parent_bom',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'parent_bom',
+ 'fieldtype': u'Link',
'hidden': 0,
- 'label': 'Parent BOM',
- 'oldfieldname': 'parent_bom',
- 'oldfieldtype': 'Link',
- 'width': '250px'
+ 'label': u'Parent BOM',
+ 'oldfieldname': u'parent_bom',
+ 'oldfieldtype': u'Link',
+ 'width': u'250px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'mat_detail_no',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'mat_detail_no',
+ 'fieldtype': u'Data',
'hidden': 1,
- 'label': 'Mat Detail No'
+ 'label': u'Mat Detail No'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'qty_consumed_per_unit',
- 'fieldtype': 'Float',
+ 'doctype': u'DocField',
+ 'fieldname': u'qty_consumed_per_unit',
+ 'fieldtype': u'Float',
'hidden': 0,
- 'label': 'Qty Consumed Per Unit',
+ 'label': u'Qty Consumed Per Unit',
'no_copy': 0
}
]
\ No newline at end of file
diff --git a/erpnext/production/doctype/pf_detail/pf_detail.txt b/erpnext/production/doctype/pf_detail/pf_detail.txt
index 5c29c84..853d9d8 100644
--- a/erpnext/production/doctype/pf_detail/pf_detail.txt
+++ b/erpnext/production/doctype/pf_detail/pf_detail.txt
@@ -3,57 +3,57 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:12',
+ 'creation': '2012-03-27 14:36:03',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:45:49',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'autoname': 'PFD/.#####',
- 'colour': 'White:FFF',
+ 'autoname': u'PFD/.#####',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
+ 'is_submittable': 1,
'istable': 1,
- 'module': 'Production',
+ 'module': u'Production',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 1
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'PF Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'PF Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'PF Detail',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'PF Detail',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1,
- 'role': 'System Manager'
+ 'role': u'System Manager'
},
# DocType, PF Detail
{
'doctype': 'DocType',
- 'name': 'PF Detail'
+ 'name': u'PF Detail'
},
# DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'permlevel': 0,
'submit': 1,
'write': 1
@@ -61,156 +61,170 @@
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
+ 'doctype': u'DocPerm',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'item_code',
- 'fieldtype': 'Link',
- 'idx': 1,
+ 'doctype': u'DocField',
+ 'fieldname': u'item_code',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Item Code',
- 'oldfieldname': 'item_code',
- 'oldfieldtype': 'Link',
- 'options': 'Item',
+ 'label': u'Item Code',
+ 'oldfieldname': u'item_code',
+ 'oldfieldtype': u'Link',
+ 'options': u'Item',
'permlevel': 0,
'reqd': 1,
'search_index': 1,
- 'trigger': 'Client',
- 'width': '150px'
+ 'trigger': u'Client',
+ 'width': u'150px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Text',
- 'idx': 2,
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Text',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Text',
'permlevel': 1,
- 'width': '300px'
+ 'width': u'300px'
},
# DocField
{
- 'default': '0.00',
- 'doctype': 'DocField',
- 'fieldname': 'planned_qty',
- 'fieldtype': 'Currency',
- 'idx': 5,
- 'label': 'Planned Quantity',
- 'oldfieldname': 'planned_qty',
- 'oldfieldtype': 'Currency',
+ 'default': u'0.00',
+ 'doctype': u'DocField',
+ 'fieldname': u'planned_qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Planned Quantity',
+ 'oldfieldname': u'planned_qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 1,
- 'width': '100px'
+ 'width': u'100px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'produced_qty',
- 'fieldtype': 'Currency',
- 'idx': 6,
- 'label': 'Produced Quantity',
- 'oldfieldname': 'produced_qty',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'produced_qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Produced Quantity',
+ 'oldfieldname': u'produced_qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 1,
- 'width': '100px'
+ 'width': u'100px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'start_date',
- 'fieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'start_date',
+ 'fieldtype': u'Date',
'hidden': 0,
- 'idx': 7,
'in_filter': 0,
- 'label': 'Start Date',
- 'oldfieldname': 'start_date',
- 'oldfieldtype': 'Date',
+ 'label': u'Start Date',
+ 'oldfieldname': u'start_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'report_hide': 0,
'reqd': 1,
'search_index': 0,
- 'width': '100px'
+ 'width': u'100px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'end_date',
- 'fieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'end_date',
+ 'fieldtype': u'Date',
'hidden': 0,
- 'idx': 8,
'in_filter': 0,
- 'label': 'End Date',
- 'oldfieldname': 'end_date',
- 'oldfieldtype': 'Date',
+ 'label': u'End Date',
+ 'oldfieldname': u'end_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'report_hide': 0,
'reqd': 1,
'search_index': 0,
- 'width': '100px'
+ 'width': u'100px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'qty',
- 'fieldtype': 'Currency',
- 'idx': 9,
- 'label': 'Quantity',
- 'oldfieldname': 'qty',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Quantity',
+ 'oldfieldname': u'qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'reqd': 1,
- 'width': '100px'
+ 'width': u'100px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'forecast_date',
- 'fieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'forecast_date',
+ 'fieldtype': u'Date',
'hidden': 1,
- 'idx': 9,
- 'label': 'Forecast Date',
- 'oldfieldname': 'forecast_date',
- 'oldfieldtype': 'Date',
+ 'label': u'Forecast Date',
+ 'oldfieldname': u'forecast_date',
+ 'oldfieldtype': u'Date',
'permlevel': 1,
'report_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'forecast_due_date',
- 'fieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'forecast_due_date',
+ 'fieldtype': u'Date',
'hidden': 1,
- 'idx': 10,
- 'label': 'Forecast Due Date',
- 'oldfieldname': 'forecast_due_date',
- 'oldfieldtype': 'Date',
+ 'label': u'Forecast Due Date',
+ 'oldfieldname': u'forecast_due_date',
+ 'oldfieldtype': u'Date',
'permlevel': 1,
'report_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'stock_uom',
- 'fieldtype': 'Data',
- 'idx': 12,
- 'label': 'Stock UOM',
- 'oldfieldname': 'stock_uom',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'stock_uom',
+ 'fieldtype': u'Data',
+ 'label': u'Stock UOM',
+ 'oldfieldname': u'stock_uom',
+ 'oldfieldtype': u'Data',
'permlevel': 1
+ },
+
+ # DocField
+ {
+ 'depends_on': u'eval:doc.amended_from',
+ 'description': u'The date at which current entry is corrected in the system.',
+ 'doctype': u'DocField',
+ 'fieldname': u'amendment_date',
+ 'fieldtype': u'Date',
+ 'label': u'Amendment Date',
+ 'no_copy': 1,
+ 'permlevel': 0,
+ 'print_hide': 1
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
+ 'fieldname': u'amended_from',
+ 'fieldtype': u'Link',
+ 'label': u'Amended From',
+ 'no_copy': 1,
+ 'options': u'Receivable Voucher',
+ 'permlevel': 1,
+ 'print_hide': 1
}
]
\ No newline at end of file
diff --git a/erpnext/production/doctype/pp_detail/pp_detail.txt b/erpnext/production/doctype/pp_detail/pp_detail.txt
index a90d59c..d2bbdb2 100644
--- a/erpnext/production/doctype/pp_detail/pp_detail.txt
+++ b/erpnext/production/doctype/pp_detail/pp_detail.txt
@@ -3,157 +3,157 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:12',
+ 'creation': '2012-03-27 14:36:03',
'docstatus': 0,
- 'modified': '2012-01-09 16:25:13',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:03',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'autoname': 'PPID/.#####',
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'autoname': u'PPID/.#####',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Production',
+ 'module': u'Production',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 27
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'PP Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'PP Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# DocType, PP Detail
{
'doctype': 'DocType',
- 'name': 'PP Detail'
+ 'name': u'PP Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'sales_order',
- 'fieldtype': 'Data',
- 'label': 'Sales Order',
- 'oldfieldname': 'source_docname',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'sales_order',
+ 'fieldtype': u'Data',
+ 'label': u'Sales Order',
+ 'oldfieldname': u'source_docname',
+ 'oldfieldtype': u'Data',
'permlevel': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'item_code',
- 'fieldtype': 'Link',
- 'label': 'Item Code',
- 'oldfieldname': 'item_code',
- 'oldfieldtype': 'Link',
- 'options': 'Item',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'item_code',
+ 'fieldtype': u'Link',
+ 'label': u'Item Code',
+ 'oldfieldname': u'item_code',
+ 'oldfieldtype': u'Link',
+ 'options': u'Item',
'permlevel': 0,
'reqd': 1,
- 'trigger': 'Client',
- 'width': '150px'
+ 'trigger': u'Client',
+ 'width': u'150px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'bom_no',
- 'fieldtype': 'Link',
- 'label': 'BOM No',
- 'oldfieldname': 'bom_no',
- 'oldfieldtype': 'Link',
- 'options': 'Bill Of Materials',
+ 'doctype': u'DocField',
+ 'fieldname': u'bom_no',
+ 'fieldtype': u'Link',
+ 'label': u'BOM No',
+ 'oldfieldname': u'bom_no',
+ 'oldfieldtype': u'Link',
+ 'options': u'Bill Of Materials',
'permlevel': 0,
'reqd': 1,
- 'width': '100px'
+ 'width': u'100px'
},
# DocField
{
- 'default': '0.00',
- 'doctype': 'DocField',
- 'fieldname': 'so_pending_qty',
- 'fieldtype': 'Currency',
- 'label': 'SO Pending Qty',
- 'oldfieldname': 'prevdoc_reqd_qty',
- 'oldfieldtype': 'Currency',
+ 'default': u'0.00',
+ 'doctype': u'DocField',
+ 'fieldname': u'so_pending_qty',
+ 'fieldtype': u'Currency',
+ 'label': u'SO Pending Qty',
+ 'oldfieldname': u'prevdoc_reqd_qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 1,
'reqd': 0,
- 'width': '100px'
+ 'width': u'100px'
},
# DocField
{
- 'default': '0.00',
- 'doctype': 'DocField',
- 'fieldname': 'planned_qty',
- 'fieldtype': 'Currency',
- 'label': 'Planned Qty',
- 'oldfieldname': 'planned_qty',
- 'oldfieldtype': 'Currency',
+ 'default': u'0.00',
+ 'doctype': u'DocField',
+ 'fieldname': u'planned_qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Planned Qty',
+ 'oldfieldname': u'planned_qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'reqd': 1,
- 'width': '100px'
+ 'width': u'100px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'stock_uom',
- 'fieldtype': 'Data',
- 'label': 'UOM',
- 'oldfieldname': 'stock_uom',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'stock_uom',
+ 'fieldtype': u'Data',
+ 'label': u'UOM',
+ 'oldfieldname': u'stock_uom',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'reqd': 1,
- 'width': '80px'
+ 'width': u'80px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Text',
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Text',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Text',
'permlevel': 1,
- 'width': '200px'
+ 'width': u'200px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'parent_packing_item',
- 'fieldtype': 'Link',
- 'label': 'Parent Packing Item',
- 'oldfieldname': 'parent_item',
- 'oldfieldtype': 'Link',
- 'options': 'Item',
+ 'doctype': u'DocField',
+ 'fieldname': u'parent_packing_item',
+ 'fieldtype': u'Link',
+ 'label': u'Parent Packing Item',
+ 'oldfieldname': u'parent_item',
+ 'oldfieldtype': u'Link',
+ 'options': u'Item',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'is_pro_created',
- 'fieldtype': 'Check',
- 'label': 'Is PRO Created',
- 'oldfieldname': 'pro_created',
- 'oldfieldtype': 'Check',
+ 'doctype': u'DocField',
+ 'fieldname': u'is_pro_created',
+ 'fieldtype': u'Check',
+ 'label': u'Is PRO Created',
+ 'oldfieldname': u'pro_created',
+ 'oldfieldtype': u'Check',
'permlevel': 1
}
]
\ No newline at end of file
diff --git a/erpnext/production/doctype/pp_so_detail/pp_so_detail.txt b/erpnext/production/doctype/pp_so_detail/pp_so_detail.txt
index c07d71b..ba8bc31 100644
--- a/erpnext/production/doctype/pp_so_detail/pp_so_detail.txt
+++ b/erpnext/production/doctype/pp_so_detail/pp_so_detail.txt
@@ -3,98 +3,122 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:13',
+ 'creation': '2012-03-27 14:36:04',
'docstatus': 0,
- 'modified': '2012-01-09 17:41:37',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:04',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'autoname': 'PP/.SO/.#####',
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'autoname': u'PP/.SO/.#####',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Production',
+ 'module': u'Production',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 5
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'PP SO Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'PP SO Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
+ },
+
+ # These values are common for all DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'name': '__common__',
+ 'parent': u'PP SO Detail',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
+ 'read': 1,
+ 'role': u'System Manager'
},
# DocType, PP SO Detail
{
'doctype': 'DocType',
- 'name': 'PP SO Detail'
+ 'name': u'PP SO Detail'
},
- # DocField
+ # DocPerm
{
- 'doctype': 'DocField',
- 'fieldname': 'sales_order',
- 'fieldtype': 'Link',
- 'label': 'Sales Order',
- 'oldfieldname': 'prevdoc_docname',
- 'oldfieldtype': 'Data',
- 'options': 'Sales Order',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'width': '150px'
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'sales_order_date',
- 'fieldtype': 'Date',
- 'label': 'Sales Order Date',
- 'oldfieldname': 'document_date',
- 'oldfieldtype': 'Date',
- 'permlevel': 1,
- 'width': '100px'
- },
-
- # DocField
- {
- 'doctype': 'DocField',
- 'fieldname': 'customer',
- 'fieldtype': 'Link',
- 'label': 'Customer',
- 'options': 'Customer',
- 'permlevel': 1,
- 'width': '150px'
- },
-
- # DocField
- {
- 'doctype': 'DocField',
- 'fieldname': 'grand_total',
- 'fieldtype': 'Currency',
- 'label': 'Grand Total',
- 'permlevel': 1,
- 'width': '100px'
- },
-
- # DocField
- {
- 'doctype': 'DocField',
- 'fieldname': 'include_in_plan',
- 'fieldtype': 'Check',
- 'label': 'Include In Plan',
- 'oldfieldname': 'include_in_plan',
- 'oldfieldtype': 'Check',
+ 'doctype': u'DocField',
+ 'fieldname': u'sales_order',
+ 'fieldtype': u'Link',
+ 'label': u'Sales Order',
+ 'oldfieldname': u'prevdoc_docname',
+ 'oldfieldtype': u'Data',
+ 'options': u'Sales Order',
'permlevel': 0,
- 'width': '100px'
+ 'width': u'150px'
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
+ 'fieldname': u'sales_order_date',
+ 'fieldtype': u'Date',
+ 'label': u'Sales Order Date',
+ 'oldfieldname': u'document_date',
+ 'oldfieldtype': u'Date',
+ 'permlevel': 1,
+ 'width': u'100px'
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
+ 'fieldname': u'customer',
+ 'fieldtype': u'Link',
+ 'label': u'Customer',
+ 'options': u'Customer',
+ 'permlevel': 1,
+ 'width': u'150px'
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
+ 'fieldname': u'grand_total',
+ 'fieldtype': u'Currency',
+ 'label': u'Grand Total',
+ 'permlevel': 1,
+ 'width': u'100px'
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
+ 'fieldname': u'include_in_plan',
+ 'fieldtype': u'Check',
+ 'label': u'Include In Plan',
+ 'oldfieldname': u'include_in_plan',
+ 'oldfieldtype': u'Check',
+ 'permlevel': 0,
+ 'width': u'100px'
}
]
\ No newline at end of file
diff --git a/erpnext/production/doctype/ppw_detail/ppw_detail.txt b/erpnext/production/doctype/ppw_detail/ppw_detail.txt
index 96bcf85..3234af1 100644
--- a/erpnext/production/doctype/ppw_detail/ppw_detail.txt
+++ b/erpnext/production/doctype/ppw_detail/ppw_detail.txt
@@ -3,50 +3,49 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:13',
+ 'creation': '2012-03-27 14:36:04',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:04',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'autoname': 'PPWD/.#######',
- 'colour': 'White:FFF',
+ 'autoname': u'PPWD/.#######',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'module': 'Production',
+ 'module': u'Production',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 1
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'warehouse',
- 'fieldtype': 'Link',
- 'idx': 1,
- 'label': 'Warehouse',
+ 'doctype': u'DocField',
+ 'fieldname': u'warehouse',
+ 'fieldtype': u'Link',
+ 'label': u'Warehouse',
'name': '__common__',
- 'oldfieldname': 'warehouse',
- 'oldfieldtype': 'Link',
- 'options': 'Warehouse',
- 'parent': 'PPW Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'oldfieldname': u'warehouse',
+ 'oldfieldtype': u'Link',
+ 'options': u'Warehouse',
+ 'parent': u'PPW Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, PPW Detail
{
'doctype': 'DocType',
- 'name': 'PPW Detail'
+ 'name': u'PPW Detail'
},
# DocField
{
- 'doctype': 'DocField'
+ 'doctype': u'DocField'
}
]
\ No newline at end of file
diff --git a/erpnext/production/doctype/pro_detail/pro_detail.txt b/erpnext/production/doctype/pro_detail/pro_detail.txt
index df7465e..cfe644e 100644
--- a/erpnext/production/doctype/pro_detail/pro_detail.txt
+++ b/erpnext/production/doctype/pro_detail/pro_detail.txt
@@ -3,154 +3,145 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:13',
+ 'creation': '2012-03-27 14:36:04',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:04',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'autoname': 'PRODC/.#######',
- 'colour': 'White:FFF',
+ 'autoname': u'PRODC/.#######',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Production',
+ 'module': u'Production',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 4
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'PRO Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'PRO Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# DocType, PRO Detail
{
'doctype': 'DocType',
- 'name': 'PRO Detail'
+ 'name': u'PRO Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'item_code',
- 'fieldtype': 'Link',
- 'idx': 1,
- 'label': 'Item Code',
- 'oldfieldname': 'item_code',
- 'oldfieldtype': 'Link',
- 'options': 'Item',
+ 'doctype': u'DocField',
+ 'fieldname': u'item_code',
+ 'fieldtype': u'Link',
+ 'label': u'Item Code',
+ 'oldfieldname': u'item_code',
+ 'oldfieldtype': u'Link',
+ 'options': u'Item',
'permlevel': 0,
'reqd': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Text',
- 'idx': 2,
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Text',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Text',
'permlevel': 1,
- 'width': '300px'
+ 'width': u'300px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'source_warehouse',
- 'fieldtype': 'Link',
- 'idx': 3,
- 'label': 'Source Warehouse',
- 'oldfieldname': 'source_warehouse',
- 'oldfieldtype': 'Link',
- 'options': 'Warehouse',
+ 'doctype': u'DocField',
+ 'fieldname': u'source_warehouse',
+ 'fieldtype': u'Link',
+ 'label': u'Source Warehouse',
+ 'oldfieldname': u'source_warehouse',
+ 'oldfieldtype': u'Link',
+ 'options': u'Warehouse',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'actual_qty',
- 'fieldtype': 'Currency',
- 'idx': 4,
- 'label': 'Current Stock',
- 'oldfieldname': 'actual_qty',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'actual_qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Current Stock',
+ 'oldfieldname': u'actual_qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'qty_reqd',
- 'fieldtype': 'Currency',
- 'idx': 6,
- 'label': 'Qty Reqd',
- 'oldfieldname': 'qty_reqd',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'qty_reqd',
+ 'fieldtype': u'Currency',
+ 'label': u'Qty Reqd',
+ 'oldfieldname': u'qty_reqd',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'issued_qty',
- 'fieldtype': 'Currency',
- 'idx': 7,
- 'label': 'Issued Qty',
- 'oldfieldname': 'issued_qty',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'issued_qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Issued Qty',
+ 'oldfieldname': u'issued_qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'consumed_qty',
- 'fieldtype': 'Currency',
- 'idx': 8,
- 'label': 'Consumed Qty',
- 'oldfieldname': 'consumed_qty',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'consumed_qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Consumed Qty',
+ 'oldfieldname': u'consumed_qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'qty_consumed_per_unit',
- 'fieldtype': 'Currency',
- 'idx': 9,
- 'label': 'Qty Consumed Per Unit',
- 'oldfieldname': 'qty_consumed_per_unit',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'qty_consumed_per_unit',
+ 'fieldtype': u'Currency',
+ 'label': u'Qty Consumed Per Unit',
+ 'oldfieldname': u'qty_consumed_per_unit',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'stock_uom',
- 'fieldtype': 'Data',
- 'idx': 12,
- 'label': 'Stock UOM',
- 'oldfieldname': 'stock_uom',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'stock_uom',
+ 'fieldtype': u'Data',
+ 'label': u'Stock UOM',
+ 'oldfieldname': u'stock_uom',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'reqd': 1
}
diff --git a/erpnext/production/doctype/pro_pp_detail/pro_pp_detail.txt b/erpnext/production/doctype/pro_pp_detail/pro_pp_detail.txt
index 042ec1a..9b5e4fa 100644
--- a/erpnext/production/doctype/pro_pp_detail/pro_pp_detail.txt
+++ b/erpnext/production/doctype/pro_pp_detail/pro_pp_detail.txt
@@ -3,127 +3,119 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:13',
+ 'creation': '2012-03-27 14:36:04',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'jai@webnotestech.com'
+ 'modified': '2012-03-27 14:36:04',
+ 'modified_by': u'Administrator',
+ 'owner': u'jai@webnotestech.com'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Production',
+ 'module': u'Production',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 5
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'PRO PP Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'PRO PP Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, PRO PP Detail
{
'doctype': 'DocType',
- 'name': 'PRO PP Detail'
+ 'name': u'PRO PP Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'source_doctype',
- 'fieldtype': 'Data',
- 'idx': 1,
- 'label': 'Source Doctype',
- 'oldfieldname': 'source_doctype',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'source_doctype',
+ 'fieldtype': u'Data',
+ 'label': u'Source Doctype',
+ 'oldfieldname': u'source_doctype',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'source_docname',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Source Docname',
- 'oldfieldname': 'source_docname',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'source_docname',
+ 'fieldtype': u'Data',
+ 'label': u'Source Docname',
+ 'oldfieldname': u'source_docname',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'source_detail_docname',
- 'fieldtype': 'Data',
- 'idx': 3,
- 'label': 'Source Detail Docname ',
- 'oldfieldname': 'source_detail_docname',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'source_detail_docname',
+ 'fieldtype': u'Data',
+ 'label': u'Source Detail Docname ',
+ 'oldfieldname': u'source_detail_docname',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'prevdoc_detail_docname',
- 'fieldtype': 'Data',
- 'idx': 4,
- 'label': 'Prevdoc Detail Docname',
- 'oldfieldname': 'prevdoc_detail_docname',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'prevdoc_detail_docname',
+ 'fieldtype': u'Data',
+ 'label': u'Prevdoc Detail Docname',
+ 'oldfieldname': u'prevdoc_detail_docname',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'confirm_date',
- 'fieldtype': 'Date',
- 'idx': 5,
- 'label': 'Confirm Date',
- 'oldfieldname': 'confirm_date',
- 'oldfieldtype': 'Date'
+ 'doctype': u'DocField',
+ 'fieldname': u'confirm_date',
+ 'fieldtype': u'Date',
+ 'label': u'Confirm Date',
+ 'oldfieldname': u'confirm_date',
+ 'oldfieldtype': u'Date'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'qty_reqd',
- 'fieldtype': 'Currency',
- 'idx': 6,
- 'label': 'Qty Reqd',
- 'oldfieldname': 'qty_reqd',
- 'oldfieldtype': 'Currency'
+ 'doctype': u'DocField',
+ 'fieldname': u'qty_reqd',
+ 'fieldtype': u'Currency',
+ 'label': u'Qty Reqd',
+ 'oldfieldname': u'qty_reqd',
+ 'oldfieldtype': u'Currency'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'produced_qty',
- 'fieldtype': 'Currency',
- 'idx': 7,
- 'label': 'Produced Qty',
- 'oldfieldname': 'produced_qty',
- 'oldfieldtype': 'Currency'
+ 'doctype': u'DocField',
+ 'fieldname': u'produced_qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Produced Qty',
+ 'oldfieldname': u'produced_qty',
+ 'oldfieldtype': u'Currency'
},
# DocField
{
'allow_on_submit': 1,
- 'doctype': 'DocField',
- 'fieldname': 'update',
- 'fieldtype': 'Check',
- 'idx': 8,
- 'label': 'Update',
- 'oldfieldname': 'update',
- 'oldfieldtype': 'Check'
+ 'doctype': u'DocField',
+ 'fieldname': u'update',
+ 'fieldtype': u'Check',
+ 'label': u'Update',
+ 'oldfieldname': u'update',
+ 'oldfieldtype': u'Check'
}
]
\ No newline at end of file
diff --git a/erpnext/production/doctype/production_control/production_control.txt b/erpnext/production/doctype/production_control/production_control.txt
index 7ca5160..4f8564c 100644
--- a/erpnext/production/doctype/production_control/production_control.txt
+++ b/erpnext/production/doctype/production_control/production_control.txt
@@ -3,22 +3,22 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:14',
+ 'creation': '2012-03-27 14:36:05',
'docstatus': 0,
- 'modified': '2010-12-23 11:22:14',
- 'modified_by': 'umair@iwebnotes.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:05',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'issingle': 1,
- 'module': 'Production',
+ 'module': u'Production',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 19
},
@@ -26,6 +26,6 @@
# DocType, Production Control
{
'doctype': 'DocType',
- 'name': 'Production Control'
+ 'name': u'Production Control'
}
]
\ No newline at end of file
diff --git a/erpnext/production/doctype/production_order/production_order.txt b/erpnext/production/doctype/production_order/production_order.txt
index d94ccc9..954dc9f 100644
--- a/erpnext/production/doctype/production_order/production_order.txt
+++ b/erpnext/production/doctype/production_order/production_order.txt
@@ -3,51 +3,52 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:14',
+ 'creation': '2012-03-27 14:36:05',
'docstatus': 0,
- 'modified': '2012-01-11 17:36:23',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:45:50',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1325837006',
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ '_last_update': u'1325837006',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
'in_create': 0,
- 'module': 'Production',
+ 'is_submittable': 1,
+ 'module': u'Production',
'name': '__common__',
- 'section_style': 'Tabbed',
- 'server_code_error': ' ',
+ 'section_style': u'Tabbed',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 190
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Production Order',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Production Order',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Production Order',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Production Order',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Production Order
{
'doctype': 'DocType',
- 'name': 'Production Order'
+ 'name': u'Production Order'
},
# DocPerm
@@ -55,18 +56,18 @@
'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'submit': 1,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'All'
+ 'role': u'All'
},
# DocPerm
@@ -74,9 +75,9 @@
'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Production Manager',
+ 'role': u'Production Manager',
'submit': 1,
'write': 1
},
@@ -86,227 +87,229 @@
'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Production User',
+ 'role': u'Production User',
'submit': 1,
'write': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Item for which this Production Order is raised.',
- 'doctype': 'DocField',
- 'fieldname': 'production_item',
- 'fieldtype': 'Link',
+ 'colour': u'White:FFF',
+ 'description': u'Item for which this Production Order is raised.',
+ 'doctype': u'DocField',
+ 'fieldname': u'production_item',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Production Item',
- 'oldfieldname': 'production_item',
- 'oldfieldtype': 'Link',
- 'options': 'Item',
+ 'label': u'Production Item',
+ 'oldfieldname': u'production_item',
+ 'oldfieldtype': u'Link',
+ 'options': u'Item',
'permlevel': 1,
'reqd': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Text',
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Text',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Text',
'permlevel': 0,
- 'width': '300px'
+ 'width': u'300px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'stock_uom',
- 'fieldtype': 'Data',
- 'label': 'Stock UOM',
- 'oldfieldname': 'stock_uom',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'stock_uom',
+ 'fieldtype': u'Data',
+ 'label': u'Stock UOM',
+ 'oldfieldname': u'stock_uom',
+ 'oldfieldtype': u'Data',
'permlevel': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Bill of Material which was considered for manufacturing the production item.',
- 'doctype': 'DocField',
- 'fieldname': 'bom_no',
- 'fieldtype': 'Link',
- 'label': 'BOM No',
- 'oldfieldname': 'bom_no',
- 'oldfieldtype': 'Link',
- 'options': 'Bill Of Materials',
+ 'colour': u'White:FFF',
+ 'description': u'Bill of Material which was considered for manufacturing the production item.',
+ 'doctype': u'DocField',
+ 'fieldname': u'bom_no',
+ 'fieldtype': u'Link',
+ 'label': u'BOM No',
+ 'oldfieldname': u'bom_no',
+ 'oldfieldtype': u'Link',
+ 'options': u'Bill Of Materials',
'permlevel': 1,
'reqd': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Quantity of item for which Production Order is raised.',
- 'doctype': 'DocField',
- 'fieldname': 'qty',
- 'fieldtype': 'Currency',
- 'label': 'Qty',
- 'oldfieldname': 'qty',
- 'oldfieldtype': 'Currency',
+ 'colour': u'White:FFF',
+ 'description': u'Quantity of item for which Production Order is raised.',
+ 'doctype': u'DocField',
+ 'fieldname': u'qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Qty',
+ 'oldfieldname': u'qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'The warehouse for finished goods where stock of produced items will be updated.',
- 'doctype': 'DocField',
- 'fieldname': 'fg_warehouse',
- 'fieldtype': 'Link',
+ 'colour': u'White:FFF',
+ 'description': u'The warehouse for finished goods where stock of produced items will be updated.',
+ 'doctype': u'DocField',
+ 'fieldname': u'fg_warehouse',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'FG Warehouse',
- 'oldfieldname': 'fg_warehouse',
- 'oldfieldtype': 'Link',
- 'options': 'Warehouse',
+ 'label': u'FG Warehouse',
+ 'oldfieldname': u'fg_warehouse',
+ 'oldfieldtype': u'Link',
+ 'options': u'Warehouse',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'The work in progress warehouse where raw materials will be operated upon to create finished goods.',
- 'doctype': 'DocField',
- 'fieldname': 'wip_warehouse',
- 'fieldtype': 'Link',
+ 'colour': u'White:FFF',
+ 'description': u'The work in progress warehouse where raw materials will be operated upon to create finished goods.',
+ 'doctype': u'DocField',
+ 'fieldname': u'wip_warehouse',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'WIP Warehouse',
- 'oldfieldname': 'wip_warehouse',
- 'oldfieldtype': 'Link',
- 'options': 'Warehouse',
+ 'label': u'WIP Warehouse',
+ 'oldfieldname': u'wip_warehouse',
+ 'oldfieldtype': u'Link',
+ 'options': u'Warehouse',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amended_from',
- 'fieldtype': 'Data',
- 'label': 'Amended From',
+ 'doctype': u'DocField',
+ 'fieldname': u'amended_from',
+ 'fieldtype': u'Data',
+ 'label': u'Amended From',
'no_copy': 1,
- 'oldfieldname': 'amended_from',
- 'oldfieldtype': 'Data',
+ 'oldfieldname': u'amended_from',
+ 'oldfieldtype': u'Data',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amendment_date',
- 'fieldtype': 'Date',
- 'label': 'Amendment Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'amendment_date',
+ 'fieldtype': u'Date',
+ 'label': u'Amendment Date',
'no_copy': 1,
- 'oldfieldname': 'amendment_date',
- 'oldfieldtype': 'Date',
+ 'oldfieldname': u'amendment_date',
+ 'oldfieldtype': u'Date',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'The date on which current entry will get or has actually executed.',
- 'doctype': 'DocField',
- 'fieldname': 'posting_date',
- 'fieldtype': 'Date',
- 'label': 'Posting Date',
- 'oldfieldname': 'posting_date',
- 'oldfieldtype': 'Date',
+ 'colour': u'White:FFF',
+ 'description': u'The date on which current entry will get or has actually executed.',
+ 'doctype': u'DocField',
+ 'fieldname': u'posting_date',
+ 'fieldtype': u'Date',
+ 'label': u'Posting Date',
+ 'oldfieldname': u'posting_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Select "Yes" if stock is maintained and tracked for sub-assembly items. Select "No" if you want child items of sub-assembly for material transfer.',
- 'doctype': 'DocField',
- 'fieldname': 'consider_sa_items',
- 'fieldtype': 'Select',
+ 'colour': u'White:FFF',
+ 'description': u'Select "Yes" if stock is maintained and tracked for sub-assembly items. Select "No" if you want child items of sub-assembly for material transfer.',
+ 'doctype': u'DocField',
+ 'fieldname': u'consider_sa_items',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Consider SA Items as raw material',
- 'oldfieldname': 'consider_sa_items',
- 'oldfieldtype': 'Select',
- 'options': '\nYes\nNo',
+ 'label': u'Consider SA Items as raw material',
+ 'oldfieldname': u'consider_sa_items',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nYes\nNo',
'permlevel': 1,
'reqd': 1
},
# DocField
{
- 'description': 'Select name of the project if Production Order need to be created against any project',
- 'doctype': 'DocField',
- 'fieldname': 'project_name',
- 'fieldtype': 'Link',
+ 'description': u'Select name of the project if Production Order need to be created against any project',
+ 'doctype': u'DocField',
+ 'fieldname': u'project_name',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Project Name',
- 'oldfieldname': 'project_name',
- 'oldfieldtype': 'Link',
- 'options': 'Project',
+ 'label': u'Project Name',
+ 'oldfieldname': u'project_name',
+ 'oldfieldtype': u'Link',
+ 'options': u'Project',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'origin',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'origin',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Origin',
+ 'label': u'Origin',
'no_copy': 1,
- 'oldfieldname': 'origin',
- 'oldfieldtype': 'Select',
- 'options': 'Manual\nMRP',
+ 'oldfieldname': u'origin',
+ 'oldfieldtype': u'Select',
+ 'options': u'Manual\nMRP',
'permlevel': 1,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'status',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'status',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Status',
+ 'label': u'Status',
'no_copy': 1,
- 'oldfieldname': 'status',
- 'oldfieldtype': 'Select',
- 'options': '\nDraft\nSubmitted\nStopped\nIn Process\nCompleted\nCancelled',
+ 'oldfieldname': u'status',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nDraft\nSubmitted\nStopped\nIn Process\nCompleted\nCancelled',
'permlevel': 1,
'reqd': 1,
'search_index': 1
@@ -314,40 +317,40 @@
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Updated after finished goods are transferred to FG Warehouse through Stock Entry',
- 'doctype': 'DocField',
- 'fieldname': 'produced_qty',
- 'fieldtype': 'Currency',
- 'label': 'Produced Qty',
- 'oldfieldname': 'produced_qty',
- 'oldfieldtype': 'Currency',
+ 'colour': u'White:FFF',
+ 'description': u'Updated after finished goods are transferred to FG Warehouse through Stock Entry',
+ 'doctype': u'DocField',
+ 'fieldname': u'produced_qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Produced Qty',
+ 'oldfieldname': u'produced_qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'company',
- 'fieldtype': 'Link',
- 'label': 'Company',
- 'oldfieldname': 'company',
- 'oldfieldtype': 'Link',
- 'options': 'Company',
+ 'doctype': u'DocField',
+ 'fieldname': u'company',
+ 'fieldtype': u'Link',
+ 'label': u'Company',
+ 'oldfieldname': u'company',
+ 'oldfieldtype': u'Link',
+ 'options': u'Company',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'fiscal_year',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'fiscal_year',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Fiscal Year',
- 'oldfieldname': 'fiscal_year',
- 'oldfieldtype': 'Select',
- 'options': 'link:Fiscal Year',
+ 'label': u'Fiscal Year',
+ 'oldfieldname': u'fiscal_year',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:Fiscal Year',
'permlevel': 0,
'reqd': 1
}
diff --git a/erpnext/production/doctype/production_planning_tool/production_planning_tool.txt b/erpnext/production/doctype/production_planning_tool/production_planning_tool.txt
index 14b0b75..2e9fbae 100644
--- a/erpnext/production/doctype/production_planning_tool/production_planning_tool.txt
+++ b/erpnext/production/doctype/production_planning_tool/production_planning_tool.txt
@@ -3,48 +3,48 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:14',
+ 'creation': '2012-03-27 14:36:05',
'docstatus': 0,
- 'modified': '2012-01-10 16:26:10',
- 'modified_by': 'Administrator',
- 'owner': 'jai@webnotestech.com'
+ 'modified': '2012-03-27 14:36:05',
+ 'modified_by': u'Administrator',
+ 'owner': u'jai@webnotestech.com'
},
# These values are common for all DocType
{
- '_last_update': '1326188323',
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ '_last_update': u'1326188323',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
'in_create': 1,
'issingle': 1,
- 'module': 'Production',
+ 'module': u'Production',
'name': '__common__',
'read_only': 1,
- 'section_style': 'Tabbed',
- 'server_code_error': ' ',
+ 'section_style': u'Tabbed',
+ 'server_code_error': u' ',
'show_in_menu': 1,
'version': 106
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Production Planning Tool',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Production Planning Tool',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Production Planning Tool',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Production Planning Tool',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
'write': 1
@@ -53,247 +53,266 @@
# DocType, Production Planning Tool
{
'doctype': 'DocType',
- 'name': 'Production Planning Tool'
+ 'name': u'Production Planning Tool'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'role': 'System Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'System Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'role': 'Production User'
+ 'doctype': u'DocPerm',
+ 'role': u'Production User'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'role': 'Production Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'Production Manager'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Select Sales Orders'
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'select_sales_orders',
+ 'fieldtype': u'Section Break',
+ 'label': u'Select Sales Orders'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'width': '50%'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'from_date',
- 'fieldtype': 'Date',
- 'label': 'From Date'
+ 'doctype': u'DocField',
+ 'fieldname': u'from_date',
+ 'fieldtype': u'Date',
+ 'label': u'From Date'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'to_date',
- 'fieldtype': 'Date',
- 'label': 'To Date'
+ 'doctype': u'DocField',
+ 'fieldname': u'to_date',
+ 'fieldtype': u'Date',
+ 'label': u'To Date'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'fg_item',
- 'fieldtype': 'Link',
- 'label': 'FG Item',
- 'options': 'Item'
+ 'doctype': u'DocField',
+ 'fieldname': u'fg_item',
+ 'fieldtype': u'Link',
+ 'label': u'FG Item',
+ 'options': u'Item'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'width': '50%'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break',
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'customer',
- 'fieldtype': 'Link',
- 'label': 'Customer',
- 'options': 'Customer'
+ 'doctype': u'DocField',
+ 'fieldname': u'customer',
+ 'fieldtype': u'Link',
+ 'label': u'Customer',
+ 'options': u'Customer'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'company',
- 'fieldtype': 'Link',
- 'label': 'Company',
- 'options': 'Company',
+ 'doctype': u'DocField',
+ 'fieldname': u'company',
+ 'fieldtype': u'Link',
+ 'label': u'Company',
+ 'options': u'Company',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'options': 'Simple'
+ 'doctype': u'DocField',
+ 'fieldname': u'section_break0',
+ 'fieldtype': u'Section Break',
+ 'options': u'Simple'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'width': '50%'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break2',
+ 'fieldtype': u'Column Break',
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Get Sales Orders',
- 'options': 'get_open_sales_orders'
+ 'doctype': u'DocField',
+ 'fieldname': u'get_sales_orders',
+ 'fieldtype': u'Button',
+ 'label': u'Get Sales Orders',
+ 'options': u'get_open_sales_orders'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'width': '50%'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break3',
+ 'fieldtype': u'Column Break',
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Clear SO Table',
- 'options': 'clear_so_table',
- 'trigger': 'Client'
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'clear_so_table',
+ 'fieldtype': u'Button',
+ 'label': u'Clear SO Table',
+ 'options': u'clear_so_table',
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'options': 'Simple'
+ 'doctype': u'DocField',
+ 'fieldname': u'section_break1',
+ 'fieldtype': u'Section Break',
+ 'options': u'Simple'
},
# DocField
{
- 'description': 'Select Sales Orders from which you want to create Production Orders. You can get sales orders based on above criteria.',
- 'doctype': 'DocField',
- 'fieldname': 'pp_so_details',
- 'fieldtype': 'Table',
- 'label': 'PP SO Details',
- 'options': 'PP SO Detail'
+ 'description': u'Select Sales Orders from which you want to create Production Orders. You can get sales orders based on above criteria.',
+ 'doctype': u'DocField',
+ 'fieldname': u'pp_so_details',
+ 'fieldtype': u'Table',
+ 'label': u'PP SO Details',
+ 'options': u'PP SO Detail'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Items'
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'items',
+ 'fieldtype': u'Section Break',
+ 'label': u'Items'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Get Items from SO',
- 'options': 'get_items_from_so'
+ 'doctype': u'DocField',
+ 'fieldname': u'get_items_from_so',
+ 'fieldtype': u'Button',
+ 'label': u'Get Items from SO',
+ 'options': u'get_items_from_so'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'width': '50%'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break4',
+ 'fieldtype': u'Column Break',
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Clear Item Table',
- 'options': 'clear_item_table',
- 'trigger': 'Client'
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'clear_item_table',
+ 'fieldtype': u'Button',
+ 'label': u'Clear Item Table',
+ 'options': u'clear_item_table',
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'options': 'Simple'
+ 'doctype': u'DocField',
+ 'fieldname': u'section_break2',
+ 'fieldtype': u'Section Break',
+ 'options': u'Simple'
},
# DocField
{
- 'description': 'Enter items and planned qty for which you want to raise production orders or download raw materials for analysis. You can pull items (which are pending to deliver) from SO as well by adding SO in plan.',
- 'doctype': 'DocField',
- 'fieldname': 'pp_details',
- 'fieldtype': 'Table',
- 'label': 'PP Details',
- 'options': 'PP Detail'
+ 'description': u'Enter items and planned qty for which you want to raise production orders or download raw materials for analysis. You can pull items (which are pending to deliver) from SO as well by adding SO in plan.',
+ 'doctype': u'DocField',
+ 'fieldname': u'pp_details',
+ 'fieldtype': u'Table',
+ 'label': u'PP Details',
+ 'options': u'PP Detail'
},
# DocField
{
- 'colour': 'White:FFF',
- 'default': 'No',
- 'description': 'Select "Yes" if stock is maintained and tracked for sub assembly items.',
- 'doctype': 'DocField',
- 'fieldname': 'consider_sa_items',
- 'fieldtype': 'Select',
- 'label': 'Consider Sub Assemblies as Raw Material',
- 'options': 'No\nYes',
+ 'colour': u'White:FFF',
+ 'default': u'No',
+ 'description': u'Select "Yes" if stock is maintained and tracked for sub assembly items.',
+ 'doctype': u'DocField',
+ 'fieldname': u'consider_sa_items',
+ 'fieldtype': u'Select',
+ 'label': u'Consider Sub Assemblies as Raw Material',
+ 'options': u'No\nYes',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'options': 'Simple'
+ 'doctype': u'DocField',
+ 'fieldname': u'section_break3',
+ 'fieldtype': u'Section Break',
+ 'options': u'Simple'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'width': '50%'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break5',
+ 'fieldtype': u'Column Break',
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Raise Production Order',
- 'options': 'raise_production_order'
+ 'doctype': u'DocField',
+ 'fieldname': u'raise_production_order',
+ 'fieldtype': u'Button',
+ 'label': u'Raise Production Order',
+ 'options': u'raise_production_order'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'width': '50%'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break6',
+ 'fieldtype': u'Column Break',
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Download Raw Material',
- 'trigger': 'Client'
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'download_raw_material',
+ 'fieldtype': u'Button',
+ 'label': u'Download Raw Material',
+ 'trigger': u'Client'
}
]
\ No newline at end of file
diff --git a/erpnext/production/doctype/workstation/workstation.txt b/erpnext/production/doctype/workstation/workstation.txt
index dd0868d..999ce58 100644
--- a/erpnext/production/doctype/workstation/workstation.txt
+++ b/erpnext/production/doctype/workstation/workstation.txt
@@ -3,80 +3,80 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:31',
+ 'creation': '2012-03-27 14:36:05',
'docstatus': 0,
- 'modified': '2011-11-24 14:34:41',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 18:46:49',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1322125389',
+ '_last_update': u'1322125389',
'allow_email': 0,
'allow_trash': 1,
- 'autoname': 'field:workstation_name',
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'autoname': u'field:workstation_name',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'Production',
+ 'document_type': u'Master',
+ 'module': u'Production',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
- 'version': 13
+ 'version': 14
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Workstation',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Workstation',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Workstation',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Workstation',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Workstation
{
'doctype': 'DocType',
- 'name': 'Workstation'
+ 'name': u'Workstation'
},
# DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'System Manager'
+ 'role': u'System Manager'
},
# DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Production User',
+ 'role': u'Production User',
'write': 1
},
@@ -84,184 +84,186 @@
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Production User',
+ 'role': u'Production User',
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Production Manager'
+ 'role': u'Production Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Production User'
+ 'role': u'Production User'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'workstation_name',
- 'fieldtype': 'Data',
- 'label': 'Workstation Name',
- 'oldfieldname': 'workstation_name',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'workstation_name',
+ 'fieldtype': u'Data',
+ 'label': u'Workstation Name',
+ 'oldfieldname': u'workstation_name',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'warehouse',
- 'fieldtype': 'Link',
- 'label': 'Warehouse',
- 'oldfieldname': 'warehouse',
- 'oldfieldtype': 'Link',
- 'options': 'Warehouse',
+ 'doctype': u'DocField',
+ 'fieldname': u'warehouse',
+ 'fieldtype': u'Link',
+ 'label': u'Warehouse',
+ 'oldfieldname': u'warehouse',
+ 'oldfieldtype': u'Link',
+ 'options': u'Warehouse',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Text',
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Text',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Text',
'permlevel': 0,
- 'width': '300px'
+ 'width': u'300px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'capacity',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'capacity',
+ 'fieldtype': u'Data',
'hidden': 1,
- 'label': 'Capacity',
- 'oldfieldname': 'capacity',
- 'oldfieldtype': 'Data',
+ 'label': u'Capacity',
+ 'oldfieldname': u'capacity',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'capacity_units',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'capacity_units',
+ 'fieldtype': u'Select',
'hidden': 1,
- 'label': 'Capacity Units',
- 'oldfieldname': 'capacity_units',
- 'oldfieldtype': 'Select',
- 'options': '\nUnits/Shifts\nUnits/Hour',
+ 'label': u'Capacity Units',
+ 'oldfieldname': u'capacity_units',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nUnits/Shifts\nUnits/Hour',
'permlevel': 0,
'reqd': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'hour_rate_labour',
- 'fieldtype': 'Currency',
- 'label': 'Hour Rate Labour',
- 'oldfieldname': 'hour_rate_labour',
- 'oldfieldtype': 'Currency',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'hour_rate_labour',
+ 'fieldtype': u'Currency',
+ 'label': u'Hour Rate Labour',
+ 'oldfieldname': u'hour_rate_labour',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'reqd': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Over Heads',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'over_heads',
+ 'fieldtype': u'Section Break',
+ 'label': u'Over Heads',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'hour_rate_electricity',
- 'fieldtype': 'Currency',
- 'label': 'Hour Rate Electricity',
- 'oldfieldname': 'hour_rate_electricity',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'hour_rate_electricity',
+ 'fieldtype': u'Currency',
+ 'label': u'Hour Rate Electricity',
+ 'oldfieldname': u'hour_rate_electricity',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'hour_rate_consumable',
- 'fieldtype': 'Currency',
- 'label': 'Hour Rate Consumable',
- 'oldfieldname': 'hour_rate_consumable',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'hour_rate_consumable',
+ 'fieldtype': u'Currency',
+ 'label': u'Hour Rate Consumable',
+ 'oldfieldname': u'hour_rate_consumable',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'hour_rate_rent',
- 'fieldtype': 'Currency',
- 'label': 'Hour Rate Rent',
- 'oldfieldname': 'hour_rate_rent',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'hour_rate_rent',
+ 'fieldtype': u'Currency',
+ 'label': u'Hour Rate Rent',
+ 'oldfieldname': u'hour_rate_rent',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'overhead',
- 'fieldtype': 'Currency',
- 'label': 'Overhead',
- 'oldfieldname': 'overhead',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'overhead',
+ 'fieldtype': u'Currency',
+ 'label': u'Overhead',
+ 'oldfieldname': u'overhead',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Hour Rate',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'hour_rate_section_break',
+ 'fieldtype': u'Section Break',
+ 'label': u'Hour Rate',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'hour_rate',
- 'fieldtype': 'Currency',
- 'label': 'Hour Rate',
- 'oldfieldname': 'hour_rate',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'hour_rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Hour Rate',
+ 'oldfieldname': u'hour_rate',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
}
]
\ No newline at end of file
diff --git a/erpnext/projects/Module Def/Projects/Projects.txt b/erpnext/projects/Module Def/Projects/Projects.txt
deleted file mode 100644
index f8cf6f7..0000000
--- a/erpnext/projects/Module Def/Projects/Projects.txt
+++ /dev/null
@@ -1,141 +0,0 @@
-[
- {
- '_last_update': '1300959287',
- 'creation': '2010-11-30 17:31:44',
- 'disabled': 'No',
- 'docstatus': 0,
- 'doctype': u'Module Def',
- 'doctype_list': None,
- 'file_list': 'undefined,undefined',
- 'idx': None,
- 'is_hidden': 'No',
- 'last_updated_date': '2011-03-10 15:57:47',
- 'modified': '2011-03-24 15:07:53',
- 'modified_by': 'Administrator',
- 'module_desc': '<div id="projects_div"></div>',
- 'module_icon': 'puzzle.png',
- 'module_label': 'Projects',
- 'module_name': 'Projects',
- 'module_page': None,
- 'module_seq': 2,
- 'name': 'Projects',
- 'owner': 'Administrator',
- 'parent': None,
- 'parentfield': None,
- 'parenttype': None,
- 'trash_reason': None,
- 'widget_code': None
- },
- {
- 'click_function': None,
- 'creation': '2010-11-30 17:31:44',
- 'description': None,
- 'display_name': 'Project',
- 'doc_name': 'Project',
- 'doc_type': 'Forms',
- 'docstatus': 0,
- 'doctype': 'Module Def Item',
- 'fields': None,
- 'hide': None,
- 'icon': None,
- 'idx': 1,
- 'modified': '2011-03-24 15:07:53',
- 'modified_by': 'Administrator',
- 'name': 'MDI00099',
- 'owner': 'Administrator',
- 'parent': 'Projects',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
- {
- 'click_function': None,
- 'creation': None,
- 'description': None,
- 'display_name': 'Task',
- 'doc_name': 'Ticket',
- 'doc_type': 'Forms',
- 'docstatus': 0,
- 'doctype': 'Module Def Item',
- 'fields': None,
- 'hide': None,
- 'icon': None,
- 'idx': 2,
- 'modified': '2011-03-24 15:07:53',
- 'modified_by': 'Administrator',
- 'name': 'MDI00285',
- 'owner': None,
- 'parent': 'Projects',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
- {
- 'click_function': None,
- 'creation': None,
- 'description': None,
- 'display_name': 'Gantt Chart',
- 'doc_name': 'Projects',
- 'doc_type': 'Pages',
- 'docstatus': 0,
- 'doctype': 'Module Def Item',
- 'fields': None,
- 'hide': None,
- 'icon': None,
- 'idx': 3,
- 'modified': '2011-03-24 15:07:53',
- 'modified_by': 'Administrator',
- 'name': 'MDI00286',
- 'owner': None,
- 'parent': 'Projects',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
- {
- 'click_function': None,
- 'creation': None,
- 'description': None,
- 'display_name': 'Timesheet',
- 'doc_name': 'Timesheet',
- 'doc_type': 'Forms',
- 'docstatus': 0,
- 'doctype': 'Module Def Item',
- 'fields': None,
- 'hide': None,
- 'icon': None,
- 'idx': 4,
- 'modified': '2011-03-24 15:07:53',
- 'modified_by': 'Administrator',
- 'name': 'MDI00287',
- 'owner': None,
- 'parent': 'Projects',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
- {
- 'creation': '2010-11-30 17:31:44',
- 'docstatus': 0,
- 'doctype': 'Module Def Role',
- 'idx': 1,
- 'modified': '2011-03-24 15:07:53',
- 'modified_by': 'Administrator',
- 'name': 'MDR00012',
- 'owner': 'Administrator',
- 'parent': 'Projects',
- 'parentfield': 'roles',
- 'parenttype': 'Module Def',
- 'role': 'Projects User'
- },
- {
- 'creation': '2010-11-30 17:31:44',
- 'docstatus': 0,
- 'doctype': 'Module Def Role',
- 'idx': 2,
- 'modified': '2011-03-24 15:07:53',
- 'modified_by': 'Administrator',
- 'name': 'MDR00013',
- 'owner': 'Administrator',
- 'parent': 'Projects',
- 'parentfield': 'roles',
- 'parenttype': 'Module Def',
- 'role': 'System Manager'
- }
-]
\ No newline at end of file
diff --git a/erpnext/projects/doctype/activity_type/activity_type.txt b/erpnext/projects/doctype/activity_type/activity_type.txt
index f366101..46ed917 100644
--- a/erpnext/projects/doctype/activity_type/activity_type.txt
+++ b/erpnext/projects/doctype/activity_type/activity_type.txt
@@ -3,76 +3,76 @@
# These values are common in all dictionaries
{
- 'creation': '2011-02-23 11:22:28',
+ 'creation': '2012-03-27 14:36:05',
'docstatus': 0,
- 'modified': '2011-02-21 15:43:40',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:05',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'autoname': 'field:activity_type',
- 'colour': 'White:FFF',
+ 'autoname': u'field:activity_type',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'in_dialog': 1,
- 'module': 'Projects',
+ 'module': u'Projects',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 12
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'activity_type',
- 'fieldtype': 'Data',
- 'idx': 1,
- 'label': 'Activity Type',
+ 'doctype': u'DocField',
+ 'fieldname': u'activity_type',
+ 'fieldtype': u'Data',
+ 'label': u'Activity Type',
'name': '__common__',
- 'parent': 'Activity Type',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Activity Type',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0,
'reqd': 1
},
# These values are common for all DocPerm
{
+ 'amend': 0,
+ 'cancel': 0,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Activity Type',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Activity Type',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
+ 'submit': 0,
'write': 1
},
# DocType, Activity Type
{
'doctype': 'DocType',
- 'name': 'Activity Type'
+ 'name': u'Activity Type'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'role': 'System Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'System Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'role': 'Projects User'
+ 'doctype': u'DocPerm',
+ 'role': u'Projects User'
},
# DocField
{
- 'doctype': 'DocField'
+ 'doctype': u'DocField'
}
]
\ No newline at end of file
diff --git a/erpnext/projects/doctype/project/help.md b/erpnext/projects/doctype/project/help.md
new file mode 100644
index 0000000..0043f04
--- /dev/null
+++ b/erpnext/projects/doctype/project/help.md
@@ -0,0 +1,5 @@
+You can use projects to:
+
+1. Track budgets (Purchase Orders, Invoices).
+2. Track material consumption.
+3. Create and assign tasks (and view them on a Gantt Chart).
\ No newline at end of file
diff --git a/erpnext/projects/doctype/project/project.txt b/erpnext/projects/doctype/project/project.txt
index 0cc81c6..527201e 100644
--- a/erpnext/projects/doctype/project/project.txt
+++ b/erpnext/projects/doctype/project/project.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:14',
+ 'creation': '2012-03-27 14:36:05',
'docstatus': 0,
- 'modified': '2012-03-22 14:39:13',
+ 'modified': '2012-03-27 14:36:05',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -43,16 +43,12 @@
# These values are common for all DocPerm
{
- 'cancel': 1,
- 'create': 1,
'doctype': u'DocPerm',
'name': '__common__',
'parent': u'Project',
'parentfield': u'permissions',
'parenttype': u'DocType',
- 'permlevel': 0,
- 'read': 1,
- 'write': 1
+ 'read': 1
},
# DocType, Project
@@ -63,14 +59,33 @@
# DocPerm
{
+ 'amend': 0,
+ 'cancel': 1,
+ 'create': 1,
'doctype': u'DocPerm',
- 'role': u'All'
+ 'permlevel': 0,
+ 'role': u'All',
+ 'submit': 0,
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 1,
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Projects User',
+ 'submit': 0,
+ 'write': 1
},
# DocPerm
{
'doctype': u'DocPerm',
- 'role': u'Projects User'
+ 'permlevel': 1,
+ 'role': u'All'
},
# DocField
@@ -78,6 +93,7 @@
'colour': u'White:FFF',
'description': u'Helps you keep track of your projects and links to Tasks. You can tag a task to a project to track its progress',
'doctype': u'DocField',
+ 'fieldname': u'basic_info',
'fieldtype': u'Section Break',
'label': u'Basic Info',
'oldfieldtype': u'Section Break',
@@ -95,8 +111,7 @@
'oldfieldname': u'project_name',
'oldfieldtype': u'Data',
'permlevel': 0,
- 'reqd': 1,
- 'search_index': 1
+ 'reqd': 1
},
# DocField
@@ -114,7 +129,7 @@
'options': u'Open\nCompleted\nCancelled',
'permlevel': 0,
'reqd': 1,
- 'search_index': 0
+ 'search_index': 1
},
# DocField
@@ -287,6 +302,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'project_details',
'fieldtype': u'Section Break',
'label': u'Project Details',
'oldfieldtype': u'Section Break',
@@ -297,6 +313,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break0',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -306,6 +323,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'section_break0',
'fieldtype': u'Section Break',
'oldfieldtype': u'Section Break',
'options': u'Simple',
@@ -328,6 +346,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'customer_details',
'fieldtype': u'Section Break',
'label': u'Customer Details',
'oldfieldtype': u'Section Break',
@@ -365,7 +384,7 @@
'oldfieldname': u'customer_name',
'oldfieldtype': u'Data',
'permlevel': 1,
- 'search_index': 0
+ 'search_index': 1
},
# DocField
@@ -406,7 +425,6 @@
'fieldtype': u'Link',
'in_filter': 1,
'label': u'Territory',
- 'no_copy': 0,
'oldfieldname': u'territory',
'oldfieldtype': u'Link',
'options': u'Territory',
@@ -461,6 +479,7 @@
'colour': u'White:FFF',
'description': u'Important dates and commitments in your project life cycle',
'doctype': u'DocField',
+ 'fieldname': u'milestones',
'fieldtype': u'Section Break',
'label': u'Milestones',
'oldfieldtype': u'Section Break',
diff --git a/erpnext/projects/doctype/project_activity/project_activity.js b/erpnext/projects/doctype/project_activity/project_activity.js
index ed2b1df..02a6dbf 100644
--- a/erpnext/projects/doctype/project_activity/project_activity.js
+++ b/erpnext/projects/doctype/project_activity/project_activity.js
@@ -55,7 +55,7 @@
if (ci==0){
var d1 = $a(cell,'div');
var img = $a(cell,'img','',{width:'40px'});
- set_user_img(img,d[ri][0])
+ img.src = wn.user_info(d[ri][0]).image;
var d2 = $a(cell,'div');
d2.innerHTML = d[ri][0] + ' on: ' + date.str_to_user(d[ri][1]);
}
diff --git a/erpnext/projects/doctype/project_activity/project_activity.txt b/erpnext/projects/doctype/project_activity/project_activity.txt
index d194131..5447165 100644
--- a/erpnext/projects/doctype/project_activity/project_activity.txt
+++ b/erpnext/projects/doctype/project_activity/project_activity.txt
@@ -3,173 +3,165 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:14',
+ 'creation': '2012-03-27 14:36:06',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:06',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'autoname': 'Activity.######',
- 'colour': 'White:FFF',
+ 'autoname': u'Activity.######',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'module': 'Projects',
+ 'module': u'Projects',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 15
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Project Activity',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Project Activity',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Project Activity',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Project Activity',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
- 'role': 'All',
+ 'role': u'All',
'write': 1
},
# DocType, Project Activity
{
'doctype': 'DocType',
- 'name': 'Project Activity'
+ 'name': u'Project Activity'
},
# DocPerm
{
- 'doctype': 'DocPerm'
+ 'doctype': u'DocPerm'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'project',
- 'fieldtype': 'Link',
- 'idx': 1,
- 'label': 'Project',
- 'oldfieldname': 'project',
- 'oldfieldtype': 'Link',
- 'options': 'Project'
+ 'doctype': u'DocField',
+ 'fieldname': u'project',
+ 'fieldtype': u'Link',
+ 'label': u'Project',
+ 'oldfieldname': u'project',
+ 'oldfieldtype': u'Link',
+ 'options': u'Project'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'activity_name',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Activity Name',
- 'oldfieldname': 'activity_name',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'activity_name',
+ 'fieldtype': u'Data',
+ 'label': u'Activity Name',
+ 'oldfieldname': u'activity_name',
+ 'oldfieldtype': u'Data',
'print_hide': 1,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'percent_complete',
- 'fieldtype': 'Select',
- 'idx': 3,
- 'label': 'Percent Complete',
- 'oldfieldname': 'percent_complete',
- 'oldfieldtype': 'Select',
- 'options': '0\n5\n10\n15\n20\n25\n30\n35\n40\n45\n50\n55\n60\n65\n70\n75\n80\n85\n90\n95\n100',
+ 'doctype': u'DocField',
+ 'fieldname': u'percent_complete',
+ 'fieldtype': u'Select',
+ 'label': u'Percent Complete',
+ 'oldfieldname': u'percent_complete',
+ 'oldfieldtype': u'Select',
+ 'options': u'0\n5\n10\n15\n20\n25\n30\n35\n40\n45\n50\n55\n60\n65\n70\n75\n80\n85\n90\n95\n100',
'reqd': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'last_update',
- 'fieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'last_update',
+ 'fieldtype': u'Date',
'hidden': 1,
- 'idx': 4,
- 'label': 'Last Update',
- 'oldfieldname': 'last_update',
- 'oldfieldtype': 'Date',
+ 'label': u'Last Update',
+ 'oldfieldname': u'last_update',
+ 'oldfieldtype': u'Date',
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'last_update_by',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'last_update_by',
+ 'fieldtype': u'Data',
'hidden': 1,
- 'idx': 5,
- 'label': 'Last Update By',
- 'oldfieldname': 'last_update_by',
- 'oldfieldtype': 'Data',
+ 'label': u'Last Update By',
+ 'oldfieldname': u'last_update_by',
+ 'oldfieldtype': u'Data',
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 6,
- 'label': 'Updates',
- 'oldfieldtype': 'Section Break'
+ 'doctype': u'DocField',
+ 'fieldname': u'updates',
+ 'fieldtype': u'Section Break',
+ 'label': u'Updates',
+ 'oldfieldtype': u'Section Break'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'idx': 7,
- 'label': 'Updates HTML',
- 'oldfieldtype': 'HTML'
+ 'doctype': u'DocField',
+ 'fieldname': u'updates_html',
+ 'fieldtype': u'HTML',
+ 'label': u'Updates HTML',
+ 'oldfieldtype': u'HTML'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'new_update',
- 'fieldtype': 'Text',
- 'idx': 8,
- 'label': 'New Update',
- 'oldfieldname': 'new_update',
- 'oldfieldtype': 'Text'
+ 'doctype': u'DocField',
+ 'fieldname': u'new_update',
+ 'fieldtype': u'Text',
+ 'label': u'New Update',
+ 'oldfieldname': u'new_update',
+ 'oldfieldtype': u'Text'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'hours',
- 'fieldtype': 'Float',
- 'idx': 9,
- 'label': 'Hours',
- 'oldfieldname': 'hours',
- 'oldfieldtype': 'Float'
+ 'doctype': u'DocField',
+ 'fieldname': u'hours',
+ 'fieldtype': u'Float',
+ 'label': u'Hours',
+ 'oldfieldname': u'hours',
+ 'oldfieldtype': u'Float'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'idx': 10,
- 'label': 'Add',
- 'oldfieldtype': 'Button',
- 'trigger': 'Client'
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'add',
+ 'fieldtype': u'Button',
+ 'label': u'Add',
+ 'oldfieldtype': u'Button',
+ 'trigger': u'Client'
}
]
\ No newline at end of file
diff --git a/erpnext/projects/doctype/project_activity_update/project_activity_update.txt b/erpnext/projects/doctype/project_activity_update/project_activity_update.txt
index 5455de5..8155ccf 100644
--- a/erpnext/projects/doctype/project_activity_update/project_activity_update.txt
+++ b/erpnext/projects/doctype/project_activity_update/project_activity_update.txt
@@ -3,61 +3,59 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:15',
+ 'creation': '2012-03-27 14:36:06',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:06',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Projects',
+ 'module': u'Projects',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'version': 1
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Project Activity Update',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Project Activity Update',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, Project Activity Update
{
'doctype': 'DocType',
- 'name': 'Project Activity Update'
+ 'name': u'Project Activity Update'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'update',
- 'fieldtype': 'Text',
- 'idx': 1,
- 'label': 'Update',
- 'oldfieldname': 'update',
- 'oldfieldtype': 'Text'
+ 'doctype': u'DocField',
+ 'fieldname': u'update',
+ 'fieldtype': u'Text',
+ 'label': u'Update',
+ 'oldfieldname': u'update',
+ 'oldfieldtype': u'Text'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'e.g. 0.5, 2.5 etc',
- 'doctype': 'DocField',
- 'fieldname': 'hours',
- 'fieldtype': 'Float',
- 'idx': 2,
- 'label': 'Hours',
- 'oldfieldname': 'hours',
- 'oldfieldtype': 'Float'
+ 'colour': u'White:FFF',
+ 'description': u'e.g. 0.5, 2.5 etc',
+ 'doctype': u'DocField',
+ 'fieldname': u'hours',
+ 'fieldtype': u'Float',
+ 'label': u'Hours',
+ 'oldfieldname': u'hours',
+ 'oldfieldtype': u'Float'
}
]
\ No newline at end of file
diff --git a/erpnext/projects/doctype/project_control/project_control.txt b/erpnext/projects/doctype/project_control/project_control.txt
index 9e1422d..76861cc 100644
--- a/erpnext/projects/doctype/project_control/project_control.txt
+++ b/erpnext/projects/doctype/project_control/project_control.txt
@@ -3,28 +3,28 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:15',
+ 'creation': '2012-03-27 14:36:06',
'docstatus': 0,
- 'modified': '2010-12-23 10:43:22',
- 'modified_by': 'umair@iwebnotes.com',
- 'owner': 'harshada@webnotestech.com'
+ 'modified': '2012-03-27 14:36:06',
+ 'modified_by': u'Administrator',
+ 'owner': u'harshada@webnotestech.com'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'issingle': 1,
- 'module': 'Projects',
+ 'module': u'Projects',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 30
},
# DocType, Project Control
{
'doctype': 'DocType',
- 'name': 'Project Control'
+ 'name': u'Project Control'
}
]
\ No newline at end of file
diff --git a/erpnext/projects/doctype/project_milestone/project_milestone.txt b/erpnext/projects/doctype/project_milestone/project_milestone.txt
index 6d45a7c..6a7a4fb 100644
--- a/erpnext/projects/doctype/project_milestone/project_milestone.txt
+++ b/erpnext/projects/doctype/project_milestone/project_milestone.txt
@@ -3,72 +3,72 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:15',
+ 'creation': '2012-03-27 14:36:06',
'docstatus': 0,
- 'modified': '2011-12-19 14:11:40',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:06',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Projects',
+ 'module': u'Projects',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 4
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Project Milestone',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Project Milestone',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, Project Milestone
{
'doctype': 'DocType',
- 'name': 'Project Milestone'
+ 'name': u'Project Milestone'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'milestone_date',
- 'fieldtype': 'Date',
- 'label': 'Milestone Date',
- 'oldfieldname': 'milestone_date',
- 'oldfieldtype': 'Date'
+ 'doctype': u'DocField',
+ 'fieldname': u'milestone_date',
+ 'fieldtype': u'Date',
+ 'label': u'Milestone Date',
+ 'oldfieldname': u'milestone_date',
+ 'oldfieldtype': u'Date'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'milestone',
- 'fieldtype': 'Text',
- 'label': 'Milestone',
- 'oldfieldname': 'milestone',
- 'oldfieldtype': 'Text',
- 'width': '300px'
+ 'doctype': u'DocField',
+ 'fieldname': u'milestone',
+ 'fieldtype': u'Text',
+ 'label': u'Milestone',
+ 'oldfieldname': u'milestone',
+ 'oldfieldtype': u'Text',
+ 'width': u'300px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'status',
- 'fieldtype': 'Select',
- 'label': 'Status',
+ 'doctype': u'DocField',
+ 'fieldname': u'status',
+ 'fieldtype': u'Select',
+ 'label': u'Status',
'no_copy': 1,
- 'oldfieldname': 'status',
- 'oldfieldtype': 'Select',
- 'options': 'Pending\nCompleted'
+ 'oldfieldname': u'status',
+ 'oldfieldtype': u'Select',
+ 'options': u'Pending\nCompleted'
}
]
\ No newline at end of file
diff --git a/erpnext/projects/doctype/ticket/ticket.txt b/erpnext/projects/doctype/ticket/ticket.txt
index 5b8da14..71ead26 100644
--- a/erpnext/projects/doctype/ticket/ticket.txt
+++ b/erpnext/projects/doctype/ticket/ticket.txt
@@ -3,67 +3,55 @@
# These values are common in all dictionaries
{
- 'creation': '2011-01-28 17:52:35',
+ 'creation': '2012-03-27 14:36:06',
'docstatus': 0,
- 'modified': '2011-12-26 11:56:35',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:06',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1324880734',
+ '_last_update': u'1324880734',
'allow_trash': 1,
- 'autoname': 'TIC/.####',
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'autoname': u'TIC/.####',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'Projects',
+ 'document_type': u'Master',
+ 'module': u'Projects',
'name': '__common__',
- 'section_style': 'Tray',
- 'server_code_error': ' ',
+ 'section_style': u'Tray',
+ 'server_code_error': u' ',
'show_in_menu': 0,
- 'subject': '%(subject)s',
- 'tag_fields': 'status',
+ 'subject': u'%(subject)s',
+ 'tag_fields': u'status',
'version': 254
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Ticket',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Ticket',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Ticket',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
- 'read': 1,
- 'submit': 0
+ 'parent': u'Ticket',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
+ 'read': 1
},
# DocType, Ticket
{
'doctype': 'DocType',
- 'name': 'Ticket'
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'permlevel': 1,
- 'role': 'Projects User',
- 'write': 0
+ 'name': u'Ticket'
},
# DocPerm
@@ -71,122 +59,126 @@
'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'All',
+ 'role': u'All',
'write': 1
},
# DocPerm
{
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'All',
+ 'role': u'All',
'write': 0
},
# DocPerm
{
- 'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Projects User',
+ 'role': u'Projects User',
'write': 1
},
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Projects User'
+ },
+
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Task Details',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'task_details',
+ 'fieldtype': u'Section Break',
+ 'label': u'Task Details',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0,
'search_index': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'subject',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'subject',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Subject',
- 'oldfieldname': 'subject',
- 'oldfieldtype': 'Data',
+ 'label': u'Subject',
+ 'oldfieldname': u'subject',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'status',
- 'fieldtype': 'Select',
- 'label': 'Status',
+ 'doctype': u'DocField',
+ 'fieldname': u'status',
+ 'fieldtype': u'Select',
+ 'label': u'Status',
'no_copy': 1,
- 'oldfieldname': 'status',
- 'oldfieldtype': 'Select',
- 'options': 'Open\nPending Review\nClosed\nCancelled',
+ 'oldfieldname': u'status',
+ 'oldfieldtype': u'Select',
+ 'options': u'Open\nPending Review\nClosed\nCancelled',
'permlevel': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'opening_date',
- 'fieldtype': 'Date',
- 'label': 'Creation Date',
- 'oldfieldname': 'opening_date',
- 'oldfieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'opening_date',
+ 'fieldtype': u'Date',
+ 'label': u'Creation Date',
+ 'oldfieldname': u'opening_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': 'eval:doc.status == "Closed" || doc.status == "Pending Review"',
- 'doctype': 'DocField',
- 'fieldname': 'review_date',
- 'fieldtype': 'Date',
+ 'colour': u'White:FFF',
+ 'depends_on': u'eval:doc.status == "Closed" || doc.status == "Pending Review"',
+ 'doctype': u'DocField',
+ 'fieldname': u'review_date',
+ 'fieldtype': u'Date',
'hidden': 1,
- 'label': 'Review Date',
- 'oldfieldname': 'review_date',
- 'oldfieldtype': 'Date',
+ 'label': u'Review Date',
+ 'oldfieldname': u'review_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': 'eval:doc.status == "Closed"',
- 'doctype': 'DocField',
- 'fieldname': 'closing_date',
- 'fieldtype': 'Date',
+ 'colour': u'White:FFF',
+ 'depends_on': u'eval:doc.status == "Closed"',
+ 'doctype': u'DocField',
+ 'fieldname': u'closing_date',
+ 'fieldtype': u'Date',
'hidden': 1,
- 'label': 'Closing Date',
- 'oldfieldname': 'closing_date',
- 'oldfieldtype': 'Date',
+ 'label': u'Closing Date',
+ 'oldfieldname': u'closing_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'priority',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'priority',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Priority',
- 'oldfieldname': 'priority',
- 'oldfieldtype': 'Select',
- 'options': 'Low\nMedium\nHigh\nUrgent',
+ 'label': u'Priority',
+ 'oldfieldname': u'priority',
+ 'oldfieldtype': u'Select',
+ 'options': u'Low\nMedium\nHigh\nUrgent',
'permlevel': 0,
'reqd': 0,
'search_index': 1
@@ -194,118 +186,119 @@
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'project',
- 'fieldtype': 'Link',
- 'label': 'Project',
- 'oldfieldname': 'project',
- 'oldfieldtype': 'Link',
- 'options': 'Project',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'project',
+ 'fieldtype': u'Link',
+ 'label': u'Project',
+ 'oldfieldname': u'project',
+ 'oldfieldtype': u'Link',
+ 'options': u'Project',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'customer',
- 'fieldtype': 'Link',
- 'label': 'Customer',
- 'oldfieldname': 'customer',
- 'oldfieldtype': 'Link',
- 'options': 'Customer',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'customer',
+ 'fieldtype': u'Link',
+ 'label': u'Customer',
+ 'oldfieldname': u'customer',
+ 'oldfieldtype': u'Link',
+ 'options': u'Customer',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'customer_name',
- 'fieldtype': 'Data',
- 'label': 'Customer Name',
- 'oldfieldname': 'customer_name',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'customer_name',
+ 'fieldtype': u'Data',
+ 'label': u'Customer Name',
+ 'oldfieldname': u'customer_name',
+ 'oldfieldtype': u'Data',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'allocated_to_old',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'allocated_to_old',
+ 'fieldtype': u'Link',
'hidden': 1,
- 'label': 'Allocated To Old',
+ 'label': u'Allocated To Old',
'no_copy': 1,
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'allocated_to',
- 'fieldtype': 'Link',
- 'label': 'Allocated To',
- 'oldfieldname': 'allocated_to',
- 'oldfieldtype': 'Link',
- 'options': 'Profile',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'allocated_to',
+ 'fieldtype': u'Link',
+ 'label': u'Allocated To',
+ 'oldfieldname': u'allocated_to',
+ 'oldfieldtype': u'Link',
+ 'options': u'Profile',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'task_email_notify',
- 'fieldtype': 'Check',
- 'label': 'Sent Mail Notification',
+ 'doctype': u'DocField',
+ 'fieldname': u'task_email_notify',
+ 'fieldtype': u'Check',
+ 'label': u'Sent Mail Notification',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'allocated_to_name',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'allocated_to_name',
+ 'fieldtype': u'Data',
'hidden': 1,
- 'label': 'Allocated To Name',
- 'oldfieldname': 'allocated_to_name',
- 'oldfieldtype': 'Data',
+ 'label': u'Allocated To Name',
+ 'oldfieldname': u'allocated_to_name',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'sent_reminder',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'sent_reminder',
+ 'fieldtype': u'Data',
'hidden': 1,
- 'label': 'Sent Reminder',
+ 'label': u'Sent Reminder',
'no_copy': 1,
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'senders_name',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'senders_name',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Raised By',
- 'oldfieldname': 'senders_name',
- 'oldfieldtype': 'Data',
+ 'label': u'Raised By',
+ 'oldfieldname': u'senders_name',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1,
'search_index': 1
@@ -313,72 +306,72 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'senders_email',
- 'fieldtype': 'Data',
- 'label': 'Email',
- 'oldfieldname': 'senders_email',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'senders_email',
+ 'fieldtype': u'Data',
+ 'label': u'Email',
+ 'oldfieldname': u'senders_email',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'senders_contact_no',
- 'fieldtype': 'Data',
- 'label': 'Senders Contact No',
- 'oldfieldname': 'senders_contact_no',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'senders_contact_no',
+ 'fieldtype': u'Data',
+ 'label': u'Senders Contact No',
+ 'oldfieldname': u'senders_contact_no',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'senders_company',
- 'fieldtype': 'Data',
- 'label': 'Senders Company',
- 'oldfieldname': 'senders_company',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'senders_company',
+ 'fieldtype': u'Data',
+ 'label': u'Senders Company',
+ 'oldfieldname': u'senders_company',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'category',
- 'fieldtype': 'Link',
- 'label': 'Category',
- 'oldfieldname': 'category',
- 'oldfieldtype': 'Link',
- 'options': 'Ticket Category',
+ 'doctype': u'DocField',
+ 'fieldname': u'category',
+ 'fieldtype': u'Link',
+ 'label': u'Category',
+ 'oldfieldname': u'category',
+ 'oldfieldtype': u'Link',
+ 'options': u'Ticket Category',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'external_or_internal',
- 'fieldtype': 'Select',
- 'label': 'External or Internal',
- 'oldfieldname': 'external_or_internal',
- 'oldfieldtype': 'Select',
- 'options': 'External\nInternal',
+ 'doctype': u'DocField',
+ 'fieldname': u'external_or_internal',
+ 'fieldtype': u'Select',
+ 'label': u'External or Internal',
+ 'oldfieldname': u'external_or_internal',
+ 'oldfieldtype': u'Select',
+ 'options': u'External\nInternal',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amended_from',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'amended_from',
+ 'fieldtype': u'Data',
'hidden': 1,
- 'label': 'Amended From',
+ 'label': u'Amended From',
'no_copy': 1,
- 'oldfieldname': 'amended_from',
- 'oldfieldtype': 'Data',
+ 'oldfieldname': u'amended_from',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'print_hide': 1,
'report_hide': 1
@@ -386,14 +379,14 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amendment_date',
- 'fieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'amendment_date',
+ 'fieldtype': u'Date',
'hidden': 1,
- 'label': 'Amendment Date',
+ 'label': u'Amendment Date',
'no_copy': 1,
- 'oldfieldname': 'amendment_date',
- 'oldfieldtype': 'Date',
+ 'oldfieldname': u'amendment_date',
+ 'oldfieldtype': u'Date',
'permlevel': 1,
'print_hide': 1,
'report_hide': 1
@@ -401,38 +394,39 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'oldfieldtype': 'Section Break',
- 'options': 'Simple',
+ 'doctype': u'DocField',
+ 'fieldname': u'section_break0',
+ 'fieldtype': u'Section Break',
+ 'oldfieldtype': u'Section Break',
+ 'options': u'Simple',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Text Editor',
- 'label': 'Details',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Text Editor',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Text Editor',
+ 'label': u'Details',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Text Editor',
'permlevel': 0,
'reqd': 0,
- 'width': '300px'
+ 'width': u'300px'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'first_creation_flag',
- 'fieldtype': 'Int',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'first_creation_flag',
+ 'fieldtype': u'Int',
'hidden': 1,
'in_filter': 0,
- 'label': 'First Creation Flag',
+ 'label': u'First Creation Flag',
'no_copy': 1,
- 'oldfieldname': 'first_creation_flag',
- 'oldfieldtype': 'Int',
+ 'oldfieldname': u'first_creation_flag',
+ 'oldfieldtype': u'Int',
'permlevel': 0,
'print_hide': 1,
'search_index': 0
@@ -440,58 +434,60 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'second_creation_flag',
- 'fieldtype': 'Int',
+ 'doctype': u'DocField',
+ 'fieldname': u'second_creation_flag',
+ 'fieldtype': u'Int',
'hidden': 1,
- 'label': 'Second Creation Flag',
+ 'label': u'Second Creation Flag',
'no_copy': 1,
- 'oldfieldname': 'second_creation_flag',
- 'oldfieldtype': 'Int',
+ 'oldfieldname': u'second_creation_flag',
+ 'oldfieldtype': u'Int',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Time and Budget',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'time_and_budget',
+ 'fieldtype': u'Section Break',
+ 'label': u'Time and Budget',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'label': 'Expected',
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'expected',
+ 'fieldtype': u'Column Break',
+ 'label': u'Expected',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'exp_start_date',
- 'fieldtype': 'Date',
- 'label': 'Expected Start Date',
- 'oldfieldname': 'exp_start_date',
- 'oldfieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'exp_start_date',
+ 'fieldtype': u'Date',
+ 'label': u'Expected Start Date',
+ 'oldfieldname': u'exp_start_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'reqd': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'exp_end_date',
- 'fieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'exp_end_date',
+ 'fieldtype': u'Date',
'in_filter': 1,
- 'label': 'Expected End Date',
- 'oldfieldname': 'exp_end_date',
- 'oldfieldtype': 'Date',
+ 'label': u'Expected End Date',
+ 'oldfieldname': u'exp_end_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'reqd': 0,
'search_index': 1
@@ -499,78 +495,79 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'exp_total_hrs',
- 'fieldtype': 'Data',
- 'label': 'Total Hours (Expected)',
- 'oldfieldname': 'exp_total_hrs',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'exp_total_hrs',
+ 'fieldtype': u'Data',
+ 'label': u'Total Hours (Expected)',
+ 'oldfieldname': u'exp_total_hrs',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'allocated_budget',
- 'fieldtype': 'Currency',
- 'label': 'Allocated Budget',
- 'oldfieldname': 'allocated_budget',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'allocated_budget',
+ 'fieldtype': u'Currency',
+ 'label': u'Allocated Budget',
+ 'oldfieldname': u'allocated_budget',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'label': 'Actual',
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'actual',
+ 'fieldtype': u'Column Break',
+ 'label': u'Actual',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'act_start_date',
- 'fieldtype': 'Date',
- 'label': 'Actual Start Date',
- 'oldfieldname': 'act_start_date',
- 'oldfieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'act_start_date',
+ 'fieldtype': u'Date',
+ 'label': u'Actual Start Date',
+ 'oldfieldname': u'act_start_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'act_end_date',
- 'fieldtype': 'Date',
- 'label': 'Actual End Date',
- 'oldfieldname': 'act_end_date',
- 'oldfieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'act_end_date',
+ 'fieldtype': u'Date',
+ 'label': u'Actual End Date',
+ 'oldfieldname': u'act_end_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'act_total_hrs',
- 'fieldtype': 'Data',
- 'label': 'Total Hours (Actual)',
- 'oldfieldname': 'act_total_hrs',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'act_total_hrs',
+ 'fieldtype': u'Data',
+ 'label': u'Total Hours (Actual)',
+ 'oldfieldname': u'act_total_hrs',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'actual_budget',
- 'fieldtype': 'Currency',
- 'label': 'Actual Budget',
- 'oldfieldname': 'actual_budget',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'actual_budget',
+ 'fieldtype': u'Currency',
+ 'label': u'Actual Budget',
+ 'oldfieldname': u'actual_budget',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
}
]
\ No newline at end of file
diff --git a/erpnext/projects/doctype/timesheet/timesheet.txt b/erpnext/projects/doctype/timesheet/timesheet.txt
index 839da19..1ccb781 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.txt
+++ b/erpnext/projects/doctype/timesheet/timesheet.txt
@@ -3,50 +3,52 @@
# These values are common in all dictionaries
{
- 'creation': '2010-12-14 10:23:29',
+ 'creation': '2012-03-27 14:36:07',
'docstatus': 0,
- 'modified': '2011-02-23 11:22:29',
- 'modified_by': 'Administrator',
- 'owner': 'ashwini@webnotestech.com'
+ 'modified': '2012-03-27 18:47:10',
+ 'modified_by': u'Administrator',
+ 'owner': u'ashwini@webnotestech.com'
},
# These values are common for all DocType
{
- 'autoname': 'TimeSheet.#####',
- 'colour': 'White:FFF',
+ 'autoname': u'TimeSheet.#####',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'module': 'Projects',
+ 'is_submittable': 1,
+ 'module': u'Projects',
'name': '__common__',
- 'search_fields': 'status, owner, timesheet_date',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
- 'subject': '%(owner)s',
- 'version': 68
+ 'search_fields': u'status, owner, timesheet_date',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
+ 'show_in_menu': 0,
+ 'subject': u'%(owner)s',
+ 'version': 69
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Timesheet',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Timesheet',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Timesheet',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Timesheet',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Timesheet
{
'doctype': 'DocType',
- 'name': 'Timesheet'
+ 'name': u'Timesheet'
},
# DocPerm
@@ -54,18 +56,18 @@
'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Projects User',
+ 'role': u'Projects User',
'submit': 1,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Projects User'
+ 'role': u'Projects User'
},
# DocPerm
@@ -73,44 +75,41 @@
'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'submit': 1,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'System Manager'
+ 'role': u'System Manager'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 1,
- 'label': 'Timesheet Details',
+ 'doctype': u'DocField',
+ 'fieldname': u'timesheet_details_section_break',
+ 'fieldtype': u'Section Break',
+ 'label': u'Timesheet Details',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'default': 'Draft',
- 'doctype': 'DocField',
- 'fieldname': 'status',
- 'fieldtype': 'Select',
- 'idx': 2,
+ 'colour': u'White:FFF',
+ 'default': u'Draft',
+ 'doctype': u'DocField',
+ 'fieldname': u'status',
+ 'fieldtype': u'Select',
'in_filter': 0,
- 'label': 'Status',
- 'oldfieldname': 'status',
- 'oldfieldtype': 'Select',
- 'options': '\nDraft\nSubmitted\nCancelled',
+ 'label': u'Status',
+ 'oldfieldname': u'status',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nDraft\nSubmitted\nCancelled',
'permlevel': 1,
'reqd': 1,
'search_index': 1
@@ -118,16 +117,15 @@
# DocField
{
- 'colour': 'White:FFF',
- 'default': 'Today',
- 'doctype': 'DocField',
- 'fieldname': 'timesheet_date',
- 'fieldtype': 'Date',
- 'idx': 3,
+ 'colour': u'White:FFF',
+ 'default': u'Today',
+ 'doctype': u'DocField',
+ 'fieldname': u'timesheet_date',
+ 'fieldtype': u'Date',
'in_filter': 1,
- 'label': 'Timesheet Date',
- 'oldfieldname': 'timesheet_date',
- 'oldfieldtype': 'Date',
+ 'label': u'Timesheet Date',
+ 'oldfieldname': u'timesheet_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'reqd': 1,
'search_index': 1
@@ -135,15 +133,14 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'owner',
- 'fieldtype': 'Link',
- 'idx': 4,
+ 'doctype': u'DocField',
+ 'fieldname': u'owner',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Timesheet By',
- 'oldfieldname': 'owner',
- 'oldfieldtype': 'Link',
- 'options': 'Profile',
+ 'label': u'Timesheet By',
+ 'oldfieldname': u'owner',
+ 'oldfieldtype': u'Link',
+ 'options': u'Profile',
'permlevel': 0,
'reqd': 1,
'search_index': 0
@@ -151,69 +148,65 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amended_from',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'amended_from',
+ 'fieldtype': u'Data',
'hidden': 1,
- 'idx': 5,
- 'label': 'Amended From',
- 'oldfieldname': 'amended_from',
- 'oldfieldtype': 'Data',
+ 'label': u'Amended From',
+ 'oldfieldname': u'amended_from',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amendment_date',
- 'fieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'amendment_date',
+ 'fieldtype': u'Date',
'hidden': 1,
- 'idx': 6,
- 'label': 'Amendment Date',
- 'oldfieldname': 'amendment_date',
- 'oldfieldtype': 'Date',
+ 'label': u'Amendment Date',
+ 'oldfieldname': u'amendment_date',
+ 'oldfieldtype': u'Date',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 7,
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'notes',
- 'fieldtype': 'Text',
- 'idx': 8,
- 'label': 'Notes',
+ 'doctype': u'DocField',
+ 'fieldname': u'notes',
+ 'fieldtype': u'Text',
+ 'label': u'Notes',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 9,
- 'options': 'Simple',
+ 'doctype': u'DocField',
+ 'fieldname': u'section_break0',
+ 'fieldtype': u'Section Break',
+ 'options': u'Simple',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'timesheet_details',
- 'fieldtype': 'Table',
- 'idx': 10,
- 'label': 'Timesheet Details',
- 'oldfieldname': 'timesheet_details',
- 'oldfieldtype': 'Table',
- 'options': 'Timesheet Detail',
+ 'doctype': u'DocField',
+ 'fieldname': u'timesheet_details',
+ 'fieldtype': u'Table',
+ 'label': u'Timesheet Details',
+ 'oldfieldname': u'timesheet_details',
+ 'oldfieldtype': u'Table',
+ 'options': u'Timesheet Detail',
'permlevel': 0
}
]
\ No newline at end of file
diff --git a/erpnext/projects/doctype/timesheet_detail/timesheet_detail.txt b/erpnext/projects/doctype/timesheet_detail/timesheet_detail.txt
index 0098228..12e5b98 100644
--- a/erpnext/projects/doctype/timesheet_detail/timesheet_detail.txt
+++ b/erpnext/projects/doctype/timesheet_detail/timesheet_detail.txt
@@ -3,167 +3,158 @@
# These values are common in all dictionaries
{
- 'creation': '2011-02-23 11:22:29',
+ 'creation': '2012-03-27 14:36:07',
'docstatus': 0,
- 'modified': '2011-02-23 11:22:28',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:07',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'autoname': 'TSD.#####',
- 'colour': 'White:FFF',
+ 'autoname': u'TSD.#####',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'module': 'Projects',
+ 'module': u'Projects',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 15
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Timesheet Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Timesheet Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# DocType, Timesheet Detail
{
'doctype': 'DocType',
- 'name': 'Timesheet Detail'
+ 'name': u'Timesheet Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'act_start_time',
- 'fieldtype': 'Time',
- 'idx': 1,
- 'label': 'Actual Start Time',
- 'oldfieldname': 'act_start_time',
- 'oldfieldtype': 'Time',
+ 'doctype': u'DocField',
+ 'fieldname': u'act_start_time',
+ 'fieldtype': u'Time',
+ 'label': u'Actual Start Time',
+ 'oldfieldname': u'act_start_time',
+ 'oldfieldtype': u'Time',
'permlevel': 0,
'reqd': 1,
- 'width': '160px'
+ 'width': u'160px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'act_end_time',
- 'fieldtype': 'Time',
- 'idx': 2,
- 'label': 'Actual End Time',
- 'oldfieldname': 'act_end_time',
- 'oldfieldtype': 'Time',
+ 'doctype': u'DocField',
+ 'fieldname': u'act_end_time',
+ 'fieldtype': u'Time',
+ 'label': u'Actual End Time',
+ 'oldfieldname': u'act_end_time',
+ 'oldfieldtype': u'Time',
'permlevel': 0,
'reqd': 1,
- 'width': '160px'
+ 'width': u'160px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'activity_type',
- 'fieldtype': 'Link',
- 'idx': 3,
- 'label': 'Activity Type',
- 'options': 'Activity Type',
+ 'doctype': u'DocField',
+ 'fieldname': u'activity_type',
+ 'fieldtype': u'Link',
+ 'label': u'Activity Type',
+ 'options': u'Activity Type',
'permlevel': 0,
'reqd': 1,
'search_index': 0,
- 'width': '200px'
+ 'width': u'200px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'other_details',
- 'fieldtype': 'Text',
- 'idx': 4,
- 'label': 'Additional Info',
- 'oldfieldname': 'other_details',
- 'oldfieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'other_details',
+ 'fieldtype': u'Text',
+ 'label': u'Additional Info',
+ 'oldfieldname': u'other_details',
+ 'oldfieldtype': u'Text',
'permlevel': 0,
- 'width': '200px'
+ 'width': u'200px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'act_total_hrs',
- 'fieldtype': 'Data',
- 'idx': 5,
- 'label': 'Total Hours (Actual)',
- 'oldfieldname': 'act_total_hrs',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'act_total_hrs',
+ 'fieldtype': u'Data',
+ 'label': u'Total Hours (Actual)',
+ 'oldfieldname': u'act_total_hrs',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
- 'width': '100px'
+ 'width': u'100px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'customer_name',
- 'fieldtype': 'Link',
- 'idx': 6,
- 'label': 'Customer Name',
- 'oldfieldname': 'customer_name',
- 'oldfieldtype': 'Data',
- 'options': 'Customer',
+ 'doctype': u'DocField',
+ 'fieldname': u'customer_name',
+ 'fieldtype': u'Link',
+ 'label': u'Customer Name',
+ 'oldfieldname': u'customer_name',
+ 'oldfieldtype': u'Data',
+ 'options': u'Customer',
'permlevel': 0,
- 'width': '150px'
+ 'width': u'150px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'project_name',
- 'fieldtype': 'Link',
- 'idx': 7,
+ 'doctype': u'DocField',
+ 'fieldname': u'project_name',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Project',
- 'oldfieldname': 'project_name',
- 'oldfieldtype': 'Link',
- 'options': 'Project',
+ 'label': u'Project',
+ 'oldfieldname': u'project_name',
+ 'oldfieldtype': u'Link',
+ 'options': u'Project',
'permlevel': 0,
'reqd': 0,
'search_index': 1,
- 'width': '150px'
+ 'width': u'150px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'task_id',
- 'fieldtype': 'Link',
- 'idx': 8,
+ 'doctype': u'DocField',
+ 'fieldname': u'task_id',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Task Id',
- 'oldfieldname': 'task_id',
- 'oldfieldtype': 'Link',
- 'options': 'Ticket',
+ 'label': u'Task Id',
+ 'oldfieldname': u'task_id',
+ 'oldfieldtype': u'Link',
+ 'options': u'Ticket',
'permlevel': 0,
'search_index': 1,
- 'width': '150px'
+ 'width': u'150px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'task_name',
- 'fieldtype': 'Link',
- 'idx': 9,
- 'label': 'Task Name',
- 'oldfieldname': 'task_name',
- 'oldfieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'task_name',
+ 'fieldtype': u'Link',
+ 'label': u'Task Name',
+ 'oldfieldname': u'task_name',
+ 'oldfieldtype': u'Link',
'permlevel': 0,
'reqd': 0,
'search_index': 0,
- 'width': '250px'
+ 'width': u'250px'
}
]
\ No newline at end of file
diff --git a/erpnext/selling/Module Def/Selling/Selling.txt b/erpnext/selling/Module Def/Selling/Selling.txt
deleted file mode 100644
index 42c8449..0000000
--- a/erpnext/selling/Module Def/Selling/Selling.txt
+++ /dev/null
@@ -1,335 +0,0 @@
-# Module Def, Selling
-[
-
- # These values are common in all dictionaries
- {
- 'creation': '2011-07-01 17:39:08',
- 'docstatus': 0,
- 'modified': '2012-01-23 18:25:58',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
- },
-
- # These values are common for all Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'name': '__common__',
- 'parent': 'Selling',
- 'parentfield': 'roles',
- 'parenttype': 'Module Def'
- },
-
- # These values are common for all Module Def Item
- {
- 'doctype': 'Module Def Item',
- 'name': '__common__',
- 'parent': 'Selling',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
-
- # These values are common for all Module Def
- {
- 'disabled': 'No',
- 'doctype': u'Module Def',
- 'doctype_list': 'Print Format, Sales Order\nPrint Format, Quotation Format\nPrint Format, Delivery Note Format',
- 'file_list': 'crm.gif,FileData/00208',
- 'is_hidden': 'No',
- 'module_desc': 'Manage you sales team, with your leads, customers, quotes, orders etc.',
- 'module_icon': 'Selling.gif',
- 'module_label': 'Selling',
- 'module_name': 'Selling',
- 'module_seq': 3,
- 'name': '__common__'
- },
-
- # Module Def, Selling
- {
- 'doctype': u'Module Def',
- 'name': 'Selling'
- },
-
- # Module Def Item
- {
- 'description': 'Database of potential customers you need to keep in touch with',
- 'display_name': 'Lead',
- 'doc_name': 'Lead',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'status\nlead_owner\nlead_name\ncontact_no\ncontact_by\ncontact_date\nexpected_month'
- },
-
- # Module Def Item
- {
- 'description': 'Your Customer Database',
- 'display_name': 'Customer',
- 'doc_name': 'Customer',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'customer_group\ncountry'
- },
-
- # Module Def Item
- {
- 'description': 'Specific requirements from a Lead / Customer',
- 'display_name': 'Enquiry',
- 'doc_name': 'Enquiry',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'status\ntransaction_date\ncustomer\ncontact_person\ncost_center\ncompany'
- },
-
- # Module Def Item
- {
- 'description': 'Offers you have made to your customers',
- 'display_name': 'Quotation',
- 'doc_name': 'Quotation',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'status\ntransaction_date\ncustomer\ncontact_person\ncost_center\ngrand_total\ncompany'
- },
-
- # Module Def Item
- {
- 'description': 'Database of confirmed Sale Orders from your Customers',
- 'display_name': 'Sales Order',
- 'doc_name': 'Sales Order',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'status\ntransaction_date\ncustomer\ncost_center\ngrand_total\nper_delivered\nper_billed\ncompany'
- },
-
- # Module Def Item
- {
- 'display_name': 'Sales Dashboard',
- 'doc_name': 'Sales Dashboard',
- 'doc_type': 'Pages',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'doc_name': 'Reports',
- 'doc_type': 'Separator',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'doc_name': 'Reports',
- 'doc_type': 'Separator',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Gross Profit',
- 'doc_name': 'Delivery Note Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Territory, Item Group wise GP',
- 'doc_name': 'Delivery Note',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Itemwise Sales Details',
- 'doc_name': 'Sales Order Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Itemwise Delivery Details',
- 'doc_name': 'Delivery Note Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Sales Personwise Transaction Summary',
- 'doc_name': 'Sales Person',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Total Target Variance Report',
- 'doc_name': 'Target Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Sales Persons Target Variance (Item Group wise)',
- 'doc_name': 'Target Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Territories Target Variance (Item Group wise)',
- 'doc_name': 'Target Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Sales Order Pending Items',
- 'doc_name': 'Sales Order Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Sales Orderwise Booking & Delivery Summary',
- 'doc_name': 'Sales Order Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Sales Orderwise Pending Qty To Deliver',
- 'doc_name': 'Sales Order Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Sales Orderwise Pending Amount To Bill',
- 'doc_name': 'Sales Order Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Delivered Items to be Install',
- 'doc_name': 'Delivery Note Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Itemwise Price List',
- 'doc_name': 'Ref Rate Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Follow-up Report',
- 'doc_name': 'Follow up',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'description': 'Ledger details of your debtors',
- 'display_name': "Debtor's Ledger",
- 'doc_name': 'GL Entry',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'description': 'Report displaying Customer, Primary Address Details & Primary Contact Details',
- 'display_name': 'Customer Address Contact',
- 'doc_name': 'Customer',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'description': 'Customer Category',
- 'display_name': 'Customer Group',
- 'doc_name': 'Customer Group',
- 'doc_type': 'Setup Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'id\ndescription'
- },
-
- # Module Def Item
- {
- 'description': 'Sales person details',
- 'display_name': 'Sales Person',
- 'doc_name': 'Sales Person',
- 'doc_type': 'Setup Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'id\nterritory\ndepartment\nmobile_no\nemail_id'
- },
-
- # Module Def Item
- {
- 'description': 'Item master',
- 'display_name': 'Item',
- 'doc_name': 'Item',
- 'doc_type': 'Setup Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'name\nitem_group\ndescription'
- },
-
- # Module Def Item
- {
- 'description': 'Sales partner details',
- 'display_name': 'Sales Partner',
- 'doc_name': 'Sales Partner',
- 'doc_type': 'Setup Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'id\npartner_type\nmobile\nemail\nterritory'
- },
-
- # Module Def Item
- {
- 'description': 'Business campaigns',
- 'display_name': 'Campaign',
- 'doc_name': 'Campaign',
- 'doc_type': 'Setup Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'id\ncampaign_name\ndescription'
- },
-
- # Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'role': 'Administrator'
- },
-
- # Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'role': 'Sales Manager'
- },
-
- # Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'role': 'Sales User'
- },
-
- # Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'role': 'Sales Master Manager'
- }
-]
\ No newline at end of file
diff --git a/erpnext/selling/doctype/campaign/campaign.txt b/erpnext/selling/doctype/campaign/campaign.txt
index 8810cb8..0912fe7 100644
--- a/erpnext/selling/doctype/campaign/campaign.txt
+++ b/erpnext/selling/doctype/campaign/campaign.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:54',
+ 'creation': '2012-03-27 14:36:07',
'docstatus': 0,
- 'modified': '2012-02-20 18:06:32',
+ 'modified': '2012-03-27 14:36:07',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -36,12 +36,84 @@
'parenttype': u'DocType'
},
+ # These values are common for all DocPerm
+ {
+ 'amend': 0,
+ 'doctype': u'DocPerm',
+ 'name': '__common__',
+ 'parent': u'Campaign',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
+ 'read': 1,
+ 'submit': 0
+ },
+
# DocType, Campaign
{
'doctype': 'DocType',
'name': u'Campaign'
},
+ # DocPerm
+ {
+ 'cancel': 1,
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Sales Master Manager',
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Sales Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales Master Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales User',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Sales User',
+ 'write': 0
+ },
+
# DocField
{
'doctype': u'DocField',
@@ -56,6 +128,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'campaign',
'fieldtype': u'Section Break',
'label': u'Campaign',
'oldfieldtype': u'Section Break',
diff --git a/erpnext/selling/doctype/customer/customer.js b/erpnext/selling/doctype/customer/customer.js
index 89b95fa..9f5f717 100644
--- a/erpnext/selling/doctype/customer/customer.js
+++ b/erpnext/selling/doctype/customer/customer.js
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-$import(Contact Control)
+wn.require('erpnext/setup/doctype/contact_control/contact_control.js');
/* ********************************* onload ********************************************* */
@@ -68,19 +68,10 @@
cur_frm.cscript.make_address = function() {
if(!cur_frm.address_list) {
- cur_frm.address_list = new wn.widgets.Listing({
+ cur_frm.address_list = new wn.ui.Listing({
parent: cur_frm.fields_dict['Address HTML'].wrapper,
page_length: 2,
new_doctype: "Address",
- new_doc_onload: function(dn) {
- ndoc = locals["Address"][dn];
- ndoc.customer = cur_frm.doc.name;
- ndoc.customer_name = cur_frm.doc.customer_name;
- ndoc.address_type = 'Office';
- },
- new_doc_onsave: function(dn) {
- cur_frm.address_list.run()
- },
get_query: function() {
return "select name, address_type, address_line1, address_line2, city, state, country, pincode, fax, email_id, phone, is_primary_address, is_shipping_address from tabAddress where customer='"+cur_frm.docname+"' and docstatus != 2 order by is_primary_address desc"
},
@@ -110,21 +101,10 @@
cur_frm.cscript.make_contact = function() {
if(!cur_frm.contact_list) {
- cur_frm.contact_list = new wn.widgets.Listing({
+ cur_frm.contact_list = new wn.ui.Listing({
parent: cur_frm.fields_dict['Contact HTML'].wrapper,
page_length: 2,
new_doctype: "Contact",
- new_doc_onload: function(dn) {
- ndoc = locals["Contact"][dn];
- ndoc.customer = cur_frm.doc.name;
- ndoc.customer_name = cur_frm.doc.customer_name;
- if(cur_frm.doc.customer_type == 'Individual') {
- ndoc.first_name = cur_frm.doc.customer_name;
- }
- },
- new_doc_onsave: function(dn) {
- cur_frm.contact_list.run()
- },
get_query: function() {
return "select name, first_name, last_name, email_id, phone, mobile_no, department, designation, is_primary_contact from tabContact where customer='"+cur_frm.docname+"' and docstatus != 2 order by is_primary_contact desc"
},
@@ -174,6 +154,7 @@
// make quotation list
// --------------------
cur_frm.cscript.make_qtn_list = function(parent,doc){
+ wn.require('lib/js/legacy/widgets/listing.js');
var lst = new Listing();
lst.colwidths = ['5%','20%','20%','20%','20%','15%'];
@@ -191,6 +172,8 @@
// make so list
// -------------
cur_frm.cscript.make_so_list = function(parent,doc){
+ wn.require('lib/js/legacy/widgets/listing.js');
+
var lst = new Listing();
lst.colwidths = ['5%','20%','20%','30%','25%'];
lst.colnames = ['Sr.','Id','Status','Sales Order Date','Grand Total'];
@@ -207,6 +190,8 @@
// make dn list
// -------------
cur_frm.cscript.make_dn_list = function(parent,doc){
+ wn.require('lib/js/legacy/widgets/listing.js');
+
var lst = new Listing();
lst.colwidths = ['5%','20%','20%','20%','20%','15%'];
lst.colnames = ['Sr.','Id','Status','Delivery Note Date','Territory','Grand Total'];
@@ -223,6 +208,8 @@
// make si list
// -------------
cur_frm.cscript.make_si_list = function(parent,doc){
+ wn.require('lib/js/legacy/widgets/listing.js');
+
var lst = new Listing();
lst.colwidths = ['5%','20%','20%','20%','20%','15%'];
lst.colnames = ['Sr.','Id','Posting Date','Due Date','Debit To','Grand Total'];
diff --git a/erpnext/selling/doctype/customer/customer.txt b/erpnext/selling/doctype/customer/customer.txt
index 993dc29..59105b3 100644
--- a/erpnext/selling/doctype/customer/customer.txt
+++ b/erpnext/selling/doctype/customer/customer.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:56',
+ 'creation': '2012-03-27 14:36:07',
'docstatus': 0,
- 'modified': '2012-02-29 13:24:31',
+ 'modified': '2012-03-27 18:47:38',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -27,7 +27,7 @@
'show_in_menu': 0,
'subject': u'eval:"%(customer_name)s"=="%(name)s" ? "" : "%(customer_name)s"',
'tag_fields': u'customer_group,customer_type',
- 'version': 434
+ 'version': 435
},
# These values are common for all DocField
@@ -59,46 +59,6 @@
# DocPerm
{
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Sales Manager',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Sales Manager',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Sales User',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Sales User',
- 'write': 0
- },
-
- # DocPerm
- {
'cancel': 1,
'create': 1,
'doctype': u'DocPerm',
@@ -117,11 +77,52 @@
'write': 0
},
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Sales Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales User',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Sales User',
+ 'write': 0
+ },
+
# DocField
{
'colour': u'White:FFF',
'description': u'Note: You Can Manage Multiple Address or Contacts via Addresses & Contacts',
'doctype': u'DocField',
+ 'fieldname': u'basic_info',
'fieldtype': u'Section Break',
'label': u'Basic Info',
'oldfieldtype': u'Section Break',
@@ -195,6 +196,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break0',
'fieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
@@ -241,6 +243,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'address_contacts',
'fieldtype': u'Section Break',
'label': u'Address & Contacts',
'permlevel': 0
@@ -251,6 +254,7 @@
'colour': u'White:FFF',
'depends_on': u'eval:doc.__islocal',
'doctype': u'DocField',
+ 'fieldname': u'address_desc',
'fieldtype': u'HTML',
'label': u'Address Desc',
'options': u'<em>Addresses will appear only when you save the customer</em>',
@@ -261,6 +265,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'address_html',
'fieldtype': u'HTML',
'label': u'Address HTML',
'permlevel': 1
@@ -269,6 +274,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break1',
'fieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
@@ -279,6 +285,7 @@
'colour': u'White:FFF',
'depends_on': u'eval:doc.__islocal',
'doctype': u'DocField',
+ 'fieldname': u'contact_desc',
'fieldtype': u'HTML',
'label': u'Contact Desc',
'options': u'<em>Contact Details will appear only when you save the customer</em>',
@@ -289,6 +296,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'contact_html',
'fieldtype': u'HTML',
'label': u'Contact HTML',
'oldfieldtype': u'HTML',
@@ -299,6 +307,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'more_info',
'fieldtype': u'Section Break',
'label': u'More Info',
'oldfieldtype': u'Section Break',
@@ -308,6 +317,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break2',
'fieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
@@ -346,6 +356,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break3',
'fieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
@@ -385,6 +396,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'sales_team_section_break',
'fieldtype': u'Section Break',
'label': u'Sales Team',
'oldfieldtype': u'Section Break',
@@ -431,6 +443,7 @@
'colour': u'White:FFF',
'depends_on': u'eval:!doc.__islocal',
'doctype': u'DocField',
+ 'fieldname': u'transaction_history',
'fieldtype': u'Section Break',
'label': u'Transaction History',
'permlevel': 0
@@ -441,6 +454,7 @@
'colour': u'White:FFF',
'depends_on': u'eval:!doc.__islocal',
'doctype': u'DocField',
+ 'fieldname': u'history_html',
'fieldtype': u'HTML',
'label': u'History HTML',
'permlevel': 0
diff --git a/erpnext/selling/doctype/enquiry/enquiry.js b/erpnext/selling/doctype/enquiry/enquiry.js
index c3f0a0b..bf2628f 100644
--- a/erpnext/selling/doctype/enquiry/enquiry.js
+++ b/erpnext/selling/doctype/enquiry/enquiry.js
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-$import(SMS Control)
+wn.require('erpnext/utilities/doctype/sms_control/sms_control.js');
cur_frm.cscript.refresh = function(doc, cdt, cdn){
diff --git a/erpnext/selling/doctype/enquiry/enquiry.txt b/erpnext/selling/doctype/enquiry/enquiry.txt
index 0a21d8a..90ec74d 100644
--- a/erpnext/selling/doctype/enquiry/enquiry.txt
+++ b/erpnext/selling/doctype/enquiry/enquiry.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:00',
+ 'creation': '2012-03-27 14:36:08',
'docstatus': 0,
- 'modified': '2012-03-07 13:10:00',
+ 'modified': '2012-03-27 14:45:47',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -17,6 +17,7 @@
'default_print_format': u'Standard',
'doctype': 'DocType',
'document_type': u'Transaction',
+ 'is_submittable': 1,
'module': u'Selling',
'name': '__common__',
'search_fields': u'status,transaction_date,customer,lead,enquiry_type,territory,company',
@@ -54,18 +55,6 @@
# DocPerm
{
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Sales Manager',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
'amend': 1,
'cancel': 1,
'create': 1,
@@ -119,11 +108,24 @@
'write': 1
},
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales Manager',
+ 'submit': 0,
+ 'write': 0
+ },
+
# DocField
{
'colour': u'White:FFF',
'description': u'Enter customer enquiry for which you might raise a quotation in future',
'doctype': u'DocField',
+ 'fieldname': u'basic_info',
'fieldtype': u'Section Break',
'label': u'Basic Info',
'oldfieldtype': u'Section Break',
@@ -288,6 +290,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break0',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -409,6 +412,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'items',
'fieldtype': u'Section Break',
'label': u'Items',
'oldfieldtype': u'Section Break',
@@ -434,6 +438,7 @@
'colour': u'White:FFF',
'description': u'Filing in Additional Information about the Enquiry will help you analyze your data better.',
'doctype': u'DocField',
+ 'fieldname': u'more_info',
'fieldtype': u'Section Break',
'label': u'More Info',
'oldfieldtype': u'Section Break',
@@ -443,6 +448,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break1',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -525,6 +531,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break2',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -594,6 +601,7 @@
'colour': u'White:FFF',
'description': u'Keep a track of communication related to this enquiry which will help for future reference.',
'doctype': u'DocField',
+ 'fieldname': u'communication_history',
'fieldtype': u'Section Break',
'label': u'Communication History',
'oldfieldtype': u'Section Break',
diff --git a/erpnext/selling/doctype/enquiry_detail/enquiry_detail.txt b/erpnext/selling/doctype/enquiry_detail/enquiry_detail.txt
index 284b436..f1c0e36 100644
--- a/erpnext/selling/doctype/enquiry_detail/enquiry_detail.txt
+++ b/erpnext/selling/doctype/enquiry_detail/enquiry_detail.txt
@@ -3,146 +3,138 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:01',
+ 'creation': '2012-03-27 14:36:08',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'yogesh@webnotestech.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:08',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Selling',
+ 'module': u'Selling',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 59
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Enquiry Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Enquiry Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, Enquiry Detail
{
'doctype': 'DocType',
- 'name': 'Enquiry Detail'
+ 'name': u'Enquiry Detail'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'item_code',
- 'fieldtype': 'Link',
- 'idx': 1,
- 'label': 'Item Code',
- 'oldfieldname': 'item_code',
- 'oldfieldtype': 'Link',
- 'options': 'Item',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'item_code',
+ 'fieldtype': u'Link',
+ 'label': u'Item Code',
+ 'oldfieldname': u'item_code',
+ 'oldfieldtype': u'Link',
+ 'options': u'Item',
'reqd': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'item_name',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Item Name',
- 'oldfieldname': 'item_name',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'item_name',
+ 'fieldtype': u'Data',
+ 'label': u'Item Name',
+ 'oldfieldname': u'item_name',
+ 'oldfieldtype': u'Data',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Text',
- 'idx': 3,
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Text',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Text',
'reqd': 1,
- 'width': '300px'
+ 'width': u'300px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'item_group',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'item_group',
+ 'fieldtype': u'Link',
'hidden': 1,
- 'idx': 6,
- 'label': 'Item Group',
- 'oldfieldname': 'item_group',
- 'oldfieldtype': 'Link',
- 'options': 'Item Group',
+ 'label': u'Item Group',
+ 'oldfieldname': u'item_group',
+ 'oldfieldtype': u'Link',
+ 'options': u'Item Group',
'print_hide': 1,
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'brand',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'brand',
+ 'fieldtype': u'Link',
'hidden': 1,
- 'idx': 7,
- 'label': 'Brand',
- 'oldfieldname': 'brand',
- 'oldfieldtype': 'Link',
- 'options': 'Brand',
+ 'label': u'Brand',
+ 'oldfieldname': u'brand',
+ 'oldfieldtype': u'Link',
+ 'options': u'Brand',
'print_hide': 1,
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'basic_rate',
- 'fieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'basic_rate',
+ 'fieldtype': u'Currency',
'hidden': 1,
- 'idx': 8,
- 'label': 'Basic Rate',
- 'oldfieldname': 'basic_rate',
- 'oldfieldtype': 'Currency',
+ 'label': u'Basic Rate',
+ 'oldfieldname': u'basic_rate',
+ 'oldfieldtype': u'Currency',
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'qty',
- 'fieldtype': 'Currency',
- 'idx': 9,
- 'label': 'Qty',
- 'oldfieldname': 'qty',
- 'oldfieldtype': 'Currency'
+ 'doctype': u'DocField',
+ 'fieldname': u'qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Qty',
+ 'oldfieldname': u'qty',
+ 'oldfieldtype': u'Currency'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'uom',
- 'fieldtype': 'Link',
- 'idx': 10,
- 'label': 'UOM',
- 'oldfieldname': 'uom',
- 'oldfieldtype': 'Link',
- 'options': 'UOM',
+ 'doctype': u'DocField',
+ 'fieldname': u'uom',
+ 'fieldtype': u'Link',
+ 'label': u'UOM',
+ 'oldfieldname': u'uom',
+ 'oldfieldtype': u'Link',
+ 'options': u'UOM',
'search_index': 0
}
]
\ No newline at end of file
diff --git a/erpnext/selling/doctype/follow_up/follow_up.txt b/erpnext/selling/doctype/follow_up/follow_up.txt
index 4c1338e..496b587 100644
--- a/erpnext/selling/doctype/follow_up/follow_up.txt
+++ b/erpnext/selling/doctype/follow_up/follow_up.txt
@@ -3,22 +3,22 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:02',
+ 'creation': '2012-03-27 14:36:09',
'docstatus': 0,
- 'modified': '2010-10-13 12:06:26',
- 'modified_by': 'yogesh@webnotestech.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:09',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Selling',
+ 'module': u'Selling',
'name': '__common__',
- 'section_style': 'Tray',
- 'server_code_error': ' ',
+ 'section_style': u'Tray',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 10
},
@@ -26,69 +26,65 @@
# These values are common for all DocField
{
'allow_on_submit': 1,
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Follow up',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Follow up',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, Follow up
{
'doctype': 'DocType',
- 'name': 'Follow up'
+ 'name': u'Follow up'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'date',
- 'fieldtype': 'Date',
- 'idx': 1,
+ 'doctype': u'DocField',
+ 'fieldname': u'date',
+ 'fieldtype': u'Date',
'in_filter': 1,
- 'label': 'Date',
- 'oldfieldname': 'date',
- 'oldfieldtype': 'Date'
+ 'label': u'Date',
+ 'oldfieldname': u'date',
+ 'oldfieldtype': u'Date'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'notes',
- 'fieldtype': 'Small Text',
- 'idx': 2,
+ 'doctype': u'DocField',
+ 'fieldname': u'notes',
+ 'fieldtype': u'Small Text',
'in_filter': 0,
- 'label': 'Notes',
- 'oldfieldname': 'notes',
- 'oldfieldtype': 'Small Text',
- 'width': '300px'
+ 'label': u'Notes',
+ 'oldfieldname': u'notes',
+ 'oldfieldtype': u'Small Text',
+ 'width': u'300px'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'follow_up_type',
- 'fieldtype': 'Select',
- 'idx': 3,
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'follow_up_type',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Follow up type',
- 'oldfieldname': 'follow_up_type',
- 'oldfieldtype': 'Select',
- 'options': '\nPhone\nEmail\nSMS\nVisit\nOther'
+ 'label': u'Follow up type',
+ 'oldfieldname': u'follow_up_type',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nPhone\nEmail\nSMS\nVisit\nOther'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'follow_up_by',
- 'fieldtype': 'Link',
- 'idx': 4,
+ 'doctype': u'DocField',
+ 'fieldname': u'follow_up_by',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Follow up by',
- 'oldfieldname': 'follow_up_by',
- 'oldfieldtype': 'Link',
- 'options': 'Sales Person'
+ 'label': u'Follow up by',
+ 'oldfieldname': u'follow_up_by',
+ 'oldfieldtype': u'Link',
+ 'options': u'Sales Person'
}
]
\ No newline at end of file
diff --git a/erpnext/selling/doctype/industry_type/industry_type.txt b/erpnext/selling/doctype/industry_type/industry_type.txt
index 71bfa9f..7e836cd 100644
--- a/erpnext/selling/doctype/industry_type/industry_type.txt
+++ b/erpnext/selling/doctype/industry_type/industry_type.txt
@@ -3,50 +3,49 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:04',
+ 'creation': '2012-03-27 14:36:09',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'harshada@webnotestech.com'
+ 'modified': '2012-03-27 14:36:09',
+ 'modified_by': u'Administrator',
+ 'owner': u'harshada@webnotestech.com'
},
# These values are common for all DocType
{
- 'autoname': 'field:industry',
- 'colour': 'White:FFF',
+ 'autoname': u'field:industry',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'Selling',
+ 'document_type': u'Master',
+ 'module': u'Selling',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 4
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'industry',
- 'fieldtype': 'Data',
- 'idx': 1,
- 'label': 'Industry',
+ 'doctype': u'DocField',
+ 'fieldname': u'industry',
+ 'fieldtype': u'Data',
+ 'label': u'Industry',
'name': '__common__',
- 'oldfieldname': 'industry',
- 'oldfieldtype': 'Data',
- 'parent': 'Industry Type',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'oldfieldname': u'industry',
+ 'oldfieldtype': u'Data',
+ 'parent': u'Industry Type',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0,
'reqd': 1
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Industry Type',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Industry Type',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1
},
@@ -54,36 +53,33 @@
# DocType, Industry Type
{
'doctype': 'DocType',
- 'name': 'Industry Type'
+ 'name': u'Industry Type'
},
# DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'role': 'Sales Manager',
+ 'doctype': u'DocPerm',
+ 'role': u'Sales Manager',
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'role': 'Sales User'
+ 'doctype': u'DocPerm',
+ 'role': u'Sales User'
},
# DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 3,
- 'role': 'Sales Master Manager',
+ 'doctype': u'DocPerm',
+ 'role': u'Sales Master Manager',
'write': 1
},
# DocField
{
- 'doctype': 'DocField'
+ 'doctype': u'DocField'
}
]
\ No newline at end of file
diff --git a/erpnext/selling/doctype/installation_note/installation_note.txt b/erpnext/selling/doctype/installation_note/installation_note.txt
index f71a5f7..7660910 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.txt
+++ b/erpnext/selling/doctype/installation_note/installation_note.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:04',
+ 'creation': '2012-03-27 14:36:09',
'docstatus': 0,
- 'modified': '2012-03-21 14:08:59',
+ 'modified': '2012-03-27 18:48:02',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -17,13 +17,14 @@
'colour': u'White:FFF',
'default_print_format': u'Standard',
'doctype': 'DocType',
+ 'is_submittable': 1,
'module': u'Selling',
'name': '__common__',
'section_style': u'Simple',
'server_code_error': u' ',
'show_in_menu': 0,
'subject': u'At %(customer_name)s on %(inst_date)s',
- 'version': 97
+ 'version': 98
},
# These values are common for all DocField
@@ -84,13 +85,6 @@
# DocPerm
{
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Sales User'
- },
-
- # DocPerm
- {
'amend': 1,
'cancel': 1,
'create': 1,
@@ -105,12 +99,20 @@
{
'doctype': u'DocPerm',
'permlevel': 1,
+ 'role': u'Sales User'
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
'role': u'Sales Manager'
},
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'installation_note',
'fieldtype': u'Section Break',
'label': u'Installation Note',
'oldfieldtype': u'Section Break',
@@ -120,6 +122,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break0',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -257,6 +260,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break1',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -396,6 +400,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'item_details',
'fieldtype': u'Section Break',
'label': u'Item Details',
'oldfieldtype': u'Section Break',
@@ -424,18 +429,7 @@
# DocField
{
'doctype': u'DocField',
- 'fieldtype': u'Button',
- 'hidden': 0,
- 'label': u'Get Items',
- 'oldfieldtype': u'Button',
- 'options': u'pull_delivery_note_details',
- 'permlevel': 0,
- 'print_hide': 1
- },
-
- # DocField
- {
- 'doctype': u'DocField',
+ 'fieldname': u'get_items',
'fieldtype': u'Button',
'hidden': 0,
'label': u'Get Items',
diff --git a/erpnext/selling/doctype/installed_item_details/installed_item_details.txt b/erpnext/selling/doctype/installed_item_details/installed_item_details.txt
index 0aa4c1b..e8aadd6 100644
--- a/erpnext/selling/doctype/installed_item_details/installed_item_details.txt
+++ b/erpnext/selling/doctype/installed_item_details/installed_item_details.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:05',
+ 'creation': '2012-03-27 14:36:10',
'docstatus': 0,
- 'modified': '2012-03-21 14:52:10',
+ 'modified': '2012-03-27 14:36:10',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/selling/doctype/lead/lead.js b/erpnext/selling/doctype/lead/lead.js
index 7255636..a32acf7 100644
--- a/erpnext/selling/doctype/lead/lead.js
+++ b/erpnext/selling/doctype/lead/lead.js
@@ -16,7 +16,7 @@
// Module CRM
-$import(SMS Control)
+wn.require('erpnext/utilities/doctype/sms_control/sms_control.js');
cur_frm.cscript.onload = function(doc, cdt, cdn) {
if(user =='Guest'){
diff --git a/erpnext/selling/doctype/lead/lead.txt b/erpnext/selling/doctype/lead/lead.txt
index 2a0cf9a..2a7df90 100644
--- a/erpnext/selling/doctype/lead/lead.txt
+++ b/erpnext/selling/doctype/lead/lead.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:07',
+ 'creation': '2012-03-27 14:36:10',
'docstatus': 0,
- 'modified': '2012-03-21 14:35:34',
+ 'modified': '2012-03-27 14:36:10',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -56,26 +56,21 @@
# DocPerm
{
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
- 'role': u'Sales User',
- 'submit': 0,
- 'write': 0
+ 'role': u'All'
},
# DocPerm
{
'amend': 0,
'cancel': 0,
- 'create': 0,
+ 'create': 1,
'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Sales Manager',
+ 'permlevel': 0,
+ 'role': u'Sales User',
'submit': 0,
- 'write': 0
+ 'write': 1
},
# DocPerm
@@ -96,28 +91,44 @@
'cancel': 0,
'create': 1,
'doctype': u'DocPerm',
+ 'match': u'owner',
'permlevel': 0,
- 'role': u'Sales User',
+ 'role': u'System Manager',
'submit': 0,
'write': 1
},
# DocPerm
{
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
- 'role': u'All'
+ 'role': u'Sales Manager',
+ 'submit': 0,
+ 'write': 0
},
# DocPerm
{
'amend': 0,
'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales User',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
'create': 1,
'doctype': u'DocPerm',
+ 'match': u'territory',
'permlevel': 0,
'role': u'System Manager',
- 'submit': 0,
'write': 1
},
@@ -134,6 +145,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'basic_info',
'fieldtype': u'Section Break',
'label': u'Basic Info',
'oldfieldtype': u'Section Break',
@@ -143,6 +155,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break0',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -285,6 +298,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break1',
'fieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
@@ -376,6 +390,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'contact_info',
'fieldtype': u'Section Break',
'label': u'Contact Info',
'oldfieldtype': u'Column Break',
@@ -458,6 +473,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break2',
'fieldtype': u'Column Break',
'permlevel': 0
},
@@ -545,6 +561,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'more_info',
'fieldtype': u'Section Break',
'label': u'More Info',
'oldfieldtype': u'Section Break',
@@ -637,6 +654,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break3',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -715,6 +733,7 @@
'colour': u'White:FFF',
'description': u'Keep a track of communication with this lead which will help for future reference.',
'doctype': u'DocField',
+ 'fieldname': u'communication_history',
'fieldtype': u'Section Break',
'label': u'Communication History',
'oldfieldtype': u'Section Break',
diff --git a/erpnext/selling/doctype/lead/listview.js b/erpnext/selling/doctype/lead/listview.js
new file mode 100644
index 0000000..b5ed6b8
--- /dev/null
+++ b/erpnext/selling/doctype/lead/listview.js
@@ -0,0 +1,32 @@
+wn.doclistviews['Lead'] = wn.views.ListView.extend({
+ init: function(d) {
+ this._super(d)
+ this.fields = this.fields.concat([
+ 'tabLead.lead_name',
+ 'tabLead.status',
+ 'tabLead.source',
+ 'tabLead.rating'
+ ]);
+ this.stats = this.stats.concat(['status', 'source', 'rating']);
+ },
+
+ prepare_data: function(data) {
+ this._super(data);
+ if(data.status=='Interested') {
+ data.label_type = 'success'
+ }
+ else if(['Open', 'Attempted to Contact', 'Contacted', 'Contact in Future'].indexOf(data.status)!=-1) {
+ data.label_type = 'info'
+ }
+ data.status_html = repl('<span class="label label-%(label_type)s">%(status)s</span>', data);
+
+ data.lead_name = (data.rating ? ('['+data.rating+'] ') : '') + '['+data.source+'] ' + data.lead_name;
+ },
+
+ columns: [
+ {width: '20%', content:'name'},
+ {width: '12%', content:'status_html'},
+ {width: '55%', content:'tags+lead_name', css: {color:'#aaa'}},
+ {width: '13%', content:'modified', css: {'text-align': 'right', 'color':'#777'}}
+ ]
+})
diff --git a/erpnext/selling/doctype/plot_control/plot_control.txt b/erpnext/selling/doctype/plot_control/plot_control.txt
index c6564d7..00af5f1 100644
--- a/erpnext/selling/doctype/plot_control/plot_control.txt
+++ b/erpnext/selling/doctype/plot_control/plot_control.txt
@@ -3,28 +3,28 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:12',
+ 'creation': '2012-03-27 14:36:12',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'harshada@webnotestech.com'
+ 'modified': '2012-03-27 14:36:12',
+ 'modified_by': u'Administrator',
+ 'owner': u'harshada@webnotestech.com'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'issingle': 1,
- 'module': 'Selling',
+ 'module': u'Selling',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 215
},
# DocType, Plot Control
{
'doctype': 'DocType',
- 'name': 'Plot Control'
+ 'name': u'Plot Control'
}
]
\ No newline at end of file
diff --git a/erpnext/selling/doctype/quotation/quotation.js b/erpnext/selling/doctype/quotation/quotation.js
index 910f54e..12d6d1e 100644
--- a/erpnext/selling/doctype/quotation/quotation.js
+++ b/erpnext/selling/doctype/quotation/quotation.js
@@ -21,9 +21,10 @@
cur_frm.cscript.sales_team_fname = "sales_team";
// =====================================================================================
-$import(Sales Common)
-$import(Other Charges)
-$import(SMS Control)
+wn.require('erpnext/selling/doctype/sales_common/sales_common.js');
+wn.require('erpnext/setup/doctype/other_charges/other_charges.js');
+wn.require('erpnext/utilities/doctype/sms_control/sms_control.js');
+wn.require('erpnext/setup/doctype/notification_control/notification_control.js');
// ONLOAD
// ===================================================================================
@@ -102,12 +103,19 @@
cur_frm.refresh();
}
- if(doc.customer) $c_obj(make_doclist(doc.doctype, doc.name), 'get_default_customer_address', '', callback);
- if(doc.customer) unhide_field(['customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group']);
+ if(doc.customer) $c_obj(make_doclist(doc.doctype, doc.name),
+ 'get_default_customer_address', '', callback);
+ if(doc.customer) unhide_field(['customer_address','contact_person','customer_name',
+ 'address_display','contact_display','contact_mobile','contact_email','territory',
+ 'customer_group']);
}
cur_frm.cscript.customer_address = cur_frm.cscript.contact_person = function(doc,dt,dn) {
- if(doc.customer) get_server_fields('get_customer_address', JSON.stringify({customer: doc.customer, address: doc.customer_address, contact: doc.contact_person}),'', doc, dt, dn, 1);
+ if(doc.customer) get_server_fields('get_customer_address', JSON.stringify({
+ customer: doc.customer,
+ address: doc.customer_address,
+ contact: doc.contact_person
+ }),'', doc, dt, dn, 1);
}
cur_frm.fields_dict.customer_address.on_new = function(dn) {
@@ -321,7 +329,6 @@
return repl("SELECT name, item_name, description FROM tabItem WHERE `tabItem`.%(key)s LIKE '%s' %(cond)s ORDER BY tabItem.item_code DESC LIMIT 50", {cond:cond});
}
-$import(Notification Control)
cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
var args = {
type: 'Quotation',
diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py
index 27206b2..f185468 100644
--- a/erpnext/selling/doctype/quotation/quotation.py
+++ b/erpnext/selling/doctype/quotation/quotation.py
@@ -77,7 +77,8 @@
# Get Item Details
# -----------------
def get_item_details(self, args=None):
- args = args and eval(args) or {}
+ import json
+ args = args and json.loads(args) or {}
if args.get('item_code'):
return get_obj('Sales Common').get_item_details(args, self)
else:
diff --git a/erpnext/selling/doctype/quotation/quotation.txt b/erpnext/selling/doctype/quotation/quotation.txt
index 39a7327..e313e2d 100644
--- a/erpnext/selling/doctype/quotation/quotation.txt
+++ b/erpnext/selling/doctype/quotation/quotation.txt
@@ -3,22 +3,13 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:17',
+ 'creation': '2012-03-27 14:36:12',
'docstatus': 0,
- 'modified': '2012-03-20 14:56:28',
+ 'modified': '2012-03-27 18:48:29',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Quotation',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
# These values are common for all DocType
{
'_last_update': u'1332235370',
@@ -30,6 +21,7 @@
'doctype': 'DocType',
'document_type': u'Transaction',
'hide_toolbar': 0,
+ 'is_submittable': 1,
'is_transaction_doc': 1,
'max_attachments': 1,
'module': u'Selling',
@@ -41,15 +33,15 @@
'show_in_menu': 0,
'subject': u'To %(customer_name)s on %(transaction_date)s worth %(currency)s %(grand_total_export)s',
'tag_fields': u'status',
- 'version': 621
+ 'version': 622
},
- # These values are common for all DocFormat
+ # These values are common for all DocField
{
- 'doctype': u'DocFormat',
+ 'doctype': u'DocField',
'name': '__common__',
'parent': u'Quotation',
- 'parentfield': u'formats',
+ 'parentfield': u'fields',
'parenttype': u'DocType'
},
@@ -76,21 +68,21 @@
'create': 1,
'doctype': u'DocPerm',
'permlevel': 0,
- 'role': u'Sales Manager',
+ 'role': u'Sales User',
'submit': 1,
'write': 1
},
# DocPerm
{
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
'doctype': u'DocPerm',
- 'permlevel': 0,
+ 'permlevel': 1,
'role': u'Sales User',
- 'submit': 1,
- 'write': 1
+ 'submit': 0,
+ 'write': 0
},
# DocPerm
@@ -103,6 +95,30 @@
# DocPerm
{
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales Manager',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 1,
+ 'cancel': 1,
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Sales Manager',
+ 'submit': 1,
+ 'write': 1
+ },
+
+ # DocPerm
+ {
'amend': 1,
'cancel': 1,
'create': 1,
@@ -115,6 +131,13 @@
# DocPerm
{
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Maintenance Manager'
+ },
+
+ # DocPerm
+ {
'amend': 1,
'cancel': 1,
'create': 1,
@@ -129,31 +152,14 @@
{
'doctype': u'DocPerm',
'permlevel': 1,
- 'role': u'All'
- },
-
- # DocFormat
- {
- 'doctype': u'DocFormat',
- 'format': u'Quotation Classic'
- },
-
- # DocFormat
- {
- 'doctype': u'DocFormat',
- 'format': u'Quotation Modern'
- },
-
- # DocFormat
- {
- 'doctype': u'DocFormat',
- 'format': u'Quotation Spartan'
+ 'role': u'Maintenance User'
},
# DocField
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'basic_info',
'fieldtype': u'Section Break',
'label': u'Basic Info',
'oldfieldtype': u'Section Break',
@@ -164,6 +170,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break0',
'fieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
@@ -357,6 +364,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'column_break1',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -488,6 +496,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'items',
'fieldtype': u'Section Break',
'label': u'Items',
'oldfieldtype': u'Section Break',
@@ -546,6 +555,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break2',
'fieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
@@ -612,6 +622,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'pull_enquiry_detail',
'fieldtype': u'Button',
'hidden': 0,
'label': u'Pull Enquiry Detail',
@@ -627,6 +638,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'section_break0',
'fieldtype': u'Section Break',
'options': u'Simple',
'permlevel': 0
@@ -650,6 +662,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'clear_table',
'fieldtype': u'Button',
'label': u'Clear Table',
'oldfieldtype': u'Button',
@@ -661,6 +674,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'recalculate_values',
'fieldtype': u'Button',
'label': u'Re-Calculate Values',
'oldfieldtype': u'Button',
@@ -688,6 +702,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'taxes',
'fieldtype': u'Section Break',
'label': u'Taxes',
'oldfieldtype': u'Section Break',
@@ -712,6 +727,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'get_charges',
'fieldtype': u'Button',
'hidden': 0,
'label': u'Get Charges',
@@ -737,6 +753,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'calculate_charges',
'fieldtype': u'Button',
'label': u'Calculate Charges',
'oldfieldtype': u'Button',
@@ -760,6 +777,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'other_charges_calculation',
'fieldtype': u'HTML',
'label': u'Other Charges Calculation',
'oldfieldtype': u'HTML',
@@ -771,6 +789,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'totals',
'fieldtype': u'Section Break',
'label': u'Totals',
'oldfieldtype': u'Section Break',
@@ -827,6 +846,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break3',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -884,6 +904,7 @@
'colour': u'White:FFF',
'description': u'Add Terms and Conditions for the Quotation like Payment Terms, Validity of Offer etc. You can also prepare a master Term Sheet and use the Template',
'doctype': u'DocField',
+ 'fieldname': u'terms_section_break',
'fieldtype': u'Section Break',
'label': u'Terms',
'oldfieldtype': u'Section Break',
@@ -908,6 +929,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'get_terms',
'fieldtype': u'Button',
'label': u'Get Terms',
'oldfieldtype': u'Button',
@@ -918,6 +940,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'terms_html',
'fieldtype': u'HTML',
'label': u'Terms HTML',
'oldfieldtype': u'HTML',
@@ -942,6 +965,7 @@
'colour': u'White:FFF',
'description': u'Filling in additional information about the Quotation will help you analyze your data better.',
'doctype': u'DocField',
+ 'fieldname': u'more_info',
'fieldtype': u'Section Break',
'label': u'More Info',
'oldfieldtype': u'Section Break',
@@ -1082,6 +1106,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break4',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -1164,6 +1189,7 @@
'colour': u'White:FFF',
'description': u'Keep a track on communications regarding this Quotation. This will help you remember earlier communications in case the Customer comes back again',
'doctype': u'DocField',
+ 'fieldname': u'communication_history',
'fieldtype': u'Section Break',
'label': u'Communication History',
'oldfieldtype': u'Section Break',
diff --git a/erpnext/selling/doctype/quotation_detail/quotation_detail.txt b/erpnext/selling/doctype/quotation_detail/quotation_detail.txt
index 1b55879..8619e82 100644
--- a/erpnext/selling/doctype/quotation_detail/quotation_detail.txt
+++ b/erpnext/selling/doctype/quotation_detail/quotation_detail.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:18',
+ 'creation': '2012-03-27 14:36:13',
'docstatus': 0,
- 'modified': '2012-03-05 15:00:10',
+ 'modified': '2012-03-27 14:36:13',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/selling/doctype/return_detail/return_detail.txt b/erpnext/selling/doctype/return_detail/return_detail.txt
index 4c1e2f7..5f0f250 100644
--- a/erpnext/selling/doctype/return_detail/return_detail.txt
+++ b/erpnext/selling/doctype/return_detail/return_detail.txt
@@ -3,149 +3,140 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:19',
+ 'creation': '2012-03-27 14:36:14',
'docstatus': 0,
- 'modified': '2011-02-23 19:09:05',
- 'modified_by': 'Administrator',
- 'owner': 'wasim@webnotestech.com'
+ 'modified': '2012-03-27 14:36:14',
+ 'modified_by': u'Administrator',
+ 'owner': u'wasim@webnotestech.com'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Selling',
+ 'module': u'Selling',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 8
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Return Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Return Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# DocType, Return Detail
{
'doctype': 'DocType',
- 'name': 'Return Detail'
+ 'name': u'Return Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'item_code',
- 'fieldtype': 'Link',
- 'idx': 1,
- 'label': 'Item Code',
- 'oldfieldname': 'item_code',
- 'oldfieldtype': 'Link',
- 'options': 'Item',
+ 'doctype': u'DocField',
+ 'fieldname': u'item_code',
+ 'fieldtype': u'Link',
+ 'label': u'Item Code',
+ 'oldfieldname': u'item_code',
+ 'oldfieldtype': u'Link',
+ 'options': u'Item',
'permlevel': 1,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Data',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
- 'width': '300px'
+ 'width': u'300px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'uom',
- 'fieldtype': 'Link',
- 'idx': 3,
- 'label': 'UOM',
- 'oldfieldname': 'uom',
- 'oldfieldtype': 'Link',
- 'options': 'UOM',
+ 'doctype': u'DocField',
+ 'fieldname': u'uom',
+ 'fieldtype': u'Link',
+ 'label': u'UOM',
+ 'oldfieldname': u'uom',
+ 'oldfieldtype': u'Link',
+ 'options': u'UOM',
'permlevel': 1,
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'rate',
- 'fieldtype': 'Currency',
- 'idx': 4,
- 'label': 'Rate',
- 'oldfieldname': 'rate',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Rate',
+ 'oldfieldname': u'rate',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'qty',
- 'fieldtype': 'Data',
- 'idx': 5,
- 'label': 'Qty',
- 'oldfieldname': 'qty',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'qty',
+ 'fieldtype': u'Data',
+ 'label': u'Qty',
+ 'oldfieldname': u'qty',
+ 'oldfieldtype': u'Data',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'returned_qty',
- 'fieldtype': 'Data',
- 'idx': 6,
- 'label': 'Returned Qty',
- 'oldfieldname': 'returned_qty',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'returned_qty',
+ 'fieldtype': u'Data',
+ 'label': u'Returned Qty',
+ 'oldfieldname': u'returned_qty',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'serial_no',
- 'fieldtype': 'Small Text',
- 'idx': 7,
- 'label': 'Serial No',
+ 'doctype': u'DocField',
+ 'fieldname': u'serial_no',
+ 'fieldtype': u'Small Text',
+ 'label': u'Serial No',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'batch_no',
- 'fieldtype': 'Data',
- 'idx': 8,
- 'label': 'Batch No',
+ 'doctype': u'DocField',
+ 'fieldname': u'batch_no',
+ 'fieldtype': u'Data',
+ 'label': u'Batch No',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'detail_name',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'detail_name',
+ 'fieldtype': u'Data',
'hidden': 1,
- 'idx': 9,
- 'label': 'Detail Name',
- 'oldfieldname': 'detail_name',
- 'oldfieldtype': 'Data',
+ 'label': u'Detail Name',
+ 'oldfieldname': u'detail_name',
+ 'oldfieldtype': u'Data',
'permlevel': 1
}
]
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_common/sales_common.js b/erpnext/selling/doctype/sales_common/sales_common.js
index cad8ec1..192875c 100644
--- a/erpnext/selling/doctype/sales_common/sales_common.js
+++ b/erpnext/selling/doctype/sales_common/sales_common.js
@@ -18,7 +18,7 @@
// ------
// cur_frm.cscript.tname - Details table name
// cur_frm.cscript.fname - Details fieldname
-// cur_frm.cscript.other_fname - Other Charges fieldname
+// cur_frm.cscript.other_fname - wn.require('erpnext/setup/doctype/other_charges/other_charges.js'); fieldname
// cur_frm.cscript.sales_team_fname - Sales Team fieldname
// ============== Load Default Taxes ===================
@@ -100,14 +100,14 @@
'grand_total': 'Grand Total', 'rounded_total': 'Rounded Total', 'in_words': 'In Words'}
par_cols_export = {'grand_total_export': 'Grand Total', 'rounded_total_export': 'Rounded Total', 'in_words_export': 'In Words'};
- for (d in par_cols_base) cur_frm.fields_dict[d].label_area.innerHTML = par_cols_base[d]+' (' + base_curr + ')';
- for (d in par_cols_export) cur_frm.fields_dict[d].label_area.innerHTML = par_cols_export[d]+' (' + doc.currency + ')';
- cur_frm.fields_dict['conversion_rate'].label_area.innerHTML = "Conversion Rate (" + doc.currency +' -> '+ base_curr + ')';
- cur_frm.fields_dict['plc_conversion_rate'].label_area.innerHTML = 'Price List Currency Conversion Rate (' + doc.price_list_currency +' -> '+ base_curr + ')';
+ for (d in par_cols_base) cur_frm.fields_dict[d].label_span.innerHTML = par_cols_base[d]+' (' + base_curr + ')';
+ for (d in par_cols_export) cur_frm.fields_dict[d].label_span.innerHTML = par_cols_export[d]+' (' + doc.currency + ')';
+ cur_frm.fields_dict['conversion_rate'].label_span.innerHTML = "Conversion Rate (" + doc.currency +' -> '+ base_curr + ')';
+ cur_frm.fields_dict['plc_conversion_rate'].label_span.innerHTML = 'Price List Currency Conversion Rate (' + doc.price_list_currency +' -> '+ base_curr + ')';
if (doc.doctype == 'Receivable Voucher') {
- cur_frm.fields_dict['total_advance'].label_area.innerHTML = 'Total Advance (' + base_curr + ')';
- cur_frm.fields_dict['outstanding_amount'].label_area.innerHTML = 'Outstanding Amount (' + base_curr + ')';
+ cur_frm.fields_dict['total_advance'].label_span.innerHTML = 'Total Advance (' + base_curr + ')';
+ cur_frm.fields_dict['outstanding_amount'].label_span.innerHTML = 'Outstanding Amount (' + base_curr + ')';
}
}
@@ -212,13 +212,16 @@
cur_frm.cscript.conversion_rate = cur_frm.cscript.currency;
cur_frm.cscript.plc_conversion_rate = cur_frm.cscript.currency;
-cur_frm.cscript.company = function(doc, dt, dn) {
+cur_frm.cscript.company = function(doc, cdt, cdn) {
wn.call({
method: 'selling.doctype.sales_common.sales_common.get_comp_base_currency',
args: {company:doc.company},
callback: function(r, rt) {
- var doc = locals[dt][dn];
- set_multiple(doc.doctype, doc.name, {currency:r.message, price_list_currency:r.message});
+ var doc = locals[cdt][cdn];
+ set_multiple(doc.doctype, doc.name, {
+ currency:r.message,
+ price_list_currency:r.message
+ });
cur_frm.cscript.currency(doc, cdt, cdn);
}
});
@@ -249,9 +252,20 @@
// ******************** ITEM CODE ********************************
cur_frm.fields_dict[cur_frm.cscript.fname].grid.get_field("item_code").get_query = function(doc, cdt, cdn) {
if (doc.order_type == 'Maintenance')
- return 'SELECT tabItem.name,tabItem.item_name,tabItem.description FROM tabItem WHERE tabItem.is_service_item="Yes" AND tabItem.docstatus != 2 AND (ifnull(`tabItem`.`end_of_life`,"") = "" OR `tabItem`.`end_of_life` > NOW() OR `tabItem`.`end_of_life`="0000-00-00") AND tabItem.%(key)s LIKE "%s" LIMIT 50';
+ return 'SELECT tabItem.name,tabItem.item_name,tabItem.description \
+ FROM tabItem WHERE tabItem.is_service_item="Yes" \
+ AND tabItem.docstatus != 2 \
+ AND (ifnull(`tabItem`.`end_of_life`,"") = "" \
+ OR `tabItem`.`end_of_life` > NOW() \
+ OR `tabItem`.`end_of_life`="0000-00-00") \
+ AND tabItem.%(key)s LIKE "%s" LIMIT 50';
else
- return 'SELECT tabItem.name,tabItem.item_name,tabItem.description FROM tabItem WHERE tabItem.is_sales_item="Yes" AND tabItem.docstatus != 2 AND (ifnull(`tabItem`.`end_of_life`,"") = "" OR `tabItem`.`end_of_life` > NOW() OR `tabItem`.`end_of_life`="0000-00-00") AND tabItem.%(key)s LIKE "%s" LIMIT 50';
+ return 'SELECT tabItem.name,tabItem.item_name,tabItem.description FROM tabItem \
+ WHERE tabItem.is_sales_item="Yes" AND tabItem.docstatus != 2 \
+ AND (ifnull(`tabItem`.`end_of_life`,"") = "" \
+ OR `tabItem`.`end_of_life` > NOW() \
+ OR `tabItem`.`end_of_life`="0000-00-00") \
+ AND tabItem.%(key)s LIKE "%s" LIMIT 50';
}
@@ -267,8 +281,14 @@
var callback = function(r, rt){
cur_frm.cscript.recalc(doc, 1);
}
- var args = {'item_code':d.item_code, 'income_account':d.income_account, 'cost_center': d.cost_center, 'warehouse': d.warehouse};
- get_server_fields('get_item_details',JSON.stringify(args), fname,doc,cdt,cdn,1,callback);
+ var args = {
+ 'item_code':d.item_code,
+ 'income_account':d.income_account,
+ 'cost_center': d.cost_center,
+ 'warehouse': d.warehouse
+ };
+ get_server_fields('get_item_details',JSON.stringify(args),
+ fname,doc,cdt,cdn,1,callback);
}
}
if(cur_frm.cscript.custom_item_code){
@@ -358,8 +378,14 @@
var sales_team = cur_frm.cscript.sales_team_fname;
var other_fname = cur_frm.cscript.other_fname;
- if(!flt(doc.conversion_rate)) { doc.conversion_rate = 1; refresh_field('conversion_rate'); }
- if(!flt(doc.plc_conversion_rate)) { doc.plc_conversion_rate = 1; refresh_field('plc_conversion_rate'); }
+ if(!flt(doc.conversion_rate)) {
+ doc.conversion_rate = 1;
+ refresh_field('conversion_rate');
+ }
+ if(!flt(doc.plc_conversion_rate)) {
+ doc.plc_conversion_rate = 1;
+ refresh_field('plc_conversion_rate');
+ }
if(n > 0) cur_frm.cscript.update_fname_table(doc , tname , fname , n, other_fname); // updates all values in table (i.e. amount, export amount, net total etc.)
@@ -378,7 +404,7 @@
}
cur_frm.cscript.calc_other_charges(doc , tname , fname , other_fname); // calculate other charges
}
- cur_frm.cscript.calc_doc_values(doc, cdt, cdn, tname, fname, other_fname); // calculates total amounts
+ cur_frm.cscript.calc_doc_values(doc, null, null, tname, fname, other_fname); // calculates total amounts
// ******************* calculate allocated amount of sales person ************************
cl = getchildren('Sales Team', doc.name, sales_team);
diff --git a/erpnext/selling/doctype/sales_common/sales_common.txt b/erpnext/selling/doctype/sales_common/sales_common.txt
index 4b0cf28..413e051 100644
--- a/erpnext/selling/doctype/sales_common/sales_common.txt
+++ b/erpnext/selling/doctype/sales_common/sales_common.txt
@@ -3,22 +3,22 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:21',
+ 'creation': '2012-03-27 14:36:14',
'docstatus': 0,
- 'modified': '2011-01-03 11:21:04',
- 'modified_by': 'nabin@webnotestech.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:14',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'issingle': 1,
- 'module': 'Selling',
+ 'module': u'Selling',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 290
},
@@ -26,6 +26,6 @@
# DocType, Sales Common
{
'doctype': 'DocType',
- 'name': 'Sales Common'
+ 'name': u'Sales Common'
}
]
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_order/listview.js b/erpnext/selling/doctype/sales_order/listview.js
new file mode 100644
index 0000000..c0b3895
--- /dev/null
+++ b/erpnext/selling/doctype/sales_order/listview.js
@@ -0,0 +1,32 @@
+// render
+wn.doclistviews['Sales Order'] = wn.views.ListView.extend({
+ init: function(d) {
+ this._super(d)
+ this.fields = this.fields.concat([
+ "`tabSales Order`.customer_name",
+ "ifnull(`tabSales Order`.per_delivered,0) as per_delivered",
+ "ifnull(`tabSales Order`.per_billed,0) as per_billed",
+ "`tabSales Order`.currency",
+ "ifnull(`tabSales Order`.grand_total_export,0) as grand_total_export"
+ ]);
+ this.stats = this.stats.concat(['status']);
+ },
+
+ columns: [
+ {width: '5%', content:'avatar'},
+ {width: '3%', content:'docstatus'},
+ {width: '15%', content:'name'},
+ {width: '37%', content:'tags+customer_name', css: {color:'#aaa'}},
+ {
+ width: '18%',
+ content: function(parent, data) {
+ $(parent).html(data.currency + ' ' + fmt_money(data.grand_total_export))
+ },
+ css: {'text-align':'right'}
+ },
+ {width: '8%', content: 'per_delivered', type:'bar-graph', label:'Delivered'},
+ {width: '8%', content: 'per_billed', type:'bar-graph', label:'Billed'},
+ {width: '10%', content:'modified', css: {'text-align': 'right', 'color':'#777'}}
+ ]
+
+});
diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index 3e0d783..9a877c6 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -22,9 +22,10 @@
cur_frm.cscript.sales_team_fname = "sales_team";
-$import(Sales Common)
-$import(Other Charges)
-$import(SMS Control)
+wn.require('erpnext/selling/doctype/sales_common/sales_common.js');
+wn.require('erpnext/setup/doctype/other_charges/other_charges.js');
+wn.require('erpnext/utilities/doctype/sms_control/sms_control.js');
+wn.require('erpnext/setup/doctype/notification_control/notification_control.js');
// ONLOAD
@@ -355,7 +356,6 @@
return 'SELECT `tabTerritory`.`name`,`tabTerritory`.`parent_territory` FROM `tabTerritory` WHERE `tabTerritory`.`is_group` = "No" AND `tabTerritory`.`docstatus`!= 2 AND `tabTerritory`.%(key)s LIKE "%s" ORDER BY `tabTerritory`.`name` ASC LIMIT 50';
}
-$import(Notification Control)
cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
var args = {
type: 'Sales Order',
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index c886ec3..7796e15 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -102,7 +102,8 @@
# Get Item Details
# ----------------
def get_item_details(self, args=None):
- args = args and eval(args) or {}
+ import json
+ args = args and json.loads(args) or {}
if args.get('item_code'):
return get_obj('Sales Common').get_item_details(args, self)
else:
diff --git a/erpnext/selling/doctype/sales_order/sales_order.txt b/erpnext/selling/doctype/sales_order/sales_order.txt
index 7a11bda..27bd86c 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.txt
+++ b/erpnext/selling/doctype/sales_order/sales_order.txt
@@ -3,22 +3,13 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:21',
+ 'creation': '2012-03-27 14:36:14',
'docstatus': 0,
- 'modified': '2012-03-02 14:34:02',
+ 'modified': '2012-03-27 18:49:05',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Sales Order',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
# These values are common for all DocType
{
'_last_update': u'1330670942',
@@ -27,6 +18,7 @@
'default_print_format': u'Standard',
'doctype': 'DocType',
'document_type': u'Transaction',
+ 'is_submittable': 1,
'is_transaction_doc': 1,
'issingle': 0,
'module': u'Selling',
@@ -38,15 +30,15 @@
'show_in_menu': 0,
'subject': u'From %(customer_name)s on %(transaction_date)s worth %(currency)s %(grand_total_export)s | %(per_delivered)s% delivered | %(per_billed)s% billed',
'tag_fields': u'delivery_status,billing_status',
- 'version': 631
+ 'version': 632
},
- # These values are common for all DocFormat
+ # These values are common for all DocField
{
- 'doctype': u'DocFormat',
+ 'doctype': u'DocField',
'name': '__common__',
'parent': u'Sales Order',
- 'parentfield': u'formats',
+ 'parentfield': u'fields',
'parenttype': u'DocType'
},
@@ -68,37 +60,6 @@
# DocPerm
{
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Production Manager'
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Sales Manager',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Sales Manager',
- 'submit': 1,
- 'write': 1
- },
-
- # DocPerm
- {
'amend': 1,
'cancel': 1,
'create': 1,
@@ -111,53 +72,6 @@
# DocPerm
{
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Sales User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'match': u'customer_name',
- 'permlevel': 0,
- 'role': u'Customer'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 2,
- 'role': u'Accounts User',
- 'write': 1
- },
-
- # DocPerm
- {
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Maintenance Manager',
- 'submit': 1,
- 'write': 1
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Maintenance Manager'
- },
-
- # DocPerm
- {
'amend': 1,
'cancel': 1,
'create': 1,
@@ -170,33 +84,105 @@
# DocPerm
{
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
- 'role': u'Maintenance User'
+ 'role': u'Maintenance Manager',
+ 'submit': 0,
+ 'write': 0
},
- # DocFormat
+ # DocPerm
{
- 'doctype': u'DocFormat',
- 'format': u'Sales Order Classic'
+ 'amend': 1,
+ 'cancel': 1,
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Maintenance Manager',
+ 'submit': 1,
+ 'write': 1
},
- # DocFormat
+ # DocPerm
{
- 'doctype': u'DocFormat',
- 'format': u'Sales Order Modern'
+ 'amend': 1,
+ 'cancel': 1,
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Sales Manager',
+ 'submit': 1,
+ 'write': 1
},
- # DocFormat
+ # DocPerm
{
- 'doctype': u'DocFormat',
- 'format': u'Sales Order Spartan'
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales Manager',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 2,
+ 'role': u'Accounts User',
+ 'submit': 0,
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Customer',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales User',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Maintenance User',
+ 'submit': 0,
+ 'write': 0
},
# DocField
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'basic_info',
'fieldtype': u'Section Break',
'label': u'Basic Info',
'oldfieldtype': u'Section Break',
@@ -207,6 +193,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break0',
'fieldtype': u'Column Break',
'in_filter': 0,
'oldfieldtype': u'Column Break',
@@ -355,6 +342,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break1',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -581,6 +569,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'items',
'fieldtype': u'Section Break',
'label': u'Items',
'oldfieldtype': u'Section Break',
@@ -634,6 +623,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break2',
'fieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
@@ -715,6 +705,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'pull_quotation_details',
'fieldtype': u'Button',
'label': u'Pull Quotation Details',
'oldfieldtype': u'Button',
@@ -726,6 +717,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'section_break0',
'fieldtype': u'Section Break',
'permlevel': 0
},
@@ -749,6 +741,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'clear_table',
'fieldtype': u'Button',
'label': u'Clear Table',
'oldfieldtype': u'Button',
@@ -760,6 +753,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'recalculate_values',
'fieldtype': u'Button',
'label': u'Re-Calculate Values',
'oldfieldtype': u'Button',
@@ -787,6 +781,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'taxes',
'fieldtype': u'Section Break',
'label': u'Taxes',
'oldfieldtype': u'Section Break',
@@ -810,6 +805,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'get_charges',
'fieldtype': u'Button',
'label': u'Get Charges',
'oldfieldtype': u'Button',
@@ -832,6 +828,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'calculate_charges',
'fieldtype': u'Button',
'label': u'Calculate Charges',
'oldfieldtype': u'Button',
@@ -856,6 +853,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'other_charges_calculation',
'fieldtype': u'HTML',
'label': u'Other Charges Calculation',
'oldfieldtype': u'HTML',
@@ -867,6 +865,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'totals',
'fieldtype': u'Section Break',
'label': u'Totals',
'oldfieldtype': u'Section Break',
@@ -919,6 +918,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break3',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -971,6 +971,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'terms_section_break',
'fieldtype': u'Section Break',
'label': u'Terms',
'oldfieldtype': u'Section Break',
@@ -995,6 +996,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'get_terms',
'fieldtype': u'Button',
'label': u'Get Terms',
'oldfieldtype': u'Button',
@@ -1006,6 +1008,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'terms_html',
'fieldtype': u'HTML',
'label': u'Terms HTML',
'oldfieldtype': u'HTML',
@@ -1031,6 +1034,7 @@
'colour': u'White:FFF',
'description': u'Filling in additional information about the Sales Order will help you analyze your data better.',
'doctype': u'DocField',
+ 'fieldname': u'more_info',
'fieldtype': u'Section Break',
'label': u'More Info',
'oldfieldtype': u'Section Break',
@@ -1041,6 +1045,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break4',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -1097,6 +1102,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break5',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -1204,6 +1210,7 @@
'colour': u'White:FFF',
'description': u'Display all the individual items delivered with the main items',
'doctype': u'DocField',
+ 'fieldname': u'packing_list',
'fieldtype': u'Section Break',
'hidden': 0,
'label': u'Packing List',
@@ -1229,6 +1236,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'sales_team_section_break',
'fieldtype': u'Section Break',
'label': u'Sales Team',
'oldfieldtype': u'Section Break',
@@ -1239,6 +1247,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break6',
'fieldtype': u'Column Break',
'permlevel': 0,
'print_hide': 1,
@@ -1267,6 +1276,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break7',
'fieldtype': u'Column Break',
'permlevel': 0,
'print_hide': 1,
@@ -1303,6 +1313,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'section_break1',
'fieldtype': u'Section Break',
'options': u'Simple',
'permlevel': 0,
@@ -1326,6 +1337,7 @@
{
'allow_on_submit': 1,
'doctype': u'DocField',
+ 'fieldname': u'repair_sales_order',
'fieldtype': u'Button',
'label': u'Repair Sales Order',
'oldfieldtype': u'Button',
diff --git a/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt b/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt
index c0a01f1..cc95c7a 100644
--- a/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt
+++ b/erpnext/selling/doctype/sales_order_detail/sales_order_detail.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:22',
+ 'creation': '2012-03-27 14:36:15',
'docstatus': 0,
- 'modified': '2012-03-05 14:59:43',
+ 'modified': '2012-03-27 14:36:15',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/selling/doctype/sales_team/sales_team.txt b/erpnext/selling/doctype/sales_team/sales_team.txt
index 9f3c50d..ca1dbac 100644
--- a/erpnext/selling/doctype/sales_team/sales_team.txt
+++ b/erpnext/selling/doctype/sales_team/sales_team.txt
@@ -3,133 +3,126 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:23',
+ 'creation': '2012-03-27 14:36:17',
'docstatus': 0,
- 'modified': '2010-11-24 09:09:57',
- 'modified_by': 'nabin@webnotestech.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:17',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Selling',
+ 'module': u'Selling',
'name': '__common__',
- 'section_style': 'Tray',
- 'server_code_error': ' ',
+ 'section_style': u'Tray',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 5
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Sales Team',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Sales Team',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, Sales Team
{
'doctype': 'DocType',
- 'name': 'Sales Team'
+ 'name': u'Sales Team'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'sales_person',
- 'fieldtype': 'Link',
- 'idx': 1,
+ 'doctype': u'DocField',
+ 'fieldname': u'sales_person',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Sales Person',
- 'oldfieldname': 'sales_person',
- 'oldfieldtype': 'Link',
- 'options': 'Sales Person',
+ 'label': u'Sales Person',
+ 'oldfieldname': u'sales_person',
+ 'oldfieldtype': u'Link',
+ 'options': u'Sales Person',
'reqd': 1,
'search_index': 1,
- 'width': '200px'
+ 'width': u'200px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'sales_designation',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Designation',
- 'oldfieldname': 'sales_designation',
- 'oldfieldtype': 'Data',
- 'width': '100px'
+ 'doctype': u'DocField',
+ 'fieldname': u'sales_designation',
+ 'fieldtype': u'Data',
+ 'label': u'Designation',
+ 'oldfieldname': u'sales_designation',
+ 'oldfieldtype': u'Data',
+ 'width': u'100px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'contact_no',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'contact_no',
+ 'fieldtype': u'Data',
'hidden': 1,
- 'idx': 3,
- 'label': 'Contact No.',
- 'oldfieldname': 'contact_no',
- 'oldfieldtype': 'Data',
- 'width': '100px'
+ 'label': u'Contact No.',
+ 'oldfieldname': u'contact_no',
+ 'oldfieldtype': u'Data',
+ 'width': u'100px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'allocated_percentage',
- 'fieldtype': 'Currency',
- 'idx': 4,
- 'label': 'Allocated (%)',
- 'oldfieldname': 'allocated_percentage',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'allocated_percentage',
+ 'fieldtype': u'Currency',
+ 'label': u'Allocated (%)',
+ 'oldfieldname': u'allocated_percentage',
+ 'oldfieldtype': u'Currency',
'reqd': 0,
- 'trigger': 'Client',
- 'width': '100px'
+ 'trigger': u'Client',
+ 'width': u'100px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'allocated_amount',
- 'fieldtype': 'Currency',
- 'idx': 5,
- 'label': 'Allocated Amount',
- 'oldfieldname': 'allocated_amount',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'allocated_amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Allocated Amount',
+ 'oldfieldname': u'allocated_amount',
+ 'oldfieldtype': u'Currency',
'reqd': 0,
- 'width': '120px'
+ 'width': u'120px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'parenttype',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'parenttype',
+ 'fieldtype': u'Data',
'hidden': 1,
- 'idx': 6,
'in_filter': 1,
- 'label': 'Parenttype',
- 'oldfieldname': 'parenttype',
- 'oldfieldtype': 'Data',
+ 'label': u'Parenttype',
+ 'oldfieldname': u'parenttype',
+ 'oldfieldtype': u'Data',
'print_hide': 1,
'search_index': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'incentives',
- 'fieldtype': 'Currency',
- 'idx': 7,
- 'label': 'Incentives',
- 'oldfieldname': 'incentives',
- 'oldfieldtype': 'Currency'
+ 'doctype': u'DocField',
+ 'fieldname': u'incentives',
+ 'fieldtype': u'Currency',
+ 'label': u'Incentives',
+ 'oldfieldname': u'incentives',
+ 'oldfieldtype': u'Currency'
}
]
\ No newline at end of file
diff --git a/erpnext/selling/doctype/shipping_address/shipping_address.txt b/erpnext/selling/doctype/shipping_address/shipping_address.txt
index b101616..b1b3370 100755
--- a/erpnext/selling/doctype/shipping_address/shipping_address.txt
+++ b/erpnext/selling/doctype/shipping_address/shipping_address.txt
@@ -3,191 +3,179 @@
# These values are common in all dictionaries
{
- 'creation': '2011-03-23 10:39:45',
+ 'creation': '2012-03-27 14:36:17',
'docstatus': 0,
- 'modified': '2011-03-24 10:39:09',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:17',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
'allow_trash': 1,
- 'autoname': 'SA.#####',
- 'colour': 'White:FFF',
+ 'autoname': u'SA.#####',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'Selling',
+ 'document_type': u'Master',
+ 'module': u'Selling',
'name': '__common__',
- 'search_fields': 'customer, ship_to, shipping_address',
- 'section_style': 'Simple',
+ 'search_fields': u'customer, ship_to, shipping_address',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 8
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Shipping Address',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Shipping Address',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Shipping Address',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Shipping Address',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Shipping Address
{
'doctype': 'DocType',
- 'name': 'Shipping Address'
+ 'name': u'Shipping Address'
},
# DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Sales Master Manager',
+ 'role': u'Sales Master Manager',
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Sales Master Manager'
+ 'role': u'Sales Master Manager'
},
# DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 3,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Sales Manager',
+ 'role': u'Sales Manager',
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 4,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Sales Manager'
+ 'role': u'Sales Manager'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 1,
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'customer',
- 'fieldtype': 'Link',
- 'idx': 2,
- 'label': 'Customer',
- 'options': 'Customer',
+ 'doctype': u'DocField',
+ 'fieldname': u'customer',
+ 'fieldtype': u'Link',
+ 'label': u'Customer',
+ 'options': u'Customer',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'customer_name',
- 'fieldtype': 'Data',
- 'idx': 3,
- 'label': 'Customer Name',
+ 'doctype': u'DocField',
+ 'fieldname': u'customer_name',
+ 'fieldtype': u'Data',
+ 'label': u'Customer Name',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'customer_address',
- 'fieldtype': 'Text',
- 'idx': 4,
- 'label': 'Customer Address',
+ 'doctype': u'DocField',
+ 'fieldname': u'customer_address',
+ 'fieldtype': u'Text',
+ 'label': u'Customer Address',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'ship_to',
- 'fieldtype': 'Data',
- 'idx': 5,
- 'label': 'Ship To',
+ 'doctype': u'DocField',
+ 'fieldname': u'ship_to',
+ 'fieldtype': u'Data',
+ 'label': u'Ship To',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'shipping_address',
- 'fieldtype': 'Text',
- 'idx': 6,
- 'label': 'Shipping Address',
+ 'doctype': u'DocField',
+ 'fieldname': u'shipping_address',
+ 'fieldtype': u'Text',
+ 'label': u'Shipping Address',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 7,
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'is_primary_address',
- 'fieldtype': 'Select',
- 'idx': 8,
- 'label': 'Is Primary Address',
- 'options': 'Yes\nNo',
+ 'doctype': u'DocField',
+ 'fieldname': u'is_primary_address',
+ 'fieldtype': u'Select',
+ 'label': u'Is Primary Address',
+ 'options': u'Yes\nNo',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'shipping_details',
- 'fieldtype': 'Text Editor',
- 'idx': 9,
- 'label': 'Shipping Details',
+ 'doctype': u'DocField',
+ 'fieldname': u'shipping_details',
+ 'fieldtype': u'Text Editor',
+ 'label': u'Shipping Details',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'idx': 10,
- 'label': 'Trash Reason',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
'permlevel': 1
}
]
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sms_center/sms_center.txt b/erpnext/selling/doctype/sms_center/sms_center.txt
index cb0a8d8..d80787a 100644
--- a/erpnext/selling/doctype/sms_center/sms_center.txt
+++ b/erpnext/selling/doctype/sms_center/sms_center.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2011-01-11 17:52:26',
+ 'creation': '2012-03-27 14:36:17',
'docstatus': 0,
- 'modified': '2012-03-21 13:06:26',
+ 'modified': '2012-03-27 14:36:17',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -142,6 +142,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'create_receiver_list',
'fieldtype': u'Button',
'label': u'Create Receiver List',
'options': u'create_receiver_list'
@@ -176,6 +177,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'send_sms',
'fieldtype': u'Button',
'label': u'Send SMS',
'options': u'send_sms'
diff --git a/erpnext/selling/page/sales_browser/sales_browser.js b/erpnext/selling/page/sales_browser/sales_browser.js
index b079515..8137d04 100644
--- a/erpnext/selling/page/sales_browser/sales_browser.js
+++ b/erpnext/selling/page/sales_browser/sales_browser.js
@@ -49,7 +49,7 @@
var tr_main_grid = make_table(div_body,1,2,'100%',['60%','40%'],{width: "100%", tableLayout: "fixed", borderCollapse: "collapse", border:"0px", padding:"4px 4px 4px 4px"});
$y($td(tr_main_grid,0,0),{border: "1px solid #dddddd", padding: "8px", width: "60%"});
- this.tree_area = $a($td(tr_main_grid,0,0),'div');
+ this.tree_area = $a($td(tr_main_grid,0,0),'div','',{minHeight:'400px'});
$y($td(tr_main_grid,0,1),{border: "1px solid #DDD"});
this.detail_area = $a($td(tr_main_grid,0,1),'div');
diff --git a/erpnext/selling/page/sales_dashboard/sales_dashboard.js b/erpnext/selling/page/sales_dashboard/sales_dashboard.js
index 1af5cb4..e89c7fb 100644
--- a/erpnext/selling/page/sales_dashboard/sales_dashboard.js
+++ b/erpnext/selling/page/sales_dashboard/sales_dashboard.js
@@ -22,8 +22,8 @@
$dh(pscript.mnt_div1);
//pscript.dx_axis = [];
- wn.require('lib/css/jqpot.css');
- wn.require('lib/js/legacy/jquery/jquery.jqplot.min.js');
+ wn.require('lib/css/lib/jqplot.css');
+ wn.require('lib/js/lib/jqplot/jquery.jqplot.min.js');
pscript.all_onchnge();
}
//=======================================================================
diff --git a/erpnext/setup/Module Def/Setup/Setup.txt b/erpnext/setup/Module Def/Setup/Setup.txt
deleted file mode 100644
index 5a0dcf7..0000000
--- a/erpnext/setup/Module Def/Setup/Setup.txt
+++ /dev/null
@@ -1,652 +0,0 @@
-[
- {
- '_last_update': None,
- 'creation': '2010-11-30 22:43:08',
- 'disabled': 'No',
- 'docstatus': 0,
- 'doctype': 'Module Def',
- 'doctype_list': None,
- 'file_list': None,
- 'idx': None,
- 'is_hidden': 'No',
- 'last_updated_date': '2011-03-21 12:13:39',
- 'modified': '2010-09-25 00:00:00',
- 'modified_by': 'Administrator',
- 'module_desc': None,
- 'module_icon': 'wired.png',
- 'module_label': 'Setup',
- 'module_name': 'Setup',
- 'module_page': 'Setup',
- 'module_seq': 1,
- 'name': 'Setup',
- 'owner': 'Administrator',
- 'parent': None,
- 'parentfield': None,
- 'parenttype': None,
- 'trash_reason': None,
- 'widget_code': None
- },
- {
- 'click_function': None,
- 'creation': '2010-11-30 22:43:08',
- 'description': 'All important setup items in one place',
- 'display_name': 'Setup Wizard',
- 'doc_name': 'Setup Wizard',
- 'doc_type': 'Pages',
- 'docstatus': 0,
- 'doctype': 'Module Def Item',
- 'fields': None,
- 'hide': None,
- 'icon': 'lightbulb.gif',
- 'idx': 1,
- 'modified': '2011-03-24 15:04:47',
- 'modified_by': 'Administrator',
- 'name': 'MDI00221',
- 'owner': 'Administrator',
- 'parent': 'Setup',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
- {
- 'click_function': None,
- 'creation': '2010-11-30 22:43:08',
- 'description': 'Personalize settings like company banner, date format, print format header etc.',
- 'display_name': 'Personalize',
- 'doc_name': 'Personalize Page',
- 'doc_type': 'Pages',
- 'docstatus': 0,
- 'doctype': 'Module Def Item',
- 'fields': None,
- 'hide': None,
- 'icon': 'star.gif',
- 'idx': 2,
- 'modified': '2011-03-24 15:04:47',
- 'modified_by': 'Administrator',
- 'name': 'MDI00222',
- 'owner': 'Administrator',
- 'parent': 'Setup',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
- {
- 'click_function': None,
- 'creation': '2010-11-30 22:43:08',
- 'description': 'Enable / Disable users. Set user roles.',
- 'display_name': 'Manage Users',
- 'doc_name': 'Manage Users',
- 'doc_type': 'Pages',
- 'docstatus': 0,
- 'doctype': 'Module Def Item',
- 'fields': None,
- 'hide': None,
- 'icon': 'group.gif',
- 'idx': 3,
- 'modified': '2011-03-24 15:04:47',
- 'modified_by': 'Administrator',
- 'name': 'MDI00223',
- 'owner': 'Administrator',
- 'parent': 'Setup',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
- {
- 'click_function': None,
- 'creation': '2010-11-30 22:43:08',
- 'description': 'Set global default values and account settings',
- 'display_name': 'Setup Defaults',
- 'doc_name': 'Manage Account',
- 'doc_type': 'Single DocType',
- 'docstatus': 0,
- 'doctype': 'Module Def Item',
- 'fields': None,
- 'hide': None,
- 'icon': 'folder.gif',
- 'idx': 4,
- 'modified': '2011-03-24 15:04:47',
- 'modified_by': 'Administrator',
- 'name': 'MDI00224',
- 'owner': 'Administrator',
- 'parent': 'Setup',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
- {
- 'click_function': None,
- 'creation': '2010-11-30 22:43:08',
- 'description': 'General Masters',
- 'display_name': 'Setup Masters',
- 'doc_name': 'Setup Masters',
- 'doc_type': 'Pages',
- 'docstatus': 0,
- 'doctype': 'Module Def Item',
- 'fields': None,
- 'hide': None,
- 'icon': 'wrench.gif',
- 'idx': 5,
- 'modified': '2011-03-24 15:04:47',
- 'modified_by': 'Administrator',
- 'name': 'MDI00225',
- 'owner': 'Administrator',
- 'parent': 'Setup',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
- {
- 'click_function': None,
- 'creation': '2010-11-30 22:43:08',
- 'description': None,
- 'display_name': 'Sales Browser',
- 'doc_name': 'Sales Browser',
- 'doc_type': 'Pages',
- 'docstatus': 0,
- 'doctype': 'Module Def Item',
- 'fields': None,
- 'hide': None,
- 'icon': None,
- 'idx': 6,
- 'modified': '2011-03-24 15:04:47',
- 'modified_by': 'Administrator',
- 'name': 'MDI00226',
- 'owner': 'Administrator',
- 'parent': 'Setup',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
- {
- 'click_function': None,
- 'creation': '2011-03-24 15:04:47',
- 'description': None,
- 'display_name': None,
- 'doc_name': None,
- 'doc_type': 'Separator',
- 'docstatus': 0,
- 'doctype': 'Module Def Item',
- 'fields': None,
- 'hide': None,
- 'icon': None,
- 'idx': 7,
- 'modified': '2011-03-24 15:04:47',
- 'modified_by': 'Administrator',
- 'name': '000003107',
- 'owner': 'Administrator',
- 'parent': 'Setup',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
- {
- 'click_function': None,
- 'creation': '2010-11-30 22:43:08',
- 'description': "Import data like Customers, Items etc in 'CSV' format",
- 'display_name': 'Import Data',
- 'doc_name': 'Import Data',
- 'doc_type': 'Pages',
- 'docstatus': 0,
- 'doctype': 'Module Def Item',
- 'fields': None,
- 'hide': None,
- 'icon': 'disk.gif',
- 'idx': 8,
- 'modified': '2011-03-24 15:04:47',
- 'modified_by': 'Administrator',
- 'name': 'MDI00228',
- 'owner': 'nabin@webnotestech.com',
- 'parent': 'Setup',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
- {
- 'click_function': None,
- 'creation': '2010-11-30 22:43:08',
- 'description': 'Set series prefix for transactions',
- 'display_name': 'Setup Series',
- 'doc_name': 'Naming Series',
- 'doc_type': 'Single DocType',
- 'docstatus': 0,
- 'doctype': 'Module Def Item',
- 'fields': None,
- 'hide': None,
- 'icon': 'paperclip.gif',
- 'idx': 9,
- 'modified': '2011-03-24 15:04:47',
- 'modified_by': 'Administrator',
- 'name': 'MDI00229',
- 'owner': 'Administrator',
- 'parent': 'Setup',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
- {
- 'click_function': None,
- 'creation': '2010-11-30 22:43:08',
- 'description': 'Set approval rights for transactions based on grand total and discount.',
- 'display_name': 'Authorization Rule',
- 'doc_name': 'Authorization Rule',
- 'doc_type': 'Forms',
- 'docstatus': 0,
- 'doctype': 'Module Def Item',
- 'fields': 'transaction\nbased_on\nmaster_name\nsystem_user\nsystem_role\napproving_role\napproving_user\nvalue',
- 'hide': None,
- 'icon': 'accept.gif',
- 'idx': 10,
- 'modified': '2011-03-24 15:04:47',
- 'modified_by': 'Administrator',
- 'name': 'MDI00230',
- 'owner': 'saumil@webnotestech.com',
- 'parent': 'Setup',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
- {
- 'click_function': None,
- 'creation': '2010-11-30 22:43:08',
- 'description': 'Add fields in transactions, masters...',
- 'display_name': 'Custom Field',
- 'doc_name': 'Custom Field',
- 'doc_type': 'Forms',
- 'docstatus': 0,
- 'doctype': 'Module Def Item',
- 'fields': 'dt\nlabel\nfieldtype\noptions',
- 'hide': None,
- 'icon': 'paperclip.gif',
- 'idx': 11,
- 'modified': '2011-03-24 15:04:47',
- 'modified_by': 'Administrator',
- 'name': 'MDI00231',
- 'owner': 'saumil@webnotestech.com',
- 'parent': 'Setup',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
- {
- 'click_function': None,
- 'creation': '2010-11-30 22:43:08',
- 'description': 'Contains records that you have trashed.',
- 'display_name': 'Trash',
- 'doc_name': 'Trash',
- 'doc_type': 'Pages',
- 'docstatus': 0,
- 'doctype': 'Module Def Item',
- 'fields': None,
- 'hide': None,
- 'icon': None,
- 'idx': 12,
- 'modified': '2011-03-24 15:04:47',
- 'modified_by': 'Administrator',
- 'name': 'MDI00232',
- 'owner': 'saumil@webnotestech.com',
- 'parent': 'Setup',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
- {
- 'click_function': None,
- 'creation': '2011-03-24 15:04:47',
- 'description': None,
- 'display_name': 'Price List',
- 'doc_name': 'Price List',
- 'doc_type': 'Setup Forms',
- 'docstatus': 0,
- 'doctype': 'Module Def Item',
- 'fields': None,
- 'hide': None,
- 'icon': None,
- 'idx': 13,
- 'modified': '2011-03-24 15:04:47',
- 'modified_by': 'Administrator',
- 'name': '000003108',
- 'owner': 'Administrator',
- 'parent': 'Setup',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
- {
- 'click_function': None,
- 'creation': '2011-03-24 15:04:47',
- 'description': None,
- 'display_name': 'Warehouse Type',
- 'doc_name': 'Warehouse Type',
- 'doc_type': 'Setup Forms',
- 'docstatus': 0,
- 'doctype': 'Module Def Item',
- 'fields': None,
- 'hide': None,
- 'icon': None,
- 'idx': 14,
- 'modified': '2011-03-24 15:04:47',
- 'modified_by': 'Administrator',
- 'name': '000003109',
- 'owner': 'Administrator',
- 'parent': 'Setup',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
- {
- 'click_function': None,
- 'creation': '2011-03-24 15:04:47',
- 'description': None,
- 'display_name': 'Warehouse',
- 'doc_name': 'Warehouse',
- 'doc_type': 'Setup Forms',
- 'docstatus': 0,
- 'doctype': 'Module Def Item',
- 'fields': None,
- 'hide': None,
- 'icon': None,
- 'idx': 15,
- 'modified': '2011-03-24 15:04:47',
- 'modified_by': 'Administrator',
- 'name': '000003110',
- 'owner': 'Administrator',
- 'parent': 'Setup',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
- {
- 'click_function': None,
- 'creation': '2011-03-24 15:04:47',
- 'description': None,
- 'display_name': 'UOM',
- 'doc_name': 'UOM',
- 'doc_type': 'Setup Forms',
- 'docstatus': 0,
- 'doctype': 'Module Def Item',
- 'fields': None,
- 'hide': None,
- 'icon': None,
- 'idx': 16,
- 'modified': '2011-03-24 15:04:47',
- 'modified_by': 'Administrator',
- 'name': '000003111',
- 'owner': 'Administrator',
- 'parent': 'Setup',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
- {
- 'click_function': None,
- 'creation': '2011-03-24 15:04:47',
- 'description': None,
- 'display_name': 'Term',
- 'doc_name': 'Term',
- 'doc_type': 'Setup Forms',
- 'docstatus': 0,
- 'doctype': 'Module Def Item',
- 'fields': None,
- 'hide': None,
- 'icon': None,
- 'idx': 17,
- 'modified': '2011-03-24 15:04:47',
- 'modified_by': 'Administrator',
- 'name': '000003112',
- 'owner': 'Administrator',
- 'parent': 'Setup',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
- {
- 'click_function': None,
- 'creation': '2011-03-24 15:04:47',
- 'description': None,
- 'display_name': 'Taxes and Charges',
- 'doc_name': 'Other Charges',
- 'doc_type': 'Setup Forms',
- 'docstatus': 0,
- 'doctype': 'Module Def Item',
- 'fields': None,
- 'hide': None,
- 'icon': None,
- 'idx': 18,
- 'modified': '2011-03-24 15:04:47',
- 'modified_by': 'Administrator',
- 'name': '000003113',
- 'owner': 'Administrator',
- 'parent': 'Setup',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
- {
- 'click_function': None,
- 'creation': '2011-03-24 15:04:47',
- 'description': None,
- 'display_name': 'Business Letter Type',
- 'doc_name': 'Business Letter Type',
- 'doc_type': 'Setup Forms',
- 'docstatus': 0,
- 'doctype': 'Module Def Item',
- 'fields': None,
- 'hide': None,
- 'icon': None,
- 'idx': 19,
- 'modified': '2011-03-24 15:04:47',
- 'modified_by': 'Administrator',
- 'name': '000003114',
- 'owner': 'Administrator',
- 'parent': 'Setup',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
- {
- 'click_function': None,
- 'creation': '2011-03-24 15:04:47',
- 'description': None,
- 'display_name': 'Business Letter Template',
- 'doc_name': 'Business Letter Template',
- 'doc_type': 'Setup Forms',
- 'docstatus': 0,
- 'doctype': 'Module Def Item',
- 'fields': None,
- 'hide': None,
- 'icon': None,
- 'idx': 20,
- 'modified': '2011-03-24 15:04:47',
- 'modified_by': 'Administrator',
- 'name': '000003115',
- 'owner': 'Administrator',
- 'parent': 'Setup',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
- {
- 'click_function': None,
- 'creation': '2011-03-24 15:04:47',
- 'description': None,
- 'display_name': 'Mode of Payment',
- 'doc_name': 'Mode of Payment',
- 'doc_type': 'Setup Forms',
- 'docstatus': 0,
- 'doctype': 'Module Def Item',
- 'fields': None,
- 'hide': None,
- 'icon': None,
- 'idx': 21,
- 'modified': '2011-03-24 15:04:47',
- 'modified_by': 'Administrator',
- 'name': '000003116',
- 'owner': 'harshada@webnotestech.com',
- 'parent': 'Setup',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
- {
- 'creation': '2010-11-30 22:43:08',
- 'docstatus': 0,
- 'doctype': 'Module Def Role',
- 'idx': 1,
- 'modified': '2010-11-30 22:43:08',
- 'modified_by': 'Administrator',
- 'name': 'MDR00042',
- 'owner': 'Administrator',
- 'parent': 'Setup',
- 'parentfield': 'roles',
- 'parenttype': 'Module Def',
- 'role': 'Administrator'
- },
- {
- 'creation': '2010-11-30 22:43:08',
- 'docstatus': 0,
- 'doctype': 'Module Def Role',
- 'idx': 2,
- 'modified': '2010-11-30 22:43:08',
- 'modified_by': 'Administrator',
- 'name': 'MDR00043',
- 'owner': 'Administrator',
- 'parent': 'Setup',
- 'parentfield': 'roles',
- 'parenttype': 'Module Def',
- 'role': 'System Manager'
- },
- {
- 'creation': '2010-11-30 22:43:08',
- 'docstatus': 0,
- 'doctype': 'Module Def Role',
- 'idx': 3,
- 'modified': '2010-11-30 22:43:08',
- 'modified_by': 'Administrator',
- 'name': 'MDR00044',
- 'owner': 'saumil@webnotestech.com',
- 'parent': 'Setup',
- 'parentfield': 'roles',
- 'parenttype': 'Module Def',
- 'role': 'Sales User'
- },
- {
- 'creation': '2010-11-30 22:43:08',
- 'docstatus': 0,
- 'doctype': 'Module Def Role',
- 'idx': 4,
- 'modified': '2010-11-30 22:43:08',
- 'modified_by': 'Administrator',
- 'name': 'MDR00045',
- 'owner': 'saumil@webnotestech.com',
- 'parent': 'Setup',
- 'parentfield': 'roles',
- 'parenttype': 'Module Def',
- 'role': 'Sales Master Manager'
- },
- {
- 'creation': '2010-11-30 22:43:08',
- 'docstatus': 0,
- 'doctype': 'Module Def Role',
- 'idx': 5,
- 'modified': '2010-11-30 22:43:08',
- 'modified_by': 'Administrator',
- 'name': 'MDR00046',
- 'owner': 'saumil@webnotestech.com',
- 'parent': 'Setup',
- 'parentfield': 'roles',
- 'parenttype': 'Module Def',
- 'role': 'Sales Master Manager'
- },
- {
- 'creation': '2010-11-30 22:43:08',
- 'docstatus': 0,
- 'doctype': 'Module Def Role',
- 'idx': 6,
- 'modified': '2010-11-30 22:43:08',
- 'modified_by': 'Administrator',
- 'name': 'MDR00047',
- 'owner': 'saumil@webnotestech.com',
- 'parent': 'Setup',
- 'parentfield': 'roles',
- 'parenttype': 'Module Def',
- 'role': 'Purchase User'
- },
- {
- 'creation': '2010-11-30 22:43:08',
- 'docstatus': 0,
- 'doctype': 'Module Def Role',
- 'idx': 7,
- 'modified': '2010-11-30 22:43:08',
- 'modified_by': 'Administrator',
- 'name': 'MDR00048',
- 'owner': 'saumil@webnotestech.com',
- 'parent': 'Setup',
- 'parentfield': 'roles',
- 'parenttype': 'Module Def',
- 'role': 'Purchase Master Manager'
- },
- {
- 'creation': '2010-11-30 22:43:08',
- 'docstatus': 0,
- 'doctype': 'Module Def Role',
- 'idx': 8,
- 'modified': '2010-11-30 22:43:08',
- 'modified_by': 'Administrator',
- 'name': 'MDR00049',
- 'owner': 'saumil@webnotestech.com',
- 'parent': 'Setup',
- 'parentfield': 'roles',
- 'parenttype': 'Module Def',
- 'role': 'Purchase Manager'
- },
- {
- 'creation': '2010-11-30 22:43:08',
- 'docstatus': 0,
- 'doctype': 'Module Def Role',
- 'idx': 9,
- 'modified': '2010-11-30 22:43:08',
- 'modified_by': 'Administrator',
- 'name': 'MDR00050',
- 'owner': 'saumil@webnotestech.com',
- 'parent': 'Setup',
- 'parentfield': 'roles',
- 'parenttype': 'Module Def',
- 'role': 'Material User'
- },
- {
- 'creation': '2010-11-30 22:43:08',
- 'docstatus': 0,
- 'doctype': 'Module Def Role',
- 'idx': 10,
- 'modified': '2010-11-30 22:43:08',
- 'modified_by': 'Administrator',
- 'name': 'MDR00051',
- 'owner': 'saumil@webnotestech.com',
- 'parent': 'Setup',
- 'parentfield': 'roles',
- 'parenttype': 'Module Def',
- 'role': 'Material Master Manager'
- },
- {
- 'creation': '2010-11-30 22:43:08',
- 'docstatus': 0,
- 'doctype': 'Module Def Role',
- 'idx': 11,
- 'modified': '2010-11-30 22:43:08',
- 'modified_by': 'Administrator',
- 'name': 'MDR00052',
- 'owner': 'saumil@webnotestech.com',
- 'parent': 'Setup',
- 'parentfield': 'roles',
- 'parenttype': 'Module Def',
- 'role': 'Material Manager'
- },
- {
- 'creation': '2010-11-30 22:43:08',
- 'docstatus': 0,
- 'doctype': 'Module Def Role',
- 'idx': 12,
- 'modified': '2010-11-30 22:43:08',
- 'modified_by': 'Administrator',
- 'name': 'MDR00053',
- 'owner': 'saumil@webnotestech.com',
- 'parent': 'Setup',
- 'parentfield': 'roles',
- 'parenttype': 'Module Def',
- 'role': 'Accounts User'
- },
- {
- 'creation': '2010-11-30 22:43:08',
- 'docstatus': 0,
- 'doctype': 'Module Def Role',
- 'idx': 13,
- 'modified': '2010-11-30 22:43:08',
- 'modified_by': 'Administrator',
- 'name': 'MDR00054',
- 'owner': 'saumil@webnotestech.com',
- 'parent': 'Setup',
- 'parentfield': 'roles',
- 'parenttype': 'Module Def',
- 'role': 'Accounts Manager'
- }
-]
\ No newline at end of file
diff --git a/erpnext/setup/Role/System Manager/System Manager.txt b/erpnext/setup/Role/System Manager/System Manager.txt
deleted file mode 100644
index 0918bc4..0000000
--- a/erpnext/setup/Role/System Manager/System Manager.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-# Role, System Manager
-[
-
- # These values are common in all dictionaries
- {
- 'creation': '2010-08-08 17:08:51',
- 'docstatus': 0,
- 'modified': '2009-07-07 17:00:24',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
- },
-
- # These values are common for all Role
- {
- 'doctype': 'Role',
- 'module': 'Setup',
- 'name': '__common__',
- 'role_name': 'System Manager'
- },
-
- # Role, System Manager
- {
- 'doctype': 'Role',
- 'name': 'System Manager'
- }
-]
\ No newline at end of file
diff --git a/erpnext/setup/__init__.py b/erpnext/setup/__init__.py
index e69de29..dad1873 100644
--- a/erpnext/setup/__init__.py
+++ b/erpnext/setup/__init__.py
@@ -0,0 +1,3 @@
+install_docs = [
+ {'doctype':'Role', 'name': 'System Manager'}
+]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/authorization_control/authorization_control.txt b/erpnext/setup/doctype/authorization_control/authorization_control.txt
index ce07175..bf204ce 100644
--- a/erpnext/setup/doctype/authorization_control/authorization_control.txt
+++ b/erpnext/setup/doctype/authorization_control/authorization_control.txt
@@ -3,28 +3,28 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:52',
+ 'creation': '2012-03-27 14:36:18',
'docstatus': 0,
- 'modified': '2010-12-16 23:57:05',
- 'modified_by': 'nabin@webnotestech.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:18',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'issingle': 1,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
- 'section_style': 'Tabbed',
- 'server_code_error': ' ',
+ 'section_style': u'Tabbed',
+ 'server_code_error': u' ',
'version': 216
},
# DocType, Authorization Control
{
'doctype': 'DocType',
- 'name': 'Authorization Control'
+ 'name': u'Authorization Control'
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/authorization_rule/authorization_rule.txt b/erpnext/setup/doctype/authorization_rule/authorization_rule.txt
index a436495..51c364f 100644
--- a/erpnext/setup/doctype/authorization_rule/authorization_rule.txt
+++ b/erpnext/setup/doctype/authorization_rule/authorization_rule.txt
@@ -3,36 +3,36 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:52',
+ 'creation': '2012-03-27 14:36:18',
'docstatus': 0,
- 'modified': '2010-12-02 18:06:28',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:18',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1308741898',
+ '_last_update': u'1308741898',
'allow_trash': 1,
- 'autoname': 'AR.####',
- 'colour': 'White:FFF',
+ 'autoname': u'AR.####',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'Setup',
+ 'document_type': u'Master',
+ 'module': u'Setup',
'name': '__common__',
- 'search_fields': 'transaction,based_on,system_user,system_role,approving_user,approving_role',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'search_fields': u'transaction,based_on,system_user,system_role,approving_user,approving_role',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 58
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Authorization Rule',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Authorization Rule',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
@@ -40,187 +40,173 @@
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Authorization Rule',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Authorization Rule',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 1
},
# DocType, Authorization Rule
{
'doctype': 'DocType',
- 'name': 'Authorization Rule'
+ 'name': u'Authorization Rule'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 1
+ 'doctype': u'DocPerm'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2
+ 'doctype': u'DocPerm'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'company',
- 'fieldtype': 'Link',
- 'idx': 1,
- 'label': 'Company',
- 'oldfieldname': 'company',
- 'oldfieldtype': 'Link',
- 'options': 'Company',
+ 'doctype': u'DocField',
+ 'fieldname': u'company',
+ 'fieldtype': u'Link',
+ 'label': u'Company',
+ 'oldfieldname': u'company',
+ 'oldfieldtype': u'Link',
+ 'options': u'Company',
'reqd': 0,
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'transaction',
- 'fieldtype': 'Select',
- 'idx': 2,
- 'label': 'Transaction',
- 'oldfieldname': 'transaction',
- 'oldfieldtype': 'Select',
- 'options': '\nDelivery Note\nPurchase Invoice\nPurchase Order\nPurchase Receipt\nQuotation\nSales Invoice\nSales Order\nStock Entry\nExpense Voucher\nAppraisal',
+ 'doctype': u'DocField',
+ 'fieldname': u'transaction',
+ 'fieldtype': u'Select',
+ 'label': u'Transaction',
+ 'oldfieldname': u'transaction',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nDelivery Note\nPurchase Invoice\nPurchase Order\nPurchase Receipt\nQuotation\nSales Invoice\nSales Order\nStock Entry\nExpense Voucher\nAppraisal',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'based_on',
- 'fieldtype': 'Select',
- 'idx': 3,
- 'label': 'Based On',
- 'oldfieldname': 'based_on',
- 'oldfieldtype': 'Select',
- 'options': '\nGrand Total\nAverage Discount\nCustomerwise Discount\nItemwise Discount\nTotal Claimed Amount\nNot Applicable',
+ 'doctype': u'DocField',
+ 'fieldname': u'based_on',
+ 'fieldtype': u'Select',
+ 'label': u'Based On',
+ 'oldfieldname': u'based_on',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nGrand Total\nAverage Discount\nCustomerwise Discount\nItemwise Discount\nTotal Claimed Amount\nNot Applicable',
'reqd': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'master_name',
- 'fieldtype': 'Link',
- 'idx': 4,
- 'label': 'Customer / Item Name',
- 'oldfieldname': 'master_name',
- 'oldfieldtype': 'Link',
- 'trigger': 'Client'
+ 'doctype': u'DocField',
+ 'fieldname': u'master_name',
+ 'fieldtype': u'Link',
+ 'label': u'Customer / Item Name',
+ 'oldfieldname': u'master_name',
+ 'oldfieldtype': u'Link',
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'system_role',
- 'fieldtype': 'Link',
- 'idx': 5,
- 'label': 'Applicable To (Role)',
- 'oldfieldname': 'system_role',
- 'oldfieldtype': 'Link',
- 'options': 'Role'
+ 'doctype': u'DocField',
+ 'fieldname': u'system_role',
+ 'fieldtype': u'Link',
+ 'label': u'Applicable To (Role)',
+ 'oldfieldname': u'system_role',
+ 'oldfieldtype': u'Link',
+ 'options': u'Role'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'system_user',
- 'fieldtype': 'Link',
- 'idx': 6,
- 'label': 'Applicable To (User)',
- 'oldfieldname': 'system_user',
- 'oldfieldtype': 'Link',
- 'options': 'Profile'
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'system_user',
+ 'fieldtype': u'Link',
+ 'label': u'Applicable To (User)',
+ 'oldfieldname': u'system_user',
+ 'oldfieldtype': u'Link',
+ 'options': u'Profile'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'This will be used for setting rule in HR module',
- 'doctype': 'DocField',
- 'fieldname': 'to_emp',
- 'fieldtype': 'Link',
- 'idx': 7,
- 'label': 'Applicable To (Employee)',
- 'oldfieldname': 'to_emp',
- 'oldfieldtype': 'Link',
- 'options': 'Employee',
+ 'colour': u'White:FFF',
+ 'description': u'This will be used for setting rule in HR module',
+ 'doctype': u'DocField',
+ 'fieldname': u'to_emp',
+ 'fieldtype': u'Link',
+ 'label': u'Applicable To (Employee)',
+ 'oldfieldname': u'to_emp',
+ 'oldfieldtype': u'Link',
+ 'options': u'Employee',
'search_index': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'This will be used for setting rule in HR module',
- 'doctype': 'DocField',
- 'fieldname': 'to_designation',
- 'fieldtype': 'Link',
- 'idx': 8,
- 'label': 'Applicable To (Designation)',
- 'oldfieldname': 'to_designation',
- 'oldfieldtype': 'Link',
- 'options': 'Designation',
+ 'colour': u'White:FFF',
+ 'description': u'This will be used for setting rule in HR module',
+ 'doctype': u'DocField',
+ 'fieldname': u'to_designation',
+ 'fieldtype': u'Link',
+ 'label': u'Applicable To (Designation)',
+ 'oldfieldname': u'to_designation',
+ 'oldfieldtype': u'Link',
+ 'options': u'Designation',
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'approving_role',
- 'fieldtype': 'Link',
- 'idx': 9,
- 'label': 'Approving Role',
- 'oldfieldname': 'approving_role',
- 'oldfieldtype': 'Link',
- 'options': 'Role'
+ 'doctype': u'DocField',
+ 'fieldname': u'approving_role',
+ 'fieldtype': u'Link',
+ 'label': u'Approving Role',
+ 'oldfieldname': u'approving_role',
+ 'oldfieldtype': u'Link',
+ 'options': u'Role'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'approving_user',
- 'fieldtype': 'Link',
- 'idx': 10,
- 'label': 'Approving User',
- 'oldfieldname': 'approving_user',
- 'oldfieldtype': 'Link',
- 'options': 'Profile'
+ 'doctype': u'DocField',
+ 'fieldname': u'approving_user',
+ 'fieldtype': u'Link',
+ 'label': u'Approving User',
+ 'oldfieldname': u'approving_user',
+ 'oldfieldtype': u'Link',
+ 'options': u'Profile'
},
# DocField
{
- 'default': '0.00',
- 'doctype': 'DocField',
- 'fieldname': 'value',
- 'fieldtype': 'Currency',
- 'idx': 11,
- 'label': 'Above Value',
- 'oldfieldname': 'value',
- 'oldfieldtype': 'Currency'
+ 'default': u'0.00',
+ 'doctype': u'DocField',
+ 'fieldname': u'value',
+ 'fieldtype': u'Currency',
+ 'label': u'Above Value',
+ 'oldfieldname': u'value',
+ 'oldfieldtype': u'Currency'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'idx': 12,
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text'
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text'
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/brand/brand.txt b/erpnext/setup/doctype/brand/brand.txt
index ccf2ca6..97ab298 100644
--- a/erpnext/setup/doctype/brand/brand.txt
+++ b/erpnext/setup/doctype/brand/brand.txt
@@ -3,113 +3,60 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:53',
+ 'creation': '2012-03-27 14:36:19',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'yogesh@webnotestech.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:19',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
'allow_trash': 1,
- 'autoname': 'field:brand',
- 'colour': 'White:FFF',
+ 'autoname': u'field:brand',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'Setup',
+ 'document_type': u'Master',
+ 'module': u'Setup',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 5
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Brand',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Brand',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Brand',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Brand',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Brand
{
'doctype': 'DocType',
- 'name': 'Brand'
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'permlevel': 1,
- 'role': 'Material Manager',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'permlevel': 0,
- 'role': 'Material Manager',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 3,
- 'permlevel': 1,
- 'role': 'Material User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 4,
- 'permlevel': 0,
- 'role': 'Material User',
- 'submit': 0,
- 'write': 0
+ 'name': u'Brand'
},
# DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 5,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Material Master Manager',
+ 'role': u'System Manager',
'write': 1
},
@@ -117,48 +64,92 @@
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 6,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
+ 'role': u'Material Master Manager',
'write': 1
},
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Material Manager',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Material Manager',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Material User',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Material User',
+ 'submit': 0,
+ 'write': 0
+ },
+
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'brand',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Brand Name',
- 'oldfieldname': 'brand',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'brand',
+ 'fieldtype': u'Data',
+ 'label': u'Brand Name',
+ 'oldfieldname': u'brand',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Text',
- 'idx': 3,
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Text',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Text',
'permlevel': 0,
- 'width': '300px'
+ 'width': u'300px'
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/company/company.txt b/erpnext/setup/doctype/company/company.txt
index 11ad19c..17bd61b 100644
--- a/erpnext/setup/doctype/company/company.txt
+++ b/erpnext/setup/doctype/company/company.txt
@@ -3,52 +3,52 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:55',
+ 'creation': '2012-03-27 14:36:19',
'docstatus': 0,
- 'modified': '2011-12-14 15:12:28',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:19',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1323855292',
+ '_last_update': u'1323855292',
'allow_trash': 1,
- 'autoname': 'field:company_name',
- 'colour': 'White:FFF',
+ 'autoname': u'field:company_name',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'Setup',
+ 'document_type': u'Master',
+ 'module': u'Setup',
'name': '__common__',
- 'section_style': 'Tabbed',
- 'server_code_error': ' ',
+ 'section_style': u'Tabbed',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 96
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Company',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Company',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Company',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Company',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Company
{
'doctype': 'DocType',
- 'name': 'Company'
+ 'name': u'Company'
},
# DocPerm
@@ -56,9 +56,9 @@
'amend': 0,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'submit': 0,
'write': 1
},
@@ -68,9 +68,9 @@
'amend': 0,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'submit': 0,
'write': 1
},
@@ -78,285 +78,291 @@
# DocPerm
{
'cancel': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'All'
+ 'role': u'All'
},
# DocField
{
- 'description': 'Please Enter Company Name and Abbr and save the document. Once saved Accounting Settings will be populated automatically',
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Details',
- 'oldfieldtype': 'Section Break',
+ 'description': u'Please Enter Company Name and Abbr and save the document. Once saved Accounting Settings will be populated automatically',
+ 'doctype': u'DocField',
+ 'fieldname': u'details',
+ 'fieldtype': u'Section Break',
+ 'label': u'Details',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'company_name',
- 'fieldtype': 'Data',
- 'label': 'Company',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'company_name',
+ 'fieldtype': u'Data',
+ 'label': u'Company',
'no_copy': 0,
- 'oldfieldname': 'company_name',
- 'oldfieldtype': 'Data',
+ 'oldfieldname': u'company_name',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Please Enter Abbreviation or Short Name properly as it will be added as Suffix to all Account Heads.',
- 'doctype': 'DocField',
- 'fieldname': 'abbr',
- 'fieldtype': 'Data',
- 'label': 'Abbr',
+ 'colour': u'White:FFF',
+ 'description': u'Please Enter Abbreviation or Short Name properly as it will be added as Suffix to all Account Heads.',
+ 'doctype': u'DocField',
+ 'fieldname': u'abbr',
+ 'fieldtype': u'Data',
+ 'label': u'Abbr',
'no_copy': 0,
- 'oldfieldname': 'abbr',
- 'oldfieldtype': 'Data',
+ 'oldfieldname': u'abbr',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'depends_on': 'eval:!doc.__islocal',
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Default Settings',
- 'oldfieldtype': 'Section Break',
+ 'depends_on': u'eval:!doc.__islocal',
+ 'doctype': u'DocField',
+ 'fieldname': u'default_settings',
+ 'fieldtype': u'Section Break',
+ 'label': u'Default Settings',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'default_currency',
- 'fieldtype': 'Select',
- 'label': 'Default Currency',
- 'options': 'link:Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'default_currency',
+ 'fieldtype': u'Select',
+ 'label': u'Default Currency',
+ 'options': u'link:Currency',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'depends_on': 'eval:!doc.__islocal',
- 'doctype': 'DocField',
- 'fieldname': 'default_bank_account',
- 'fieldtype': 'Link',
- 'label': 'Default Bank Account',
+ 'depends_on': u'eval:!doc.__islocal',
+ 'doctype': u'DocField',
+ 'fieldname': u'default_bank_account',
+ 'fieldtype': u'Link',
+ 'label': u'Default Bank Account',
'no_copy': 1,
- 'oldfieldname': 'default_bank_account',
- 'oldfieldtype': 'Link',
- 'options': 'Account',
+ 'oldfieldname': u'default_bank_account',
+ 'oldfieldtype': u'Link',
+ 'options': u'Account',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'depends_on': 'eval:!doc.__islocal',
- 'doctype': 'DocField',
- 'fieldname': 'receivables_group',
- 'fieldtype': 'Link',
- 'label': 'Receivables Group',
+ 'depends_on': u'eval:!doc.__islocal',
+ 'doctype': u'DocField',
+ 'fieldname': u'receivables_group',
+ 'fieldtype': u'Link',
+ 'label': u'Receivables Group',
'no_copy': 1,
- 'oldfieldname': 'receivables_group',
- 'oldfieldtype': 'Link',
- 'options': 'Account',
+ 'oldfieldname': u'receivables_group',
+ 'oldfieldtype': u'Link',
+ 'options': u'Account',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'depends_on': 'eval:!doc.__islocal',
- 'doctype': 'DocField',
- 'fieldname': 'payables_group',
- 'fieldtype': 'Link',
- 'label': 'Payables Group',
+ 'depends_on': u'eval:!doc.__islocal',
+ 'doctype': u'DocField',
+ 'fieldname': u'payables_group',
+ 'fieldtype': u'Link',
+ 'label': u'Payables Group',
'no_copy': 1,
- 'oldfieldname': 'payables_group',
- 'oldfieldtype': 'Link',
- 'options': 'Account',
+ 'oldfieldname': u'payables_group',
+ 'oldfieldtype': u'Link',
+ 'options': u'Account',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'depends_on': 'eval:!doc.__islocal',
- 'doctype': 'DocField',
- 'fieldname': 'credit_days',
- 'fieldtype': 'Int',
- 'label': 'Credit Days',
- 'oldfieldname': 'credit_days',
- 'oldfieldtype': 'Int',
+ 'depends_on': u'eval:!doc.__islocal',
+ 'doctype': u'DocField',
+ 'fieldname': u'credit_days',
+ 'fieldtype': u'Int',
+ 'label': u'Credit Days',
+ 'oldfieldname': u'credit_days',
+ 'oldfieldtype': u'Int',
'permlevel': 0
},
# DocField
{
- 'depends_on': 'eval:!doc.__islocal',
- 'doctype': 'DocField',
- 'fieldname': 'credit_limit',
- 'fieldtype': 'Currency',
- 'label': 'Credit Limit',
- 'oldfieldname': 'credit_limit',
- 'oldfieldtype': 'Currency',
+ 'depends_on': u'eval:!doc.__islocal',
+ 'doctype': u'DocField',
+ 'fieldname': u'credit_limit',
+ 'fieldtype': u'Currency',
+ 'label': u'Credit Limit',
+ 'oldfieldname': u'credit_limit',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': 'eval:!doc.__islocal',
- 'doctype': 'DocField',
- 'fieldname': 'yearly_bgt_flag',
- 'fieldtype': 'Select',
- 'label': 'If Yearly Budget Exceeded',
- 'oldfieldname': 'yearly_bgt_flag',
- 'oldfieldtype': 'Select',
- 'options': '\nWarn\nIgnore\nStop',
+ 'colour': u'White:FFF',
+ 'depends_on': u'eval:!doc.__islocal',
+ 'doctype': u'DocField',
+ 'fieldname': u'yearly_bgt_flag',
+ 'fieldtype': u'Select',
+ 'label': u'If Yearly Budget Exceeded',
+ 'oldfieldname': u'yearly_bgt_flag',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nWarn\nIgnore\nStop',
'permlevel': 0
},
# DocField
{
- 'depends_on': 'eval:!doc.__islocal',
- 'doctype': 'DocField',
- 'fieldname': 'monthly_bgt_flag',
- 'fieldtype': 'Select',
- 'label': 'If Monthly Budget Exceeded',
- 'oldfieldname': 'monthly_bgt_flag',
- 'oldfieldtype': 'Select',
- 'options': '\nWarn\nIgnore\nStop',
+ 'depends_on': u'eval:!doc.__islocal',
+ 'doctype': u'DocField',
+ 'fieldname': u'monthly_bgt_flag',
+ 'fieldtype': u'Select',
+ 'label': u'If Monthly Budget Exceeded',
+ 'oldfieldname': u'monthly_bgt_flag',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nWarn\nIgnore\nStop',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Company Info',
+ 'doctype': u'DocField',
+ 'fieldname': u'company_info',
+ 'fieldtype': u'Section Break',
+ 'label': u'Company Info',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'address',
- 'fieldtype': 'Small Text',
- 'label': 'Address',
- 'oldfieldname': 'address',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'address',
+ 'fieldtype': u'Small Text',
+ 'label': u'Address',
+ 'oldfieldname': u'address',
+ 'oldfieldtype': u'Small Text',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'phone_no',
- 'fieldtype': 'Data',
- 'label': 'Phone No',
- 'oldfieldname': 'phone_no',
- 'oldfieldtype': 'Data',
- 'options': 'Phone',
+ 'doctype': u'DocField',
+ 'fieldname': u'phone_no',
+ 'fieldtype': u'Data',
+ 'label': u'Phone No',
+ 'oldfieldname': u'phone_no',
+ 'oldfieldtype': u'Data',
+ 'options': u'Phone',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'fax',
- 'fieldtype': 'Data',
- 'label': 'Fax',
- 'oldfieldname': 'fax',
- 'oldfieldtype': 'Data',
- 'options': 'Phone',
+ 'doctype': u'DocField',
+ 'fieldname': u'fax',
+ 'fieldtype': u'Data',
+ 'label': u'Fax',
+ 'oldfieldname': u'fax',
+ 'oldfieldtype': u'Data',
+ 'options': u'Phone',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'email',
- 'fieldtype': 'Data',
- 'label': 'Email',
- 'oldfieldname': 'email',
- 'oldfieldtype': 'Data',
- 'options': 'Email',
+ 'doctype': u'DocField',
+ 'fieldname': u'email',
+ 'fieldtype': u'Data',
+ 'label': u'Email',
+ 'oldfieldname': u'email',
+ 'oldfieldtype': u'Data',
+ 'options': u'Email',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'website',
- 'fieldtype': 'Data',
- 'label': 'Website',
- 'oldfieldname': 'website',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'website',
+ 'fieldtype': u'Data',
+ 'label': u'Website',
+ 'oldfieldname': u'website',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Company registration numbers for your reference. Example: VAT Registration Numbers etc.',
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Registration Info',
- 'oldfieldtype': 'Section Break',
+ 'colour': u'White:FFF',
+ 'description': u'Company registration numbers for your reference. Example: VAT Registration Numbers etc.',
+ 'doctype': u'DocField',
+ 'fieldname': u'registration_info',
+ 'fieldtype': u'Section Break',
+ 'label': u'Registration Info',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Company registration numbers for your reference. Tax numbers etc.',
- 'doctype': 'DocField',
- 'fieldname': 'registration_details',
- 'fieldtype': 'Code',
- 'label': 'Registration Details',
- 'oldfieldname': 'registration_details',
- 'oldfieldtype': 'Code',
+ 'colour': u'White:FFF',
+ 'description': u'Company registration numbers for your reference. Tax numbers etc.',
+ 'doctype': u'DocField',
+ 'fieldname': u'registration_details',
+ 'fieldtype': u'Code',
+ 'label': u'Registration Details',
+ 'oldfieldname': u'registration_details',
+ 'oldfieldtype': u'Code',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'label': 'Trash Reason',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
'no_copy': 1,
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/contact_control/contact_control.js b/erpnext/setup/doctype/contact_control/contact_control.js
index b6825eb..f58e75d 100755
--- a/erpnext/setup/doctype/contact_control/contact_control.js
+++ b/erpnext/setup/doctype/contact_control/contact_control.js
@@ -1,14 +1,6 @@
// common partner functions
// =========================
-/*
-// make shipping list body
-// ------------------------
-cur_frm.cscript.make_sl_body = function(){
- cur_frm.fields_dict['Shipping HTML'].wrapper.innerHTML = '';
- cur_frm.shipping_html = $a(cur_frm.fields_dict['Shipping HTML'].wrapper,'div');
-}
-*/
// make history list body
// -----------------------
@@ -18,35 +10,6 @@
}
-/*
-// set shipping list message
-// --------------------------
-cur_frm.cscript.set_sl_msg = function(doc){
- cur_frm.shipping_html.innerHTML = 'Shipping Address Details will appear only when you save the ' + doc.doctype.toLowerCase();
-}
-*/
-/*
-// set history list message
-// -------------------------
-cur_frm.cscript.set_hl_msg = function(doc){
- cur_frm.history_html.innerHTML= 'History Details will appear only when you save the ' + doc.doctype.toLowerCase();
-}
-*/
-
-
-/*
-// make shipping address
-// -------------
-cur_frm.cscript.make_shipping_address = function(doc, dt, dn){
- cur_frm.shipping_html.innerHTML = '';
-
- var dsn = cur_frm.doc.customer_name;
- var dsa = cur_frm.doc.address;
- cl = new AddressList(cur_frm.shipping_html,dt,dn,dsn,dsa);
-}
-*/
-
-
// make history
// -------------
cur_frm.cscript.make_history = function(doc,dt,dn){
@@ -157,406 +120,4 @@
cur_frm.fields_dict['territory'].get_query = function(doc,dt,dn) {
return 'SELECT `tabTerritory`.`name`,`tabTerritory`.`parent_territory` FROM `tabTerritory` WHERE `tabTerritory`.`is_group` = "No" AND `tabTerritory`.`docstatus`!= 2 AND `tabTerritory`.%(key)s LIKE "%s" ORDER BY `tabTerritory`.`name` ASC LIMIT 50';
}
-}
-
-
-// =======================================================================================================
-
-// contact list
-// --------------
-ContactList = function(parent,dt,dn,dsn){
-
- var me = this;
-
- this.dt = dt;
- this.dn = dn;
- this.dsn = dsn ? dsn : dn;
-
- this.wrapper = $a(parent,'div');
- me.get_list();
-}
-
-// add contact
-// ------------
-ContactList.prototype.add_contact = function(){
- var me = this;
-
- // onload - set default values
- var cont = LocalDB.create('Contact');
-
- var c = locals['Contact'][cont];
-
- if(me.dt == 'Customer') {
- c.is_customer = 1;
- c.customer = me.dn;
- c.customer_name = me.dsn;
- }
- else if(me.dt == 'Supplier'){
- c.is_supplier = 1;
- c.supplier = me.dn;
- c.supplier_name = me.dsn;
- }
- else if(me.dt == 'Sales Partner'){
- c.is_sales_partner = 1;
- c.sales_partner = me.dn;
- //c.sales_partner_name = me.dsn;
- }
-
- loaddoc('Contact',c.name);
-}
-
-// get contact list
-// -----------------
-ContactList.prototype.get_list = function(){
- var me = this;
-
- me.make_list();
-
- var dt = me.dt.toLowerCase().split(' ').join('_');
-
- // build query
- me.lst.get_query = function(){
- this.query = repl("select name, first_name, last_name, concat_ws(' ', first_name, last_name), email_id, contact_no, department, designation, is_primary_contact, has_login, disable_login from tabContact where %(dt)s = '%(dn)s' and docstatus != 2",{'dt':dt, 'dn':me.dn});
-
- this.query_max = repl("select count(name) from tabContact where %(dt)s = '%(dn)s' and docstatus != 2",{'dt':dt, 'dn':me.dn});
- }
-
- // render list ui
- me.lst.show_cell = function(cell,ri,ci,d){
- me.render_list(cell,ri,ci,d);
- }
-
- // run query
- me.lst.run();
-
- // onrun
- me.lst.onrun = function(){
- if(!this.has_data()){
- this.rec_label.innerHTML = '';
-
- $a(this.rec_label,'span').innerHTML = "You do not have any contact. ";
- $($a(this.rec_label,'span')).html('Add a new contact').addClass('link_type').click(function(){ me.add_contact(); });
-
- $dh(this.results);
- }
- else{
- $ds(this.results);
- }
- }
-}
-
-// make list
-// -----------
-ContactList.prototype.make_list = function(){
- var me = this;
-
- var l = new Listing();
- l.colwidths = ['5%','30%','30%','20%','20%'];
- l.colnames = ['Sr.','Contact Name','Email Id','Contact No', 'Action'];
- l.page_len = 10;
-
- me.lst = l;
-
- l.make(me.wrapper);
-
- // Add contact button
- me.add_btn = $btn(l.btn_area,'+ Add Contact', function(){ me.add_contact();}, {fontWeight:'bold'});
-}
-
-// make contact cell
-// ------------------
-ContactList.prototype.render_list = function(cell,ri,ci,d){
- var me = this;
-
- // name
- if(ci == 0){
- var nm = $a($a(cell,'div'),'span','',{cursor:'pointer'});
- nm.innerHTML = d[ri][3];
- nm.id = d[ri][0];
-
- nm.onclick = function(){
- loaddoc('Contact', this.id);
-
- // on save callback - refresh list
- }
-
- // department and designation
- var des = d[ri][7] ? d[ri][7] : '';
- var dep = d[ri][6] ? d[ri][6] : '';
-
- var sp = $a(cell,'div','comment');
- sp.innerHTML = des + (dep ? (', ' + dep) : '');
- }
-
- // email id, contact no, department, designation
- // -----------------------------------------------------
- if(ci == 1) cell.innerHTML = d[ri][4] ? d[ri][4] : '-';
- if(ci == 2) cell.innerHTML = d[ri][5] ? d[ri][5] : '-';
-
- // actions
- // --------------------------------------
- if(ci== 3) me.make_actions(cell,ri,ci,d);
-}
-
-// make actions
-// ---------------
-ContactList.prototype.make_actions = function(cell,ri,ci,d){
- var me = this;
-
- var tab = make_table(cell,1,2,'100%',['40%','60%']);
-
- // Edit and Delete
- var t = make_table($td(tab,0,0),1,2);
-
- var edit = $a($td(t,0,0),'div','wn-icon ic-doc_edit');
- $(edit).click(function(){ loaddoc('Contact',d[ri][0]); });
-
- edit.setAttribute('title','Edit');
-
-// Below code should be uncommented once customer/venodr invitation process is stable
-// ===========================================================================
-/*
- var del = $a($td(t,0,1),'div','wn-icon ic-trash');
- $(del).click(function(){ me.delete_contact(d[ri][0],d[ri][4]) });
-
- set_custom_tooltip(del, 'Delete');
-
- // Invite, Enable and Disable - Integrate after gateway logic incorporated
-
- if(d[ri][9] == 'Yes') {
- if(d[ri][10] == 'Yes'){
- var enb = $a($td(tab,0,1),'div','wn-icon ic-checkmark');
- $(enb).click(function(){ me.enable_login(d[ri][0], d[ri][4]); });
- }
- else{
- var dsb = $a($td(tab,0,1),'div','wn-icon ic-delete');
- $(dsb).click(function(){ me.disable_login(d[ri][0], d[ri][4]) });
- }
- }
- else{
- var inv = $a($td(tab,0,1),'div','wn-icon ic-mail');
- $(inv).click(function(){ me.invite_contact(d[ri][0], d[ri][4], d[ri][1], d[ri][2]) });
- }*/
-}
-
-// enable login
-// ----------------------------------------------------------
-ContactList.prototype.enable_login = function(id, email_id){
- var me = this;
-
- var callback = function(r,rt){
- me.get_list();
-
- if(!r.exc) msgprint('Login for contact enabled',1);
- else errprint(r.exc);
- }
-
- var args = {};
- args.contact = id;
- args.email = email_id;
-
- $c_obj('Contact Control','enable_login',JSON.stringify(args),callback);
-}
-
-// disable login
-// -------------------------------------------------------------
-ContactList.prototype.disable_login = function(id, email_id){
- var me = this;
-
- var callback = function(r,rt){
- me.get_list();
-
- if(!r.exc) msgprint('Login for contact disabled',1);
- else errprint(r.exc);
- }
-
- var args = {};
- args.contact = id;
- args.email = email_id;
-
- $c_obj('Contact Control','disable_login',JSON.stringify(args),callback);
-}
-
-// delete contact
-// -----------------
-ContactList.prototype.delete_contact = function(id,email_id,has_login){
- var me = this;
-
- var callback = function(r,rt){
- me.get_list();
-
- if(!r.exc) msgprint('Contact deleted successfully');
- else errprint(r.exc);
- }
-
- var args = {};
- args.contact = id;
- args.email = email_id;
- args.has_login = has_login;
-
- $c_obj('Contact Control','delete_contact',JSON.stringify(args),callback);
-}
-
-// invite user
-// --------------------------------------------------------
-ContactList.prototype.invite_contact = function(id,email_id,first_name,last_name){
- var me = this;
-
- if(!email_id){
- msgprint("Please add email id and save the contact first. You can then invite contact to view transactions.")
- }
- else{
- var callback = function(r,rt){
- if(!r.exc) msgprint('Invitation sent');
- else errprint(r.exc);
- }
-
- var args = {
- 'contact' : id,
- 'email' : email_id,
- 'first_name' : first_name ? first_name : '',
- 'last_name' : last_name ? last_name : '',
- 'usert_type' : 'Partner'
- };
-
- $c_obj('Contact Control','invite_contact',JSON.stringify(args),callback);
- }
-}
-
-
-// address list
-// --------------
-AddressList = function(parent,dt,dn,dsn,dsa){
-
- var me = this;
-
- this.dt = dt;
- this.dn = dn;
- this.dsn = dsn ? dsn : dn;
- this.dsa = dsa ? dsa : '';
-
- this.wrapper = $a(parent,'div');
- me.get_addr_list();
-}
-
-
-// add contact
-// ------------
-AddressList.prototype.add_address = function(){
- var me = this;
-
- // onload - set default values
- var addr = LocalDB.create('Shipping Address');
-
- var a = locals['Shipping Address'][addr];
-
- a.customer = me.dn;
- a.customer_name = me.dsn;
- a.customer_address = me.dsa;
- loaddoc('Shipping Address',a.name);
-}
-
-
-// get address list
-// -----------------
-AddressList.prototype.get_addr_list = function(){
- var me = this;
-
- me.make_addr_list();
-
- var dt = me.dt.toLowerCase().split(' ').join('_');
-
- // build query
- me.lst.get_query = function(){
- this.query = repl("select name, ship_to, shipping_address, is_primary_address, shipping_details from `tabShipping Address` where %(dt)s = '%(dn)s' and docstatus != 2",{'dt':dt, 'dn':me.dn});
-
- this.query_max = repl("select count(name) from `tabShipping Address` where %(dt)s = '%(dn)s'",{'dt':dt, 'dn':me.dn});
- }
-
- // render list ui
- me.lst.show_cell = function(cell,ri,ci,d){
- me.render_list(cell,ri,ci,d);
- }
-
- // run query
- me.lst.run();
-
- // onrun
- me.lst.onrun = function(){
- if(!this.has_data()){
- this.rec_label.innerHTML = '';
-
- $a(this.rec_label,'span').innerHTML = "You do not have any shipping address.";
- $($a(this.rec_label,'span')).html('Add a new address').addClass('link_type').click(function(){ me.add_address(); });
-
- $dh(this.results);
- }
- else{
- $ds(this.results);
- }
- }
-}
-
-
-// make list
-// -----------
-AddressList.prototype.make_addr_list = function(){
- var me = this;
-
- var l = new Listing();
- l.colwidths = ['5%', '15%', '25%','10%','35%','10%'];
- l.colnames = ['Sr.', 'Ship To', 'Shipping Address','Primary Address', 'Shipping Details', 'Action'];
- l.page_len = 10;
-
- me.lst = l;
-
- l.make(me.wrapper);
-
- // Add address button
- me.add_btn = $btn(l.btn_area,'+ Add Address', function(){ me.add_address();}, {fontWeight:'bold'});
-}
-
-
-
-// make address cell
-// ------------------
-AddressList.prototype.render_list = function(cell,ri,ci,d){
- var me = this;
-
- // name
- if(ci == 0){
- var nm = $a($a(cell,'div'),'span','',{cursor:'pointer'});
- nm.innerHTML = d[ri][1];
- nm.id = d[ri][0];
-
- nm.onclick = function(){
- loaddoc('Shipping Address', this.id);
- }
- }
-
- // shipping address, primary address, shipping details
- // ----------------------------------------------------
- if(ci == 1) cell.innerHTML = d[ri][2] ? d[ri][2] : '-';
- if(ci == 2) cell.innerHTML = d[ri][3] ? d[ri][3] : '-';
- if(ci == 3) cell.innerHTML = d[ri][4] ? d[ri][4] : '-';
-
- // actions
- // --------------------------------------
- if(ci== 4) me.make_actions(cell,ri,ci,d);
-}
-
-// make actions
-// ---------------
-AddressList.prototype.make_actions = function(cell,ri,ci,d){
- var me = this;
-
- var tab = make_table(cell,1,2,'100%',['40%','60%']);
-
- // Edit and Delete
- var t = make_table($td(tab,0,0),1,2);
-
- var edit = $a($td(t,0,0),'div','wn-icon ic-doc_edit');
- $(edit).click(function(){ loaddoc('Shipping Address',d[ri][0]); });
-
- edit.setAttribute('title','Edit');
-}
+}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/contact_control/contact_control.txt b/erpnext/setup/doctype/contact_control/contact_control.txt
index b9e84ad..c398190 100644
--- a/erpnext/setup/doctype/contact_control/contact_control.txt
+++ b/erpnext/setup/doctype/contact_control/contact_control.txt
@@ -3,86 +3,82 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:56',
+ 'creation': '2012-03-27 14:36:19',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'yogesh@webnotestech.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:19',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'in_create': 1,
'issingle': 1,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
'read_only': 1,
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 25
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldtype': u'Text',
'name': '__common__',
- 'parent': 'Contact Control',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Contact Control',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Contact Control',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Contact Control',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 1
},
# DocType, Contact Control
{
'doctype': 'DocType',
- 'name': 'Contact Control'
+ 'name': u'Contact Control'
},
# DocPerm
{
- 'doctype': 'DocPerm'
+ 'doctype': u'DocPerm'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'header',
- 'idx': 1,
- 'label': 'Header'
+ 'doctype': u'DocField',
+ 'fieldname': u'header',
+ 'label': u'Header'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'customer_intro',
- 'idx': 2,
- 'label': 'Customer Intro'
+ 'doctype': u'DocField',
+ 'fieldname': u'customer_intro',
+ 'label': u'Customer Intro'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'supplier_intro',
- 'idx': 3,
- 'label': 'Supplier Intro'
+ 'doctype': u'DocField',
+ 'fieldname': u'supplier_intro',
+ 'label': u'Supplier Intro'
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/country/country.txt b/erpnext/setup/doctype/country/country.txt
index 089ceb3..bc3e9ed 100644
--- a/erpnext/setup/doctype/country/country.txt
+++ b/erpnext/setup/doctype/country/country.txt
@@ -3,42 +3,41 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:56',
+ 'creation': '2012-03-27 14:36:19',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'yogesh@webnotestech.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:19',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'autoname': 'field:country_name',
- 'colour': 'White:FFF',
+ 'autoname': u'field:country_name',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
+ 'document_type': u'Master',
'in_create': 0,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
'read_only': 0,
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 11
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'country_name',
- 'fieldtype': 'Data',
- 'idx': 1,
- 'label': 'Country Name',
+ 'doctype': u'DocField',
+ 'fieldname': u'country_name',
+ 'fieldtype': u'Data',
+ 'label': u'Country Name',
'name': '__common__',
- 'oldfieldname': 'country_name',
- 'oldfieldtype': 'Data',
- 'parent': 'Country',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'oldfieldname': u'country_name',
+ 'oldfieldtype': u'Data',
+ 'parent': u'Country',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0,
'reqd': 1
},
@@ -46,11 +45,11 @@
# These values are common for all DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Country',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Country',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
'write': 1
@@ -59,42 +58,38 @@
# DocType, Country
{
'doctype': 'DocType',
- 'name': 'Country'
+ 'name': u'Country'
},
# DocPerm
{
'amend': 0,
'cancel': 0,
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'role': 'Sales Master Manager',
+ 'doctype': u'DocPerm',
+ 'role': u'Sales Master Manager',
'submit': 0
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'role': 'Purchase Master Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'Purchase Master Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 3,
- 'role': 'HR User'
+ 'doctype': u'DocPerm',
+ 'role': u'HR User'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 4,
- 'role': 'HR Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'HR Manager'
},
# DocField
{
- 'doctype': 'DocField'
+ 'doctype': u'DocField'
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/currency/currency.txt b/erpnext/setup/doctype/currency/currency.txt
index d5d066c..5abf9c5 100644
--- a/erpnext/setup/doctype/currency/currency.txt
+++ b/erpnext/setup/doctype/currency/currency.txt
@@ -3,41 +3,40 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:56',
+ 'creation': '2012-03-27 14:36:19',
'docstatus': 0,
- 'modified': '2010-11-18 16:00:32',
- 'modified_by': 'yogesh@webnotestech.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:19',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'autoname': 'field:currency_name',
- 'colour': 'White:FFF',
+ 'autoname': u'field:currency_name',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'in_create': 0,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
'read_only': 0,
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 3
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'currency_name',
- 'fieldtype': 'Data',
- 'idx': 1,
- 'label': 'Currency Name',
+ 'doctype': u'DocField',
+ 'fieldname': u'currency_name',
+ 'fieldtype': u'Data',
+ 'label': u'Currency Name',
'name': '__common__',
- 'oldfieldname': 'currency_name',
- 'oldfieldtype': 'Data',
- 'parent': 'Currency',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'oldfieldname': u'currency_name',
+ 'oldfieldtype': u'Data',
+ 'parent': u'Currency',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0,
'reqd': 1
},
@@ -45,11 +44,11 @@
# These values are common for all DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Currency',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Currency',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
'write': 1
@@ -58,23 +57,15 @@
# DocType, Currency
{
'doctype': 'DocType',
- 'name': 'Currency'
- },
-
- # DocPerm
- {
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'role': 'Accounts Manager'
+ 'name': u'Currency'
},
# DocPerm
{
'amend': 0,
'cancel': 0,
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'role': 'Sales Master Manager',
+ 'doctype': u'DocPerm',
+ 'role': u'Sales Master Manager',
'submit': 0
},
@@ -82,14 +73,19 @@
{
'amend': 0,
'cancel': 0,
- 'doctype': 'DocPerm',
- 'idx': 3,
- 'role': 'Purchase Master Manager',
+ 'doctype': u'DocPerm',
+ 'role': u'Purchase Master Manager',
'submit': 0
},
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'role': u'Accounts Manager'
+ },
+
# DocField
{
- 'doctype': 'DocField'
+ 'doctype': u'DocField'
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/customer_group/customer_group.txt b/erpnext/setup/doctype/customer_group/customer_group.txt
index 90043c8..c5ee40e 100644
--- a/erpnext/setup/doctype/customer_group/customer_group.txt
+++ b/erpnext/setup/doctype/customer_group/customer_group.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:57',
+ 'creation': '2012-03-27 14:36:19',
'docstatus': 0,
- 'modified': '2012-03-21 14:52:40',
+ 'modified': '2012-03-27 14:36:19',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -58,56 +58,6 @@
# DocPerm
{
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Sales Manager',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Sales Manager',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Sales Master Manager',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Sales User',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Sales User',
- 'write': 0
- },
-
- # DocPerm
- {
'cancel': 1,
'create': 1,
'doctype': u'DocPerm',
@@ -116,6 +66,56 @@
'write': 1
},
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Sales Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales Master Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales User',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Sales User',
+ 'write': 0
+ },
+
# DocField
{
'doctype': u'DocField',
diff --git a/erpnext/setup/doctype/email_digest/email_digest.txt b/erpnext/setup/doctype/email_digest/email_digest.txt
index 897adad..0a29a8c 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.txt
+++ b/erpnext/setup/doctype/email_digest/email_digest.txt
@@ -3,99 +3,101 @@
# These values are common in all dictionaries
{
- 'creation': '2011-12-14 12:15:09',
+ 'creation': '2012-03-27 14:36:20',
'docstatus': 0,
- 'modified': '2011-12-22 19:01:33',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:20',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1324556758',
- 'autoname': 'Prompt',
- 'colour': 'White:FFF',
+ '_last_update': u'1324556758',
+ 'autoname': u'Prompt',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'System',
- 'module': 'Setup',
+ 'document_type': u'System',
+ 'module': u'Setup',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 81
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Email Digest',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Email Digest',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Email Digest',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Email Digest',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1,
- 'role': 'System Manager'
+ 'role': u'System Manager'
},
# DocType, Email Digest
{
'doctype': 'DocType',
- 'name': 'Email Digest'
+ 'name': u'Email Digest'
},
# DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Settings',
+ 'doctype': u'DocField',
+ 'fieldname': u'settings',
+ 'fieldtype': u'Section Break',
+ 'label': u'Settings',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'enabled',
- 'fieldtype': 'Check',
- 'label': 'Enabled',
+ 'doctype': u'DocField',
+ 'fieldname': u'enabled',
+ 'fieldtype': u'Check',
+ 'label': u'Enabled',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'company',
- 'fieldtype': 'Select',
- 'label': 'For Company',
- 'options': 'link:Company',
+ 'doctype': u'DocField',
+ 'fieldname': u'company',
+ 'fieldtype': u'Select',
+ 'label': u'For Company',
+ 'options': u'link:Company',
'permlevel': 0,
'reqd': 1
},
@@ -103,249 +105,253 @@
# DocField
{
'allow_on_submit': 0,
- 'doctype': 'DocField',
- 'fieldname': 'frequency',
- 'fieldtype': 'Select',
- 'label': 'How frequently?',
- 'options': '\nDaily\nWeekly\nMonthly',
+ 'doctype': u'DocField',
+ 'fieldname': u'frequency',
+ 'fieldtype': u'Select',
+ 'label': u'How frequently?',
+ 'options': u'\nDaily\nWeekly\nMonthly',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'depends_on': 'eval:doc.enabled',
- 'doctype': 'DocField',
- 'fieldname': 'next_send',
- 'fieldtype': 'Data',
- 'label': 'Next email will be sent on:',
+ 'depends_on': u'eval:doc.enabled',
+ 'doctype': u'DocField',
+ 'fieldname': u'next_send',
+ 'fieldtype': u'Data',
+ 'label': u'Next email will be sent on:',
'permlevel': 1
},
# DocField
{
- 'default': '1',
- 'doctype': 'DocField',
- 'fieldname': 'use_standard',
- 'fieldtype': 'Check',
+ 'default': u'1',
+ 'doctype': u'DocField',
+ 'fieldname': u'use_standard',
+ 'fieldtype': u'Check',
'hidden': 1,
- 'label': 'Use standard?',
+ 'label': u'Use standard?',
'permlevel': 0,
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Add/Remove Recipients',
+ 'doctype': u'DocField',
+ 'fieldname': u'addremove_recipients',
+ 'fieldtype': u'Button',
+ 'label': u'Add/Remove Recipients',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'description': 'Note: Email will not be sent to disabled users',
- 'doctype': 'DocField',
- 'fieldname': 'recipient_list',
- 'fieldtype': 'Text',
- 'label': 'Recipients',
+ 'description': u'Note: Email will not be sent to disabled users',
+ 'doctype': u'DocField',
+ 'fieldname': u'recipient_list',
+ 'fieldtype': u'Text',
+ 'label': u'Recipients',
'permlevel': 1,
'reqd': 1
},
# DocField
{
- 'depends_on': 'eval:doc.use_standard',
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Select Digest Content',
+ 'depends_on': u'eval:doc.use_standard',
+ 'doctype': u'DocField',
+ 'fieldname': u'select_digest_content',
+ 'fieldtype': u'Section Break',
+ 'label': u'Select Digest Content',
'permlevel': 0
},
# DocField
{
- 'depends_on': 'eval:doc.use_standard',
- 'doctype': 'DocField',
- 'fieldname': 'new_leads',
- 'fieldtype': 'Check',
- 'label': 'New Leads',
+ 'depends_on': u'eval:doc.use_standard',
+ 'doctype': u'DocField',
+ 'fieldname': u'new_leads',
+ 'fieldtype': u'Check',
+ 'label': u'New Leads',
'permlevel': 0
},
# DocField
{
- 'depends_on': 'eval:doc.use_standard',
- 'doctype': 'DocField',
- 'fieldname': 'new_enquiries',
- 'fieldtype': 'Check',
- 'label': 'New Enquiries',
+ 'depends_on': u'eval:doc.use_standard',
+ 'doctype': u'DocField',
+ 'fieldname': u'new_enquiries',
+ 'fieldtype': u'Check',
+ 'label': u'New Enquiries',
'permlevel': 0
},
# DocField
{
- 'depends_on': 'eval:doc.use_standard',
- 'doctype': 'DocField',
- 'fieldname': 'new_quotations',
- 'fieldtype': 'Check',
- 'label': 'New Quotations',
+ 'depends_on': u'eval:doc.use_standard',
+ 'doctype': u'DocField',
+ 'fieldname': u'new_quotations',
+ 'fieldtype': u'Check',
+ 'label': u'New Quotations',
'permlevel': 0
},
# DocField
{
- 'depends_on': 'eval:doc.use_standard',
- 'doctype': 'DocField',
- 'fieldname': 'new_sales_orders',
- 'fieldtype': 'Check',
- 'label': 'New Sales Orders',
+ 'depends_on': u'eval:doc.use_standard',
+ 'doctype': u'DocField',
+ 'fieldname': u'new_sales_orders',
+ 'fieldtype': u'Check',
+ 'label': u'New Sales Orders',
'permlevel': 0
},
# DocField
{
- 'depends_on': 'eval:doc.use_standard',
- 'doctype': 'DocField',
- 'fieldname': 'new_purchase_orders',
- 'fieldtype': 'Check',
- 'label': 'New Purchase Orders',
+ 'depends_on': u'eval:doc.use_standard',
+ 'doctype': u'DocField',
+ 'fieldname': u'new_purchase_orders',
+ 'fieldtype': u'Check',
+ 'label': u'New Purchase Orders',
'permlevel': 0
},
# DocField
{
- 'depends_on': 'eval:doc.use_standard',
- 'doctype': 'DocField',
- 'fieldname': 'new_transactions',
- 'fieldtype': 'Check',
- 'label': 'New Transactions',
+ 'depends_on': u'eval:doc.use_standard',
+ 'doctype': u'DocField',
+ 'fieldname': u'new_transactions',
+ 'fieldtype': u'Check',
+ 'label': u'New Transactions',
'permlevel': 0
},
# DocField
{
- 'depends_on': 'eval:doc.use_standard',
- 'doctype': 'DocField',
- 'fieldname': 'payables',
- 'fieldtype': 'Check',
- 'label': 'Payables',
+ 'depends_on': u'eval:doc.use_standard',
+ 'doctype': u'DocField',
+ 'fieldname': u'payables',
+ 'fieldtype': u'Check',
+ 'label': u'Payables',
'permlevel': 0
},
# DocField
{
- 'depends_on': 'eval:doc.use_standard',
- 'doctype': 'DocField',
- 'fieldname': 'payments',
- 'fieldtype': 'Check',
- 'label': 'Payments',
+ 'depends_on': u'eval:doc.use_standard',
+ 'doctype': u'DocField',
+ 'fieldname': u'payments',
+ 'fieldtype': u'Check',
+ 'label': u'Payments',
'permlevel': 0
},
# DocField
{
- 'depends_on': 'eval:doc.use_standard',
- 'doctype': 'DocField',
- 'fieldname': 'expenses_booked',
- 'fieldtype': 'Check',
- 'label': 'Expenses Booked',
+ 'depends_on': u'eval:doc.use_standard',
+ 'doctype': u'DocField',
+ 'fieldname': u'expenses_booked',
+ 'fieldtype': u'Check',
+ 'label': u'Expenses Booked',
'permlevel': 0
},
# DocField
{
- 'depends_on': 'eval:doc.use_standard',
- 'doctype': 'DocField',
- 'fieldname': 'invoiced_amount',
- 'fieldtype': 'Check',
- 'label': 'Invoiced Amount (Receivables)',
+ 'depends_on': u'eval:doc.use_standard',
+ 'doctype': u'DocField',
+ 'fieldname': u'invoiced_amount',
+ 'fieldtype': u'Check',
+ 'label': u'Invoiced Amount (Receivables)',
'permlevel': 0
},
# DocField
{
- 'depends_on': 'eval:doc.use_standard',
- 'doctype': 'DocField',
- 'fieldname': 'collections',
- 'fieldtype': 'Check',
- 'label': 'Collections',
+ 'depends_on': u'eval:doc.use_standard',
+ 'doctype': u'DocField',
+ 'fieldname': u'collections',
+ 'fieldtype': u'Check',
+ 'label': u'Collections',
'permlevel': 0
},
# DocField
{
- 'depends_on': 'eval:doc.use_standard',
- 'doctype': 'DocField',
- 'fieldname': 'income',
- 'fieldtype': 'Check',
- 'label': 'Income',
+ 'depends_on': u'eval:doc.use_standard',
+ 'doctype': u'DocField',
+ 'fieldname': u'income',
+ 'fieldtype': u'Check',
+ 'label': u'Income',
'permlevel': 0
},
# DocField
{
- 'depends_on': 'eval:doc.use_standard',
- 'doctype': 'DocField',
- 'fieldname': 'income_year_to_date',
- 'fieldtype': 'Check',
- 'label': 'Income Year to Date',
+ 'depends_on': u'eval:doc.use_standard',
+ 'doctype': u'DocField',
+ 'fieldname': u'income_year_to_date',
+ 'fieldtype': u'Check',
+ 'label': u'Income Year to Date',
'permlevel': 0
},
# DocField
{
- 'depends_on': 'eval:doc.use_standard',
- 'doctype': 'DocField',
- 'fieldname': 'bank_balance',
- 'fieldtype': 'Check',
- 'label': 'Bank Balance',
+ 'depends_on': u'eval:doc.use_standard',
+ 'doctype': u'DocField',
+ 'fieldname': u'bank_balance',
+ 'fieldtype': u'Check',
+ 'label': u'Bank Balance',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'stock_below_rl',
- 'fieldtype': 'Check',
+ 'doctype': u'DocField',
+ 'fieldname': u'stock_below_rl',
+ 'fieldtype': u'Check',
'hidden': 1,
- 'label': 'Stock Items below re-order level',
+ 'label': u'Stock Items below re-order level',
'permlevel': 0
},
# DocField
{
- 'depends_on': 'eval:!doc.use_standard',
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Enter Custom Code',
+ 'depends_on': u'eval:!doc.use_standard',
+ 'doctype': u'DocField',
+ 'fieldname': u'enter_custom_code',
+ 'fieldtype': u'Section Break',
+ 'label': u'Enter Custom Code',
'permlevel': 0
},
# DocField
{
- 'depends_on': 'eval:!doc.use_standard',
- 'doctype': 'DocField',
- 'fieldname': 'custom_code',
- 'fieldtype': 'Code',
- 'label': 'Custom Python Code',
+ 'depends_on': u'eval:!doc.use_standard',
+ 'doctype': u'DocField',
+ 'fieldname': u'custom_code',
+ 'fieldtype': u'Code',
+ 'label': u'Custom Python Code',
'permlevel': 0
},
# DocField
{
- 'depends_on': 'eval:!doc.use_standard',
- 'doctype': 'DocField',
- 'fieldname': 'email_template',
- 'fieldtype': 'Code',
- 'label': 'Email Template',
+ 'depends_on': u'eval:!doc.use_standard',
+ 'doctype': u'DocField',
+ 'fieldname': u'email_template',
+ 'fieldtype': u'Code',
+ 'label': u'Email Template',
'permlevel': 0
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/email_settings/email_settings.js b/erpnext/setup/doctype/email_settings/email_settings.js
deleted file mode 100644
index 599fbcc..0000000
--- a/erpnext/setup/doctype/email_settings/email_settings.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// ERPNext - web based ERP (http://erpnext.com)
-// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-cur_frm.cscript.refresh = function(doc,cdt,cdn){
- if(!doc.outgoing_mail_server || !doc.mail_login || !doc.mail_password || !doc.auto_email_id || !doc.mail_port || !doc.use_ssl){
- get_server_fields('set_vals','','',doc, cdt, cdn, 1);
- }
-}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/email_settings/email_settings.py b/erpnext/setup/doctype/email_settings/email_settings.py
index c670b31..3e17636 100644
--- a/erpnext/setup/doctype/email_settings/email_settings.py
+++ b/erpnext/setup/doctype/email_settings/email_settings.py
@@ -23,21 +23,6 @@
def __init__(self,doc,doclist):
self.doc,self.doclist = doc,doclist
- def set_vals(self):
- res = sql("select field, value from `tabSingles` where doctype = 'Control Panel' and field IN ('outgoing_mail_server','mail_login','mail_password','auto_email_id','mail_port','use_ssl')")
- ret = {}
- for r in res:
- ret[cstr(r[0])]=r[1] and cstr(r[1]) or ''
-
- return ret
-
- def set_cp_value(self, key):
- """
- Update value in control panel
- """
- webnotes.conn.set_value('Control Panel', None, key,
- self.doc.fields.get(key))
-
def validate(self):
"""
Checks connectivity to email servers before saving
@@ -113,11 +98,3 @@
except poplib.error_proto, e:
webnotes.msgprint('Invalid User Name or Support Password. Please rectify and try again.')
webnotes.msgprint(e)
-
-
- def on_update(self):
- """
- update control panel
- """
- for f in ('outgoing_mail_server', 'mail_login', 'mail_password', 'auto_email_id', 'mail_port', 'use_ssl'):
- self.set_cp_value(f)
diff --git a/erpnext/setup/doctype/email_settings/email_settings.txt b/erpnext/setup/doctype/email_settings/email_settings.txt
index b6e52fc..fdf1cf0 100644
--- a/erpnext/setup/doctype/email_settings/email_settings.txt
+++ b/erpnext/setup/doctype/email_settings/email_settings.txt
@@ -3,234 +3,240 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:59',
+ 'creation': '2012-03-27 14:36:20',
'docstatus': 0,
- 'modified': '2012-01-25 18:44:45',
- 'modified_by': 'Administrator',
- 'owner': 'harshada@webnotestech.com'
+ 'modified': '2012-03-27 14:36:20',
+ 'modified_by': u'Administrator',
+ 'owner': u'harshada@webnotestech.com'
},
# These values are common for all DocType
{
- '_last_update': '1325570647',
+ '_last_update': u'1325570647',
'allow_copy': 1,
'allow_email': 1,
'allow_print': 1,
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
'in_create': 1,
'issingle': 1,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 35
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Email Settings',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Email Settings',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Email Settings',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Email Settings',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 1
},
# DocType, Email Settings
{
'doctype': 'DocType',
- 'name': 'Email Settings'
+ 'name': u'Email Settings'
},
# DocPerm
{
- 'doctype': 'DocPerm'
+ 'doctype': u'DocPerm'
},
# DocPerm
{
- 'doctype': 'DocPerm'
+ 'doctype': u'DocPerm'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Outgoing Mails'
+ 'doctype': u'DocField',
+ 'fieldname': u'outgoing_mails',
+ 'fieldtype': u'Section Break',
+ 'label': u'Outgoing Mails'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'label': '1',
- 'options': '<div class="help_box">Set your outgoing mail settings here. All system generated notifications, emails will go from this mail server</div>'
+ 'doctype': u'DocField',
+ 'fieldname': u'html1',
+ 'fieldtype': u'HTML',
+ 'label': u'1',
+ 'options': u'<div class="help_box">Set your outgoing mail settings here. All system generated notifications, emails will go from this mail server</div>'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'outgoing_mail_server',
- 'fieldtype': 'Data',
- 'label': 'Outgoing Mail Server'
+ 'doctype': u'DocField',
+ 'fieldname': u'outgoing_mail_server',
+ 'fieldtype': u'Data',
+ 'label': u'Outgoing Mail Server'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'mail_port',
- 'fieldtype': 'Int',
- 'label': 'Mail Port'
+ 'doctype': u'DocField',
+ 'fieldname': u'mail_port',
+ 'fieldtype': u'Int',
+ 'label': u'Mail Port'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'use_ssl',
- 'fieldtype': 'Check',
- 'label': 'Use SSL'
+ 'doctype': u'DocField',
+ 'fieldname': u'use_ssl',
+ 'fieldtype': u'Check',
+ 'label': u'Use SSL'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'mail_login',
- 'fieldtype': 'Data',
- 'label': 'Login Id'
+ 'doctype': u'DocField',
+ 'fieldname': u'mail_login',
+ 'fieldtype': u'Data',
+ 'label': u'Login Id'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'mail_password',
- 'fieldtype': 'Password',
- 'label': 'Mail Password'
+ 'doctype': u'DocField',
+ 'fieldname': u'mail_password',
+ 'fieldtype': u'Password',
+ 'label': u'Mail Password'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'auto_email_id',
- 'fieldtype': 'Data',
- 'label': 'Auto Email Id'
+ 'doctype': u'DocField',
+ 'fieldname': u'auto_email_id',
+ 'fieldtype': u'Data',
+ 'label': u'Auto Email Id'
},
# DocField
{
- 'description': 'Set the POP3 email settings to pull emails directly from a mailbox and create Support Tickets',
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Support Ticket Mail Settings'
+ 'description': u'Set the POP3 email settings to pull emails directly from a mailbox and create Support Tickets',
+ 'doctype': u'DocField',
+ 'fieldname': u'support_ticket_mail_settings',
+ 'fieldtype': u'Section Break',
+ 'label': u'Support Ticket Mail Settings'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'label': '2',
- 'options': '<div class="help_box">To automatically create Support Tickets from your incoming mail, set your pop3 settings here.</div>'
+ 'doctype': u'DocField',
+ 'fieldname': u'html2',
+ 'fieldtype': u'HTML',
+ 'label': u'2',
+ 'options': u'<div class="help_box">To automatically create Support Tickets from your incoming mail, set your pop3 settings here.</div>'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'options': 'Simple'
+ 'doctype': u'DocField',
+ 'fieldname': u'section_break0',
+ 'fieldtype': u'Section Break',
+ 'options': u'Simple'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Check this to pull emails from your mailbox',
- 'doctype': 'DocField',
- 'fieldname': 'sync_support_mails',
- 'fieldtype': 'Check',
- 'label': 'Sync Support Mails'
+ 'colour': u'White:FFF',
+ 'description': u'Check this to pull emails from your mailbox',
+ 'doctype': u'DocField',
+ 'fieldname': u'sync_support_mails',
+ 'fieldtype': u'Check',
+ 'label': u'Sync Support Mails'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Your support email id - must be a valid email - this is where your emails will come!',
- 'doctype': 'DocField',
- 'fieldname': 'support_email',
- 'fieldtype': 'Data',
- 'label': 'Support Email'
+ 'colour': u'White:FFF',
+ 'description': u'Your support email id - must be a valid email - this is where your emails will come!',
+ 'doctype': u'DocField',
+ 'fieldname': u'support_email',
+ 'fieldtype': u'Data',
+ 'label': u'Support Email'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'POP3 mail server (e.g. pop.gmail.com)',
- 'doctype': 'DocField',
- 'fieldname': 'support_host',
- 'fieldtype': 'Data',
- 'label': 'POP3 Mail Server'
+ 'colour': u'White:FFF',
+ 'description': u'POP3 mail server (e.g. pop.gmail.com)',
+ 'doctype': u'DocField',
+ 'fieldname': u'support_host',
+ 'fieldtype': u'Data',
+ 'label': u'POP3 Mail Server'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'support_use_ssl',
- 'fieldtype': 'Check',
- 'label': 'Use SSL'
+ 'doctype': u'DocField',
+ 'fieldname': u'support_use_ssl',
+ 'fieldtype': u'Check',
+ 'label': u'Use SSL'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'support_username',
- 'fieldtype': 'Data',
- 'label': 'User Name'
+ 'doctype': u'DocField',
+ 'fieldname': u'support_username',
+ 'fieldtype': u'Data',
+ 'label': u'User Name'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'support_password',
- 'fieldtype': 'Password',
- 'label': 'Support Password'
+ 'doctype': u'DocField',
+ 'fieldname': u'support_password',
+ 'fieldtype': u'Password',
+ 'label': u'Support Password'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Signature to be appended at the end of every email',
- 'doctype': 'DocField',
- 'fieldname': 'support_signature',
- 'fieldtype': 'Text',
- 'label': 'Signature'
+ 'colour': u'White:FFF',
+ 'description': u'Signature to be appended at the end of every email',
+ 'doctype': u'DocField',
+ 'fieldname': u'support_signature',
+ 'fieldtype': u'Text',
+ 'label': u'Signature'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Autoreply when a new mail is received',
- 'doctype': 'DocField',
- 'fieldname': 'support_autoreply',
- 'fieldtype': 'Text',
- 'label': 'Autoreply'
+ 'colour': u'White:FFF',
+ 'description': u'Autoreply when a new mail is received',
+ 'doctype': u'DocField',
+ 'fieldname': u'support_autoreply',
+ 'fieldtype': u'Text',
+ 'label': u'Autoreply'
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/features_setup/features_setup.txt b/erpnext/setup/doctype/features_setup/features_setup.txt
index eff542b..8b03665 100644
--- a/erpnext/setup/doctype/features_setup/features_setup.txt
+++ b/erpnext/setup/doctype/features_setup/features_setup.txt
@@ -3,46 +3,46 @@
# These values are common in all dictionaries
{
- 'creation': '2011-09-07 11:59:05',
+ 'creation': '2012-03-27 14:36:21',
'docstatus': 0,
- 'modified': '2011-12-14 11:05:55',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:21',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1323840127',
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ '_last_update': u'1323840127',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
'issingle': 1,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
- 'name_case': 'Title Case',
- 'section_style': 'Simple',
+ 'name_case': u'Title Case',
+ 'section_style': u'Simple',
'show_in_menu': 1,
'version': 26
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Features Setup',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Features Setup',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Features Setup',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Features Setup',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
'write': 1
@@ -51,272 +51,282 @@
# DocType, Features Setup
{
'doctype': 'DocType',
- 'name': 'Features Setup'
+ 'name': u'Features Setup'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'role': 'System Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'System Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'role': 'Administrator'
+ 'doctype': u'DocPerm',
+ 'role': u'Administrator'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Materials'
+ 'doctype': u'DocField',
+ 'fieldname': u'materials',
+ 'fieldtype': u'Section Break',
+ 'label': u'Materials'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.',
- 'doctype': 'DocField',
- 'fieldname': 'fs_item_serial_nos',
- 'fieldtype': 'Check',
- 'label': 'Item Serial Nos'
+ 'colour': u'White:FFF',
+ 'description': u'To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.',
+ 'doctype': u'DocField',
+ 'fieldname': u'fs_item_serial_nos',
+ 'fieldtype': u'Check',
+ 'label': u'Item Serial Nos'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'To track items in sales and purchase documents with batch nos<br><b>Preferred Industry: Chemicals etc</b>',
- 'doctype': 'DocField',
- 'fieldname': 'fs_item_batch_nos',
- 'fieldtype': 'Check',
- 'label': 'Item Batch Nos'
+ 'colour': u'White:FFF',
+ 'description': u'To track items in sales and purchase documents with batch nos<br><b>Preferred Industry: Chemicals etc</b>',
+ 'doctype': u'DocField',
+ 'fieldname': u'fs_item_batch_nos',
+ 'fieldtype': u'Check',
+ 'label': u'Item Batch Nos'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'To track brand name in the following documents<br>\nDelivery Note, Enuiry, Indent, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Receivable Voucher, Sales BOM, Sales Order, Serial No',
- 'doctype': 'DocField',
- 'fieldname': 'fs_brands',
- 'fieldtype': 'Check',
- 'label': 'Brands'
+ 'colour': u'White:FFF',
+ 'description': u'To track brand name in the following documents<br>\nDelivery Note, Enuiry, Indent, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Receivable Voucher, Sales BOM, Sales Order, Serial No',
+ 'doctype': u'DocField',
+ 'fieldname': u'fs_brands',
+ 'fieldtype': u'Check',
+ 'label': u'Brands'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': '1. To maintain the customer wise item code and to make them searchable based on their code use this option',
- 'doctype': 'DocField',
- 'fieldname': 'fs_item_advanced',
- 'fieldtype': 'Check',
- 'label': 'Item Advanced'
+ 'colour': u'White:FFF',
+ 'description': u'1. To maintain the customer wise item code and to make them searchable based on their code use this option',
+ 'doctype': u'DocField',
+ 'fieldname': u'fs_item_advanced',
+ 'fieldtype': u'Check',
+ 'label': u'Item Advanced'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'If Sale BOM is defined, the actual BOM of the Pack is displayed as table.\nAvailable in Delivery Note and Sales Order',
- 'doctype': 'DocField',
- 'fieldname': 'fs_packing_details',
- 'fieldtype': 'Check',
- 'label': 'Packing Detials'
+ 'colour': u'White:FFF',
+ 'description': u'If Sale BOM is defined, the actual BOM of the Pack is displayed as table.\nAvailable in Delivery Note and Sales Order',
+ 'doctype': u'DocField',
+ 'fieldname': u'fs_packing_details',
+ 'fieldtype': u'Check',
+ 'label': u'Packing Detials'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'To get Item Group in details table',
- 'doctype': 'DocField',
- 'fieldname': 'fs_item_group_in_details',
- 'fieldtype': 'Check',
- 'label': 'Item Groups in Details'
+ 'colour': u'White:FFF',
+ 'description': u'To get Item Group in details table',
+ 'doctype': u'DocField',
+ 'fieldname': u'fs_item_group_in_details',
+ 'fieldtype': u'Check',
+ 'label': u'Item Groups in Details'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Sales and Purchase'
+ 'doctype': u'DocField',
+ 'fieldname': u'sales_and_purchase',
+ 'fieldtype': u'Section Break',
+ 'label': u'Sales and Purchase'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'All export related fields like currency, conversion rate, export total, export grand total etc are available in <br>\nDelivery Note, POS, Quotation, Sales Invoice, Sales Order etc.',
- 'doctype': 'DocField',
- 'fieldname': 'fs_exports',
- 'fieldtype': 'Check',
- 'label': 'Exports'
+ 'colour': u'White:FFF',
+ 'description': u'All export related fields like currency, conversion rate, export total, export grand total etc are available in <br>\nDelivery Note, POS, Quotation, Sales Invoice, Sales Order etc.',
+ 'doctype': u'DocField',
+ 'fieldname': u'fs_exports',
+ 'fieldtype': u'Check',
+ 'label': u'Exports'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'All import related fields like currency, conversion rate, import total, import grand total etc are available in <br>\nPurchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.',
- 'doctype': 'DocField',
- 'fieldname': 'fs_imports',
- 'fieldtype': 'Check',
- 'label': 'Imports'
+ 'colour': u'White:FFF',
+ 'description': u'All import related fields like currency, conversion rate, import total, import grand total etc are available in <br>\nPurchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.',
+ 'doctype': u'DocField',
+ 'fieldname': u'fs_imports',
+ 'fieldtype': u'Check',
+ 'label': u'Imports'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Field available in Delivery Note, Quotation, Receivable Voucher, Sales Order',
- 'doctype': 'DocField',
- 'fieldname': 'fs_discounts',
- 'fieldtype': 'Check',
- 'label': 'Sales Discounts'
+ 'colour': u'White:FFF',
+ 'description': u'Field available in Delivery Note, Quotation, Receivable Voucher, Sales Order',
+ 'doctype': u'DocField',
+ 'fieldname': u'fs_discounts',
+ 'fieldtype': u'Check',
+ 'label': u'Sales Discounts'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice',
- 'doctype': 'DocField',
- 'fieldname': 'fs_purchase_discounts',
- 'fieldtype': 'Check',
- 'label': 'Purchase Discounts'
+ 'colour': u'White:FFF',
+ 'description': u'Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice',
+ 'doctype': u'DocField',
+ 'fieldname': u'fs_purchase_discounts',
+ 'fieldtype': u'Check',
+ 'label': u'Purchase Discounts'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'To track any installation or commissioning related work after sales',
- 'doctype': 'DocField',
- 'fieldname': 'fs_after_sales_installations',
- 'fieldtype': 'Check',
- 'label': 'After Sale Installations'
+ 'colour': u'White:FFF',
+ 'description': u'To track any installation or commissioning related work after sales',
+ 'doctype': u'DocField',
+ 'fieldname': u'fs_after_sales_installations',
+ 'fieldtype': u'Check',
+ 'label': u'After Sale Installations'
},
# DocField
{
- 'description': 'Available in \nBill Of Materials, Delivery Note, Payable Voucher, Production Order, Purchase Order, Purchase Receipt, Receivable Voucher, Sales Order, Stock Entry, Timesheet',
- 'doctype': 'DocField',
- 'fieldname': 'fs_projects',
- 'fieldtype': 'Check',
- 'label': 'Projects'
+ 'description': u'Available in \nBill Of Materials, Delivery Note, Payable Voucher, Production Order, Purchase Order, Purchase Receipt, Receivable Voucher, Sales Order, Stock Entry, Timesheet',
+ 'doctype': u'DocField',
+ 'fieldname': u'fs_projects',
+ 'fieldtype': u'Check',
+ 'label': u'Projects'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'If you have Sales Team and Sale Partners (Channel Partners) they can be tagged and maintain their contribution in the sales activity',
- 'doctype': 'DocField',
- 'fieldname': 'fs_sales_extras',
- 'fieldtype': 'Check',
- 'label': 'Sales Extras'
+ 'colour': u'White:FFF',
+ 'description': u'If you have Sales Team and Sale Partners (Channel Partners) they can be tagged and maintain their contribution in the sales activity',
+ 'doctype': u'DocField',
+ 'fieldname': u'fs_sales_extras',
+ 'fieldtype': u'Check',
+ 'label': u'Sales Extras'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Accounts'
+ 'doctype': u'DocField',
+ 'fieldname': u'accounts',
+ 'fieldtype': u'Section Break',
+ 'label': u'Accounts'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.',
- 'doctype': 'DocField',
- 'fieldname': 'fs_recurring_invoice',
- 'fieldtype': 'Check',
- 'label': 'Recurring Invoice'
+ 'colour': u'White:FFF',
+ 'description': u'Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.',
+ 'doctype': u'DocField',
+ 'fieldname': u'fs_recurring_invoice',
+ 'fieldtype': u'Check',
+ 'label': u'Recurring Invoice'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break2',
+ 'fieldtype': u'Column Break'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'To enable <b>Point of Sale</b> features',
- 'doctype': 'DocField',
- 'fieldname': 'fs_pos',
- 'fieldtype': 'Check',
- 'label': 'Point of Sale'
+ 'colour': u'White:FFF',
+ 'description': u'To enable <b>Point of Sale</b> features',
+ 'doctype': u'DocField',
+ 'fieldname': u'fs_pos',
+ 'fieldtype': u'Check',
+ 'label': u'Point of Sale'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Production'
+ 'doctype': u'DocField',
+ 'fieldname': u'production',
+ 'fieldtype': u'Section Break',
+ 'label': u'Production'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'If you involve in manufacturing activity<br>\nEnables item <b>Is Manufactured</b>',
- 'doctype': 'DocField',
- 'fieldname': 'fs_manufacturing',
- 'fieldtype': 'Check',
- 'label': 'Manufacturing'
+ 'colour': u'White:FFF',
+ 'description': u'If you involve in manufacturing activity<br>\nEnables item <b>Is Manufactured</b>',
+ 'doctype': u'DocField',
+ 'fieldname': u'fs_manufacturing',
+ 'fieldtype': u'Check',
+ 'label': u'Manufacturing'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break3',
+ 'fieldtype': u'Column Break'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'If you follow Quality Inspection<br>\nEnables item QA Required and QA No in Purchase Receipt',
- 'doctype': 'DocField',
- 'fieldname': 'fs_quality',
- 'fieldtype': 'Check',
- 'label': 'Quality'
+ 'colour': u'White:FFF',
+ 'description': u'If you follow Quality Inspection<br>\nEnables item QA Required and QA No in Purchase Receipt',
+ 'doctype': u'DocField',
+ 'fieldname': u'fs_quality',
+ 'fieldtype': u'Check',
+ 'label': u'Quality'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Miscelleneous'
+ 'doctype': u'DocField',
+ 'fieldname': u'miscelleneous',
+ 'fieldtype': u'Section Break',
+ 'label': u'Miscelleneous'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page',
- 'doctype': 'DocField',
- 'fieldname': 'fs_page_break',
- 'fieldtype': 'Check',
- 'label': 'Page Break'
+ 'colour': u'White:FFF',
+ 'description': u'If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page',
+ 'doctype': u'DocField',
+ 'fieldname': u'fs_page_break',
+ 'fieldtype': u'Check',
+ 'label': u'Page Break'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break4',
+ 'fieldtype': u'Column Break'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Enables <b>More Info.</b> in all documents',
- 'doctype': 'DocField',
- 'fieldname': 'fs_more_info',
- 'fieldtype': 'Check',
- 'label': 'More Info'
+ 'colour': u'White:FFF',
+ 'description': u'Enables <b>More Info.</b> in all documents',
+ 'doctype': u'DocField',
+ 'fieldname': u'fs_more_info',
+ 'fieldtype': u'Check',
+ 'label': u'More Info'
}
-]
+]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/import_data_control/import_data_control.txt b/erpnext/setup/doctype/import_data_control/import_data_control.txt
index 06787e0..fa19e10 100644
--- a/erpnext/setup/doctype/import_data_control/import_data_control.txt
+++ b/erpnext/setup/doctype/import_data_control/import_data_control.txt
@@ -3,28 +3,28 @@
# These values are common in all dictionaries
{
- 'creation': '2010-10-04 16:30:30',
+ 'creation': '2012-03-27 14:36:21',
'docstatus': 0,
- 'modified': '2010-12-24 11:43:03',
- 'modified_by': 'abhishek@webnotestech.com',
- 'owner': 'harshada@webnotestech.com'
+ 'modified': '2012-03-27 14:36:21',
+ 'modified_by': u'Administrator',
+ 'owner': u'harshada@webnotestech.com'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'issingle': 1,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 12
},
# DocType, Import Data Control
{
'doctype': 'DocType',
- 'name': 'Import Data Control'
+ 'name': u'Import Data Control'
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/item_group/item_group.txt b/erpnext/setup/doctype/item_group/item_group.txt
index e744901..b56b8da 100644
--- a/erpnext/setup/doctype/item_group/item_group.txt
+++ b/erpnext/setup/doctype/item_group/item_group.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:06',
+ 'creation': '2012-03-27 14:36:21',
'docstatus': 0,
- 'modified': '2012-03-22 14:40:03',
+ 'modified': '2012-03-27 14:36:21',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -57,54 +57,6 @@
# DocPerm
{
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Material Manager',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Material Manager',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Material User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Material User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
'cancel': 1,
'create': 1,
'doctype': u'DocPerm',
@@ -123,6 +75,54 @@
'write': 1
},
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Material Manager',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Material Manager',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Material User',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Material User',
+ 'submit': 0,
+ 'write': 0
+ },
+
# DocField
{
'doctype': u'DocField',
diff --git a/erpnext/setup/doctype/manage_account/manage_account.txt b/erpnext/setup/doctype/manage_account/manage_account.txt
index 4077afe..970e279 100644
--- a/erpnext/setup/doctype/manage_account/manage_account.txt
+++ b/erpnext/setup/doctype/manage_account/manage_account.txt
@@ -3,58 +3,58 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:09',
+ 'creation': '2012-03-27 14:36:21',
'docstatus': 0,
- 'modified': '2012-01-20 11:25:18',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:21',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1323855502',
+ '_last_update': u'1323855502',
'allow_copy': 1,
'allow_email': 1,
'allow_print': 1,
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
'hide_toolbar': 0,
'in_create': 1,
'issingle': 1,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
'read_only': 1,
- 'section_style': 'Tabbed',
- 'server_code_error': ' ',
+ 'section_style': u'Tabbed',
+ 'server_code_error': u' ',
'show_in_menu': 1,
'version': 517
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Manage Account',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Manage Account',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Manage Account',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Manage Account',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Manage Account
{
'doctype': 'DocType',
- 'name': 'Manage Account'
+ 'name': u'Manage Account'
},
# DocPerm
@@ -62,9 +62,9 @@
'amend': 0,
'cancel': 0,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'submit': 0,
'write': 1
},
@@ -72,464 +72,482 @@
# DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'System Manager',
+ 'role': u'All'
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'System Manager',
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'permlevel': 1,
- 'role': 'All'
- },
-
- # DocPerm
- {
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 2,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'System'
+ 'doctype': u'DocField',
+ 'fieldname': u'system',
+ 'fieldtype': u'Section Break',
+ 'label': u'System'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Example: http://frappe.erpnext.com',
- 'doctype': 'DocField',
- 'fieldname': 'account_url',
- 'fieldtype': 'Data',
- 'label': 'Account URL'
+ 'colour': u'White:FFF',
+ 'description': u'Example: http://frappe.erpnext.com',
+ 'doctype': u'DocField',
+ 'fieldname': u'account_url',
+ 'fieldtype': u'Data',
+ 'label': u'Account URL'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'sms_sender_name',
- 'fieldtype': 'Data',
- 'label': 'SMS Sender Name'
+ 'doctype': u'DocField',
+ 'fieldname': u'sms_sender_name',
+ 'fieldtype': u'Data',
+ 'label': u'SMS Sender Name'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Company'
+ 'doctype': u'DocField',
+ 'fieldname': u'company',
+ 'fieldtype': u'Section Break',
+ 'label': u'Company'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'default_company',
- 'fieldtype': 'Link',
- 'label': 'Default Company',
- 'options': 'Company',
+ 'doctype': u'DocField',
+ 'fieldname': u'default_company',
+ 'fieldtype': u'Link',
+ 'label': u'Default Company',
+ 'options': u'Company',
'reqd': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'current_fiscal_year',
- 'fieldtype': 'Link',
- 'label': 'Current Fiscal Year',
- 'options': 'Fiscal Year',
+ 'doctype': u'DocField',
+ 'fieldname': u'current_fiscal_year',
+ 'fieldtype': u'Link',
+ 'label': u'Current Fiscal Year',
+ 'options': u'Fiscal Year',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'date_format',
- 'fieldtype': 'Select',
- 'label': 'Date Format',
- 'options': 'yyyy-mm-dd\ndd-mm-yyyy\ndd/mm/yyyy\nmm/dd/yyyy\nmm-dd-yyyy'
+ 'doctype': u'DocField',
+ 'fieldname': u'date_format',
+ 'fieldtype': u'Select',
+ 'label': u'Date Format',
+ 'options': u'yyyy-mm-dd\ndd-mm-yyyy\ndd/mm/yyyy\nmm/dd/yyyy\nmm-dd-yyyy'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'width': '50%'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break',
+ 'width': u'50%'
},
# DocField
{
- 'default': 'INR',
- 'doctype': 'DocField',
- 'fieldname': 'default_currency',
- 'fieldtype': 'Select',
- 'label': 'Default Currency',
- 'options': 'link:Currency',
+ 'default': u'INR',
+ 'doctype': u'DocField',
+ 'fieldname': u'default_currency',
+ 'fieldtype': u'Select',
+ 'label': u'Default Currency',
+ 'options': u'link:Currency',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'default_currency_format',
- 'fieldtype': 'Select',
- 'label': 'Default Currency Format',
- 'options': 'Lacs\nMillions'
+ 'doctype': u'DocField',
+ 'fieldname': u'default_currency_format',
+ 'fieldtype': u'Select',
+ 'label': u'Default Currency Format',
+ 'options': u'Lacs\nMillions'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'default_currency_fraction',
- 'fieldtype': 'Data',
- 'label': 'Default Currency Fraction'
+ 'doctype': u'DocField',
+ 'fieldname': u'default_currency_fraction',
+ 'fieldtype': u'Data',
+ 'label': u'Default Currency Fraction'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Stock'
+ 'doctype': u'DocField',
+ 'fieldname': u'stock',
+ 'fieldtype': u'Section Break',
+ 'label': u'Stock'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'width': '50%'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break2',
+ 'fieldtype': u'Column Break',
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'default_item_group',
- 'fieldtype': 'Link',
- 'label': 'Default Item Group',
- 'options': 'Item Group'
+ 'doctype': u'DocField',
+ 'fieldname': u'default_item_group',
+ 'fieldtype': u'Link',
+ 'label': u'Default Item Group',
+ 'options': u'Item Group'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'label': 'IGHelp',
- 'options': '<a href="#!Sales Browser/Item Group">To manage Item Groups, click here</a>'
+ 'doctype': u'DocField',
+ 'fieldname': u'ighelp',
+ 'fieldtype': u'HTML',
+ 'label': u'IGHelp',
+ 'options': u'<a href="#!Sales Browser/Item Group">To manage Item Groups, click here</a>'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'default_stock_uom',
- 'fieldtype': 'Link',
- 'label': 'Default Stock UOM',
- 'options': 'UOM'
+ 'doctype': u'DocField',
+ 'fieldname': u'default_stock_uom',
+ 'fieldtype': u'Link',
+ 'label': u'Default Stock UOM',
+ 'options': u'UOM'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'default_valuation_method',
- 'fieldtype': 'Select',
- 'label': 'Default Valuation Method',
- 'options': 'FIFO\nMoving Average'
+ 'doctype': u'DocField',
+ 'fieldname': u'default_valuation_method',
+ 'fieldtype': u'Select',
+ 'label': u'Default Valuation Method',
+ 'options': u'FIFO\nMoving Average'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'default_warehouse_type',
- 'fieldtype': 'Link',
- 'label': 'Default Warehouse Type',
- 'options': 'Warehouse Type'
+ 'doctype': u'DocField',
+ 'fieldname': u'default_warehouse_type',
+ 'fieldtype': u'Link',
+ 'label': u'Default Warehouse Type',
+ 'options': u'Warehouse Type'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'auto_indent',
- 'fieldtype': 'Check',
- 'label': 'Raise Indent when stock reaches re-order level'
+ 'doctype': u'DocField',
+ 'fieldname': u'auto_indent',
+ 'fieldtype': u'Check',
+ 'label': u'Raise Indent when stock reaches re-order level'
},
# DocField
{
- 'default': '1',
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'width': '50%'
+ 'default': u'1',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break3',
+ 'fieldtype': u'Column Break',
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Percentage you are allowed to receive or deliver more against the quantity ordered. <p>For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units</p>',
- 'doctype': 'DocField',
- 'fieldname': 'tolerance',
- 'fieldtype': 'Currency',
- 'label': 'Allowance Percent'
+ 'colour': u'White:FFF',
+ 'description': u'Percentage you are allowed to receive or deliver more against the quantity ordered. <p>For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units</p>',
+ 'doctype': u'DocField',
+ 'fieldname': u'tolerance',
+ 'fieldtype': u'Currency',
+ 'label': u'Allowance Percent'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Stock level frozen up to this date, nobody can do / modify entry except authorized person',
- 'doctype': 'DocField',
- 'fieldname': 'stock_frozen_upto',
- 'fieldtype': 'Date',
- 'label': 'Stock Frozen Upto'
+ 'colour': u'White:FFF',
+ 'description': u'Stock level frozen up to this date, nobody can do / modify entry except authorized person',
+ 'doctype': u'DocField',
+ 'fieldname': u'stock_frozen_upto',
+ 'fieldtype': u'Date',
+ 'label': u'Stock Frozen Upto'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Users with this role are allowed to do / modify stock entry before frozen date',
- 'doctype': 'DocField',
- 'fieldname': 'stock_auth_role',
- 'fieldtype': 'Link',
- 'label': 'Authorized Role (Frozen Entry)',
- 'options': 'Role'
+ 'colour': u'White:FFF',
+ 'description': u'Users with this role are allowed to do / modify stock entry before frozen date',
+ 'doctype': u'DocField',
+ 'fieldname': u'stock_auth_role',
+ 'fieldtype': u'Link',
+ 'label': u'Authorized Role (Frozen Entry)',
+ 'options': u'Role'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Accounts'
+ 'doctype': u'DocField',
+ 'fieldname': u'accounts',
+ 'fieldtype': u'Section Break',
+ 'label': u'Accounts'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Accounting entry frozen up to this date, nobody can do / modify entry except authorized person',
- 'doctype': 'DocField',
- 'fieldname': 'acc_frozen_upto',
- 'fieldtype': 'Date',
- 'label': 'Accounts Frozen Upto'
+ 'colour': u'White:FFF',
+ 'description': u'Accounting entry frozen up to this date, nobody can do / modify entry except authorized person',
+ 'doctype': u'DocField',
+ 'fieldname': u'acc_frozen_upto',
+ 'fieldtype': u'Date',
+ 'label': u'Accounts Frozen Upto'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Users with this role are allowed to do / modify accounting entry before frozen date',
- 'doctype': 'DocField',
- 'fieldname': 'bde_auth_role',
- 'fieldtype': 'Link',
- 'label': 'Authourized Role (Frozen Entry)',
- 'options': 'Role'
+ 'colour': u'White:FFF',
+ 'description': u'Users with this role are allowed to do / modify accounting entry before frozen date',
+ 'doctype': u'DocField',
+ 'fieldname': u'bde_auth_role',
+ 'fieldtype': u'Link',
+ 'label': u'Authourized Role (Frozen Entry)',
+ 'options': u'Role'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'credit_controller',
- 'fieldtype': 'Link',
- 'label': 'Credit Controller',
- 'options': 'Role'
+ 'doctype': u'DocField',
+ 'fieldname': u'credit_controller',
+ 'fieldtype': u'Link',
+ 'label': u'Credit Controller',
+ 'options': u'Role'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break4',
+ 'fieldtype': u'Column Break'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'label': 'Account Info',
- 'options': '<div class="help-box">For more accounting defaults, Open <a href="#!List/Company">Company</a></div>'
+ 'doctype': u'DocField',
+ 'fieldname': u'account_info',
+ 'fieldtype': u'HTML',
+ 'label': u'Account Info',
+ 'options': u'<div class="help-box">For more accounting defaults, Open <a href="#!List/Company">Company</a></div>'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Selling'
+ 'doctype': u'DocField',
+ 'fieldname': u'selling',
+ 'fieldtype': u'Section Break',
+ 'label': u'Selling'
},
# DocField
{
- 'colour': 'White:FFF',
- 'default': 'Customer Name',
- 'doctype': 'DocField',
- 'fieldname': 'cust_master_name',
- 'fieldtype': 'Select',
- 'label': 'Customer Master created by ',
- 'options': 'Customer Name\nNaming Series'
+ 'colour': u'White:FFF',
+ 'default': u'Customer Name',
+ 'doctype': u'DocField',
+ 'fieldname': u'cust_master_name',
+ 'fieldtype': u'Select',
+ 'label': u'Customer Master created by ',
+ 'options': u'Customer Name\nNaming Series'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'default_customer_group',
- 'fieldtype': 'Link',
- 'label': 'Default Customer Group',
- 'options': 'Customer Group'
+ 'doctype': u'DocField',
+ 'fieldname': u'default_customer_group',
+ 'fieldtype': u'Link',
+ 'label': u'Default Customer Group',
+ 'options': u'Customer Group'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'label': 'CGHelp',
- 'options': '<a href="#!Sales Browser/Customer Group">To manage Customer Groups, click here</a>'
+ 'doctype': u'DocField',
+ 'fieldname': u'cghelp',
+ 'fieldtype': u'HTML',
+ 'label': u'CGHelp',
+ 'options': u'<a href="#!Sales Browser/Customer Group">To manage Customer Groups, click here</a>'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'default_territory',
- 'fieldtype': 'Link',
- 'label': 'Default Territory',
- 'options': 'Territory'
+ 'doctype': u'DocField',
+ 'fieldname': u'default_territory',
+ 'fieldtype': u'Link',
+ 'label': u'Default Territory',
+ 'options': u'Territory'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'label': 'TerritoryHelp',
- 'options': '<a href="#!Sales Browser/Territory">To manage Territory, click here</a>'
+ 'doctype': u'DocField',
+ 'fieldname': u'territoryhelp',
+ 'fieldtype': u'HTML',
+ 'label': u'TerritoryHelp',
+ 'options': u'<a href="#!Sales Browser/Territory">To manage Territory, click here</a>'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'width': '50%'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break5',
+ 'fieldtype': u'Column Break',
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'default_price_list',
- 'fieldtype': 'Link',
- 'label': 'Default Price List',
- 'options': 'Price List'
+ 'doctype': u'DocField',
+ 'fieldname': u'default_price_list',
+ 'fieldtype': u'Link',
+ 'label': u'Default Price List',
+ 'options': u'Price List'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'default_price_list_currency',
- 'fieldtype': 'Link',
- 'label': 'Default Price List Currency',
- 'options': 'Currency'
+ 'doctype': u'DocField',
+ 'fieldname': u'default_price_list_currency',
+ 'fieldtype': u'Link',
+ 'label': u'Default Price List Currency',
+ 'options': u'Currency'
},
# DocField
{
- 'colour': 'White:FFF',
- 'default': 'No',
- 'doctype': 'DocField',
- 'fieldname': 'so_required',
- 'fieldtype': 'Select',
- 'label': 'Sales Order Required',
- 'options': 'No\nYes'
+ 'colour': u'White:FFF',
+ 'default': u'No',
+ 'doctype': u'DocField',
+ 'fieldname': u'so_required',
+ 'fieldtype': u'Select',
+ 'label': u'Sales Order Required',
+ 'options': u'No\nYes'
},
# DocField
{
- 'colour': 'White:FFF',
- 'default': 'No',
- 'doctype': 'DocField',
- 'fieldname': 'dn_required',
- 'fieldtype': 'Select',
- 'label': 'Delivery Note Required',
- 'options': 'No\nYes'
+ 'colour': u'White:FFF',
+ 'default': u'No',
+ 'doctype': u'DocField',
+ 'fieldname': u'dn_required',
+ 'fieldtype': u'Select',
+ 'label': u'Delivery Note Required',
+ 'options': u'No\nYes'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Buying'
+ 'doctype': u'DocField',
+ 'fieldname': u'buying',
+ 'fieldtype': u'Section Break',
+ 'label': u'Buying'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'default_supplier_type',
- 'fieldtype': 'Link',
- 'label': 'Default Supplier Type',
- 'options': 'Supplier Type'
+ 'doctype': u'DocField',
+ 'fieldname': u'default_supplier_type',
+ 'fieldtype': u'Link',
+ 'label': u'Default Supplier Type',
+ 'options': u'Supplier Type'
},
# DocField
{
- 'colour': 'White:FFF',
- 'default': 'Supplier Name',
- 'doctype': 'DocField',
- 'fieldname': 'supp_master_name',
- 'fieldtype': 'Select',
- 'label': 'Supplier Master created by ',
- 'options': 'Supplier Name\nNaming Series'
+ 'colour': u'White:FFF',
+ 'default': u'Supplier Name',
+ 'doctype': u'DocField',
+ 'fieldname': u'supp_master_name',
+ 'fieldtype': u'Select',
+ 'label': u'Supplier Master created by ',
+ 'options': u'Supplier Name\nNaming Series'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'width': '50%'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break6',
+ 'fieldtype': u'Column Break',
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'default': 'No',
- 'doctype': 'DocField',
- 'fieldname': 'po_required',
- 'fieldtype': 'Select',
- 'label': 'Purchase Order Required',
- 'options': 'No\nYes'
+ 'colour': u'White:FFF',
+ 'default': u'No',
+ 'doctype': u'DocField',
+ 'fieldname': u'po_required',
+ 'fieldtype': u'Select',
+ 'label': u'Purchase Order Required',
+ 'options': u'No\nYes'
},
# DocField
{
- 'colour': 'White:FFF',
- 'default': 'No',
- 'doctype': 'DocField',
- 'fieldname': 'pr_required',
- 'fieldtype': 'Select',
- 'label': 'Purchase Receipt Required',
- 'options': 'No\nYes'
+ 'colour': u'White:FFF',
+ 'default': u'No',
+ 'doctype': u'DocField',
+ 'fieldname': u'pr_required',
+ 'fieldtype': u'Select',
+ 'label': u'Purchase Receipt Required',
+ 'options': u'No\nYes'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'HR',
- 'options': '<div style="padding-top: 8px;" class="columnHeading">HR</div>'
+ 'doctype': u'DocField',
+ 'fieldname': u'hr',
+ 'fieldtype': u'Section Break',
+ 'label': u'HR',
+ 'options': u'<div style="padding-top: 8px;" class="columnHeading">HR</div>'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Employee record is created using selected field. ',
- 'doctype': 'DocField',
- 'fieldname': 'emp_created_by',
- 'fieldtype': 'Select',
- 'label': 'Employee Records to be created by ',
- 'options': '\nNaming Series\nEmployee Number'
+ 'colour': u'White:FFF',
+ 'description': u'Employee record is created using selected field. ',
+ 'doctype': u'DocField',
+ 'fieldname': u'emp_created_by',
+ 'fieldtype': u'Select',
+ 'label': u'Employee Records to be created by ',
+ 'options': u'\nNaming Series\nEmployee Number'
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/market_segment/market_segment.txt b/erpnext/setup/doctype/market_segment/market_segment.txt
index 6ecdb25..64832d2 100644
--- a/erpnext/setup/doctype/market_segment/market_segment.txt
+++ b/erpnext/setup/doctype/market_segment/market_segment.txt
@@ -3,78 +3,75 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:10',
+ 'creation': '2012-03-27 14:36:21',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'yogesh@webnotestech.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:21',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
'allow_trash': 1,
- 'autoname': 'field:segment_name',
- 'colour': 'White:FFF',
+ 'autoname': u'field:segment_name',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'in_create': 1,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
- 'name_case': 'Title Case',
+ 'name_case': u'Title Case',
'read_only': 0,
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 1
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Market Segment',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Market Segment',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# DocType, Market Segment
{
'doctype': 'DocType',
- 'name': 'Market Segment'
+ 'name': u'Market Segment'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'segment_name',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Segment Name',
- 'oldfieldname': 'segment_name',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'segment_name',
+ 'fieldtype': u'Data',
+ 'label': u'Segment Name',
+ 'oldfieldname': u'segment_name',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'details',
- 'fieldtype': 'Text',
- 'idx': 3,
- 'label': 'Details',
- 'oldfieldname': 'details',
- 'oldfieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'details',
+ 'fieldtype': u'Text',
+ 'label': u'Details',
+ 'oldfieldname': u'details',
+ 'oldfieldtype': u'Text',
'permlevel': 0
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/naming_series/naming_series.txt b/erpnext/setup/doctype/naming_series/naming_series.txt
index a02d5b7..dd3a0ef 100644
--- a/erpnext/setup/doctype/naming_series/naming_series.txt
+++ b/erpnext/setup/doctype/naming_series/naming_series.txt
@@ -3,62 +3,61 @@
# These values are common in all dictionaries
{
- 'creation': '2010-10-27 14:29:55',
+ 'creation': '2012-03-27 14:36:21',
'docstatus': 0,
- 'modified': '2010-11-26 18:45:26',
- 'modified_by': 'sneha@webnotestech.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:21',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'hide_heading': 1,
'hide_toolbar': 1,
'issingle': 1,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
'read_only': 1,
- 'section_style': 'Tray',
- 'server_code_error': ' ',
+ 'section_style': u'Tray',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 58
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Naming Series',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Naming Series',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Naming Series',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Naming Series',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Naming Series
{
'doctype': 'DocType',
- 'name': 'Naming Series'
+ 'name': u'Naming Series'
},
# DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 1
},
@@ -67,20 +66,18 @@
'amend': 0,
'cancel': 0,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 2,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'submit': 0,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 3,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'System Manager'
+ 'role': u'System Manager'
},
# DocPerm
@@ -88,119 +85,112 @@
'amend': 0,
'cancel': 0,
'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 4,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'submit': 0,
'write': 0
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 5,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Guest'
+ 'role': u'Guest'
},
# DocField
{
- 'description': 'Set prefix for numbering series on your transactions',
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 1,
- 'label': 'Setup Series'
+ 'description': u'Set prefix for numbering series on your transactions',
+ 'doctype': u'DocField',
+ 'fieldname': u'setup_series',
+ 'fieldtype': u'Section Break',
+ 'label': u'Setup Series'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'idx': 2,
- 'label': 'Head HTML'
+ 'doctype': u'DocField',
+ 'fieldname': u'head_html',
+ 'fieldtype': u'HTML',
+ 'label': u'Head HTML'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'select_doc_for_series',
- 'fieldtype': 'Select',
- 'idx': 3,
- 'label': 'Select Transaction'
+ 'doctype': u'DocField',
+ 'fieldname': u'select_doc_for_series',
+ 'fieldtype': u'Select',
+ 'label': u'Select Transaction'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'idx': 4,
- 'label': 'Help HTML',
- 'options': '<div style="padding: 8px; background-color: #FFD; margin: 8px 0px;">\nWrite the list of series options in the list below. Each on a new line<br>\nAllowed special characters are "/" and "-"<br>\nExamples:<br>\nINV-<br>\nINV-10-<br>\nINVK-<br>\n</div>'
+ 'doctype': u'DocField',
+ 'fieldname': u'help_html',
+ 'fieldtype': u'HTML',
+ 'label': u'Help HTML',
+ 'options': u'<div style="padding: 8px; background-color: #FFD; margin: 8px 0px;">\nWrite the list of series options in the list below. Each on a new line<br>\nAllowed special characters are "/" and "-"<br>\nExamples:<br>\nINV-<br>\nINV-10-<br>\nINVK-<br>\n</div>'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'set_options',
- 'fieldtype': 'Text',
- 'idx': 5,
- 'label': 'Set Series'
+ 'doctype': u'DocField',
+ 'fieldname': u'set_options',
+ 'fieldtype': u'Text',
+ 'label': u'Set Series'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Check this if you want to force the user to select a series before saving. There will be no default if you check this.',
- 'doctype': 'DocField',
- 'fieldname': 'user_must_always_select',
- 'fieldtype': 'Check',
- 'idx': 6,
- 'label': 'User must always select'
+ 'colour': u'White:FFF',
+ 'description': u'Check this if you want to force the user to select a series before saving. There will be no default if you check this.',
+ 'doctype': u'DocField',
+ 'fieldname': u'user_must_always_select',
+ 'fieldtype': u'Check',
+ 'label': u'User must always select'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'idx': 7,
- 'label': 'Update',
- 'options': 'update_series'
+ 'doctype': u'DocField',
+ 'fieldname': u'update',
+ 'fieldtype': u'Button',
+ 'label': u'Update',
+ 'options': u'update_series'
},
# DocField
{
- 'description': 'Set starting number for series of your transactions',
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 8,
- 'label': 'Update Series'
+ 'description': u'Set starting number for series of your transactions',
+ 'doctype': u'DocField',
+ 'fieldname': u'update_series',
+ 'fieldtype': u'Section Break',
+ 'label': u'Update Series'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'prefix',
- 'fieldtype': 'Data',
- 'idx': 9,
- 'label': 'Prefix'
+ 'doctype': u'DocField',
+ 'fieldname': u'prefix',
+ 'fieldtype': u'Data',
+ 'label': u'Prefix'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'starts_from',
- 'fieldtype': 'Int',
- 'idx': 10,
- 'label': 'Starts From'
+ 'doctype': u'DocField',
+ 'fieldname': u'starts_from',
+ 'fieldtype': u'Int',
+ 'label': u'Starts From'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'idx': 11,
- 'label': 'Update Series Start',
- 'options': 'update_series_start'
+ 'doctype': u'DocField',
+ 'fieldname': u'update_series_start',
+ 'fieldtype': u'Button',
+ 'label': u'Update Series Start',
+ 'options': u'update_series_start'
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/naming_series_options/naming_series_options.txt b/erpnext/setup/doctype/naming_series_options/naming_series_options.txt
index 23f4905..88554ec 100644
--- a/erpnext/setup/doctype/naming_series_options/naming_series_options.txt
+++ b/erpnext/setup/doctype/naming_series_options/naming_series_options.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-12-14 10:23:17',
+ 'creation': '2012-03-27 14:36:21',
'docstatus': 0,
- 'modified': '2012-03-21 14:53:21',
+ 'modified': '2012-03-27 14:36:21',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/setup/doctype/notification_control/notification_control.txt b/erpnext/setup/doctype/notification_control/notification_control.txt
index e93408c..55cf475 100644
--- a/erpnext/setup/doctype/notification_control/notification_control.txt
+++ b/erpnext/setup/doctype/notification_control/notification_control.txt
@@ -3,11 +3,11 @@
# These values are common in all dictionaries
{
- 'creation': '2010-09-01 15:48:07',
+ 'creation': '2012-03-27 14:36:22',
'docstatus': 0,
- 'modified': '2010-10-14 10:48:02',
- 'modified_by': 'nabin@webnotestech.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:22',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
@@ -15,33 +15,33 @@
'allow_copy': 1,
'allow_email': 1,
'allow_print': 1,
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'issingle': 1,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 79
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Notification Control',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Notification Control',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Notification Control',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Notification Control',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1
},
@@ -49,282 +49,259 @@
# DocType, Notification Control
{
'doctype': 'DocType',
- 'name': 'Notification Control'
+ 'name': u'Notification Control'
},
# DocPerm
{
'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'role': 'Guest',
+ 'doctype': u'DocPerm',
+ 'role': u'Guest',
'write': 0
},
# DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'role': 'System Manager',
+ 'doctype': u'DocPerm',
+ 'role': u'System Manager',
'write': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 1,
- 'label': 'Send Auto-notification for'
+ 'doctype': u'DocField',
+ 'fieldname': u'send_autonotification_for',
+ 'fieldtype': u'Section Break',
+ 'label': u'Send Auto-notification for'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 2,
- 'label': 'Sales',
- 'width': '50%'
+ 'doctype': u'DocField',
+ 'fieldname': u'sales',
+ 'fieldtype': u'Column Break',
+ 'label': u'Sales',
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'enquiry',
- 'fieldtype': 'Check',
+ 'doctype': u'DocField',
+ 'fieldname': u'enquiry',
+ 'fieldtype': u'Check',
'hidden': 1,
- 'idx': 3,
- 'label': 'Enquiry',
+ 'label': u'Enquiry',
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'quotation',
- 'fieldtype': 'Check',
- 'idx': 4,
- 'label': 'Quotation'
+ 'doctype': u'DocField',
+ 'fieldname': u'quotation',
+ 'fieldtype': u'Check',
+ 'label': u'Quotation'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'sales_order',
- 'fieldtype': 'Check',
- 'idx': 5,
- 'label': 'Sales Order'
+ 'doctype': u'DocField',
+ 'fieldname': u'sales_order',
+ 'fieldtype': u'Check',
+ 'label': u'Sales Order'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'delivery_note',
- 'fieldtype': 'Check',
- 'idx': 6,
- 'label': 'Delivery Note'
+ 'doctype': u'DocField',
+ 'fieldname': u'delivery_note',
+ 'fieldtype': u'Check',
+ 'label': u'Delivery Note'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'receivable_voucher',
- 'fieldtype': 'Check',
- 'idx': 7,
- 'label': 'Sales Invoice'
+ 'doctype': u'DocField',
+ 'fieldname': u'receivable_voucher',
+ 'fieldtype': u'Check',
+ 'label': u'Sales Invoice'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 8,
- 'label': 'Purchase',
- 'width': '50%'
+ 'doctype': u'DocField',
+ 'fieldname': u'purchase',
+ 'fieldtype': u'Column Break',
+ 'label': u'Purchase',
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'purchase_order',
- 'fieldtype': 'Check',
- 'idx': 9,
- 'label': 'Purchase Order'
+ 'doctype': u'DocField',
+ 'fieldname': u'purchase_order',
+ 'fieldtype': u'Check',
+ 'label': u'Purchase Order'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'purchase_receipt',
- 'fieldtype': 'Check',
- 'idx': 10,
- 'label': 'Purchase Receipt'
+ 'doctype': u'DocField',
+ 'fieldname': u'purchase_receipt',
+ 'fieldtype': u'Check',
+ 'label': u'Purchase Receipt'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'payable_voucher',
- 'fieldtype': 'Check',
- 'idx': 11,
- 'label': 'Purchase Invoice',
+ 'doctype': u'DocField',
+ 'fieldname': u'payable_voucher',
+ 'fieldtype': u'Check',
+ 'label': u'Purchase Invoice',
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'expense_voucher',
- 'fieldtype': 'Check',
- 'idx': 12,
- 'label': 'Expense Voucher'
+ 'doctype': u'DocField',
+ 'fieldname': u'expense_voucher',
+ 'fieldtype': u'Check',
+ 'label': u'Expense Voucher'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 13,
- 'label': 'Customize the Notification'
+ 'doctype': u'DocField',
+ 'fieldname': u'customize_the_notification',
+ 'fieldtype': u'Section Break',
+ 'label': u'Customize the Notification'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'select_transaction',
- 'fieldtype': 'Select',
- 'idx': 14,
- 'label': 'Select Transaction',
- 'options': '\nQuotation\nSales Order\nDelivery Note\nSales Invoice\nPayment Received\nPurchase Order\nPurchase Receipt\nPayment Sent',
- 'trigger': 'Client'
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'select_transaction',
+ 'fieldtype': u'Select',
+ 'label': u'Select Transaction',
+ 'options': u'\nQuotation\nSales Order\nDelivery Note\nSales Invoice\nPayment Received\nPurchase Order\nPurchase Receipt\nPayment Sent',
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'custom_message',
- 'fieldtype': 'Text Editor',
- 'idx': 15,
- 'label': 'Custom Message'
+ 'doctype': u'DocField',
+ 'fieldname': u'custom_message',
+ 'fieldtype': u'Text Editor',
+ 'label': u'Custom Message'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'idx': 16,
- 'label': 'Update',
- 'options': 'set_message'
+ 'doctype': u'DocField',
+ 'fieldname': u'update',
+ 'fieldtype': u'Button',
+ 'label': u'Update',
+ 'options': u'set_message'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'quotation_message',
- 'fieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'quotation_message',
+ 'fieldtype': u'Text',
'hidden': 1,
- 'idx': 17,
- 'label': 'Quotation Message',
+ 'label': u'Quotation Message',
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'sales_order_message',
- 'fieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'sales_order_message',
+ 'fieldtype': u'Text',
'hidden': 1,
- 'idx': 18,
- 'label': 'Sales Order Message',
+ 'label': u'Sales Order Message',
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'delivery_note_message',
- 'fieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'delivery_note_message',
+ 'fieldtype': u'Text',
'hidden': 1,
- 'idx': 19,
- 'label': 'Delivery Note Message',
+ 'label': u'Delivery Note Message',
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'sales_invoice_message',
- 'fieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'sales_invoice_message',
+ 'fieldtype': u'Text',
'hidden': 1,
- 'idx': 20,
- 'label': 'Sales Invoice Message',
+ 'label': u'Sales Invoice Message',
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'payment_received_message',
- 'fieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'payment_received_message',
+ 'fieldtype': u'Text',
'hidden': 1,
- 'idx': 21,
- 'label': 'Payment Received Message',
+ 'label': u'Payment Received Message',
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'purchase_order_message',
- 'fieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'purchase_order_message',
+ 'fieldtype': u'Text',
'hidden': 1,
- 'idx': 22,
- 'label': 'Purchase Order Message',
+ 'label': u'Purchase Order Message',
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'purchase_receipt_message',
- 'fieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'purchase_receipt_message',
+ 'fieldtype': u'Text',
'hidden': 1,
- 'idx': 23,
- 'label': 'Purchase Receipt Message',
+ 'label': u'Purchase Receipt Message',
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'payment_sent_message',
- 'fieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'payment_sent_message',
+ 'fieldtype': u'Text',
'hidden': 1,
- 'idx': 24,
- 'label': 'Payment Sent Message',
+ 'label': u'Payment Sent Message',
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'expense_voucher_approved_message',
- 'fieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'expense_voucher_approved_message',
+ 'fieldtype': u'Text',
'hidden': 1,
- 'idx': 25,
- 'label': 'Expense Voucher Approved Message',
+ 'label': u'Expense Voucher Approved Message',
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'expense_voucher_rejected_message',
- 'fieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'expense_voucher_rejected_message',
+ 'fieldtype': u'Text',
'hidden': 1,
- 'idx': 26,
- 'label': 'Expense Voucher Rejected Message',
+ 'label': u'Expense Voucher Rejected Message',
'print_hide': 1
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/order_lost_reason/order_lost_reason.txt b/erpnext/setup/doctype/order_lost_reason/order_lost_reason.txt
index d1ef5a8..f146dc5 100644
--- a/erpnext/setup/doctype/order_lost_reason/order_lost_reason.txt
+++ b/erpnext/setup/doctype/order_lost_reason/order_lost_reason.txt
@@ -3,46 +3,46 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:10',
+ 'creation': '2012-03-27 14:36:22',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'yogesh@webnotestech.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:22',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
'allow_trash': 1,
- 'autoname': 'field:order_lost_reason',
- 'colour': 'White:FFF',
+ 'autoname': u'field:order_lost_reason',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'Setup',
+ 'document_type': u'Master',
+ 'module': u'Setup',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 4
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Order Lost Reason',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Order Lost Reason',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Order Lost Reason',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Order Lost Reason',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
'write': 1
@@ -51,46 +51,42 @@
# DocType, Order Lost Reason
{
'doctype': 'DocType',
- 'name': 'Order Lost Reason'
+ 'name': u'Order Lost Reason'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'role': 'System Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'System Manager'
},
# DocPerm
{
'amend': 0,
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'role': 'Sales Master Manager',
+ 'doctype': u'DocPerm',
+ 'role': u'Sales Master Manager',
'submit': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'order_lost_reason',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Order Lost Reason',
- 'oldfieldname': 'order_lost_reason',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'order_lost_reason',
+ 'fieldtype': u'Data',
+ 'label': u'Order Lost Reason',
+ 'oldfieldname': u'order_lost_reason',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
}
diff --git a/erpnext/setup/doctype/other_charges/other_charges.txt b/erpnext/setup/doctype/other_charges/other_charges.txt
index b4dee65..170e557 100644
--- a/erpnext/setup/doctype/other_charges/other_charges.txt
+++ b/erpnext/setup/doctype/other_charges/other_charges.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:11',
+ 'creation': '2012-03-27 14:36:22',
'docstatus': 0,
- 'modified': '2012-03-21 14:51:06',
+ 'modified': '2012-03-27 14:36:22',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -55,42 +55,6 @@
# DocPerm
{
'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Sales Master Manager',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Sales User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Sales User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
'cancel': 1,
'create': 1,
'doctype': u'DocPerm',
@@ -122,6 +86,42 @@
'write': 1
},
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales Master Manager',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales User',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Sales User',
+ 'submit': 0,
+ 'write': 0
+ },
+
# DocField
{
'doctype': u'DocField',
@@ -136,6 +136,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'other_charges_details',
'fieldtype': u'Section Break',
'label': u'Other Charges Details',
'oldfieldtype': u'Section Break',
diff --git a/erpnext/setup/doctype/period/period.txt b/erpnext/setup/doctype/period/period.txt
index 15941a5..77ee019 100644
--- a/erpnext/setup/doctype/period/period.txt
+++ b/erpnext/setup/doctype/period/period.txt
@@ -3,120 +3,113 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:12',
+ 'creation': '2012-03-27 14:36:22',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'umair@iwebnotes.com',
- 'owner': 'nabin@webnotestech.com'
+ 'modified': '2012-03-27 14:36:22',
+ 'modified_by': u'Administrator',
+ 'owner': u'nabin@webnotestech.com'
},
# These values are common for all DocType
{
- 'autoname': 'field:period_name',
- 'colour': 'White:FFF',
+ 'autoname': u'field:period_name',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
+ 'document_type': u'Master',
'in_create': 1,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 5
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Period',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Period',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Period',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Period',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 0
},
# DocType, Period
{
'doctype': 'DocType',
- 'name': 'Period'
+ 'name': u'Period'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 1
+ 'doctype': u'DocPerm'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2
+ 'doctype': u'DocPerm'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'period_name',
- 'fieldtype': 'Data',
- 'idx': 1,
- 'label': 'Period Name',
- 'oldfieldname': 'period_name',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'period_name',
+ 'fieldtype': u'Data',
+ 'label': u'Period Name',
+ 'oldfieldname': u'period_name',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'start_date',
- 'fieldtype': 'Date',
- 'idx': 2,
- 'label': 'Start Date',
- 'oldfieldname': 'start_date',
- 'oldfieldtype': 'Date'
+ 'doctype': u'DocField',
+ 'fieldname': u'start_date',
+ 'fieldtype': u'Date',
+ 'label': u'Start Date',
+ 'oldfieldname': u'start_date',
+ 'oldfieldtype': u'Date'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'end_date',
- 'fieldtype': 'Date',
- 'idx': 3,
- 'label': 'End Date',
- 'oldfieldname': 'end_date',
- 'oldfieldtype': 'Date'
+ 'doctype': u'DocField',
+ 'fieldname': u'end_date',
+ 'fieldtype': u'Date',
+ 'label': u'End Date',
+ 'oldfieldname': u'end_date',
+ 'oldfieldtype': u'Date'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'period_type',
- 'fieldtype': 'Data',
- 'idx': 4,
- 'label': 'Period Type',
- 'oldfieldname': 'period_type',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'period_type',
+ 'fieldtype': u'Data',
+ 'label': u'Period Type',
+ 'oldfieldname': u'period_type',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'fiscal_year',
- 'fieldtype': 'Data',
- 'idx': 5,
- 'label': 'Fiscal Year',
- 'oldfieldname': 'fiscal_year',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'fiscal_year',
+ 'fieldtype': u'Data',
+ 'label': u'Fiscal Year',
+ 'oldfieldname': u'fiscal_year',
+ 'oldfieldtype': u'Data'
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/period_control/period_control.txt b/erpnext/setup/doctype/period_control/period_control.txt
index 5a4117e..420b319 100644
--- a/erpnext/setup/doctype/period_control/period_control.txt
+++ b/erpnext/setup/doctype/period_control/period_control.txt
@@ -3,30 +3,30 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:12',
+ 'creation': '2012-03-27 14:36:22',
'docstatus': 0,
- 'modified': '2011-01-03 17:46:14',
- 'modified_by': 'umair@iwebnotes.com',
- 'owner': 'nabin@webnotestech.com'
+ 'modified': '2012-03-27 14:36:22',
+ 'modified_by': u'Administrator',
+ 'owner': u'nabin@webnotestech.com'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'in_create': 1,
'issingle': 1,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
'read_only': 1,
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 36
},
# DocType, Period Control
{
'doctype': 'DocType',
- 'name': 'Period Control'
+ 'name': u'Period Control'
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/permission_control/permission_control.py b/erpnext/setup/doctype/permission_control/permission_control.py
index 049a3f5..d261c41 100644
--- a/erpnext/setup/doctype/permission_control/permission_control.py
+++ b/erpnext/setup/doctype/permission_control/permission_control.py
@@ -57,22 +57,31 @@
# Get Perm Level, Perm type of Doctypes of Module and Role Selected
# -------------------------------------------------------------------
def get_permissions(self,doctype):
- ret = []
-
- # Get permtype for the role selected
- ptype = sql("select `role`,`permlevel`,`read`,`write`,`create`,`submit`,`cancel`,`amend` from tabDocPerm where `parent` = %s order by `permlevel` ASC",doctype,as_dict = 1)
+ import webnotes.model.doctype
+ doclist = webnotes.model.doctype.get(doctype, form=0)
+
+ ptype = [{
+ 'role': perm.role,
+ 'permlevel': cint(perm.permlevel),
+ 'read': cint(perm.read),
+ 'write': cint(perm.write),
+ 'create': cint(perm.create),
+ 'cancel': cint(perm.cancel),
+ 'submit': cint(perm.submit),
+ 'amend': cint(perm.amend)
+ } for perm in sorted(doclist,
+ key=lambda d: [d.fields.get('permlevel'),
+ d.fields.get('role')]) if perm.doctype=='DocPerm']
- # to convert 0L in 0 in values of dictionary
- for p in ptype:
- for key in p:
- if key!='role':
- p[key] = cint(p[key])
- ret.append(p)
-
- # fields list
- fl = ['', 'owner'] + [l[0] for l in sql("select fieldname from tabDocField where parent=%s and fieldtype='Link' and ifnull(options,'')!=''", doctype)]
-
- return {'perms':ret, 'fields':fl}
+ fl = ['', 'owner'] + [d.fieldname for d in doclist \
+ if d.doctype=='DocField' and d.fieldtype=='Link' \
+ and cstr(d.options)!='']
+
+ return {
+ 'perms':ptype,
+ 'fields':fl,
+ 'is_submittable': doclist[0].fields.get('is_submittable')
+ }
# get default values
# ------------------
@@ -180,6 +189,11 @@
sql("delete from tabDocPerm where parent = %s and role = %s and ifnull(permlevel,0) = %s",(parent, role, cint(permlevel)))
sql("update tabDocType set modified = %s where name = %s",(now(), parent))
+
+
+ from webnotes.utils.cache import CacheItem
+ CacheItem(parent).clear()
+
msgprint("Permissions Updated")
# Get Fields based on DocType and Permlevel
diff --git a/erpnext/setup/doctype/permission_control/permission_control.txt b/erpnext/setup/doctype/permission_control/permission_control.txt
index 397d6c7..dd95608 100644
--- a/erpnext/setup/doctype/permission_control/permission_control.txt
+++ b/erpnext/setup/doctype/permission_control/permission_control.txt
@@ -3,24 +3,24 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:12',
+ 'creation': '2012-03-27 14:36:22',
'docstatus': 0,
- 'modified': '2010-12-20 15:09:18',
- 'modified_by': 'sneha@webnotestech.com',
- 'owner': 'saumil@webnotestech.com'
+ 'modified': '2012-03-27 14:36:22',
+ 'modified_by': u'Administrator',
+ 'owner': u'saumil@webnotestech.com'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'in_create': 1,
'issingle': 1,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
'read_only': 1,
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 15
},
@@ -28,6 +28,6 @@
# DocType, Permission Control
{
'doctype': 'DocType',
- 'name': 'Permission Control'
+ 'name': u'Permission Control'
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/personalize/personalize.txt b/erpnext/setup/doctype/personalize/personalize.txt
index bd4e1a2..aa5f76a 100644
--- a/erpnext/setup/doctype/personalize/personalize.txt
+++ b/erpnext/setup/doctype/personalize/personalize.txt
@@ -3,103 +3,99 @@
# These values are common in all dictionaries
{
- 'creation': '2011-03-22 16:06:53',
+ 'creation': '2012-03-27 14:36:22',
'docstatus': 0,
- 'modified': '2011-03-17 12:20:29',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:22',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1303277497',
+ '_last_update': u'1303277497',
'allow_attach': 1,
'allow_copy': 1,
'allow_email': 1,
'allow_print': 1,
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Other',
+ 'document_type': u'Other',
'in_create': 1,
'issingle': 1,
'max_attachments': 1,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
'read_only': 1,
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'version': 4
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Personalize',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Personalize',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Personalize',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Personalize',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 1
},
# DocType, Personalize
{
'doctype': 'DocType',
- 'name': 'Personalize'
+ 'name': u'Personalize'
},
# DocPerm
{
- 'doctype': 'DocPerm'
+ 'doctype': u'DocPerm'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'idx': 1,
- 'label': 'Help HTML',
- 'options': '<div class="help_box">You can edit HTML for your banner or add an attachment and click on "Set from Attachment"</div>'
+ 'doctype': u'DocField',
+ 'fieldname': u'help_html',
+ 'fieldtype': u'HTML',
+ 'label': u'Help HTML',
+ 'options': u'<div class="help_box">You can edit HTML for your banner or add an attachment and click on "Set from Attachment"</div>'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'header_html',
- 'fieldtype': 'Code',
- 'idx': 2,
- 'label': 'Banner HTML'
+ 'doctype': u'DocField',
+ 'fieldname': u'header_html',
+ 'fieldtype': u'Code',
+ 'label': u'Banner HTML'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'set_from_attachment',
- 'fieldtype': 'Check',
- 'idx': 3,
- 'label': 'Set from attachment'
+ 'doctype': u'DocField',
+ 'fieldname': u'set_from_attachment',
+ 'fieldtype': u'Check',
+ 'label': u'Set from attachment'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'file_list',
- 'fieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'file_list',
+ 'fieldtype': u'Text',
'hidden': 1,
- 'idx': 4,
- 'label': 'File List'
+ 'label': u'File List'
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/price_list/price_list.txt b/erpnext/setup/doctype/price_list/price_list.txt
index 5185a63..5d7e57e 100644
--- a/erpnext/setup/doctype/price_list/price_list.txt
+++ b/erpnext/setup/doctype/price_list/price_list.txt
@@ -3,47 +3,47 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:13',
+ 'creation': '2012-03-27 14:36:22',
'docstatus': 0,
- 'modified': '2011-04-18 10:01:48',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:22',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1303100817',
+ '_last_update': u'1303100817',
'allow_attach': 1,
'allow_trash': 1,
- 'autoname': 'field:price_list_name',
- 'colour': 'White:FFF',
+ 'autoname': u'field:price_list_name',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'Setup',
+ 'document_type': u'Master',
+ 'module': u'Setup',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 6
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Price List',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Price List',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
'amend': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Price List',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Price List',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1,
'submit': 0
},
@@ -51,135 +51,127 @@
# DocType, Price List
{
'doctype': 'DocType',
- 'name': 'Price List'
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'permlevel': 1,
- 'role': 'Sales Manager',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'permlevel': 0,
- 'role': 'Sales Manager',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 3,
- 'permlevel': 1,
- 'role': 'Sales User',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 4,
- 'permlevel': 0,
- 'role': 'Sales User',
- 'write': 0
+ 'name': u'Price List'
},
# DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 5,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Sales Master Manager',
+ 'role': u'Sales Master Manager',
'write': 1
},
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Sales Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales User',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Sales User',
+ 'write': 0
+ },
+
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'price_list_name',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Price List Name',
- 'oldfieldname': 'price_list_name',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'price_list_name',
+ 'fieldtype': u'Data',
+ 'label': u'Price List Name',
+ 'oldfieldname': u'price_list_name',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': 'eval:!doc.__islocal',
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'idx': 3,
- 'label': 'Price Help',
+ 'colour': u'White:FFF',
+ 'depends_on': u'eval:!doc.__islocal',
+ 'doctype': u'DocField',
+ 'fieldname': u'price_help',
+ 'fieldtype': u'HTML',
+ 'label': u'Price Help',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': 'eval:!doc.__islocal',
- 'description': 'Click on this button to clear prices for this list in all items',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'idx': 4,
- 'label': 'Clear Prices',
+ 'colour': u'White:FFF',
+ 'depends_on': u'eval:!doc.__islocal',
+ 'description': u'Click on this button to clear prices for this list in all items',
+ 'doctype': u'DocField',
+ 'fieldname': u'clear_prices',
+ 'fieldtype': u'Button',
+ 'label': u'Clear Prices',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'file_list',
- 'fieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'file_list',
+ 'fieldtype': u'Text',
'hidden': 1,
- 'idx': 5,
- 'label': 'File List',
+ 'label': u'File List',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': 'eval:!doc.__islocal',
- 'description': 'Update prices from the attachment',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'idx': 6,
- 'label': 'Update Prices',
- 'options': 'update_prices',
+ 'colour': u'White:FFF',
+ 'depends_on': u'eval:!doc.__islocal',
+ 'description': u'Update prices from the attachment',
+ 'doctype': u'DocField',
+ 'fieldname': u'update_prices',
+ 'fieldtype': u'Button',
+ 'label': u'Update Prices',
+ 'options': u'update_prices',
'permlevel': 0,
- 'trigger': 'Server'
+ 'trigger': u'Server'
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/print_heading/print_heading.txt b/erpnext/setup/doctype/print_heading/print_heading.txt
index db4c07a..a2de331 100644
--- a/erpnext/setup/doctype/print_heading/print_heading.txt
+++ b/erpnext/setup/doctype/print_heading/print_heading.txt
@@ -3,101 +3,97 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:13',
+ 'creation': '2012-03-27 14:36:22',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:22',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1294312215',
+ '_last_update': u'1294312215',
'allow_trash': 1,
- 'autoname': 'field:print_heading',
- 'colour': 'White:FFF',
+ 'autoname': u'field:print_heading',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'Setup',
+ 'document_type': u'Master',
+ 'module': u'Setup',
'name': '__common__',
- 'search_fields': 'print_heading',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'search_fields': u'print_heading',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 27
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Print Heading',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Print Heading',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Print Heading',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Print Heading',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
- 'role': 'All',
+ 'role': u'All',
'write': 1
},
# DocType, Print Heading
{
'doctype': 'DocType',
- 'name': 'Print Heading'
+ 'name': u'Print Heading'
},
# DocPerm
{
- 'doctype': 'DocPerm'
+ 'doctype': u'DocPerm'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'print_heading',
- 'fieldtype': 'Data',
- 'idx': 2,
+ 'doctype': u'DocField',
+ 'fieldname': u'print_heading',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Print Heading',
- 'oldfieldname': 'print_heading',
- 'oldfieldtype': 'Data',
+ 'label': u'Print Heading',
+ 'oldfieldname': u'print_heading',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Small Text',
- 'idx': 3,
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Small Text',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Small Text',
'permlevel': 0,
- 'width': '300px'
+ 'width': u'300px'
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/sales_browser_control/sales_browser_control.txt b/erpnext/setup/doctype/sales_browser_control/sales_browser_control.txt
index ce635f4..3370b9e 100644
--- a/erpnext/setup/doctype/sales_browser_control/sales_browser_control.txt
+++ b/erpnext/setup/doctype/sales_browser_control/sales_browser_control.txt
@@ -3,28 +3,28 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:21',
+ 'creation': '2012-03-27 14:36:23',
'docstatus': 0,
- 'modified': '2010-12-24 11:56:36',
- 'modified_by': 'abhishek@webnotestech.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:23',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'issingle': 1,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 159
},
# DocType, Sales Browser Control
{
'doctype': 'DocType',
- 'name': 'Sales Browser Control'
+ 'name': u'Sales Browser Control'
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.js b/erpnext/setup/doctype/sales_partner/sales_partner.js
index 1194756..30ab18a 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.js
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.js
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-$import(Contact Control)
+wn.require('erpnext/setup/doctype/contact_control/contact_control.js');
cur_frm.cscript.onload = function(doc,dt,dn){
// history doctypes and scripts
@@ -48,18 +48,10 @@
cur_frm.cscript.make_address = function() {
if(!cur_frm.address_list) {
- cur_frm.address_list = new wn.widgets.Listing({
+ cur_frm.address_list = new wn.ui.Listing({
parent: cur_frm.fields_dict['Address HTML'].wrapper,
page_length: 2,
- new_doctype: "Address",
- new_doc_onload: function(dn) {
- ndoc = locals["Address"][dn];
- ndoc.sales_partner = cur_frm.doc.name;
- ndoc.address_type = 'Office';
- },
- new_doc_onsave: function(dn) {
- cur_frm.address_list.run()
- },
+ new_doctype: "Address",
get_query: function() {
return "select name, address_type, address_line1, address_line2, city, state, country, pincode, fax, email_id, phone, is_primary_address, is_shipping_address from tabAddress where sales_partner='"+cur_frm.docname+"' and docstatus != 2 order by is_primary_address desc"
},
@@ -80,17 +72,10 @@
cur_frm.cscript.make_contact = function() {
if(!cur_frm.contact_list) {
- cur_frm.contact_list = new wn.widgets.Listing({
+ cur_frm.contact_list = new wn.ui.Listing({
parent: cur_frm.fields_dict['Contact HTML'].wrapper,
page_length: 2,
new_doctype: "Contact",
- new_doc_onload: function(dn) {
- ndoc = locals["Contact"][dn];
- ndoc.sales_partner = cur_frm.doc.name;
- },
- new_doc_onsave: function(dn) {
- cur_frm.contact_list.run()
- },
get_query: function() {
return "select name, first_name, last_name, email_id, phone, mobile_no, department, designation, is_primary_contact from tabContact where sales_partner='"+cur_frm.docname+"' and docstatus != 2 order by is_primary_contact desc"
},
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.txt b/erpnext/setup/doctype/sales_partner/sales_partner.txt
index b030b34..0aa2de7 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.txt
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:22',
+ 'creation': '2012-03-27 14:36:23',
'docstatus': 0,
- 'modified': '2012-03-21 14:53:54',
+ 'modified': '2012-03-27 18:49:33',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -26,7 +26,7 @@
'section_style': u'Tabbed',
'server_code_error': u' ',
'show_in_menu': 0,
- 'version': 73
+ 'version': 74
},
# These values are common for all DocField
@@ -57,6 +57,49 @@
# DocPerm
{
'amend': 0,
+ 'cancel': 1,
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Sales Master Manager',
+ 'submit': 0,
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales Master Manager',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 1,
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'System Manager',
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'System Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
@@ -102,54 +145,12 @@
'write': 0
},
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Sales Master Manager',
- 'submit': 0,
- 'write': 1
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Sales Master Manager',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'System Manager',
- 'write': 1
- },
-
- # DocPerm
- {
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'System Manager',
- 'write': 0
- },
-
# DocField
{
'colour': u'White:FFF',
'description': u'Note: You Can Manage Multiple Address or Contacts via Addresses & Contacts',
'doctype': u'DocField',
+ 'fieldname': u'basic_info',
'fieldtype': u'Section Break',
'label': u'Basic Info',
'oldfieldtype': u'Section Break',
@@ -187,6 +188,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break0',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -219,6 +221,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'address_contacts',
'fieldtype': u'Section Break',
'label': u'Address & Contacts',
'permlevel': 0
@@ -229,6 +232,7 @@
'colour': u'White:FFF',
'depends_on': u'eval:doc.__islocal',
'doctype': u'DocField',
+ 'fieldname': u'address_desc',
'fieldtype': u'HTML',
'label': u'Address Desc',
'options': u'<em>Addresses will appear only when you save the customer</em>',
@@ -238,6 +242,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'address_html',
'fieldtype': u'HTML',
'label': u'Address HTML',
'permlevel': 1
@@ -246,6 +251,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break1',
'fieldtype': u'Column Break',
'permlevel': 0
},
@@ -255,6 +261,7 @@
'colour': u'White:FFF',
'depends_on': u'eval:doc.__islocal',
'doctype': u'DocField',
+ 'fieldname': u'contact_desc',
'fieldtype': u'HTML',
'label': u'Contact Desc',
'options': u'<em>Contact Details will appear only when you save the customer</em>',
@@ -264,6 +271,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'contact_html',
'fieldtype': u'HTML',
'label': u'Contact HTML',
'permlevel': 1
@@ -272,6 +280,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'partner_target_details_section_break',
'fieldtype': u'Section Break',
'label': u'Partner Target Details',
'oldfieldtype': u'Section Break',
@@ -306,6 +315,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'manage_html',
'fieldtype': u'HTML',
'hidden': 1,
'label': u'Manage HTML',
@@ -319,6 +329,7 @@
'colour': u'White:FFF',
'depends_on': u'eval:!doc.__islocal',
'doctype': u'DocField',
+ 'fieldname': u'transaction_history',
'fieldtype': u'Section Break',
'label': u'Transaction History',
'oldfieldtype': u'Section Break',
@@ -328,6 +339,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'history_html',
'fieldtype': u'HTML',
'label': u'History HTML',
'oldfieldtype': u'HTML',
diff --git a/erpnext/setup/doctype/sales_person/sales_person.txt b/erpnext/setup/doctype/sales_person/sales_person.txt
index 9ae96bf..45769e1 100644
--- a/erpnext/setup/doctype/sales_person/sales_person.txt
+++ b/erpnext/setup/doctype/sales_person/sales_person.txt
@@ -3,48 +3,48 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:22',
+ 'creation': '2012-03-27 14:36:23',
'docstatus': 0,
- 'modified': '2011-02-23 15:11:46',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 18:49:47',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1302765705',
+ '_last_update': u'1302765705',
'allow_trash': 1,
- 'autoname': 'field:sales_person_name',
- 'colour': 'White:FFF',
+ 'autoname': u'field:sales_person_name',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
+ 'document_type': u'Master',
'in_create': 1,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
- 'search_fields': 'name,parent_sales_person',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'search_fields': u'name,parent_sales_person',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
- 'version': 131
+ 'version': 132
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Sales Person',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Sales Person',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
'amend': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Sales Person',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Sales Person',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1,
'submit': 0
},
@@ -52,61 +52,16 @@
# DocType, Sales Person
{
'doctype': 'DocType',
- 'name': 'Sales Person'
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'permlevel': 1,
- 'role': 'Sales Manager',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'permlevel': 0,
- 'role': 'Sales Manager',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 3,
- 'permlevel': 1,
- 'role': 'Sales User',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 4,
- 'permlevel': 0,
- 'role': 'Sales User',
- 'write': 0
+ 'name': u'Sales Person'
},
# DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 5,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Sales Master Manager',
+ 'role': u'Sales Master Manager',
'write': 1
},
@@ -114,46 +69,83 @@
{
'cancel': 0,
'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 6,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Sales Master Manager',
+ 'role': u'Sales Master Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Sales Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales User',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Sales User',
'write': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 2,
- 'label': 'General Info',
- 'oldfieldtype': 'Section Break',
- 'options': 'Simple',
+ 'doctype': u'DocField',
+ 'fieldname': u'general_info',
+ 'fieldtype': u'Section Break',
+ 'label': u'General Info',
+ 'oldfieldtype': u'Section Break',
+ 'options': u'Simple',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'sales_person_name',
- 'fieldtype': 'Data',
- 'idx': 3,
+ 'doctype': u'DocField',
+ 'fieldname': u'sales_person_name',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Sales Person Name',
- 'oldfieldname': 'sales_person_name',
- 'oldfieldtype': 'Data',
+ 'label': u'Sales Person Name',
+ 'oldfieldname': u'sales_person_name',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1,
'search_index': 0
@@ -161,196 +153,184 @@
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Select company name first.',
- 'doctype': 'DocField',
- 'fieldname': 'parent_sales_person',
- 'fieldtype': 'Link',
- 'idx': 4,
- 'label': 'Parent Sales Person',
- 'oldfieldname': 'parent_sales_person',
- 'oldfieldtype': 'Link',
- 'options': 'Sales Person',
+ 'colour': u'White:FFF',
+ 'description': u'Select company name first.',
+ 'doctype': u'DocField',
+ 'fieldname': u'parent_sales_person',
+ 'fieldtype': u'Link',
+ 'label': u'Parent Sales Person',
+ 'oldfieldname': u'parent_sales_person',
+ 'oldfieldtype': u'Link',
+ 'options': u'Sales Person',
'permlevel': 0,
'reqd': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'idx': 5,
- 'label': 'SPHelp',
- 'oldfieldtype': 'HTML',
- 'options': '<a href="#!Sales Browser/Sales Person">To manage Sales Person, click here</a>',
+ 'doctype': u'DocField',
+ 'fieldname': u'sphelp',
+ 'fieldtype': u'HTML',
+ 'label': u'SPHelp',
+ 'oldfieldtype': u'HTML',
+ 'options': u'<a href="#!Sales Browser/Sales Person">To manage Sales Person, click here</a>',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'is_group',
- 'fieldtype': 'Select',
- 'idx': 6,
- 'label': 'Has Child Node',
- 'oldfieldname': 'is_group',
- 'oldfieldtype': 'Select',
- 'options': '\nYes\nNo',
+ 'doctype': u'DocField',
+ 'fieldname': u'is_group',
+ 'fieldtype': u'Select',
+ 'label': u'Has Child Node',
+ 'oldfieldname': u'is_group',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nYes\nNo',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'employee',
- 'fieldtype': 'Link',
- 'idx': 7,
- 'label': 'Employee',
- 'options': 'Employee',
+ 'doctype': u'DocField',
+ 'fieldname': u'employee',
+ 'fieldtype': u'Link',
+ 'label': u'Employee',
+ 'options': u'Employee',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'department',
- 'fieldtype': 'Data',
- 'idx': 8,
- 'label': 'Department',
- 'oldfieldname': 'department',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'department',
+ 'fieldtype': u'Data',
+ 'label': u'Department',
+ 'oldfieldname': u'department',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'designation',
- 'fieldtype': 'Data',
- 'idx': 9,
- 'label': 'Designation',
- 'oldfieldname': 'designation',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'designation',
+ 'fieldtype': u'Data',
+ 'label': u'Designation',
+ 'oldfieldname': u'designation',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'mobile_no',
- 'fieldtype': 'Data',
- 'idx': 10,
- 'label': 'Mobile No',
- 'oldfieldname': 'mobile_no',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'mobile_no',
+ 'fieldtype': u'Data',
+ 'label': u'Mobile No',
+ 'oldfieldname': u'mobile_no',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 11,
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'email_id',
- 'fieldtype': 'Data',
- 'idx': 12,
- 'label': 'Email Id',
- 'oldfieldname': 'email_id',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'email_id',
+ 'fieldtype': u'Data',
+ 'label': u'Email Id',
+ 'oldfieldname': u'email_id',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'country',
- 'fieldtype': 'Select',
- 'idx': 13,
+ 'doctype': u'DocField',
+ 'fieldname': u'country',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Country',
- 'oldfieldname': 'country',
- 'oldfieldtype': 'Select',
- 'options': 'link:Country',
+ 'label': u'Country',
+ 'oldfieldname': u'country',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:Country',
'permlevel': 0,
'search_index': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'state',
- 'fieldtype': 'Select',
- 'idx': 14,
+ 'doctype': u'DocField',
+ 'fieldname': u'state',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'State',
- 'oldfieldname': 'state',
- 'oldfieldtype': 'Select',
- 'options': 'link:State',
+ 'label': u'State',
+ 'oldfieldname': u'state',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:State',
'permlevel': 0,
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'city',
- 'fieldtype': 'Data',
- 'idx': 15,
- 'label': 'City',
- 'oldfieldname': 'city',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'city',
+ 'fieldtype': u'Data',
+ 'label': u'City',
+ 'oldfieldname': u'city',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'territory',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'territory',
+ 'fieldtype': u'Link',
'hidden': 0,
- 'idx': 16,
- 'label': 'Territory',
- 'oldfieldname': 'territory',
- 'oldfieldtype': 'Link',
- 'options': 'Territory',
+ 'label': u'Territory',
+ 'oldfieldname': u'territory',
+ 'oldfieldtype': u'Link',
+ 'options': u'Territory',
'permlevel': 0,
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'idx': 17,
- 'label': 'Territory Help',
- 'oldfieldtype': 'HTML',
- 'options': '<a href="javascript:cur_frm.cscript.TreePage(\'Territory\');">To manage Territory, click here</a>',
+ 'doctype': u'DocField',
+ 'fieldname': u'territory_help',
+ 'fieldtype': u'HTML',
+ 'label': u'Territory Help',
+ 'oldfieldtype': u'HTML',
+ 'options': u'<a href="javascript:cur_frm.cscript.TreePage(\'Territory\');">To manage Territory, click here</a>',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'lft',
- 'fieldtype': 'Int',
+ 'doctype': u'DocField',
+ 'fieldname': u'lft',
+ 'fieldtype': u'Int',
'hidden': 1,
- 'idx': 18,
'in_filter': 1,
- 'label': 'lft',
+ 'label': u'lft',
'no_copy': 1,
- 'oldfieldname': 'lft',
- 'oldfieldtype': 'Int',
+ 'oldfieldname': u'lft',
+ 'oldfieldtype': u'Int',
'permlevel': 0,
'print_hide': 1,
'search_index': 1
@@ -358,16 +338,15 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'rgt',
- 'fieldtype': 'Int',
+ 'doctype': u'DocField',
+ 'fieldname': u'rgt',
+ 'fieldtype': u'Int',
'hidden': 1,
- 'idx': 19,
'in_filter': 1,
- 'label': 'rgt',
+ 'label': u'rgt',
'no_copy': 1,
- 'oldfieldname': 'rgt',
- 'oldfieldtype': 'Int',
+ 'oldfieldname': u'rgt',
+ 'oldfieldtype': u'Int',
'permlevel': 0,
'print_hide': 1,
'search_index': 1
@@ -375,54 +354,51 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'old_parent',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'old_parent',
+ 'fieldtype': u'Data',
'hidden': 1,
- 'idx': 20,
- 'label': 'old_parent',
+ 'label': u'old_parent',
'no_copy': 1,
- 'oldfieldname': 'old_parent',
- 'oldfieldtype': 'Data',
+ 'oldfieldname': u'old_parent',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'distribution_id',
- 'fieldtype': 'Link',
- 'idx': 21,
- 'label': 'Distribution Id',
- 'oldfieldname': 'distribution_id',
- 'oldfieldtype': 'Link',
- 'options': 'Budget Distribution',
+ 'doctype': u'DocField',
+ 'fieldname': u'distribution_id',
+ 'fieldtype': u'Link',
+ 'label': u'Distribution Id',
+ 'oldfieldname': u'distribution_id',
+ 'oldfieldtype': u'Link',
+ 'options': u'Budget Distribution',
'permlevel': 0,
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 22,
- 'label': 'Target Details',
- 'oldfieldtype': 'Section Break',
- 'options': 'Simple',
+ 'doctype': u'DocField',
+ 'fieldname': u'target_details_section_break',
+ 'fieldtype': u'Section Break',
+ 'label': u'Target Details',
+ 'oldfieldtype': u'Section Break',
+ 'options': u'Simple',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'target_details',
- 'fieldtype': 'Table',
- 'idx': 23,
- 'label': 'Target Details1',
- 'oldfieldname': 'target_details',
- 'oldfieldtype': 'Table',
- 'options': 'Target Detail',
+ 'doctype': u'DocField',
+ 'fieldname': u'target_details',
+ 'fieldtype': u'Table',
+ 'label': u'Target Details1',
+ 'oldfieldname': u'target_details',
+ 'oldfieldtype': u'Table',
+ 'options': u'Target Detail',
'permlevel': 0
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/series_detail/series_detail.txt b/erpnext/setup/doctype/series_detail/series_detail.txt
index a6df55d..f7411c5 100644
--- a/erpnext/setup/doctype/series_detail/series_detail.txt
+++ b/erpnext/setup/doctype/series_detail/series_detail.txt
@@ -3,61 +3,59 @@
# These values are common in all dictionaries
{
- 'creation': '2011-07-08 13:20:10',
+ 'creation': '2012-03-27 14:36:25',
'docstatus': 0,
- 'modified': '2011-07-08 13:20:34',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:25',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
- 'section_style': 'Tray',
+ 'section_style': u'Tray',
'show_in_menu': 0,
'version': 3
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Series Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Series Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, Series Detail
{
'doctype': 'DocType',
- 'name': 'Series Detail'
+ 'name': u'Series Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'series',
- 'fieldtype': 'Read Only',
- 'idx': 1,
- 'label': 'Series',
- 'oldfieldname': 'series',
- 'oldfieldtype': 'Read Only'
+ 'doctype': u'DocField',
+ 'fieldname': u'series',
+ 'fieldtype': u'Read Only',
+ 'label': u'Series',
+ 'oldfieldname': u'series',
+ 'oldfieldtype': u'Read Only'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'remove',
- 'fieldtype': 'Check',
- 'idx': 2,
- 'label': 'Remove',
- 'oldfieldname': 'remove',
- 'oldfieldtype': 'Check',
- 'trigger': 'Client'
+ 'doctype': u'DocField',
+ 'fieldname': u'remove',
+ 'fieldtype': u'Check',
+ 'label': u'Remove',
+ 'oldfieldname': u'remove',
+ 'oldfieldtype': u'Check',
+ 'trigger': u'Client'
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/setup_control/setup_control.txt b/erpnext/setup/doctype/setup_control/setup_control.txt
index 5ded66b..58ad5f3 100644
--- a/erpnext/setup/doctype/setup_control/setup_control.txt
+++ b/erpnext/setup/doctype/setup_control/setup_control.txt
@@ -3,31 +3,31 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:24',
+ 'creation': '2012-03-27 14:36:25',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'yogesh@webnotestech.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:25',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'in_create': 1,
'issingle': 1,
'istable': 0,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
'read_only': 1,
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 73
},
# DocType, Setup Control
{
'doctype': 'DocType',
- 'name': 'Setup Control'
+ 'name': u'Setup Control'
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/setup_wizard_control/setup_wizard_control.txt b/erpnext/setup/doctype/setup_wizard_control/setup_wizard_control.txt
index 5f432ad..765b5e1 100644
--- a/erpnext/setup/doctype/setup_wizard_control/setup_wizard_control.txt
+++ b/erpnext/setup/doctype/setup_wizard_control/setup_wizard_control.txt
@@ -3,48 +3,47 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:24',
+ 'creation': '2012-03-27 14:36:25',
'docstatus': 0,
- 'modified': '2011-07-04 17:10:23',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:25',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'issingle': 1,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 110
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Setup Wizard Control',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Setup Wizard Control',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
- 'role': 'All',
+ 'role': u'All',
'write': 1
},
# DocType, Setup Wizard Control
{
'doctype': 'DocType',
- 'name': 'Setup Wizard Control'
+ 'name': u'Setup Wizard Control'
},
# DocPerm
{
- 'doctype': 'DocPerm'
+ 'doctype': u'DocPerm'
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/sms_settings/sms_settings.txt b/erpnext/setup/doctype/sms_settings/sms_settings.txt
index f4bddd6..a552d7a 100755
--- a/erpnext/setup/doctype/sms_settings/sms_settings.txt
+++ b/erpnext/setup/doctype/sms_settings/sms_settings.txt
@@ -3,137 +3,131 @@
# These values are common in all dictionaries
{
- 'creation': '2011-05-24 18:21:16',
+ 'creation': '2012-03-27 14:36:25',
'docstatus': 0,
- 'modified': '2011-05-25 11:59:34',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:25',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1306304974',
+ '_last_update': u'1306304974',
'allow_copy': 1,
'allow_email': 1,
'allow_print': 1,
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'in_create': 0,
'issingle': 1,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
'read_only': 0,
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 16
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'SMS Settings',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'SMS Settings',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'SMS Settings',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'SMS Settings',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1,
- 'role': 'System Manager'
+ 'role': u'System Manager'
},
# DocType, SMS Settings
{
'doctype': 'DocType',
- 'name': 'SMS Settings'
+ 'name': u'SMS Settings'
},
# DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'permlevel': 0,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
+ 'doctype': u'DocPerm',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 1,
- 'width': '50%'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Eg. smsgateway.com/api/send_sms.cgi',
- 'doctype': 'DocField',
- 'fieldname': 'sms_gateway_url',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'SMS Gateway URL',
+ 'colour': u'White:FFF',
+ 'description': u'Eg. smsgateway.com/api/send_sms.cgi',
+ 'doctype': u'DocField',
+ 'fieldname': u'sms_gateway_url',
+ 'fieldtype': u'Data',
+ 'label': u'SMS Gateway URL',
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Enter url parameter for message',
- 'doctype': 'DocField',
- 'fieldname': 'message_parameter',
- 'fieldtype': 'Data',
- 'idx': 3,
- 'label': 'Message Parameter',
+ 'colour': u'White:FFF',
+ 'description': u'Enter url parameter for message',
+ 'doctype': u'DocField',
+ 'fieldname': u'message_parameter',
+ 'fieldtype': u'Data',
+ 'label': u'Message Parameter',
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Enter url parameter for receiver nos',
- 'doctype': 'DocField',
- 'fieldname': 'receiver_parameter',
- 'fieldtype': 'Data',
- 'idx': 4,
- 'label': 'Receiver Parameter',
+ 'colour': u'White:FFF',
+ 'description': u'Enter url parameter for receiver nos',
+ 'doctype': u'DocField',
+ 'fieldname': u'receiver_parameter',
+ 'fieldtype': u'Data',
+ 'label': u'Receiver Parameter',
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 5,
- 'label': 'Static Parameters',
- 'width': '50%'
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'static_parameters',
+ 'fieldtype': u'Column Break',
+ 'label': u'Static Parameters',
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)',
- 'doctype': 'DocField',
- 'fieldname': 'static_parameter_details',
- 'fieldtype': 'Table',
- 'idx': 6,
- 'label': 'Static Parameter Details',
- 'options': 'Static Parameter Detail'
+ 'colour': u'White:FFF',
+ 'description': u'Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)',
+ 'doctype': u'DocField',
+ 'fieldname': u'static_parameter_details',
+ 'fieldtype': u'Table',
+ 'label': u'Static Parameter Details',
+ 'options': u'Static Parameter Detail'
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/state/state.txt b/erpnext/setup/doctype/state/state.txt
index 09e186b..b07bb67 100644
--- a/erpnext/setup/doctype/state/state.txt
+++ b/erpnext/setup/doctype/state/state.txt
@@ -3,36 +3,36 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:25',
+ 'creation': '2012-03-27 14:36:25',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:25',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'autoname': 'field:state_name',
- 'colour': 'White:FFF',
+ 'autoname': u'field:state_name',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
+ 'document_type': u'Master',
'in_create': 0,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
'read_only': 0,
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 14
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'State',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'State',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0,
'reqd': 1
},
@@ -40,11 +40,11 @@
# These values are common for all DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'State',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'State',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
'write': 1
@@ -53,53 +53,48 @@
# DocType, State
{
'doctype': 'DocType',
- 'name': 'State'
+ 'name': u'State'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'role': 'System Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'System Manager'
},
# DocPerm
{
'amend': 0,
'cancel': 0,
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'role': 'Sales Master Manager',
+ 'doctype': u'DocPerm',
+ 'role': u'Sales Master Manager',
'submit': 0
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 3,
- 'role': 'Purchase Master Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'Purchase Master Manager'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'state_name',
- 'fieldtype': 'Data',
- 'idx': 1,
- 'label': 'State Name',
- 'oldfieldname': 'state_name',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'state_name',
+ 'fieldtype': u'Data',
+ 'label': u'State Name',
+ 'oldfieldname': u'state_name',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'country',
- 'fieldtype': 'Select',
- 'idx': 2,
- 'label': 'Country',
- 'oldfieldname': 'country',
- 'oldfieldtype': 'Select',
- 'options': 'link:Country'
+ 'doctype': u'DocField',
+ 'fieldname': u'country',
+ 'fieldtype': u'Select',
+ 'label': u'Country',
+ 'oldfieldname': u'country',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:Country'
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/static_parameter_detail/static_parameter_detail.txt b/erpnext/setup/doctype/static_parameter_detail/static_parameter_detail.txt
index 587a716..79de261 100755
--- a/erpnext/setup/doctype/static_parameter_detail/static_parameter_detail.txt
+++ b/erpnext/setup/doctype/static_parameter_detail/static_parameter_detail.txt
@@ -3,57 +3,55 @@
# These values are common in all dictionaries
{
- 'creation': '2011-05-24 18:22:22',
+ 'creation': '2012-03-27 14:36:25',
'docstatus': 0,
- 'modified': '2011-05-24 18:42:30',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:25',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 4
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldtype': u'Data',
'name': '__common__',
- 'parent': 'Static Parameter Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Static Parameter Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0,
'reqd': 1,
- 'width': '150px'
+ 'width': u'150px'
},
# DocType, Static Parameter Detail
{
'doctype': 'DocType',
- 'name': 'Static Parameter Detail'
+ 'name': u'Static Parameter Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'parameter',
- 'idx': 1,
- 'label': 'Parameter'
+ 'doctype': u'DocField',
+ 'fieldname': u'parameter',
+ 'label': u'Parameter'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'value',
- 'idx': 2,
- 'label': 'Value'
+ 'doctype': u'DocField',
+ 'fieldname': u'value',
+ 'label': u'Value'
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/supplier_type/supplier_type.txt b/erpnext/setup/doctype/supplier_type/supplier_type.txt
index e608e6c..41f76e2 100644
--- a/erpnext/setup/doctype/supplier_type/supplier_type.txt
+++ b/erpnext/setup/doctype/supplier_type/supplier_type.txt
@@ -3,45 +3,45 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:26',
+ 'creation': '2012-03-27 14:36:25',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'yogesh@webnotestech.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:25',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
'allow_trash': 1,
- 'autoname': 'field:supplier_type',
- 'colour': 'White:FFF',
+ 'autoname': u'field:supplier_type',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'Setup',
+ 'document_type': u'Master',
+ 'module': u'Setup',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 3
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Supplier Type',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Supplier Type',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
'amend': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Supplier Type',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Supplier Type',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1,
'submit': 0
},
@@ -49,85 +49,78 @@
# DocType, Supplier Type
{
'doctype': 'DocType',
- 'name': 'Supplier Type'
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'permlevel': 1,
- 'role': 'Purchase Manager',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'permlevel': 0,
- 'role': 'Purchase Manager',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 3,
- 'permlevel': 1,
- 'role': 'Purchase User',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 4,
- 'permlevel': 0,
- 'role': 'Purchase User',
- 'write': 0
+ 'name': u'Supplier Type'
},
# DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 5,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Purchase Master Manager',
+ 'role': u'Purchase Master Manager',
'write': 1
},
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Purchase Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Purchase Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Purchase User',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Purchase User',
+ 'write': 0
+ },
+
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'supplier_type',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Supplier Type',
- 'oldfieldname': 'supplier_type',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'supplier_type',
+ 'fieldtype': u'Data',
+ 'label': u'Supplier Type',
+ 'oldfieldname': u'supplier_type',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
}
diff --git a/erpnext/setup/doctype/target_detail/target_detail.txt b/erpnext/setup/doctype/target_detail/target_detail.txt
index 43f1d6e..171f443 100644
--- a/erpnext/setup/doctype/target_detail/target_detail.txt
+++ b/erpnext/setup/doctype/target_detail/target_detail.txt
@@ -3,93 +3,89 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:26',
+ 'creation': '2012-03-27 14:36:25',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'abhishek@webnotestech.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:25',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
- 'section_style': 'Tray',
- 'server_code_error': ' ',
+ 'section_style': u'Tray',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 15
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Target Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Target Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, Target Detail
{
'doctype': 'DocType',
- 'name': 'Target Detail'
+ 'name': u'Target Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'item_group',
- 'fieldtype': 'Link',
- 'idx': 1,
+ 'doctype': u'DocField',
+ 'fieldname': u'item_group',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Item Group',
- 'oldfieldname': 'item_group',
- 'oldfieldtype': 'Link',
- 'options': 'Item Group',
+ 'label': u'Item Group',
+ 'oldfieldname': u'item_group',
+ 'oldfieldtype': u'Link',
+ 'options': u'Item Group',
'reqd': 0,
'search_index': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'fiscal_year',
- 'fieldtype': 'Select',
- 'idx': 2,
+ 'doctype': u'DocField',
+ 'fieldname': u'fiscal_year',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Fiscal Year',
- 'oldfieldname': 'fiscal_year',
- 'oldfieldtype': 'Select',
- 'options': 'link:Fiscal Year',
+ 'label': u'Fiscal Year',
+ 'oldfieldname': u'fiscal_year',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:Fiscal Year',
'reqd': 1,
'search_index': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'target_qty',
- 'fieldtype': 'Currency',
- 'idx': 3,
- 'label': 'Target Qty',
- 'oldfieldname': 'target_qty',
- 'oldfieldtype': 'Currency'
+ 'doctype': u'DocField',
+ 'fieldname': u'target_qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Target Qty',
+ 'oldfieldname': u'target_qty',
+ 'oldfieldtype': u'Currency'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'target_amount',
- 'fieldtype': 'Currency',
- 'idx': 4,
+ 'doctype': u'DocField',
+ 'fieldname': u'target_amount',
+ 'fieldtype': u'Currency',
'in_filter': 1,
- 'label': 'Target Amount',
- 'oldfieldname': 'target_amount',
- 'oldfieldtype': 'Currency',
+ 'label': u'Target Amount',
+ 'oldfieldname': u'target_amount',
+ 'oldfieldtype': u'Currency',
'reqd': 0,
'search_index': 1
}
diff --git a/erpnext/setup/doctype/term/term.txt b/erpnext/setup/doctype/term/term.txt
index 5adae34..ae1d1b0 100644
--- a/erpnext/setup/doctype/term/term.txt
+++ b/erpnext/setup/doctype/term/term.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:27',
+ 'creation': '2012-03-27 14:36:25',
'docstatus': 0,
- 'modified': '2012-03-21 14:54:12',
+ 'modified': '2012-03-27 14:36:25',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -58,42 +58,6 @@
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Sales Master Manager',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Sales Master Manager',
- 'submit': 0,
- 'write': 1
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Sales User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
'permlevel': 0,
'role': u'Sales User',
'submit': 0,
@@ -127,6 +91,42 @@
'write': 1
},
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales Master Manager',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 1,
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Sales Master Manager',
+ 'submit': 0,
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales User',
+ 'submit': 0,
+ 'write': 0
+ },
+
# DocField
{
'doctype': u'DocField',
diff --git a/erpnext/setup/doctype/territory/territory.txt b/erpnext/setup/doctype/territory/territory.txt
index 098c28f..2a1cc4d 100644
--- a/erpnext/setup/doctype/territory/territory.txt
+++ b/erpnext/setup/doctype/territory/territory.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:28',
+ 'creation': '2012-03-27 14:36:25',
'docstatus': 0,
- 'modified': '2012-03-21 14:46:04',
+ 'modified': '2012-03-27 18:50:08',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -27,7 +27,7 @@
'section_style': u'Simple',
'server_code_error': u' ',
'show_in_menu': 0,
- 'version': 86
+ 'version': 87
},
# These values are common for all DocField
@@ -59,56 +59,6 @@
# DocPerm
{
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Sales Manager',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Sales Manager',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Sales Master Manager',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Sales User',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Sales User',
- 'write': 0
- },
-
- # DocPerm
- {
'cancel': 1,
'create': 1,
'doctype': u'DocPerm',
@@ -117,6 +67,56 @@
'write': 1
},
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Sales Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales Master Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales User',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Sales User',
+ 'write': 0
+ },
+
# DocField
{
'doctype': u'DocField',
@@ -172,6 +172,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'territoryhelp',
'fieldtype': u'HTML',
'label': u'TerritoryHelp',
'oldfieldtype': u'HTML',
@@ -259,6 +260,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'target_details_section_break',
'fieldtype': u'Section Break',
'label': u'Target Details',
'oldfieldtype': u'Section Break',
diff --git a/erpnext/setup/doctype/uom/uom.txt b/erpnext/setup/doctype/uom/uom.txt
index 7918322..93b5ff9 100644
--- a/erpnext/setup/doctype/uom/uom.txt
+++ b/erpnext/setup/doctype/uom/uom.txt
@@ -3,46 +3,46 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:29',
+ 'creation': '2012-03-27 14:36:26',
'docstatus': 0,
- 'modified': '2010-12-24 15:14:23',
- 'modified_by': 'abhishek@webnotestech.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:26',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1307707462',
+ '_last_update': u'1307707462',
'allow_trash': 1,
- 'autoname': 'field:uom_name',
- 'colour': 'White:FFF',
+ 'autoname': u'field:uom_name',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'Setup',
+ 'document_type': u'Master',
+ 'module': u'Setup',
'name': '__common__',
- 'section_style': 'Tabbed',
- 'server_code_error': ' ',
+ 'section_style': u'Tabbed',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 5
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'UOM',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'UOM',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
'amend': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'UOM',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'UOM',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1,
'submit': 0
},
@@ -50,95 +50,88 @@
# DocType, UOM
{
'doctype': 'DocType',
- 'name': 'UOM'
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'permlevel': 1,
- 'role': 'Material Manager',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'permlevel': 0,
- 'role': 'Material Manager',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 3,
- 'permlevel': 1,
- 'role': 'Material User',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 4,
- 'permlevel': 0,
- 'role': 'Material User',
- 'write': 0
+ 'name': u'UOM'
},
# DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 5,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Material Master Manager',
+ 'role': u'Material Master Manager',
'write': 1
},
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Material Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Material Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Material User',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Material User',
+ 'write': 0
+ },
+
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 2,
- 'label': 'UOM Details',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'uom_details',
+ 'fieldtype': u'Section Break',
+ 'label': u'UOM Details',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'uom_name',
- 'fieldtype': 'Data',
- 'idx': 3,
- 'label': 'UOM Name',
- 'oldfieldname': 'uom_name',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'uom_name',
+ 'fieldtype': u'Data',
+ 'label': u'UOM Name',
+ 'oldfieldname': u'uom_name',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
}
diff --git a/erpnext/setup/doctype/warehouse_type/warehouse_type.txt b/erpnext/setup/doctype/warehouse_type/warehouse_type.txt
index c843838..6015752 100644
--- a/erpnext/setup/doctype/warehouse_type/warehouse_type.txt
+++ b/erpnext/setup/doctype/warehouse_type/warehouse_type.txt
@@ -3,45 +3,45 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:30',
+ 'creation': '2012-03-27 14:36:26',
'docstatus': 0,
- 'modified': '2010-09-22 10:52:43',
- 'modified_by': 'yogesh@webnotestech.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:26',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
'allow_trash': 1,
- 'autoname': 'field:warehouse_type',
- 'colour': 'White:FFF',
+ 'autoname': u'field:warehouse_type',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 0,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 6
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Warehouse Type',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Warehouse Type',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
'amend': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Warehouse Type',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Warehouse Type',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1,
'submit': 0
},
@@ -49,86 +49,79 @@
# DocType, Warehouse Type
{
'doctype': 'DocType',
- 'name': 'Warehouse Type'
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'permlevel': 1,
- 'role': 'Material Manager',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'permlevel': 0,
- 'role': 'Material Manager',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 3,
- 'permlevel': 1,
- 'role': 'Material User',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 4,
- 'permlevel': 0,
- 'role': 'Material User',
- 'write': 0
+ 'name': u'Warehouse Type'
},
# DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 5,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Material Master Manager',
+ 'role': u'Material Master Manager',
'write': 1
},
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Material Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Material Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Material User',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Material User',
+ 'write': 0
+ },
+
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'warehouse_type',
- 'fieldtype': 'Data',
- 'idx': 2,
+ 'doctype': u'DocField',
+ 'fieldname': u'warehouse_type',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Warehouse Type',
- 'oldfieldname': 'warehouse_type',
- 'oldfieldtype': 'Data',
+ 'label': u'Warehouse Type',
+ 'oldfieldname': u'warehouse_type',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1,
'search_index': 1
diff --git a/erpnext/setup/doctype/workflow_action_detail/workflow_action_detail.txt b/erpnext/setup/doctype/workflow_action_detail/workflow_action_detail.txt
index 26028af..660eb11 100644
--- a/erpnext/setup/doctype/workflow_action_detail/workflow_action_detail.txt
+++ b/erpnext/setup/doctype/workflow_action_detail/workflow_action_detail.txt
@@ -3,61 +3,59 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:30',
+ 'creation': '2012-03-27 14:36:26',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'swarnalata@webnotestech.com'
+ 'modified': '2012-03-27 14:36:26',
+ 'modified_by': u'Administrator',
+ 'owner': u'swarnalata@webnotestech.com'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 5
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Workflow Action Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Workflow Action Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0,
- 'width': '200px'
+ 'width': u'200px'
},
# DocType, Workflow Action Detail
{
'doctype': 'DocType',
- 'name': 'Workflow Action Detail'
+ 'name': u'Workflow Action Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'action_field',
- 'fieldtype': 'Select',
- 'idx': 1,
- 'label': 'Field',
- 'oldfieldname': 'action_field',
- 'oldfieldtype': 'Select'
+ 'doctype': u'DocField',
+ 'fieldname': u'action_field',
+ 'fieldtype': u'Select',
+ 'label': u'Field',
+ 'oldfieldname': u'action_field',
+ 'oldfieldtype': u'Select'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'action_value',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Value',
- 'oldfieldname': 'action_value',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'action_value',
+ 'fieldtype': u'Data',
+ 'label': u'Value',
+ 'oldfieldname': u'action_value',
+ 'oldfieldtype': u'Data'
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/workflow_engine/workflow_engine.txt b/erpnext/setup/doctype/workflow_engine/workflow_engine.txt
index 5b090c8..f6e3ce7 100644
--- a/erpnext/setup/doctype/workflow_engine/workflow_engine.txt
+++ b/erpnext/setup/doctype/workflow_engine/workflow_engine.txt
@@ -3,22 +3,22 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:31',
+ 'creation': '2012-03-27 14:36:26',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'swarnalata@webnotestech.com'
+ 'modified': '2012-03-27 14:36:26',
+ 'modified_by': u'Administrator',
+ 'owner': u'swarnalata@webnotestech.com'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'issingle': 1,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 4
},
@@ -26,6 +26,6 @@
# DocType, Workflow Engine
{
'doctype': 'DocType',
- 'name': 'Workflow Engine'
+ 'name': u'Workflow Engine'
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/workflow_rule/workflow_rule.txt b/erpnext/setup/doctype/workflow_rule/workflow_rule.txt
index a3ed11b..93f1c40 100644
--- a/erpnext/setup/doctype/workflow_rule/workflow_rule.txt
+++ b/erpnext/setup/doctype/workflow_rule/workflow_rule.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:31',
+ 'creation': '2012-03-27 14:36:26',
'docstatus': 0,
- 'modified': '2012-03-21 14:58:16',
+ 'modified': '2012-03-27 14:36:26',
'modified_by': u'Administrator',
'owner': u'swarnalata@webnotestech.com'
},
@@ -64,6 +64,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'rule_definition',
'fieldtype': u'Section Break',
'label': u'Rule Definition',
'oldfieldtype': u'Section Break'
@@ -72,6 +73,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'intro_html',
'fieldtype': u'HTML',
'label': u'Intro HTML',
'oldfieldtype': u'HTML',
@@ -135,6 +137,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'define_rule',
'fieldtype': u'Section Break',
'label': u'Define Rule',
'oldfieldtype': u'Section Break',
@@ -170,6 +173,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'action_detail',
'fieldtype': u'Section Break',
'label': u'Action Detail',
'oldfieldtype': u'Section Break'
@@ -178,6 +182,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'action_html',
'fieldtype': u'HTML',
'label': u'Action html',
'oldfieldtype': u'HTML',
@@ -199,6 +204,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'reject_html',
'fieldtype': u'HTML',
'hidden': 1,
'label': u'Reject HTML',
diff --git a/erpnext/setup/doctype/workflow_rule_detail/workflow_rule_detail.txt b/erpnext/setup/doctype/workflow_rule_detail/workflow_rule_detail.txt
index 3f22040..dbdb04b 100644
--- a/erpnext/setup/doctype/workflow_rule_detail/workflow_rule_detail.txt
+++ b/erpnext/setup/doctype/workflow_rule_detail/workflow_rule_detail.txt
@@ -3,110 +3,104 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:31',
+ 'creation': '2012-03-27 14:36:26',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'swarnalata@webnotestech.com'
+ 'modified': '2012-03-27 14:36:26',
+ 'modified_by': u'Administrator',
+ 'owner': u'swarnalata@webnotestech.com'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Setup',
+ 'module': u'Setup',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 9
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Workflow Rule Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Workflow Rule Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, Workflow Rule Detail
{
'doctype': 'DocType',
- 'name': 'Workflow Rule Detail'
+ 'name': u'Workflow Rule Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'rule_field',
- 'fieldtype': 'Select',
- 'idx': 1,
- 'label': 'Field',
- 'oldfieldname': 'rule_field',
- 'oldfieldtype': 'Select',
- 'options': '[]',
- 'width': '200px'
+ 'doctype': u'DocField',
+ 'fieldname': u'rule_field',
+ 'fieldtype': u'Select',
+ 'label': u'Field',
+ 'oldfieldname': u'rule_field',
+ 'oldfieldtype': u'Select',
+ 'options': u'[]',
+ 'width': u'200px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'operator',
- 'fieldtype': 'Select',
- 'idx': 2,
- 'label': 'Operator',
- 'oldfieldname': 'operator',
- 'oldfieldtype': 'Select',
- 'options': '\nequal\nnot equal\ngreater than\ngreater than equal\nless than\nless than equal'
+ 'doctype': u'DocField',
+ 'fieldname': u'operator',
+ 'fieldtype': u'Select',
+ 'label': u'Operator',
+ 'oldfieldname': u'operator',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nequal\nnot equal\ngreater than\ngreater than equal\nless than\nless than equal'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'value',
- 'fieldtype': 'Data',
- 'idx': 3,
- 'label': 'Value',
- 'oldfieldname': 'value',
- 'oldfieldtype': 'Data',
- 'width': '100px'
+ 'doctype': u'DocField',
+ 'fieldname': u'value',
+ 'fieldtype': u'Data',
+ 'label': u'Value',
+ 'oldfieldname': u'value',
+ 'oldfieldtype': u'Data',
+ 'width': u'100px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'comparing_field',
- 'fieldtype': 'Select',
- 'idx': 4,
- 'label': 'Field from other forms',
- 'oldfieldname': 'comparing_field',
- 'oldfieldtype': 'Select'
+ 'doctype': u'DocField',
+ 'fieldname': u'comparing_field',
+ 'fieldtype': u'Select',
+ 'label': u'Field from other forms',
+ 'oldfieldname': u'comparing_field',
+ 'oldfieldtype': u'Select'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'message',
- 'fieldtype': 'Data',
- 'idx': 5,
- 'label': 'Message when Cond. False',
- 'oldfieldname': 'message',
- 'oldfieldtype': 'Data',
- 'width': '200px'
+ 'doctype': u'DocField',
+ 'fieldname': u'message',
+ 'fieldtype': u'Data',
+ 'label': u'Message when Cond. False',
+ 'oldfieldname': u'message',
+ 'oldfieldtype': u'Data',
+ 'width': u'200px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'exception',
- 'fieldtype': 'Select',
- 'idx': 6,
- 'label': 'Raise Exception',
- 'oldfieldname': 'exception',
- 'oldfieldtype': 'Select',
- 'options': '\nYes\nNo'
+ 'doctype': u'DocField',
+ 'fieldname': u'exception',
+ 'fieldtype': u'Select',
+ 'label': u'Raise Exception',
+ 'oldfieldname': u'exception',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nYes\nNo'
}
]
\ No newline at end of file
diff --git a/erpnext/setup/page/import_data/import_data.js b/erpnext/setup/page/import_data/import_data.js
index aeb7dad..734c16d 100644
--- a/erpnext/setup/page/import_data/import_data.js
+++ b/erpnext/setup/page/import_data/import_data.js
@@ -47,7 +47,7 @@
dt.onclick = function(){
var ovr = $('input[name="overwrite"]:checked').length;
- window.location = outUrl + '?cmd=get_template&dt=' + this.nm + (ovr ? '&overwrite=1' : '');
+ window.location = wn.request.url + '?cmd=get_template&dt=' + this.nm + (ovr ? '&overwrite=1' : '');
}
}
}
diff --git a/erpnext/setup/page/modules_setup/modules_setup.js b/erpnext/setup/page/modules_setup/modules_setup.js
index af7522f..c7f80fc 100644
--- a/erpnext/setup/page/modules_setup/modules_setup.js
+++ b/erpnext/setup/page/modules_setup/modules_setup.js
@@ -1,4 +1,4 @@
-wn.require('lib/js/lib/jquery-ui-sortable.min.js');
+wn.require('lib/js/lib/jquery/jquery.ui.sortable.js');
$.extend(wn.pages.modules_setup, {
modules: ['Activity', 'Accounts', 'Selling', 'Buying', 'Stock', 'Production', 'Projects',
diff --git a/erpnext/setup/page/permission_engine/permission_engine.js b/erpnext/setup/page/permission_engine/permission_engine.js
index 1d77e51..5f5630c 100644
--- a/erpnext/setup/page/permission_engine/permission_engine.js
+++ b/erpnext/setup/page/permission_engine/permission_engine.js
@@ -148,9 +148,13 @@
// Get permissions
if(r.message.perms.length) {
me.get_results(r.message);
+ pscript.is_submittable = cint(r.message.is_submittable);
}
- else me.body.innerHTML = '<div style = "color : red; margin:8px 0px;">No Records Found</div>'
- pscript.show_submittable();
+ else {
+ me.body.innerHTML = '<div style = "color : red; margin:8px 0px;">No Records Found</div>'
+ pscript.is_submittable = 0;
+ }
+ pscript.hide_submit_amend()
});
}
@@ -171,6 +175,7 @@
var head = $a(this.body, 'h3'); head.innerHTML = 'Rules for ' + doctype;
var permt = make_table(me.body, perms.length+1,9,'80%',[],{border:'1px solid #AAA', padding:'3px', verticalAlign:'middle', height:'30px'});
+ $(permt).attr('id', 'perm_table');
// Create Grid for particular DocType
// ------------------------------------
@@ -203,9 +208,7 @@
var val = perms[l][$td(permt,0,m+2).fieldname];
if(val == 1) chk.checked = 1;
else chk.checked = 0;
-
- if(m==3) { chk.onclick = pscript.show_submittable }
-
+ //if(m==3) { chk.onclick = pscript.show_submittable }
chk.doctype = doctype;
chk.permlevel = perms[l].permlevel; chk.perm_type = col_labels[m+2].toLowerCase(); chk.role = perms[l].role;
pscript.all_checkboxes.push(chk);
@@ -214,21 +217,18 @@
// add selects for match
me.add_match_select(r, perms, permt, doctype);
+
}
-// Show submittable warning
-pscript.show_submittable = function() {
- var submittable = 0;
- for(i in pscript.all_checkboxes) {
- c = pscript.all_checkboxes[i];
- if(c.perm_type=='submit' && c.checked) {
- submittable = 1;
- break;
- }
- }
- if(submittable) {
+pscript.hide_submit_amend = function() {
+ var perm_table = $('#perm_table');
+ if (pscript.is_submittable) {
+ perm_table.find('td:nth-child(6)').each(function() { $(this).toggle(true); });
+ perm_table.find('td:nth-child(8)').each(function() { $(this).toggle(true); });
$('#submittable_warning').toggle(true);
} else {
+ perm_table.find('td:nth-child(6)').each(function() { $(this).toggle(false); });
+ perm_table.find('td:nth-child(8)').each(function() { $(this).toggle(false); });
$('#submittable_warning').toggle(false);
}
}
@@ -538,6 +538,22 @@
if(sel_val(s))
add_to_out(s.details.parent, s.details.permlevel, s.details.role, 'match', sel_val(s));
}
+
+ if(pscript.is_submittable) {
+ var doctype = sel_val(me.type_select);
+ var validated = false;
+ for(var role in out[doctype][0]) {
+ if(out[doctype][0][role]['submit']) {
+ validated = true;
+ break;
+ };
+ }
+ if(!validated) {
+ msgprint("Atleast one Role at Level 0 needs to have submit permission. \
+ Please rectify and try again.")
+ return;
+ }
+ }
var args = "{'perm_dict': "+JSON.stringify(out)+"}"
$c_obj('Permission Control','update_permissions', args, function(r,rt) {});
diff --git a/erpnext/setup/page/setup/setup.html b/erpnext/setup/page/setup/setup.html
index 50ef112..056a28f 100644
--- a/erpnext/setup/page/setup/setup.html
+++ b/erpnext/setup/page/setup/setup.html
@@ -31,10 +31,6 @@
<b><a href="#!List/Authorization Rule">Amount based Authorization Rules</a></b><br>
<span class="help">Restrict submission rights based on amount</span>
</p>
- <p>
- <b><a href="#!modules_setup">Modules Setup</a></b><br>
- <span class="help">Show, hide modules</span>
- </p>
</div>
<div class="setup-column">
<h3>Data</h3>
@@ -85,21 +81,29 @@
<div class="setup-column">
<h3>Customize ERPNext</h3>
<p>
- <b><a href="#!List/Custom Field">Custom Fields</a></b><br>
- <span class="help">Add fields to forms</span>
- </p>
- <p>
<b><a href="#!Form/DocLayer/DocLayer">Customize Forms</a></b><br>
<span class="help">Change entry properties (hide fields, make mandatory etc)</span>
</p>
<p>
- <b><a href="#!Form/Naming Series/Naming Series">Numbering Series</a></b><br>
- <span class="help">Set multiple numbering series for transactions</span>
+ <b><a href="#!List/Custom Field">Custom Fields</a></b><br>
+ <span class="help">Add fields to forms</span>
+ </p>
+ <p>
+ <b><a href="#!List/Custom Script">Custom Scripts</a></b><br>
+ <span class="help">Add custom code to forms</span>
</p>
<p>
<b><a href="#!Form/Features Setup/Features Setup">Disable Features</a></b><br>
<span class="help">Simplify entry forms by disabling features</span>
</p>
+ <p>
+ <b><a href="#!modules_setup">Modules Setup</a></b><br>
+ <span class="help">Show, hide modules</span>
+ </p>
+ <p>
+ <b><a href="#!Form/Naming Series/Naming Series">Numbering Series</a></b><br>
+ <span class="help">Set multiple numbering series for transactions</span>
+ </p>
</div>
<div class="setup-column">
<h3>Branding and Printing</h3>
@@ -115,14 +119,16 @@
<b><a href="#!List/Print Heading">Print Headings</a></b><br>
<span class="help">Add headers for standard print formats</span>
</p>
+ <!--
<p>
<b><a href="#!Form/Personalize/Personalize">Home Banner</a></b><br>
<span class="help">Add a home page banner</span>
</p>
+ -->
<p>
<b><a href="#!Form/Style Settings/Style Settings">Style Settings</a></b><br>
<span class="help">Change background fonts etc</span>
</p>
</div>
<div style="clear: both"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/erpnext/startup/event_handlers.py b/erpnext/startup/event_handlers.py
index 703399a..e5846b5 100644
--- a/erpnext/startup/event_handlers.py
+++ b/erpnext/startup/event_handlers.py
@@ -26,9 +26,11 @@
if login_manager.user not in ('Guest', None, '') and webnotes.conn.cur_db_name!='accounts' and webnotes.conn.get_value('Control Panel', 'Control Panel', 'account_id')!='s5u011':
try:
login_manager = login_as(login_manager)
- update_account_details()
- import server_tools.gateway_utils
- server_tools.gateway_utils.check_login(login_manager.user)
+ if hasattr(webnotes.defs, 'sync_with_gateway') and \
+ cint(webnotes.defs.sync_with_gateway) or 0:
+ update_account_details()
+ import server_tools.gateway_utils
+ server_tools.gateway_utils.check_login(login_manager.user)
except ImportError:
pass
@@ -158,6 +160,8 @@
# logout the user from SSO
#
def on_logout(login_manager):
- if cint(webnotes.conn.get_value('Control Panel', None, 'sync_with_gateway')):
+ import webnotes.defs
+ if hasattr(webnotes.defs, 'sync_with_gateway') and \
+ cint(webnotes.defs.sync_with_gateway) or 0:
from server_tools.gateway_utils import logout_sso
logout_sso(user=login_manager.user)
diff --git a/erpnext/startup/js/complete_setup.js b/erpnext/startup/js/complete_setup.js
index ac89aff..c643813 100644
--- a/erpnext/startup/js/complete_setup.js
+++ b/erpnext/startup/js/complete_setup.js
@@ -85,7 +85,7 @@
wn.boot.user_info[user].fullname = user_fullname;
d.hide();
$('header').toggle(true);
- page_body.wntoolbar.set_user_name();
+ wn.container.wntoolbar.set_user_name();
});
}
diff --git a/erpnext/startup/js/modules.js b/erpnext/startup/js/modules.js
index d43b021..2e0e701 100644
--- a/erpnext/startup/js/modules.js
+++ b/erpnext/startup/js/modules.js
@@ -61,7 +61,7 @@
erpnext.module_page.make_list = function(module, wrapper) {
// make project listing
- wrapper.list = new wn.widgets.Listing({
+ wrapper.list = new wn.ui.Listing({
parent: $(wrapper).find('.reports-list').get(0),
method: 'utilities.get_report_list',
render_row: function(row, data) {
diff --git a/erpnext/startup/js/toolbar.js b/erpnext/startup/js/toolbar.js
index 7bf9c6a..eb3bff8 100644
--- a/erpnext/startup/js/toolbar.js
+++ b/erpnext/startup/js/toolbar.js
@@ -48,7 +48,7 @@
$('#toolbar-user').append('<li><a href="#billing">Billing</a></li>')
}
- $.extend(page_body.wntoolbar, {
+ $.extend(wn.container.wntoolbar, {
set_new_comments: function(new_comments) {
var navbar_nc = $('.navbar-new-comments');
if(new_comments && new_comments.length>0) {
@@ -66,7 +66,7 @@
}
});
- page_body.wntoolbar.set_new_comments();
+ wn.container.wntoolbar.set_new_comments();
}
erpnext.toolbar.add_modules = function() {
diff --git a/erpnext/startup/startup.css b/erpnext/startup/startup.css
index 225e444..a6f4e92 100644
--- a/erpnext/startup/startup.css
+++ b/erpnext/startup/startup.css
@@ -1,11 +1,11 @@
h1, h2, h3, h4, h5 {
- font-family: Tahoma, Arial, Verdana, sans-serif;
+ font-family: "Open Sans", Helvetica, "Helvetica Neue", sans-serif;
font-weight: bold;
}
body {
- font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
- font-size: 12px;
+ font-family: "Open Sans", Helvetica, "Helvetica Neue", sans-serif;
+ font-size: 13px;
}
span, div, td, input, textarea, button, select {
@@ -13,7 +13,11 @@
}
body {
- background: url(../images/stripedbg.png) repeat;
+ background: url(../images/redbeech.jpg) repeat;
+}
+
+.small {
+ font-size: 11.5px;
}
.erpnext-footer {
diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js
index c00770c..27befaf 100644
--- a/erpnext/startup/startup.js
+++ b/erpnext/startup/startup.js
@@ -49,14 +49,14 @@
erpnext.startup.set_globals();
- if(wn.boot.custom_css) {
- set_style(wn.boot.custom_css);
- }
if(wn.boot.user_background) {
erpnext.set_user_background(wn.boot.user_background);
}
if(user == 'Guest'){
+ if(wn.boot.custom_css) {
+ set_style(wn.boot.custom_css);
+ }
if(wn.boot.website_settings.title_prefix) {
wn.title_prefix = wn.boot.website_settings.title_prefix;
}
@@ -64,6 +64,10 @@
// always allow apps
wn.boot.profile.allow_modules = wn.boot.profile.allow_modules.concat(
['To Do', 'Knowledge Base', 'Calendar', 'Activity', 'Messages'])
+ // allow dashboard to accounts manager
+ if(user_roles.indexOf('Accounts Manager')!=-1) {
+ wn.boot.profile.allow_modules.push('Dashboard');
+ }
// setup toolbar
erpnext.toolbar.setup();
@@ -73,8 +77,8 @@
// border to the body
// ------------------
- $('footer').html('<div class="web-footer erpnext-footer">\
- <a href="#!attributions">ERPNext | Attributions and License</a></div>');
+ //$('footer').html('<div class="web-footer erpnext-footer">\
+ // <a href="#!attributions">ERPNext | Attributions and License</a></div>');
// complete registration
if(in_list(user_roles,'System Manager') && (wn.boot.setup_complete=='No')) {
@@ -107,14 +111,14 @@
var update_messages = function(reset) {
// Updates Team Messages
- if(inList(['Guest'], user)) { return; }
+ if(inList(['Guest'], user) || !wn.session_alive) { return; }
if(!reset) {
$c_page('home', 'event_updates', 'get_global_status_messages', null,
function(r,rt) {
if(!r.exc) {
// This function is defined in toolbar.js
- page_body.wntoolbar.set_new_comments(r.message.unread_messages);
+ wn.container.wntoolbar.set_new_comments(r.message.unread_messages);
var show_in_circle = function(parent_id, msg) {
var parent = $('#'+parent_id);
@@ -139,7 +143,7 @@
}
);
} else {
- page_body.wntoolbar.set_new_comments(0);
+ wn.container.wntoolbar.set_new_comments(0);
$('#unread_messages').toggle(false);
}
}
diff --git a/erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt b/erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
index d628495..43be998 100644
--- a/erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
+++ b/erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:35',
+ 'creation': '2010-09-20 12:33:34',
'docstatus': 0,
- 'modified': '2012-03-20 14:24:12',
+ 'modified': '2012-03-27 14:17:40',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/stock/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt b/erpnext/stock/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt
index 43e800f..f106869 100644
--- a/erpnext/stock/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt
+++ b/erpnext/stock/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:35',
+ 'creation': '2010-09-20 12:33:35',
'docstatus': 0,
- 'modified': '2012-03-01 17:58:16',
+ 'modified': '2012-03-27 14:17:39',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/stock/Module Def/Stock/Stock.txt b/erpnext/stock/Module Def/Stock/Stock.txt
deleted file mode 100644
index 991d410..0000000
--- a/erpnext/stock/Module Def/Stock/Stock.txt
+++ /dev/null
@@ -1,242 +0,0 @@
-# Module Def, Stock
-[
-
- # These values are common in all dictionaries
- {
- 'creation': '2011-07-01 17:40:49',
- 'docstatus': 0,
- 'modified': '2012-02-01 15:43:00',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
- },
-
- # These values are common for all Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'name': '__common__',
- 'parent': 'Stock',
- 'parentfield': 'roles',
- 'parenttype': 'Module Def'
- },
-
- # These values are common for all Module Def Item
- {
- 'doctype': 'Module Def Item',
- 'name': '__common__',
- 'parent': 'Stock',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
-
- # These values are common for all Module Def
- {
- 'disabled': 'No',
- 'doctype': u'Module Def',
- 'doctype_list': 'DocType Label, QA Inspection Report',
- 'is_hidden': 'No',
- 'module_desc': 'Material Management',
- 'module_icon': 'Stock.gif',
- 'module_label': 'Stock',
- 'module_name': 'Stock',
- 'module_seq': 7,
- 'name': '__common__'
- },
-
- # Module Def, Stock
- {
- 'doctype': u'Module Def',
- 'name': 'Stock'
- },
-
- # Module Def Item
- {
- 'description': 'Item master',
- 'display_name': 'Item',
- 'doc_name': 'Item',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'name\nitem_group\ndescription'
- },
-
- # Module Def Item
- {
- 'description': 'A unique number identifying each entity of an item',
- 'display_name': 'Serial No',
- 'doc_name': 'Serial No',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'item_code\nstatus\nwarehouse\npr_no\ndelivery_note_no\ncustomer'
- },
-
- # Module Def Item
- {
- 'description': 'Record of items added, removed or moved from one warehouse to another.',
- 'display_name': 'Stock Entry',
- 'doc_name': 'Stock Entry',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'transfer_date\npurpose\nfrom_warehouse\nto_warehouse\nremarks'
- },
-
- # Module Def Item
- {
- 'description': 'Record of items delivered to your customers along with the Printed Note',
- 'display_name': 'Delivery Note',
- 'doc_name': 'Delivery Note',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'status\ntransaction_date\ncustomer\nterritory\ngrand_total\nper_billed'
- },
-
- # Module Def Item
- {
- 'description': 'Generate Packing Slips based on a Delivery Note',
- 'display_name': 'Packing Slip',
- 'doc_name': 'Packing Slip',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'delivery_note\nfrom_case_no\nto_case_no\nnet_weight_pkg\ngross_weight_pkg'
- },
-
- # Module Def Item
- {
- 'description': 'Record of incoming material from your suppliers',
- 'display_name': 'Purchase Receipt',
- 'doc_name': 'Purchase Receipt',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'status\ntransaction_date\nsupplier\ngrand_total\nper_billed'
- },
-
- # Module Def Item
- {
- 'description': 'Details of Installation done after delivery',
- 'display_name': 'Installation Note',
- 'doc_name': 'Installation Note',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'description': 'Create Quality Inspection Report for any item',
- 'display_name': 'Inspection Report',
- 'doc_name': 'QA Inspection Report',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'inspection_type\nitem_code\nreport_date\npurchase_receipt_no\ndelivery_note_no'
- },
-
- # Module Def Item
- {
- 'description': 'Reconcile your stock by uploading it form an excel file',
- 'display_name': 'Stock Reconciliation',
- 'doc_name': 'Stock Reconciliation',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'reconciliation_date\nreconciliation_time\nremark'
- },
-
- # Module Def Item
- {
- 'description': 'This utility tool will update Stock UOM in Item and will respectively update Actual Qty in Stock Ledger as per Conversion Factor.',
- 'display_name': 'Stock UOM Replace Utility',
- 'doc_name': 'Stock UOM Replace Utility',
- 'doc_type': 'Single DocType',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'description': 'This utility will help in tracking stock for Sales Return and Purchase Return.',
- 'display_name': 'Sales and Purchase Return Wizard',
- 'doc_name': 'Sales and Purchase Return Wizard',
- 'doc_type': 'Single DocType',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'description': 'You can create master template for landed cost wizard',
- 'display_name': 'Landed Cost Master',
- 'doc_name': 'Landed Cost Master',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'icon': 'accept.gif'
- },
-
- # Module Def Item
- {
- 'description': 'Add extra expenses into Purchase Receipt which should be consider for item valuation. The cost will be added proportionately as per purchase receipt value.',
- 'display_name': 'Landed Cost Wizard',
- 'doc_name': 'Landed Cost Wizard',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'icon': 'accept.gif'
- },
-
- # Module Def Item
- {
- 'display_name': 'Stock Ledger',
- 'doc_name': 'Stock Ledger Entry',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Stock Level',
- 'doc_name': 'Bin',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Shortage To Indent',
- 'doc_name': 'Item',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'description': 'Stock Value as per Item and Warehouse',
- 'display_name': 'Stock Report',
- 'doc_name': 'Stock Ledger Entry',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Stock Aging Report',
- 'doc_name': 'Serial No',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'role': 'Material User'
- },
-
- # Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'role': 'Material Master Manager'
- },
-
- # Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'role': 'Material Manager'
- },
-
- # Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'role': 'Quality Manager'
- }
-]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/batch/batch.txt b/erpnext/stock/doctype/batch/batch.txt
index f589b12..85dbef3 100644
--- a/erpnext/stock/doctype/batch/batch.txt
+++ b/erpnext/stock/doctype/batch/batch.txt
@@ -3,155 +3,146 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:52',
+ 'creation': '2012-03-27 14:36:26',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'harshada@webnotestech.com'
+ 'modified': '2012-03-27 14:36:26',
+ 'modified_by': u'Administrator',
+ 'owner': u'harshada@webnotestech.com'
},
# These values are common for all DocType
{
'allow_trash': 1,
- 'autoname': 'field:batch_id',
- 'colour': 'White:FFF',
+ 'autoname': u'field:batch_id',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'Stock',
+ 'document_type': u'Master',
+ 'module': u'Stock',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 12
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Batch',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Batch',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Batch',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Batch',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1,
- 'role': 'Material Master Manager'
+ 'role': u'Material Master Manager'
},
# DocType, Batch
{
'doctype': 'DocType',
- 'name': 'Batch'
+ 'name': u'Batch'
},
# DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'permlevel': 0,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
+ 'doctype': u'DocPerm',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'batch_id',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Batch ID',
+ 'doctype': u'DocField',
+ 'fieldname': u'batch_id',
+ 'fieldtype': u'Data',
+ 'label': u'Batch ID',
'no_copy': 1,
- 'oldfieldname': 'batch_id',
- 'oldfieldtype': 'Data',
+ 'oldfieldname': u'batch_id',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Small Text',
- 'idx': 3,
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Small Text',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Small Text',
'permlevel': 0,
- 'width': '300px'
+ 'width': u'300px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'start_date',
- 'fieldtype': 'Date',
- 'idx': 4,
- 'label': 'Batch Started Date',
- 'oldfieldname': 'start_date',
- 'oldfieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'start_date',
+ 'fieldtype': u'Date',
+ 'label': u'Batch Started Date',
+ 'oldfieldname': u'start_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'finished_date',
- 'fieldtype': 'Date',
- 'idx': 5,
- 'label': 'Batch Finished Date',
- 'oldfieldname': 'finished_date',
- 'oldfieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'finished_date',
+ 'fieldtype': u'Date',
+ 'label': u'Batch Finished Date',
+ 'oldfieldname': u'finished_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'expiry_date',
- 'fieldtype': 'Date',
- 'idx': 6,
- 'label': 'Expiry Date',
- 'oldfieldname': 'expiry_date',
- 'oldfieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'expiry_date',
+ 'fieldtype': u'Date',
+ 'label': u'Expiry Date',
+ 'oldfieldname': u'expiry_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'item',
- 'fieldtype': 'Link',
- 'idx': 7,
- 'label': 'Item',
- 'oldfieldname': 'item',
- 'oldfieldtype': 'Link',
- 'options': 'Item',
+ 'doctype': u'DocField',
+ 'fieldname': u'item',
+ 'fieldtype': u'Link',
+ 'label': u'Item',
+ 'oldfieldname': u'item',
+ 'oldfieldtype': u'Link',
+ 'options': u'Item',
'permlevel': 0,
'reqd': 1
}
diff --git a/erpnext/stock/doctype/bin/bin.txt b/erpnext/stock/doctype/bin/bin.txt
index c0c525e..14cd963 100644
--- a/erpnext/stock/doctype/bin/bin.txt
+++ b/erpnext/stock/doctype/bin/bin.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:52',
+ 'creation': '2012-03-27 14:36:27',
'docstatus': 0,
- 'modified': '2012-03-21 14:07:49',
+ 'modified': '2012-03-27 14:36:27',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -41,17 +41,12 @@
# These values are common for all DocPerm
{
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
'doctype': u'DocPerm',
'name': '__common__',
'parent': u'Bin',
'parentfield': u'permissions',
'parenttype': u'DocType',
- 'read': 1,
- 'submit': 0,
- 'write': 0
+ 'read': 1
},
# DocType, Bin
@@ -90,16 +85,26 @@
# DocPerm
{
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
- 'role': u'Material User'
+ 'role': u'Material User',
+ 'submit': 0,
+ 'write': 0
},
# DocPerm
{
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
'doctype': u'DocPerm',
'permlevel': 0,
- 'role': u'Material Manager'
+ 'role': u'Material Manager',
+ 'submit': 0,
+ 'write': 0
},
# DocField
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
index d2b58f8..95bd7bf 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js
@@ -20,9 +20,10 @@
cur_frm.cscript.other_fname = "other_charges";
cur_frm.cscript.sales_team_fname = "sales_team";
-$import(Sales Common)
-$import(Other Charges)
-$import(SMS Control)
+wn.require('erpnext/selling/doctype/sales_common/sales_common.js');
+wn.require('erpnext/setup/doctype/other_charges/other_charges.js');
+wn.require('erpnext/utilities/doctype/sms_control/sms_control.js');
+wn.require('erpnext/setup/doctype/notification_control/notification_control.js');
// ONLOAD
// ================================================================================================
@@ -322,7 +323,6 @@
return out;
}
-$import(Notification Control)
cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
var args = {
type: 'Delivery Note',
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py
index 3d8a101..5940bb2 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.py
@@ -107,7 +107,8 @@
# ***************** Get Item Details ******************************
def get_item_details(self, args=None):
- args = args and eval(args) or {}
+ import json
+ args = args and json.loads(args) or {}
if args.get('item_code'):
return get_obj('Sales Common').get_item_details(args, self)
else:
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.txt b/erpnext/stock/doctype/delivery_note/delivery_note.txt
index 7bbd7d5..2ea3cfe 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.txt
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.txt
@@ -3,22 +3,13 @@
# These values are common in all dictionaries
{
- 'creation': '2011-04-18 15:58:20',
+ 'creation': '2012-03-27 14:36:28',
'docstatus': 0,
- 'modified': '2012-03-02 12:15:44',
+ 'modified': '2012-03-27 18:50:57',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
- # These values are common for all DocField
- {
- 'doctype': u'DocField',
- 'name': '__common__',
- 'parent': u'Delivery Note',
- 'parentfield': u'fields',
- 'parenttype': u'DocType'
- },
-
# These values are common for all DocType
{
'_last_update': u'1330593645',
@@ -27,6 +18,7 @@
'doctype': 'DocType',
'document_type': u'Transaction',
'in_create': 0,
+ 'is_submittable': 1,
'is_transaction_doc': 1,
'module': u'Stock',
'name': '__common__',
@@ -37,15 +29,15 @@
'show_in_menu': 0,
'subject': u'To %(customer_name)s on %(posting_date)s | %(per_billed)s% billed',
'tag_fields': u'billing_status',
- 'version': 475
+ 'version': 476
},
- # These values are common for all DocFormat
+ # These values are common for all DocField
{
- 'doctype': u'DocFormat',
+ 'doctype': u'DocField',
'name': '__common__',
'parent': u'Delivery Note',
- 'parentfield': u'formats',
+ 'parentfield': u'fields',
'parenttype': u'DocType'
},
@@ -67,14 +59,20 @@
# DocPerm
{
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
+ 'cancel': 0,
+ 'create': 0,
'doctype': u'DocPerm',
'permlevel': 0,
- 'role': u'Material User',
- 'submit': 1,
- 'write': 1
+ 'role': u'Accounts User',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Accounts User'
},
# DocPerm
@@ -91,18 +89,46 @@
# DocPerm
{
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales User',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'match': u'customer_name',
'permlevel': 0,
- 'role': u'Material Master Manager',
- 'submit': 1,
+ 'role': u'Customer'
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 2,
+ 'role': u'All',
'write': 1
},
# DocPerm
{
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Material Manager',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
'amend': 1,
'cancel': 1,
'create': 1,
@@ -115,53 +141,33 @@
# DocPerm
{
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Sales Manager',
- 'submit': 1,
- 'write': 1
- },
-
- # DocPerm
- {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
- 'role': u'All',
+ 'role': u'Material User',
+ 'submit': 0,
'write': 0
},
# DocPerm
{
+ 'amend': 1,
+ 'cancel': 1,
+ 'create': 1,
'doctype': u'DocPerm',
- 'permlevel': 2,
- 'role': u'All'
- },
-
- # DocFormat
- {
- 'doctype': u'DocFormat',
- 'format': u'Delivery Note Classic'
- },
-
- # DocFormat
- {
- 'doctype': u'DocFormat',
- 'format': u'Delivery Note Modern'
- },
-
- # DocFormat
- {
- 'doctype': u'DocFormat',
- 'format': u'Delivery Note Spartan'
+ 'permlevel': 0,
+ 'role': u'Material User',
+ 'submit': 1,
+ 'write': 1
},
# DocField
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'basic_info',
'fieldtype': u'Section Break',
'label': u'Basic Info',
'oldfieldtype': u'Section Break',
@@ -171,6 +177,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break0',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -313,6 +320,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break1',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0
@@ -516,6 +524,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'items',
'fieldtype': u'Section Break',
'label': u'Items',
'oldfieldtype': u'Section Break',
@@ -569,6 +578,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break2',
'fieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
@@ -626,6 +636,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'get_items',
'fieldtype': u'Button',
'hidden': 0,
'label': u'Get Items',
@@ -638,6 +649,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'section_break0',
'fieldtype': u'Section Break',
'permlevel': 0
},
@@ -675,6 +687,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'recalculate_values',
'fieldtype': u'Button',
'label': u'Re-Calculate Values',
'oldfieldtype': u'Button',
@@ -686,6 +699,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'taxes',
'fieldtype': u'Section Break',
'label': u'Taxes',
'oldfieldtype': u'Section Break',
@@ -710,6 +724,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'get_charges',
'fieldtype': u'Button',
'label': u'Get Charges',
'oldfieldtype': u'Button',
@@ -747,6 +762,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'calculate_charges',
'fieldtype': u'Button',
'label': u'Calculate Charges',
'oldfieldtype': u'Button',
@@ -758,6 +774,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'other_charges_calculation',
'fieldtype': u'HTML',
'label': u'Other Charges Calculation',
'oldfieldtype': u'HTML',
@@ -768,6 +785,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'totals',
'fieldtype': u'Section Break',
'label': u'Totals',
'oldfieldtype': u'Section Break',
@@ -823,6 +841,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break3',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0
@@ -876,6 +895,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'terms_section_break',
'fieldtype': u'Section Break',
'label': u'Terms',
'oldfieldtype': u'Section Break',
@@ -899,6 +919,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'get_terms',
'fieldtype': u'Button',
'label': u'Get Terms',
'oldfieldtype': u'Button',
@@ -912,6 +933,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'terms_html',
'fieldtype': u'HTML',
'label': u'Terms HTML',
'oldfieldtype': u'HTML',
@@ -935,6 +957,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'transporter_info',
'fieldtype': u'Section Break',
'label': u'Transporter Info',
'permlevel': 0,
@@ -944,6 +967,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break4',
'fieldtype': u'Column Break',
'permlevel': 0,
'print_hide': 1,
@@ -1006,6 +1030,7 @@
'colour': u'White:FFF',
'description': u'Filling in Additional Information about the Delivery Note will help you analyze your data better.',
'doctype': u'DocField',
+ 'fieldname': u'more_info',
'fieldtype': u'Section Break',
'label': u'More Info',
'oldfieldtype': u'Section Break',
@@ -1052,6 +1077,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break5',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -1218,6 +1244,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'packing_list',
'fieldtype': u'Section Break',
'label': u'Packing List',
'oldfieldtype': u'Section Break',
@@ -1242,6 +1269,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'sales_team_section_break',
'fieldtype': u'Section Break',
'label': u'Sales Team',
'oldfieldtype': u'Section Break',
@@ -1252,6 +1280,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break6',
'fieldtype': u'Column Break',
'permlevel': 0,
'print_hide': 1,
@@ -1277,6 +1306,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break7',
'fieldtype': u'Column Break',
'permlevel': 0,
'print_hide': 1,
@@ -1316,6 +1346,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'section_break1',
'fieldtype': u'Section Break',
'options': u'Simple',
'permlevel': 0,
@@ -1339,6 +1370,7 @@
{
'allow_on_submit': 1,
'doctype': u'DocField',
+ 'fieldname': u'repair_delivery_note',
'fieldtype': u'Button',
'label': u'Repair Delivery Note',
'oldfieldtype': u'Button',
diff --git a/erpnext/stock/doctype/delivery_note_detail/delivery_note_detail.txt b/erpnext/stock/doctype/delivery_note_detail/delivery_note_detail.txt
index c4bacb3..4465d4d 100644
--- a/erpnext/stock/doctype/delivery_note_detail/delivery_note_detail.txt
+++ b/erpnext/stock/doctype/delivery_note_detail/delivery_note_detail.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:58',
+ 'creation': '2012-03-27 14:36:29',
'docstatus': 0,
- 'modified': '2012-03-05 15:00:39',
+ 'modified': '2012-03-27 14:36:29',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/stock/doctype/delivery_note_packing_detail/delivery_note_packing_detail.txt b/erpnext/stock/doctype/delivery_note_packing_detail/delivery_note_packing_detail.txt
index 3924c13..d9df51d 100644
--- a/erpnext/stock/doctype/delivery_note_packing_detail/delivery_note_packing_detail.txt
+++ b/erpnext/stock/doctype/delivery_note_packing_detail/delivery_note_packing_detail.txt
@@ -3,270 +3,253 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:58',
+ 'creation': '2012-03-27 14:36:30',
'docstatus': 0,
- 'modified': '2011-03-14 14:50:55',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:30',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Stock',
+ 'module': u'Stock',
'name': '__common__',
- 'section_style': 'Tray',
- 'server_code_error': ' ',
+ 'section_style': u'Tray',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 17
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Delivery Note Packing Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Delivery Note Packing Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# DocType, Delivery Note Packing Detail
{
'doctype': 'DocType',
- 'name': 'Delivery Note Packing Detail'
+ 'name': u'Delivery Note Packing Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'parent_item',
- 'fieldtype': 'Link',
- 'idx': 1,
- 'label': 'Parent Item',
- 'oldfieldname': 'parent_item',
- 'oldfieldtype': 'Link',
- 'options': 'Item',
+ 'doctype': u'DocField',
+ 'fieldname': u'parent_item',
+ 'fieldtype': u'Link',
+ 'label': u'Parent Item',
+ 'oldfieldname': u'parent_item',
+ 'oldfieldtype': u'Link',
+ 'options': u'Item',
'permlevel': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'item_code',
- 'fieldtype': 'Link',
- 'idx': 2,
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'item_code',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Item Code',
- 'oldfieldname': 'item_code',
- 'oldfieldtype': 'Link',
- 'options': 'Item',
+ 'label': u'Item Code',
+ 'oldfieldname': u'item_code',
+ 'oldfieldtype': u'Link',
+ 'options': u'Item',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'item_name',
- 'fieldtype': 'Data',
- 'idx': 3,
+ 'doctype': u'DocField',
+ 'fieldname': u'item_name',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Item Name',
- 'oldfieldname': 'item_name',
- 'oldfieldtype': 'Data',
+ 'label': u'Item Name',
+ 'oldfieldname': u'item_name',
+ 'oldfieldtype': u'Data',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'parent_detail_docname',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'parent_detail_docname',
+ 'fieldtype': u'Data',
'hidden': 1,
- 'idx': 4,
- 'label': 'Parent Detail docname',
+ 'label': u'Parent Detail docname',
'no_copy': 1,
- 'oldfieldname': 'parent_detail_docname',
- 'oldfieldtype': 'Data',
+ 'oldfieldname': u'parent_detail_docname',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Text',
- 'idx': 5,
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Text',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Text',
'permlevel': 1,
- 'width': '300px'
+ 'width': u'300px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'warehouse',
- 'fieldtype': 'Link',
- 'idx': 6,
- 'label': 'Warehouse',
- 'oldfieldname': 'warehouse',
- 'oldfieldtype': 'Link',
- 'options': 'Warehouse',
+ 'doctype': u'DocField',
+ 'fieldname': u'warehouse',
+ 'fieldtype': u'Link',
+ 'label': u'Warehouse',
+ 'oldfieldname': u'warehouse',
+ 'oldfieldtype': u'Link',
+ 'options': u'Warehouse',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'qty',
- 'fieldtype': 'Currency',
- 'idx': 7,
- 'label': 'Qty',
- 'oldfieldname': 'qty',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Qty',
+ 'oldfieldname': u'qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'serial_no',
- 'fieldtype': 'Text',
- 'idx': 8,
- 'label': 'Serial No',
+ 'doctype': u'DocField',
+ 'fieldname': u'serial_no',
+ 'fieldtype': u'Text',
+ 'label': u'Serial No',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'actual_qty',
- 'fieldtype': 'Currency',
- 'idx': 9,
- 'label': 'Actual Qty',
+ 'doctype': u'DocField',
+ 'fieldname': u'actual_qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Actual Qty',
'no_copy': 1,
- 'oldfieldname': 'actual_qty',
- 'oldfieldtype': 'Currency',
+ 'oldfieldname': u'actual_qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'projected_qty',
- 'fieldtype': 'Currency',
- 'idx': 10,
- 'label': 'Projected Qty',
+ 'doctype': u'DocField',
+ 'fieldname': u'projected_qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Projected Qty',
'no_copy': 1,
- 'oldfieldname': 'projected_qty',
- 'oldfieldtype': 'Currency',
+ 'oldfieldname': u'projected_qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'uom',
- 'fieldtype': 'Link',
- 'idx': 11,
- 'label': 'UOM',
- 'oldfieldname': 'uom',
- 'oldfieldtype': 'Link',
- 'options': 'UOM',
+ 'doctype': u'DocField',
+ 'fieldname': u'uom',
+ 'fieldtype': u'Link',
+ 'label': u'UOM',
+ 'oldfieldname': u'uom',
+ 'oldfieldtype': u'Link',
+ 'options': u'UOM',
'permlevel': 1,
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'planned_qty',
- 'fieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'planned_qty',
+ 'fieldtype': u'Currency',
'hidden': 1,
- 'idx': 12,
- 'label': 'Planned Qty ',
+ 'label': u'Planned Qty ',
'no_copy': 1,
- 'oldfieldname': 'planned_qty',
- 'oldfieldtype': 'Currency',
+ 'oldfieldname': u'planned_qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'produced_qty',
- 'fieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'produced_qty',
+ 'fieldtype': u'Currency',
'hidden': 1,
- 'idx': 13,
- 'label': 'Produced Qty',
+ 'label': u'Produced Qty',
'no_copy': 1,
- 'oldfieldname': 'produced_qty',
- 'oldfieldtype': 'Currency',
+ 'oldfieldname': u'produced_qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'prevdoc_doctype',
- 'fieldtype': 'Data',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'prevdoc_doctype',
+ 'fieldtype': u'Data',
'hidden': 1,
- 'idx': 14,
- 'label': 'Prevdoc DocType',
- 'oldfieldname': 'prevdoc_doctype',
- 'oldfieldtype': 'Data',
+ 'label': u'Prevdoc DocType',
+ 'oldfieldname': u'prevdoc_doctype',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
- 'description': 'The date at which current entry is made in system.',
- 'doctype': 'DocField',
- 'fieldname': 'transaction_date',
- 'fieldtype': 'Date',
+ 'description': u'The date at which current entry is made in system.',
+ 'doctype': u'DocField',
+ 'fieldname': u'transaction_date',
+ 'fieldtype': u'Date',
'hidden': 0,
- 'idx': 15,
- 'label': 'Sales Order Date',
- 'oldfieldname': 'transaction_date',
- 'oldfieldtype': 'Date',
+ 'label': u'Sales Order Date',
+ 'oldfieldname': u'transaction_date',
+ 'oldfieldtype': u'Date',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'delivery_date',
- 'fieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'delivery_date',
+ 'fieldtype': u'Date',
'hidden': 0,
- 'idx': 16,
- 'label': 'Expected Delivery Date',
- 'oldfieldname': 'delivery_date',
- 'oldfieldtype': 'Date',
+ 'label': u'Expected Delivery Date',
+ 'oldfieldname': u'delivery_date',
+ 'oldfieldtype': u'Date',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'confirmation_date',
- 'fieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'confirmation_date',
+ 'fieldtype': u'Date',
'hidden': 1,
- 'idx': 17,
- 'label': 'Confirmed delivery date',
+ 'label': u'Confirmed delivery date',
'no_copy': 1,
- 'oldfieldname': 'confirmation_date',
- 'oldfieldtype': 'Date',
+ 'oldfieldname': u'confirmation_date',
+ 'oldfieldtype': u'Date',
'permlevel': 1,
'print_hide': 1
},
@@ -274,13 +257,12 @@
# DocField
{
'allow_on_submit': 1,
- 'doctype': 'DocField',
- 'fieldname': 'page_break',
- 'fieldtype': 'Check',
- 'idx': 18,
- 'label': 'Page Break',
- 'oldfieldname': 'page_break',
- 'oldfieldtype': 'Check',
+ 'doctype': u'DocField',
+ 'fieldname': u'page_break',
+ 'fieldtype': u'Check',
+ 'label': u'Page Break',
+ 'oldfieldname': u'page_break',
+ 'oldfieldtype': u'Check',
'permlevel': 1
}
]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item/item.txt b/erpnext/stock/doctype/item/item.txt
index 682b69c..19e6a48 100644
--- a/erpnext/stock/doctype/item/item.txt
+++ b/erpnext/stock/doctype/item/item.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:05',
+ 'creation': '2012-03-27 14:36:31',
'docstatus': 0,
- 'modified': '2012-02-21 12:40:01',
+ 'modified': '2012-03-27 18:51:27',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -29,7 +29,7 @@
'show_in_menu': 0,
'subject': u'%(item_name)s',
'tag_fields': u'item_group',
- 'version': 171
+ 'version': 172
},
# These values are common for all DocField
@@ -59,73 +59,6 @@
# DocPerm
{
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Material Manager',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Material Manager',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Material User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Material User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Material Master Manager',
- 'write': 1
- },
-
- # DocPerm
- {
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Material Master Manager',
- 'write': 0
- },
-
- # DocPerm
- {
'cancel': 1,
'create': 1,
'doctype': u'DocPerm',
@@ -136,14 +69,82 @@
# DocPerm
{
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Material Master Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 1,
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Material Master Manager',
+ 'write': 1
+ },
+
+ # DocPerm
+ {
'doctype': u'DocPerm',
'permlevel': 1,
'role': u'System Manager'
},
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Material Manager',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Material Manager',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Material User',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Material User',
+ 'submit': 0,
+ 'write': 0
+ },
+
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'item',
'fieldtype': u'Section Break',
'label': u'Item',
'no_copy': 0,
@@ -211,6 +212,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'ighelp',
'fieldtype': u'HTML',
'label': u'IGHelp',
'oldfieldtype': u'HTML',
@@ -236,6 +238,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break0',
'fieldtype': u'Column Break',
'permlevel': 0
},
@@ -269,6 +272,7 @@
'colour': u'White:FFF',
'description': u'Generates HTML to include image (1st attachment) in the description',
'doctype': u'DocField',
+ 'fieldname': u'add_image',
'fieldtype': u'Button',
'label': u'Add Image',
'permlevel': 0
@@ -277,6 +281,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'inventory',
'fieldtype': u'Section Break',
'label': u'Inventory',
'oldfieldtype': u'Section Break',
@@ -402,6 +407,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break1',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -502,6 +508,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'purchase_details',
'fieldtype': u'Section Break',
'label': u'Purchase Details',
'oldfieldtype': u'Section Break',
@@ -608,6 +615,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break2',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -657,6 +665,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'sales_details',
'fieldtype': u'Section Break',
'label': u'Sales Details',
'oldfieldtype': u'Section Break',
@@ -759,6 +768,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break3',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -793,6 +803,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'item_tax_section_break',
'fieldtype': u'Section Break',
'label': u'Item Tax',
'oldfieldtype': u'Section Break',
@@ -814,6 +825,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'inspection_criteria',
'fieldtype': u'Section Break',
'label': u'Inspection Criteria',
'oldfieldtype': u'Section Break',
@@ -850,6 +862,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'manufacturing',
'fieldtype': u'Section Break',
'label': u'Manufacturing',
'oldfieldtype': u'Section Break',
diff --git a/erpnext/stock/doctype/item_customer_detail/item_customer_detail.txt b/erpnext/stock/doctype/item_customer_detail/item_customer_detail.txt
index f53f18e..d41c927 100644
--- a/erpnext/stock/doctype/item_customer_detail/item_customer_detail.txt
+++ b/erpnext/stock/doctype/item_customer_detail/item_customer_detail.txt
@@ -3,38 +3,38 @@
# These values are common in all dictionaries
{
- 'creation': '2011-08-18 11:38:43',
+ 'creation': '2012-03-27 14:36:33',
'docstatus': 0,
- 'modified': '2011-08-18 11:54:36',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:33',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'autoname': 'ITEMCUST/.#####',
- 'colour': 'White:FFF',
- 'description': 'For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes',
+ 'autoname': u'ITEMCUST/.#####',
+ 'colour': u'White:FFF',
+ 'description': u'For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes',
'doctype': 'DocType',
'in_create': 1,
'istable': 1,
- 'module': 'Stock',
+ 'module': u'Stock',
'name': '__common__',
'read_only': 0,
- 'section_style': 'Tray',
- 'server_code_error': ' ',
+ 'section_style': u'Tray',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 7
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'in_filter': 1,
'name': '__common__',
- 'parent': 'Item Customer Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Item Customer Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0,
'reqd': 1,
'search_index': 1
@@ -43,31 +43,29 @@
# DocType, Item Customer Detail
{
'doctype': 'DocType',
- 'name': 'Item Customer Detail'
+ 'name': u'Item Customer Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'customer_name',
- 'fieldtype': 'Link',
- 'idx': 1,
- 'label': 'Customer Name',
- 'oldfieldname': 'price_list_name',
- 'oldfieldtype': 'Select',
- 'options': 'Customer',
- 'width': '180px'
+ 'doctype': u'DocField',
+ 'fieldname': u'customer_name',
+ 'fieldtype': u'Link',
+ 'label': u'Customer Name',
+ 'oldfieldname': u'price_list_name',
+ 'oldfieldtype': u'Select',
+ 'options': u'Customer',
+ 'width': u'180px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'ref_code',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Ref Code',
- 'oldfieldname': 'ref_rate',
- 'oldfieldtype': 'Currency',
- 'width': '120px'
+ 'doctype': u'DocField',
+ 'fieldname': u'ref_code',
+ 'fieldtype': u'Data',
+ 'label': u'Ref Code',
+ 'oldfieldname': u'ref_rate',
+ 'oldfieldtype': u'Currency',
+ 'width': u'120px'
}
]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item_specification_detail/item_specification_detail.txt b/erpnext/stock/doctype/item_specification_detail/item_specification_detail.txt
index 7173b09..2c3d900 100644
--- a/erpnext/stock/doctype/item_specification_detail/item_specification_detail.txt
+++ b/erpnext/stock/doctype/item_specification_detail/item_specification_detail.txt
@@ -3,64 +3,62 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:06',
+ 'creation': '2012-03-27 14:36:33',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'umair@iwebnotes.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:33',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'autoname': 'IISD/.#####',
- 'colour': 'White:FFF',
+ 'autoname': u'IISD/.#####',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Stock',
+ 'module': u'Stock',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 1
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldtype': u'Data',
'name': '__common__',
- 'oldfieldtype': 'Data',
- 'parent': 'Item Specification Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'oldfieldtype': u'Data',
+ 'parent': u'Item Specification Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, Item Specification Detail
{
'doctype': 'DocType',
- 'name': 'Item Specification Detail'
+ 'name': u'Item Specification Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'specification',
- 'idx': 1,
+ 'doctype': u'DocField',
+ 'fieldname': u'specification',
'in_filter': 0,
- 'label': 'Parameter',
- 'oldfieldname': 'specification',
+ 'label': u'Parameter',
+ 'oldfieldname': u'specification',
'reqd': 1,
'search_index': 0,
- 'width': '200px'
+ 'width': u'200px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'value',
- 'idx': 2,
- 'label': 'Acceptance Criteria',
- 'oldfieldname': 'value'
+ 'doctype': u'DocField',
+ 'fieldname': u'value',
+ 'label': u'Acceptance Criteria',
+ 'oldfieldname': u'value'
}
]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item_supplier/item_supplier.txt b/erpnext/stock/doctype/item_supplier/item_supplier.txt
index 609c1e9..e7806b3 100644
--- a/erpnext/stock/doctype/item_supplier/item_supplier.txt
+++ b/erpnext/stock/doctype/item_supplier/item_supplier.txt
@@ -3,56 +3,56 @@
# These values are common in all dictionaries
{
- 'creation': '2012-01-17 18:36:35',
+ 'creation': '2012-03-27 14:36:33',
'docstatus': 0,
- 'modified': '2012-01-17 18:40:37',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:33',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Stock',
+ 'module': u'Stock',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 3
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Item Supplier',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Item Supplier',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, Item Supplier
{
'doctype': 'DocType',
- 'name': 'Item Supplier'
+ 'name': u'Item Supplier'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'supplier',
- 'fieldtype': 'Link',
- 'label': 'Supplier',
- 'options': 'Supplier'
+ 'doctype': u'DocField',
+ 'fieldname': u'supplier',
+ 'fieldtype': u'Link',
+ 'label': u'Supplier',
+ 'options': u'Supplier'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'supplier_part_no',
- 'fieldtype': 'Data',
- 'label': 'Supplier Part Number',
- 'width': '200px'
+ 'doctype': u'DocField',
+ 'fieldname': u'supplier_part_no',
+ 'fieldtype': u'Data',
+ 'label': u'Supplier Part Number',
+ 'width': u'200px'
}
]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item_tax/item_tax.txt b/erpnext/stock/doctype/item_tax/item_tax.txt
index 1d4adb7..1ceffdb 100644
--- a/erpnext/stock/doctype/item_tax/item_tax.txt
+++ b/erpnext/stock/doctype/item_tax/item_tax.txt
@@ -3,64 +3,62 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:06',
+ 'creation': '2012-03-27 14:36:33',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'umair@iwebnotes.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:33',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Stock',
+ 'module': u'Stock',
'name': '__common__',
- 'section_style': 'Tray',
- 'server_code_error': ' ',
+ 'section_style': u'Tray',
+ 'server_code_error': u' ',
'show_in_menu': 0
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Item Tax',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Item Tax',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, Item Tax
{
'doctype': 'DocType',
- 'name': 'Item Tax'
+ 'name': u'Item Tax'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'tax_type',
- 'fieldtype': 'Link',
- 'idx': 1,
- 'label': 'Tax',
- 'oldfieldname': 'tax_type',
- 'oldfieldtype': 'Link',
- 'options': 'Account',
+ 'doctype': u'DocField',
+ 'fieldname': u'tax_type',
+ 'fieldtype': u'Link',
+ 'label': u'Tax',
+ 'oldfieldname': u'tax_type',
+ 'oldfieldtype': u'Link',
+ 'options': u'Account',
'reqd': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'tax_rate',
- 'fieldtype': 'Currency',
- 'idx': 2,
- 'label': 'Tax Rate',
- 'oldfieldname': 'tax_rate',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'tax_rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Tax Rate',
+ 'oldfieldname': u'tax_rate',
+ 'oldfieldtype': u'Currency',
'reqd': 0
}
]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/landed_cost_detail/landed_cost_detail.txt b/erpnext/stock/doctype/landed_cost_detail/landed_cost_detail.txt
index 9792f33..186283d 100644
--- a/erpnext/stock/doctype/landed_cost_detail/landed_cost_detail.txt
+++ b/erpnext/stock/doctype/landed_cost_detail/landed_cost_detail.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:06',
+ 'creation': '2012-03-27 14:36:33',
'docstatus': 0,
- 'modified': '2012-03-21 14:58:34',
+ 'modified': '2012-03-27 14:36:33',
'modified_by': u'Administrator',
'owner': u'wasim@webnotestech.com'
},
diff --git a/erpnext/stock/doctype/landed_cost_master/landed_cost_master.txt b/erpnext/stock/doctype/landed_cost_master/landed_cost_master.txt
index 71374f8..8013d0b 100644
--- a/erpnext/stock/doctype/landed_cost_master/landed_cost_master.txt
+++ b/erpnext/stock/doctype/landed_cost_master/landed_cost_master.txt
@@ -3,166 +3,155 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:07',
+ 'creation': '2012-03-27 14:36:34',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:34',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1309508838',
- 'autoname': 'field:title',
- 'colour': 'White:FFF',
+ '_last_update': u'1309508838',
+ 'autoname': u'field:title',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'Stock',
+ 'document_type': u'Master',
+ 'module': u'Stock',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 2
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Landed Cost Master',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Landed Cost Master',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Landed Cost Master',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Landed Cost Master',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Landed Cost Master
{
'doctype': 'DocType',
- 'name': 'Landed Cost Master'
+ 'name': u'Landed Cost Master'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'All'
+ 'role': u'All'
},
# DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 2,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Purchase Manager',
+ 'role': u'Purchase Manager',
'write': 1
},
# DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 3,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 1
},
# DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 4,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Purchase User',
+ 'role': u'Purchase User',
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 5,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'All'
+ 'role': u'All'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 6,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'System Manager'
+ 'role': u'System Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 7,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Purchase User'
+ 'role': u'Purchase User'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 8,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Purchase Manager'
+ 'role': u'Purchase Manager'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'title',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Title',
- 'oldfieldname': 'title',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'title',
+ 'fieldtype': u'Data',
+ 'label': u'Title',
+ 'oldfieldname': u'title',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'idx': 3,
- 'label': 'Landed Cost Details',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'landed_cost_details',
+ 'fieldtype': u'Section Break',
+ 'label': u'Landed Cost Details',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'landed_cost',
- 'fieldtype': 'Table',
- 'idx': 4,
- 'label': 'Landed Cost',
- 'oldfieldname': 'landed_cost',
- 'oldfieldtype': 'Table',
- 'options': 'Landed Cost Master Detail',
+ 'doctype': u'DocField',
+ 'fieldname': u'landed_cost',
+ 'fieldtype': u'Table',
+ 'label': u'Landed Cost',
+ 'oldfieldname': u'landed_cost',
+ 'oldfieldtype': u'Table',
+ 'options': u'Landed Cost Master Detail',
'permlevel': 0
}
]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/landed_cost_master_detail/landed_cost_master_detail.txt b/erpnext/stock/doctype/landed_cost_master_detail/landed_cost_master_detail.txt
index bc752d9..1beccea 100644
--- a/erpnext/stock/doctype/landed_cost_master_detail/landed_cost_master_detail.txt
+++ b/erpnext/stock/doctype/landed_cost_master_detail/landed_cost_master_detail.txt
@@ -3,59 +3,57 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:07',
+ 'creation': '2012-03-27 14:36:34',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:34',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Stock',
+ 'module': u'Stock',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 2
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldtype': u'Data',
'name': '__common__',
- 'oldfieldtype': 'Data',
- 'parent': 'Landed Cost Master Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'oldfieldtype': u'Data',
+ 'parent': u'Landed Cost Master Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, Landed Cost Master Detail
{
'doctype': 'DocType',
- 'name': 'Landed Cost Master Detail'
+ 'name': u'Landed Cost Master Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'account_head',
- 'idx': 1,
- 'label': 'Account Head',
- 'oldfieldname': 'account_head'
+ 'doctype': u'DocField',
+ 'fieldname': u'account_head',
+ 'label': u'Account Head',
+ 'oldfieldname': u'account_head'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'idx': 2,
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'width': '300px'
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'width': u'300px'
}
]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/landed_cost_wizard/landed_cost_wizard.txt b/erpnext/stock/doctype/landed_cost_wizard/landed_cost_wizard.txt
index 1e12afa..f121cc9 100644
--- a/erpnext/stock/doctype/landed_cost_wizard/landed_cost_wizard.txt
+++ b/erpnext/stock/doctype/landed_cost_wizard/landed_cost_wizard.txt
@@ -3,59 +3,59 @@
# These values are common in all dictionaries
{
- 'creation': '2011-11-16 16:17:22',
+ 'creation': '2012-03-27 14:36:34',
'docstatus': 0,
- 'modified': '2011-11-16 16:32:18',
- 'modified_by': 'Administrator',
- 'owner': 'wasim@webnotestech.com'
+ 'modified': '2012-03-27 14:36:34',
+ 'modified_by': u'Administrator',
+ 'owner': u'wasim@webnotestech.com'
},
# These values are common for all DocType
{
- '_last_update': '1321441191',
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ '_last_update': u'1321441191',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
'issingle': 1,
- 'module': 'Stock',
+ 'module': u'Stock',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 1,
'version': 35
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Landed Cost Wizard',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Landed Cost Wizard',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Landed Cost Wizard',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Landed Cost Wizard',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Landed Cost Wizard
{
'doctype': 'DocType',
- 'name': 'Landed Cost Wizard'
+ 'name': u'Landed Cost Wizard'
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'All',
+ 'role': u'All',
'write': 0
},
@@ -64,9 +64,9 @@
'amend': 0,
'cancel': 0,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Purchase Manager',
+ 'role': u'Purchase Manager',
'submit': 0,
'write': 1
},
@@ -74,148 +74,154 @@
# DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 1
},
# DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Purchase User',
+ 'role': u'Purchase User',
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'All'
+ 'role': u'All'
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'System Manager'
+ 'role': u'System Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Purchase User'
+ 'role': u'Purchase User'
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Purchase Manager'
+ 'role': u'Purchase Manager'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'label': 'Process',
- 'options': '<div class="field_description"><b>Process:</b><br>1. Fetch and select Purchase Receipt<br>2. Enter extra costs<br>3. Click on Update Landed Cost button<br> 4. Cost will be added into other charges table of selected PR proportionately based on net total<br>5. Item Valuation Rate will be recalculated</div>'
+ 'doctype': u'DocField',
+ 'fieldname': u'process',
+ 'fieldtype': u'HTML',
+ 'label': u'Process',
+ 'options': u'<div class="field_description"><b>Process:</b><br>1. Fetch and select Purchase Receipt<br>2. Enter extra costs<br>3. Click on Update Landed Cost button<br> 4. Cost will be added into other charges table of selected PR proportionately based on net total<br>5. Item Valuation Rate will be recalculated</div>'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'options': 'Simple'
+ 'doctype': u'DocField',
+ 'fieldname': u'section_break0',
+ 'fieldtype': u'Section Break',
+ 'options': u'Simple'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'from_pr_date',
- 'fieldtype': 'Date',
- 'label': 'From PR Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'from_pr_date',
+ 'fieldtype': u'Date',
+ 'label': u'From PR Date',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'to_pr_date',
- 'fieldtype': 'Date',
- 'label': 'To PR Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'to_pr_date',
+ 'fieldtype': u'Date',
+ 'label': u'To PR Date',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'currency',
- 'fieldtype': 'Select',
- 'label': 'Currency',
- 'options': 'link:Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'currency',
+ 'fieldtype': u'Select',
+ 'label': u'Currency',
+ 'options': u'link:Currency',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Get Purchase Receipt',
- 'options': 'get_purchase_receipts'
+ 'doctype': u'DocField',
+ 'fieldname': u'get_purchase_receipt',
+ 'fieldtype': u'Button',
+ 'label': u'Get Purchase Receipt',
+ 'options': u'get_purchase_receipts'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'lc_pr_details',
- 'fieldtype': 'Table',
- 'label': 'LC PR Details',
- 'options': 'LC PR Detail'
+ 'doctype': u'DocField',
+ 'fieldname': u'lc_pr_details',
+ 'fieldtype': u'Table',
+ 'label': u'LC PR Details',
+ 'options': u'LC PR Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'options': 'Simple'
+ 'doctype': u'DocField',
+ 'fieldname': u'section_break1',
+ 'fieldtype': u'Section Break',
+ 'options': u'Simple'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'landed_cost',
- 'fieldtype': 'Link',
- 'label': 'Select Landed Cost Details Master',
- 'options': 'Landed Cost Master'
+ 'doctype': u'DocField',
+ 'fieldname': u'landed_cost',
+ 'fieldtype': u'Link',
+ 'label': u'Select Landed Cost Details Master',
+ 'options': u'Landed Cost Master'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Get Details',
- 'options': 'get_landed_cost_master_details'
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'get_details',
+ 'fieldtype': u'Button',
+ 'label': u'Get Details',
+ 'options': u'get_landed_cost_master_details'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'landed_cost_details',
- 'fieldtype': 'Table',
- 'label': 'Landed Cost Details',
- 'options': 'Landed Cost Detail'
+ 'doctype': u'DocField',
+ 'fieldname': u'landed_cost_details',
+ 'fieldtype': u'Table',
+ 'label': u'Landed Cost Details',
+ 'options': u'Landed Cost Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Update PR',
- 'options': 'update_landed_cost'
+ 'doctype': u'DocField',
+ 'fieldname': u'update_pr',
+ 'fieldtype': u'Button',
+ 'label': u'Update PR',
+ 'options': u'update_landed_cost'
}
]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/lc_pr_detail/lc_pr_detail.txt b/erpnext/stock/doctype/lc_pr_detail/lc_pr_detail.txt
index b6bcb42..aaca21f 100644
--- a/erpnext/stock/doctype/lc_pr_detail/lc_pr_detail.txt
+++ b/erpnext/stock/doctype/lc_pr_detail/lc_pr_detail.txt
@@ -3,63 +3,63 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:07',
+ 'creation': '2012-03-27 14:36:34',
'docstatus': 0,
- 'modified': '2011-11-16 16:10:00',
- 'modified_by': 'Administrator',
- 'owner': 'wasim@webnotestech.com'
+ 'modified': '2012-03-27 14:36:34',
+ 'modified_by': u'Administrator',
+ 'owner': u'wasim@webnotestech.com'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Stock',
+ 'module': u'Stock',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 5
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'LC PR Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'LC PR Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, LC PR Detail
{
'doctype': 'DocType',
- 'name': 'LC PR Detail'
+ 'name': u'LC PR Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'purchase_receipt',
- 'fieldtype': 'Link',
- 'label': 'Purchase Receipt',
- 'oldfieldname': 'purchase_receipt_no',
- 'oldfieldtype': 'Link',
- 'options': 'Purchase Receipt',
- 'width': '220px'
+ 'doctype': u'DocField',
+ 'fieldname': u'purchase_receipt',
+ 'fieldtype': u'Link',
+ 'label': u'Purchase Receipt',
+ 'oldfieldname': u'purchase_receipt_no',
+ 'oldfieldtype': u'Link',
+ 'options': u'Purchase Receipt',
+ 'width': u'220px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'select_pr',
- 'fieldtype': 'Check',
- 'label': 'Select PR',
- 'oldfieldname': 'include_in_landed_cost',
- 'oldfieldtype': 'Check',
- 'width': '120px'
+ 'doctype': u'DocField',
+ 'fieldname': u'select_pr',
+ 'fieldtype': u'Check',
+ 'label': u'Select PR',
+ 'oldfieldname': u'include_in_landed_cost',
+ 'oldfieldtype': u'Check',
+ 'width': u'120px'
}
]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.txt b/erpnext/stock/doctype/packing_slip/packing_slip.txt
index 6c54a9d..0a81695 100644
--- a/erpnext/stock/doctype/packing_slip/packing_slip.txt
+++ b/erpnext/stock/doctype/packing_slip/packing_slip.txt
@@ -3,54 +3,55 @@
# These values are common in all dictionaries
{
- 'creation': '2012-01-30 12:13:10',
+ 'creation': '2012-03-27 14:36:34',
'docstatus': 0,
- 'modified': '2012-02-02 10:37:15',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:45:49',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1328091392',
- 'autoname': 'PS.#######',
- 'colour': 'White:FFF',
+ '_last_update': u'1328091392',
+ 'autoname': u'PS.#######',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Transaction',
+ 'document_type': u'Transaction',
+ 'is_submittable': 1,
'is_transaction_doc': 1,
- 'module': 'Stock',
+ 'module': u'Stock',
'name': '__common__',
'read_only_onload': 1,
- 'search_fields': 'delivery_note',
- 'section_style': 'Simple',
+ 'search_fields': u'delivery_note',
+ 'section_style': u'Simple',
'show_in_menu': 0,
- 'subject': '[%(delivery_note)s] Case Nos: %(from_case_no)s - %(to_case_no)s | Net Weight: %(net_weight_pkg)s %(net_weight_uom)s | Gross Weight: %(gross_weight_pkg)s %(gross_weight_uom)s',
+ 'subject': u'[%(delivery_note)s] Case Nos: %(from_case_no)s - %(to_case_no)s | Net Weight: %(net_weight_pkg)s %(net_weight_uom)s | Gross Weight: %(gross_weight_pkg)s %(gross_weight_uom)s',
'version': 40
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Packing Slip',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Packing Slip',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Packing Slip',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Packing Slip',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Packing Slip
{
'doctype': 'DocType',
- 'name': 'Packing Slip'
+ 'name': u'Packing Slip'
},
# DocPerm
@@ -58,9 +59,9 @@
'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Material User',
+ 'role': u'Material User',
'submit': 1,
'write': 1
},
@@ -70,9 +71,9 @@
'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Sales User',
+ 'role': u'Sales User',
'submit': 1,
'write': 1
},
@@ -82,9 +83,9 @@
'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Material Master Manager',
+ 'role': u'Material Master Manager',
'submit': 1,
'write': 1
},
@@ -94,9 +95,9 @@
'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Material Manager',
+ 'role': u'Material Manager',
'submit': 1,
'write': 1
},
@@ -106,61 +107,64 @@
'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Sales Manager',
+ 'role': u'Sales Manager',
'submit': 1,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'All'
+ 'role': u'All'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Packing Slip Details',
+ 'doctype': u'DocField',
+ 'fieldname': u'packing_slip_details',
+ 'fieldtype': u'Section Break',
+ 'label': u'Packing Slip Details',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'delivery_note',
- 'fieldtype': 'Link',
- 'label': 'Delivery Note',
- 'options': 'Delivery Note',
+ 'doctype': u'DocField',
+ 'fieldname': u'delivery_note',
+ 'fieldtype': u'Link',
+ 'label': u'Delivery Note',
+ 'options': u'Delivery Note',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'naming_series',
- 'fieldtype': 'Select',
- 'label': 'Series',
+ 'doctype': u'DocField',
+ 'fieldname': u'naming_series',
+ 'fieldtype': u'Select',
+ 'label': u'Series',
'no_copy': 0,
- 'options': 'PS',
+ 'options': u'PS',
'permlevel': 0,
'print_hide': 1,
'reqd': 1
@@ -168,147 +172,167 @@
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'section_break0',
+ 'fieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break2',
+ 'fieldtype': u'Column Break',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'from_case_no',
- 'fieldtype': 'Data',
- 'label': 'From Case No.',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'from_case_no',
+ 'fieldtype': u'Data',
+ 'label': u'From Case No.',
'no_copy': 1,
'permlevel': 0,
'reqd': 1,
- 'width': '50px'
+ 'width': u'50px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break3',
+ 'fieldtype': u'Column Break',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'to_case_no',
- 'fieldtype': 'Data',
- 'label': 'To Case No.',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'to_case_no',
+ 'fieldtype': u'Data',
+ 'label': u'To Case No.',
'no_copy': 1,
'permlevel': 0,
- 'width': '50px'
+ 'width': u'50px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Package Item Details',
+ 'doctype': u'DocField',
+ 'fieldname': u'package_item_details',
+ 'fieldtype': u'Section Break',
+ 'label': u'Package Item Details',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'item_details',
- 'fieldtype': 'Table',
- 'label': 'Items',
- 'options': 'Packing Slip Detail',
+ 'doctype': u'DocField',
+ 'fieldname': u'item_details',
+ 'fieldtype': u'Table',
+ 'label': u'Items',
+ 'options': u'Packing Slip Detail',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Package Weight Details',
+ 'doctype': u'DocField',
+ 'fieldname': u'package_weight_details',
+ 'fieldtype': u'Section Break',
+ 'label': u'Package Weight Details',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'net_weight_pkg',
- 'fieldtype': 'Currency',
- 'label': 'Net Weight',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'net_weight_pkg',
+ 'fieldtype': u'Currency',
+ 'label': u'Net Weight',
'no_copy': 1,
'permlevel': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'net_weight_uom',
- 'fieldtype': 'Data',
- 'label': 'Net Weight UOM',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'net_weight_uom',
+ 'fieldtype': u'Data',
+ 'label': u'Net Weight UOM',
'no_copy': 1,
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break4',
+ 'fieldtype': u'Column Break',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'gross_weight_pkg',
- 'fieldtype': 'Currency',
- 'label': 'Gross Weight',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'gross_weight_pkg',
+ 'fieldtype': u'Currency',
+ 'label': u'Gross Weight',
'no_copy': 1,
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'gross_weight_uom',
- 'fieldtype': 'Link',
- 'label': 'Gross Weight UOM',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'gross_weight_uom',
+ 'fieldtype': u'Link',
+ 'label': u'Gross Weight UOM',
'no_copy': 1,
- 'options': 'UOM',
+ 'options': u'UOM',
'permlevel': 0
},
# DocField
{
- 'depends_on': 'eval:doc.amended_from',
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Misc Details',
+ 'depends_on': u'eval:doc.amended_from',
+ 'doctype': u'DocField',
+ 'fieldname': u'misc_details',
+ 'fieldtype': u'Section Break',
+ 'label': u'Misc Details',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amended_from',
- 'fieldtype': 'Link',
- 'label': 'Amended From',
+ 'doctype': u'DocField',
+ 'fieldname': u'amended_from',
+ 'fieldtype': u'Link',
+ 'label': u'Amended From',
'no_copy': 1,
- 'options': 'Packing Slip',
+ 'options': u'Packing Slip',
'permlevel': 1,
'print_hide': 1
+ },
+
+ # DocField
+ {
+ 'depends_on': u'eval:doc.amended_from',
+ 'description': u'The date at which current entry is corrected in the system.',
+ 'doctype': u'DocField',
+ 'fieldname': u'amendment_date',
+ 'fieldtype': u'Date',
+ 'label': u'Amendment Date',
+ 'no_copy': 1,
+ 'permlevel': 0,
+ 'print_hide': 1
}
]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/packing_slip_detail/packing_slip_detail.txt b/erpnext/stock/doctype/packing_slip_detail/packing_slip_detail.txt
index 5a83b6f..02f3902 100644
--- a/erpnext/stock/doctype/packing_slip_detail/packing_slip_detail.txt
+++ b/erpnext/stock/doctype/packing_slip_detail/packing_slip_detail.txt
@@ -3,111 +3,111 @@
# These values are common in all dictionaries
{
- 'creation': '2012-01-30 17:40:50',
+ 'creation': '2012-03-27 14:36:34',
'docstatus': 0,
- 'modified': '2012-01-31 13:15:40',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:34',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'autoname': 'PSD/.#######',
- 'colour': 'White:FFF',
+ 'autoname': u'PSD/.#######',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Stock',
+ 'module': u'Stock',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 9
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Packing Slip Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Packing Slip Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# DocType, Packing Slip Detail
{
'doctype': 'DocType',
- 'name': 'Packing Slip Detail'
+ 'name': u'Packing Slip Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'item_code',
- 'fieldtype': 'Link',
- 'label': 'Item Code',
- 'options': 'Item',
+ 'doctype': u'DocField',
+ 'fieldname': u'item_code',
+ 'fieldtype': u'Link',
+ 'label': u'Item Code',
+ 'options': u'Item',
'permlevel': 0,
'reqd': 1,
- 'width': '100px'
+ 'width': u'100px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'item_name',
- 'fieldtype': 'Data',
- 'label': 'Item Name',
+ 'doctype': u'DocField',
+ 'fieldname': u'item_name',
+ 'fieldtype': u'Data',
+ 'label': u'Item Name',
'permlevel': 1,
- 'width': '200px'
+ 'width': u'200px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'qty',
- 'fieldtype': 'Currency',
- 'label': 'Quantity',
+ 'doctype': u'DocField',
+ 'fieldname': u'qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Quantity',
'permlevel': 0,
'reqd': 1,
- 'width': '100px'
+ 'width': u'100px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'stock_uom',
- 'fieldtype': 'Data',
- 'label': 'UOM',
+ 'doctype': u'DocField',
+ 'fieldname': u'stock_uom',
+ 'fieldtype': u'Data',
+ 'label': u'UOM',
'permlevel': 1,
- 'width': '100px'
+ 'width': u'100px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'net_weight',
- 'fieldtype': 'Float',
- 'label': 'Net Weight',
+ 'doctype': u'DocField',
+ 'fieldname': u'net_weight',
+ 'fieldtype': u'Float',
+ 'label': u'Net Weight',
'permlevel': 1,
- 'width': '100px'
+ 'width': u'100px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'weight_uom',
- 'fieldtype': 'Link',
- 'label': 'Weight UOM',
- 'options': 'UOM',
+ 'doctype': u'DocField',
+ 'fieldname': u'weight_uom',
+ 'fieldtype': u'Link',
+ 'label': u'Weight UOM',
+ 'options': u'UOM',
'permlevel': 1,
- 'width': '100px'
+ 'width': u'100px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'page_break',
- 'fieldtype': 'Check',
- 'label': 'Page Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'page_break',
+ 'fieldtype': u'Check',
+ 'label': u'Page Break',
'permlevel': 0
}
]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index 7ad9d91..921eede 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -18,9 +18,10 @@
cur_frm.cscript.fname = "purchase_receipt_details";
cur_frm.cscript.other_fname = "purchase_tax_details";
-$import(Purchase Common)
-$import(Purchase Other Charges)
-$import(SMS Control)
+wn.require('erpnext/buying/doctype/purchase_other_charges/purchase_other_charges.js');
+wn.require('erpnext/buying/doctype/purchase_common/purchase_common.js');
+wn.require('erpnext/utilities/doctype/sms_control/sms_control.js');
+wn.require('erpnext/setup/doctype/notification_control/notification_control.js');
//========================== On Load ================================================================
cur_frm.cscript.onload = function(doc, cdt, cdn) {
@@ -315,7 +316,6 @@
return out;
}
-$import(Notification Control)
cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
var args = {
type: 'Purchase Receipt',
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt
index 6724b69..303046d 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:15',
+ 'creation': '2012-03-27 14:36:34',
'docstatus': 0,
- 'modified': '2012-03-02 12:26:39',
+ 'modified': '2012-03-27 18:51:48',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -17,6 +17,7 @@
'default_print_format': u'Standard',
'doctype': 'DocType',
'document_type': u'Transaction',
+ 'is_submittable': 1,
'is_transaction_doc': 1,
'module': u'Stock',
'name': '__common__',
@@ -26,7 +27,7 @@
'server_code_error': u' ',
'show_in_menu': 0,
'subject': u'From %(supplier_name)s against %(purchase_order)s on %(posting_date)s',
- 'version': 325
+ 'version': 326
},
# These values are common for all DocField
@@ -56,54 +57,6 @@
# DocPerm
{
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Material Manager',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Material Manager',
- 'submit': 1,
- 'write': 1
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Material User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 1,
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Material User',
- 'submit': 1,
- 'write': 1
- },
-
- # DocPerm
- {
'amend': 1,
'cancel': 1,
'create': 1,
@@ -137,11 +90,60 @@
'write': 1
},
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Material Manager',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 1,
+ 'cancel': 1,
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Material Manager',
+ 'submit': 1,
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Material User',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 1,
+ 'cancel': 1,
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Material User',
+ 'submit': 1,
+ 'write': 1
+ },
+
# DocField
{
'colour': u'White:FFF',
'description': u'Enter Basic Information about the Purchase Receipt',
'doctype': u'DocField',
+ 'fieldname': u'basic_info',
'fieldtype': u'Section Break',
'label': u'Basic Info',
'oldfieldtype': u'Section Break',
@@ -151,6 +153,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break0',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -296,6 +299,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break1',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -435,6 +439,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'items',
'fieldtype': u'Section Break',
'label': u'Items',
'oldfieldtype': u'Section Break',
@@ -511,6 +516,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break2',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0
@@ -536,6 +542,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'pull_purchase_order_details',
'fieldtype': u'Button',
'label': u'Pull Purchase Order Details',
'oldfieldtype': u'Button',
@@ -548,6 +555,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'section_break0',
'fieldtype': u'Section Break',
'oldfieldtype': u'Section Break',
'options': u'Simple',
@@ -586,6 +594,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'recalculate_values',
'fieldtype': u'Button',
'label': u'Re-Calculate Values',
'oldfieldtype': u'Button',
@@ -598,6 +607,7 @@
'colour': u'White:FFF',
'description': u'Add / Edit taxes and other charges',
'doctype': u'DocField',
+ 'fieldname': u'taxes',
'fieldtype': u'Section Break',
'label': u'Taxes',
'oldfieldtype': u'Section Break',
@@ -622,6 +632,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'get_tax_detail',
'fieldtype': u'Button',
'label': u'Get Tax Detail',
'oldfieldtype': u'Button',
@@ -645,6 +656,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'calculate_tax',
'fieldtype': u'Button',
'label': u'Calculate Tax',
'oldfieldtype': u'Button',
@@ -668,6 +680,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'tax_calculation',
'fieldtype': u'HTML',
'label': u'Tax Calculation',
'oldfieldtype': u'HTML',
@@ -680,6 +693,7 @@
'colour': u'White:FFF',
'description': u'Detailed Breakup of the totals',
'doctype': u'DocField',
+ 'fieldname': u'totals',
'fieldtype': u'Section Break',
'label': u'Totals',
'oldfieldtype': u'Section Break',
@@ -752,6 +766,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break3',
'fieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
@@ -823,6 +838,7 @@
'colour': u'White:FFF',
'description': u'Add Terms and Conditions for the Purchase Receipt. You can also prepare a master Term Sheet and use the Template.',
'doctype': u'DocField',
+ 'fieldname': u'terms_section_break',
'fieldtype': u'Section Break',
'label': u'Terms',
'oldfieldtype': u'Section Break',
@@ -845,6 +861,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'get_terms',
'fieldtype': u'Button',
'label': u'Get Terms',
'oldfieldtype': u'Button',
@@ -855,6 +872,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'terms_html',
'fieldtype': u'HTML',
'label': u'Terms HTML',
'oldfieldtype': u'HTML',
@@ -879,6 +897,7 @@
'colour': u'White:FFF',
'description': u'Filing in Additional Information about the Purchase Receipt will help you analyze your data better.',
'doctype': u'DocField',
+ 'fieldname': u'more_info',
'fieldtype': u'Section Break',
'label': u'More Info',
'oldfieldtype': u'Section Break',
@@ -926,6 +945,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break4',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -937,6 +957,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'other_details',
'fieldtype': u'HTML',
'hidden': 1,
'label': u'Other Details',
@@ -1006,6 +1027,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'transporter_info',
'fieldtype': u'Section Break',
'label': u'Transporter Info',
'permlevel': 0
@@ -1057,6 +1079,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break5',
'fieldtype': u'Column Break',
'permlevel': 0,
'width': u'50%'
@@ -1099,6 +1122,7 @@
'colour': u'White:FFF',
'description': u'Following table will show values if items are sub - contracted. These values will be fetched from the master of "Bill of Materials" of sub - contracted items.',
'doctype': u'DocField',
+ 'fieldname': u'raw_material_details',
'fieldtype': u'Section Break',
'label': u'Raw Material Details',
'oldfieldtype': u'Section Break',
@@ -1109,6 +1133,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'get_current_stock',
'fieldtype': u'Button',
'label': u'Get Current Stock',
'oldfieldtype': u'Button',
@@ -1136,6 +1161,7 @@
'allow_on_submit': 1,
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'repair_purchase_receipt',
'fieldtype': u'Button',
'label': u'Repair Purchase Receipt',
'oldfieldtype': u'Button',
diff --git a/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt b/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
index 815864f..a0e0f57 100755
--- a/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
+++ b/erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:16',
+ 'creation': '2012-03-27 14:36:35',
'docstatus': 0,
- 'modified': '2012-03-05 17:44:23',
+ 'modified': '2012-03-27 14:36:35',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/stock/doctype/ref_rate_detail/ref_rate_detail.txt b/erpnext/stock/doctype/ref_rate_detail/ref_rate_detail.txt
index 5e17acd..0a467b0 100644
--- a/erpnext/stock/doctype/ref_rate_detail/ref_rate_detail.txt
+++ b/erpnext/stock/doctype/ref_rate_detail/ref_rate_detail.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:19',
+ 'creation': '2012-03-27 14:36:36',
'docstatus': 0,
- 'modified': '2012-03-21 14:57:41',
+ 'modified': '2012-03-27 14:36:36',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/stock/doctype/sales_and_purchase_return_wizard/sales_and_purchase_return_wizard.txt b/erpnext/stock/doctype/sales_and_purchase_return_wizard/sales_and_purchase_return_wizard.txt
index bc6d6fa..1db2830 100644
--- a/erpnext/stock/doctype/sales_and_purchase_return_wizard/sales_and_purchase_return_wizard.txt
+++ b/erpnext/stock/doctype/sales_and_purchase_return_wizard/sales_and_purchase_return_wizard.txt
@@ -3,65 +3,61 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:21',
+ 'creation': '2012-03-27 14:36:36',
'docstatus': 0,
- 'modified': '2011-02-23 19:09:18',
- 'modified_by': 'Administrator',
- 'owner': 'wasim@webnotestech.com'
+ 'modified': '2012-03-27 14:36:36',
+ 'modified_by': u'Administrator',
+ 'owner': u'wasim@webnotestech.com'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'is_transaction_doc': 0,
'issingle': 1,
'istable': 0,
'menu_index': 1,
- 'module': 'Stock',
+ 'module': u'Stock',
'name': '__common__',
- 'parent_node': 'Materials',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'parent_node': u'Materials',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 1,
'version': 46
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Sales and Purchase Return Wizard',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Sales and Purchase Return Wizard',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Sales and Purchase Return Wizard',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Sales and Purchase Return Wizard',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Sales and Purchase Return Wizard
{
'doctype': 'DocType',
- 'name': 'Sales and Purchase Return Wizard'
+ 'name': u'Sales and Purchase Return Wizard'
},
# DocPerm
{
- 'amend': 0,
- 'cancel': 0,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Material User',
- 'submit': 0,
+ 'role': u'All',
'write': 1
},
@@ -69,11 +65,137 @@
{
'amend': 0,
'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 2,
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'System Manager',
+ 'submit': 0,
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Material User',
+ 'role': u'All'
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'System Manager',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Accounts Manager'
+ },
+
+ # DocPerm
+ {
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Purchase Manager',
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Purchase User',
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Sales Manager',
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Sales User',
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Accounts User',
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Accounts Manager',
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Accounts User'
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales User'
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales Manager'
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Purchase User'
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Purchase Manager'
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Material Manager',
'submit': 0,
'write': 0
},
@@ -83,10 +205,9 @@
'amend': 0,
'cancel': 0,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 3,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Material Manager',
+ 'role': u'Material Manager',
'submit': 0,
'write': 1
},
@@ -96,348 +217,198 @@
'amend': 0,
'cancel': 0,
'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 4,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Material Manager',
+ 'role': u'Material User',
'submit': 0,
'write': 0
},
# DocPerm
{
- 'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 5,
- 'permlevel': 0,
- 'role': 'All',
- 'write': 1
- },
-
- # DocPerm
- {
'amend': 0,
'cancel': 0,
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 6,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
+ 'role': u'Material User',
'submit': 0,
'write': 1
},
- # DocPerm
- {
- 'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 7,
- 'permlevel': 0,
- 'role': 'Accounts Manager',
- 'write': 1
- },
-
- # DocPerm
- {
- 'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 8,
- 'permlevel': 0,
- 'role': 'Accounts User',
- 'write': 1
- },
-
- # DocPerm
- {
- 'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 9,
- 'permlevel': 0,
- 'role': 'Sales User',
- 'write': 1
- },
-
- # DocPerm
- {
- 'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 10,
- 'permlevel': 0,
- 'role': 'Sales Manager',
- 'write': 1
- },
-
- # DocPerm
- {
- 'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 11,
- 'permlevel': 0,
- 'role': 'Purchase User',
- 'write': 1
- },
-
- # DocPerm
- {
- 'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 12,
- 'permlevel': 0,
- 'role': 'Purchase Manager',
- 'write': 1
- },
-
- # DocPerm
- {
- 'doctype': 'DocPerm',
- 'idx': 13,
- 'permlevel': 1,
- 'role': 'All'
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 14,
- 'permlevel': 1,
- 'role': 'System Manager',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'doctype': 'DocPerm',
- 'idx': 15,
- 'permlevel': 1,
- 'role': 'Accounts Manager'
- },
-
- # DocPerm
- {
- 'doctype': 'DocPerm',
- 'idx': 16,
- 'permlevel': 1,
- 'role': 'Accounts User'
- },
-
- # DocPerm
- {
- 'doctype': 'DocPerm',
- 'idx': 17,
- 'permlevel': 1,
- 'role': 'Sales User'
- },
-
- # DocPerm
- {
- 'doctype': 'DocPerm',
- 'idx': 18,
- 'permlevel': 1,
- 'role': 'Sales Manager'
- },
-
- # DocPerm
- {
- 'doctype': 'DocPerm',
- 'idx': 19,
- 'permlevel': 1,
- 'role': 'Purchase User'
- },
-
- # DocPerm
- {
- 'doctype': 'DocPerm',
- 'idx': 20,
- 'permlevel': 1,
- 'role': 'Purchase Manager'
- },
-
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'return_date',
- 'fieldtype': 'Date',
- 'idx': 1,
- 'label': 'Return Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'return_date',
+ 'fieldtype': u'Date',
+ 'label': u'Return Date',
'no_copy': 1,
- 'oldfieldname': 'return_date',
- 'oldfieldtype': 'Date',
+ 'oldfieldname': u'return_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'return_type',
- 'fieldtype': 'Select',
- 'idx': 2,
- 'label': 'Return Type',
+ 'doctype': u'DocField',
+ 'fieldname': u'return_type',
+ 'fieldtype': u'Select',
+ 'label': u'Return Type',
'no_copy': 1,
- 'oldfieldname': 'return_type',
- 'oldfieldtype': 'Select',
- 'options': '\nSales Return\nPurchase Return',
+ 'oldfieldname': u'return_type',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nSales Return\nPurchase Return',
'permlevel': 0,
'reqd': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'delivery_note_no',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'delivery_note_no',
+ 'fieldtype': u'Link',
'hidden': 1,
- 'idx': 3,
- 'label': 'Delivery Note No',
+ 'label': u'Delivery Note No',
'no_copy': 1,
- 'oldfieldname': 'delivery_note_no',
- 'oldfieldtype': 'Link',
- 'options': 'Delivery Note',
+ 'oldfieldname': u'delivery_note_no',
+ 'oldfieldtype': u'Link',
+ 'options': u'Delivery Note',
'permlevel': 0,
'reqd': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'sales_invoice_no',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'sales_invoice_no',
+ 'fieldtype': u'Link',
'hidden': 1,
- 'idx': 4,
- 'label': 'Sales Invoice No',
- 'options': 'Receivable Voucher',
+ 'label': u'Sales Invoice No',
+ 'options': u'Receivable Voucher',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'purchase_receipt_no',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'purchase_receipt_no',
+ 'fieldtype': u'Link',
'hidden': 1,
- 'idx': 5,
- 'label': 'Purchase Receipt No',
+ 'label': u'Purchase Receipt No',
'no_copy': 1,
- 'oldfieldname': 'purchase_receipt_no',
- 'oldfieldtype': 'Link',
- 'options': 'Purchase Receipt',
+ 'oldfieldname': u'purchase_receipt_no',
+ 'oldfieldtype': u'Link',
+ 'options': u'Purchase Receipt',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'cust_supp',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'cust_supp',
+ 'fieldtype': u'Data',
'hidden': 1,
- 'idx': 6,
- 'label': 'Customer/Supplier',
+ 'label': u'Customer/Supplier',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'cust_supp_name',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'cust_supp_name',
+ 'fieldtype': u'Data',
'hidden': 1,
- 'idx': 7,
- 'label': 'Cust/Supp Name',
+ 'label': u'Cust/Supp Name',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'cust_supp_address',
- 'fieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'cust_supp_address',
+ 'fieldtype': u'Small Text',
'hidden': 1,
- 'idx': 8,
- 'label': 'Cust/Supp Address',
+ 'label': u'Cust/Supp Address',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'get_items',
+ 'fieldtype': u'Button',
'hidden': 1,
- 'idx': 9,
- 'label': 'Get Items',
- 'oldfieldtype': 'Button',
+ 'label': u'Get Items',
+ 'oldfieldtype': u'Button',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'return_details',
- 'fieldtype': 'Table',
+ 'doctype': u'DocField',
+ 'fieldname': u'return_details',
+ 'fieldtype': u'Table',
'hidden': 1,
- 'idx': 10,
- 'label': 'Return Details',
+ 'label': u'Return Details',
'no_copy': 1,
- 'oldfieldname': 'return_details',
- 'oldfieldtype': 'Table',
- 'options': 'Return Detail',
+ 'oldfieldname': u'return_details',
+ 'oldfieldtype': u'Table',
+ 'options': u'Return Detail',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
+ 'doctype': u'DocField',
+ 'fieldname': u'make_stock_entry',
+ 'fieldtype': u'Button',
'hidden': 1,
- 'idx': 11,
- 'label': 'Make Stock Entry',
- 'oldfieldtype': 'Button',
+ 'label': u'Make Stock Entry',
+ 'oldfieldtype': u'Button',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
+ 'doctype': u'DocField',
+ 'fieldname': u'make_excise_invoice',
+ 'fieldtype': u'Button',
'hidden': 1,
- 'idx': 12,
- 'label': 'Make Excise Invoice',
- 'oldfieldtype': 'Button',
+ 'label': u'Make Excise Invoice',
+ 'oldfieldtype': u'Button',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
+ 'doctype': u'DocField',
+ 'fieldname': u'make_credit_note',
+ 'fieldtype': u'Button',
'hidden': 1,
- 'idx': 13,
- 'label': 'Make Credit Note',
- 'oldfieldtype': 'Button',
+ 'label': u'Make Credit Note',
+ 'oldfieldtype': u'Button',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
+ 'doctype': u'DocField',
+ 'fieldname': u'make_debit_note',
+ 'fieldtype': u'Button',
'hidden': 1,
- 'idx': 14,
- 'label': 'Make Debit Note',
- 'oldfieldtype': 'Button',
+ 'label': u'Make Debit Note',
+ 'oldfieldtype': u'Button',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
}
]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/sales_bom/sales_bom.txt b/erpnext/stock/doctype/sales_bom/sales_bom.txt
index 2e80a37..6595def 100644
--- a/erpnext/stock/doctype/sales_bom/sales_bom.txt
+++ b/erpnext/stock/doctype/sales_bom/sales_bom.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:21',
+ 'creation': '2012-03-27 14:36:36',
'docstatus': 0,
- 'modified': '2012-03-21 14:55:47',
+ 'modified': '2012-03-27 14:45:51',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -18,6 +18,7 @@
'default_print_format': u'Standard',
'doctype': 'DocType',
'document_type': u'Master',
+ 'is_submittable': 1,
'module': u'Stock',
'name': '__common__',
'section_style': u'Simple',
@@ -54,6 +55,30 @@
# DocPerm
{
'amend': 0,
+ 'cancel': 1,
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Sales User',
+ 'submit': 0,
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales User',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
@@ -99,30 +124,6 @@
'write': 0
},
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Sales User',
- 'submit': 0,
- 'write': 1
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Sales User',
- 'submit': 0,
- 'write': 0
- },
-
# DocField
{
'doctype': u'DocField',
@@ -225,6 +226,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'find_sales_bom',
'fieldtype': u'Button',
'label': u'Find Sales BOM',
'oldfieldtype': u'Button',
@@ -254,5 +256,30 @@
'oldfieldtype': u'Link',
'options': u'UOM',
'permlevel': 0
+ },
+
+ # DocField
+ {
+ 'depends_on': u'eval:doc.amended_from',
+ 'description': u'The date at which current entry is corrected in the system.',
+ 'doctype': u'DocField',
+ 'fieldname': u'amendment_date',
+ 'fieldtype': u'Date',
+ 'label': u'Amendment Date',
+ 'no_copy': 1,
+ 'permlevel': 0,
+ 'print_hide': 1
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
+ 'fieldname': u'amended_from',
+ 'fieldtype': u'Link',
+ 'label': u'Amended From',
+ 'no_copy': 1,
+ 'options': u'Receivable Voucher',
+ 'permlevel': 1,
+ 'print_hide': 1
}
]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/sales_bom_detail/sales_bom_detail.txt b/erpnext/stock/doctype/sales_bom_detail/sales_bom_detail.txt
index 3b104e7..3b1beb5 100644
--- a/erpnext/stock/doctype/sales_bom_detail/sales_bom_detail.txt
+++ b/erpnext/stock/doctype/sales_bom_detail/sales_bom_detail.txt
@@ -3,117 +3,111 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:21',
+ 'creation': '2012-03-27 14:36:37',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'umair@iwebnotes.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:37',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Stock',
+ 'module': u'Stock',
'name': '__common__',
- 'section_style': 'Tray',
- 'server_code_error': ' ',
+ 'section_style': u'Tray',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 3
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Sales BOM Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Sales BOM Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# DocType, Sales BOM Detail
{
'doctype': 'DocType',
- 'name': 'Sales BOM Detail'
+ 'name': u'Sales BOM Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'is_main_item',
- 'fieldtype': 'Select',
- 'idx': 1,
- 'label': 'Is Main Item',
- 'oldfieldname': 'is_main_item',
- 'oldfieldtype': 'Select',
- 'options': '\nYes\nNo',
+ 'doctype': u'DocField',
+ 'fieldname': u'is_main_item',
+ 'fieldtype': u'Select',
+ 'label': u'Is Main Item',
+ 'oldfieldname': u'is_main_item',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nYes\nNo',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'item_code',
- 'fieldtype': 'Link',
- 'idx': 2,
- 'label': 'Item',
- 'oldfieldname': 'item_code',
- 'oldfieldtype': 'Link',
- 'options': 'Item',
+ 'doctype': u'DocField',
+ 'fieldname': u'item_code',
+ 'fieldtype': u'Link',
+ 'label': u'Item',
+ 'oldfieldname': u'item_code',
+ 'oldfieldtype': u'Link',
+ 'options': u'Item',
'permlevel': 0,
'reqd': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Text',
- 'idx': 3,
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Text',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Text',
'permlevel': 0,
- 'width': '300px'
+ 'width': u'300px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'rate',
- 'fieldtype': 'Currency',
- 'idx': 6,
- 'label': 'Rate',
- 'oldfieldname': 'rate',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Rate',
+ 'oldfieldname': u'rate',
+ 'oldfieldtype': u'Currency',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'qty',
- 'fieldtype': 'Currency',
- 'idx': 9,
- 'label': 'Qty',
- 'oldfieldname': 'qty',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Qty',
+ 'oldfieldname': u'qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'uom',
- 'fieldtype': 'Link',
- 'idx': 10,
- 'label': 'UOM',
- 'oldfieldname': 'uom',
- 'oldfieldtype': 'Link',
- 'options': 'UOM',
+ 'doctype': u'DocField',
+ 'fieldname': u'uom',
+ 'fieldtype': u'Link',
+ 'label': u'UOM',
+ 'oldfieldname': u'uom',
+ 'oldfieldtype': u'Link',
+ 'options': u'UOM',
'permlevel': 1,
'search_index': 0
}
diff --git a/erpnext/stock/doctype/serial_no/serial_no.txt b/erpnext/stock/doctype/serial_no/serial_no.txt
index df42c7f..2713400 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.txt
+++ b/erpnext/stock/doctype/serial_no/serial_no.txt
@@ -3,113 +3,65 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:23',
+ 'creation': '2012-03-27 14:36:37',
'docstatus': 0,
- 'modified': '2012-01-31 15:53:38',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:37',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1325570647',
+ '_last_update': u'1325570647',
'allow_trash': 1,
- 'autoname': 'field:serial_no',
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'autoname': u'field:serial_no',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'Stock',
+ 'document_type': u'Master',
+ 'module': u'Stock',
'name': '__common__',
- 'search_fields': 'item_code,status',
- 'section_style': 'Tabbed',
- 'server_code_error': ' ',
+ 'search_fields': u'item_code,status',
+ 'section_style': u'Tabbed',
+ 'server_code_error': u' ',
'show_in_menu': 0,
- 'subject': 'Item Code: %(item_code)s, Warehouse: %(warehouse)s',
- 'tag_fields': 'status',
+ 'subject': u'Item Code: %(item_code)s, Warehouse: %(warehouse)s',
+ 'tag_fields': u'status',
'version': 191
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Serial No',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Serial No',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Serial No',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Serial No',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Serial No
{
'doctype': 'DocType',
- 'name': 'Serial No'
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'permlevel': 1,
- 'role': 'Material Manager',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'permlevel': 0,
- 'role': 'Material Manager',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'permlevel': 1,
- 'role': 'Material User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'permlevel': 0,
- 'role': 'Material User',
- 'submit': 0,
- 'write': 0
+ 'name': u'Serial No'
},
# DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 1
},
@@ -117,54 +69,104 @@
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Material Master Manager',
+ 'role': u'Material Master Manager',
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'System Manager'
+ 'role': u'System Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Sales Master Manager'
+ 'role': u'Sales Master Manager'
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Material Manager',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Material Manager',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Material User',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Material User',
+ 'submit': 0,
+ 'write': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Details',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'details',
+ 'fieldtype': u'Section Break',
+ 'label': u'Details',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
'permlevel': 0
},
# DocField
{
- 'default': 'In Store',
- 'doctype': 'DocField',
- 'fieldname': 'status',
- 'fieldtype': 'Select',
+ 'default': u'In Store',
+ 'doctype': u'DocField',
+ 'fieldname': u'status',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Status',
+ 'label': u'Status',
'no_copy': 1,
- 'oldfieldname': 'status',
- 'oldfieldtype': 'Select',
- 'options': '\nIn Store\nDelivered\nNot in Use\nPurchase Returned',
+ 'oldfieldname': u'status',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nIn Store\nDelivered\nNot in Use\nPurchase Returned',
'permlevel': 1,
'reqd': 1,
'search_index': 1
@@ -172,14 +174,14 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'serial_no',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'serial_no',
+ 'fieldtype': u'Data',
'in_filter': 0,
- 'label': 'Serial No',
+ 'label': u'Serial No',
'no_copy': 1,
- 'oldfieldname': 'serial_no',
- 'oldfieldtype': 'Data',
+ 'oldfieldname': u'serial_no',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1,
'search_index': 1
@@ -187,61 +189,62 @@
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'item_code',
- 'fieldtype': 'Link',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'item_code',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Item Code',
- 'oldfieldname': 'item_code',
- 'oldfieldtype': 'Link',
- 'options': 'Item',
+ 'label': u'Item Code',
+ 'oldfieldname': u'item_code',
+ 'oldfieldtype': u'Link',
+ 'options': u'Item',
'permlevel': 0,
'reqd': 1,
'search_index': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'item_name',
- 'fieldtype': 'Data',
- 'label': 'Item Name',
+ 'doctype': u'DocField',
+ 'fieldname': u'item_name',
+ 'fieldtype': u'Data',
+ 'label': u'Item Name',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Text',
'in_filter': 1,
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Text',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Text',
'permlevel': 1,
'search_index': 0,
- 'width': '300px'
+ 'width': u'300px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'item_group',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'item_group',
+ 'fieldtype': u'Link',
'in_filter': 0,
- 'label': 'Item Group',
- 'oldfieldname': 'item_group',
- 'oldfieldtype': 'Link',
- 'options': 'Item Group',
+ 'label': u'Item Group',
+ 'oldfieldname': u'item_group',
+ 'oldfieldtype': u'Link',
+ 'options': u'Item Group',
'permlevel': 1,
'reqd': 1,
'search_index': 0
@@ -249,14 +252,14 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'brand',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'brand',
+ 'fieldtype': u'Link',
'in_filter': 0,
- 'label': 'Brand',
- 'oldfieldname': 'brand',
- 'oldfieldtype': 'Link',
- 'options': 'Brand',
+ 'label': u'Brand',
+ 'oldfieldname': u'brand',
+ 'oldfieldtype': u'Link',
+ 'options': u'Brand',
'permlevel': 1,
'reqd': 0,
'search_index': 0
@@ -264,65 +267,67 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Purchase Details',
+ 'doctype': u'DocField',
+ 'fieldname': u'purchase_details',
+ 'fieldtype': u'Section Break',
+ 'label': u'Purchase Details',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break2',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'purchase_document_type',
- 'fieldtype': 'Select',
- 'label': 'Purchase Document Type',
+ 'doctype': u'DocField',
+ 'fieldname': u'purchase_document_type',
+ 'fieldtype': u'Select',
+ 'label': u'Purchase Document Type',
'no_copy': 1,
- 'options': '\nPurchase Receipt\nStock Entry',
+ 'options': u'\nPurchase Receipt\nStock Entry',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'purchase_document_no',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'purchase_document_no',
+ 'fieldtype': u'Data',
'hidden': 0,
- 'label': 'Purchase Document No',
+ 'label': u'Purchase Document No',
'no_copy': 1,
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'purchase_date',
- 'fieldtype': 'Date',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'purchase_date',
+ 'fieldtype': u'Date',
'in_filter': 1,
- 'label': 'Purchase Date',
+ 'label': u'Purchase Date',
'no_copy': 1,
- 'oldfieldname': 'purchase_date',
- 'oldfieldtype': 'Date',
+ 'oldfieldname': u'purchase_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'reqd': 0,
'search_index': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'purchase_time',
- 'fieldtype': 'Time',
- 'label': 'Incoming Time',
+ 'doctype': u'DocField',
+ 'fieldname': u'purchase_time',
+ 'fieldtype': u'Time',
+ 'label': u'Incoming Time',
'no_copy': 1,
'permlevel': 0,
'reqd': 1
@@ -330,14 +335,14 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'purchase_rate',
- 'fieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'purchase_rate',
+ 'fieldtype': u'Currency',
'in_filter': 0,
- 'label': 'Incoming Rate',
+ 'label': u'Incoming Rate',
'no_copy': 1,
- 'oldfieldname': 'purchase_rate',
- 'oldfieldtype': 'Currency',
+ 'oldfieldname': u'purchase_rate',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'reqd': 1,
'search_index': 0
@@ -345,23 +350,24 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break3',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'warehouse',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'warehouse',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Warehouse',
+ 'label': u'Warehouse',
'no_copy': 1,
- 'oldfieldname': 'warehouse',
- 'oldfieldtype': 'Link',
- 'options': 'Warehouse',
+ 'oldfieldname': u'warehouse',
+ 'oldfieldtype': u'Link',
+ 'options': u'Warehouse',
'permlevel': 0,
'reqd': 0,
'search_index': 1
@@ -369,186 +375,189 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'supplier',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'supplier',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Supplier',
+ 'label': u'Supplier',
'no_copy': 1,
- 'options': 'Supplier',
+ 'options': u'Supplier',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'supplier_name',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'supplier_name',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Supplier Name',
+ 'label': u'Supplier Name',
'no_copy': 1,
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'address_display',
- 'fieldtype': 'Text',
- 'label': 'Supplier Address',
+ 'doctype': u'DocField',
+ 'fieldname': u'address_display',
+ 'fieldtype': u'Text',
+ 'label': u'Supplier Address',
'no_copy': 1,
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Delivery Details',
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'delivery_details',
+ 'fieldtype': u'Section Break',
+ 'label': u'Delivery Details',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break4',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'delivery_document_type',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'delivery_document_type',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Delivery Document Type',
+ 'label': u'Delivery Document Type',
'no_copy': 1,
- 'options': '\nDelivery Note\nReceivable Voucher\nStock Entry',
+ 'options': u'\nDelivery Note\nReceivable Voucher\nStock Entry',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'delivery_document_no',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'delivery_document_no',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Delivery Document No',
+ 'label': u'Delivery Document No',
'no_copy': 1,
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'customer_address',
- 'fieldtype': 'Text',
- 'label': 'Customer Address',
- 'oldfieldname': 'customer_address',
- 'oldfieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'customer_address',
+ 'fieldtype': u'Text',
+ 'label': u'Customer Address',
+ 'oldfieldname': u'customer_address',
+ 'oldfieldtype': u'Text',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'delivery_date',
- 'fieldtype': 'Date',
- 'label': 'Delivery Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'delivery_date',
+ 'fieldtype': u'Date',
+ 'label': u'Delivery Date',
'no_copy': 1,
- 'oldfieldname': 'delivery_date',
- 'oldfieldtype': 'Date',
+ 'oldfieldname': u'delivery_date',
+ 'oldfieldtype': u'Date',
'permlevel': 1,
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'delivery_time',
- 'fieldtype': 'Time',
- 'label': 'Delivery Time',
+ 'doctype': u'DocField',
+ 'fieldname': u'delivery_time',
+ 'fieldtype': u'Time',
+ 'label': u'Delivery Time',
'no_copy': 1,
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'is_cancelled',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'is_cancelled',
+ 'fieldtype': u'Select',
'hidden': 1,
- 'label': 'Is Cancelled',
- 'oldfieldname': 'is_cancelled',
- 'oldfieldtype': 'Select',
- 'options': '\nYes\nNo',
+ 'label': u'Is Cancelled',
+ 'oldfieldname': u'is_cancelled',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nYes\nNo',
'permlevel': 0,
'report_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break5',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'customer',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'customer',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Customer',
+ 'label': u'Customer',
'no_copy': 1,
- 'oldfieldname': 'customer',
- 'oldfieldtype': 'Link',
- 'options': 'Customer',
+ 'oldfieldname': u'customer',
+ 'oldfieldtype': u'Link',
+ 'options': u'Customer',
'permlevel': 1,
'print_hide': 1,
'search_index': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'customer_name',
- 'fieldtype': 'Data',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'customer_name',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Customer Name',
+ 'label': u'Customer Name',
'no_copy': 1,
- 'oldfieldname': 'customer_name',
- 'oldfieldtype': 'Data',
+ 'oldfieldname': u'customer_name',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'delivery_address',
- 'fieldtype': 'Text',
- 'label': 'Delivery Address',
+ 'doctype': u'DocField',
+ 'fieldname': u'delivery_address',
+ 'fieldtype': u'Text',
+ 'label': u'Delivery Address',
'no_copy': 1,
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'territory',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'territory',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Territory',
+ 'label': u'Territory',
'no_copy': 1,
- 'oldfieldname': 'territory',
- 'oldfieldtype': 'Link',
- 'options': 'Territory',
+ 'oldfieldname': u'territory',
+ 'oldfieldtype': u'Link',
+ 'options': u'Territory',
'permlevel': 1,
'print_hide': 1,
'report_hide': 0
@@ -556,110 +565,114 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Warranty / AMC Details',
+ 'doctype': u'DocField',
+ 'fieldname': u'warranty_amc_details',
+ 'fieldtype': u'Section Break',
+ 'label': u'Warranty / AMC Details',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break6',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'maintenance_status',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'maintenance_status',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Maintenance Status',
+ 'label': u'Maintenance Status',
'no_copy': 0,
- 'oldfieldname': 'maintenance_status',
- 'oldfieldtype': 'Select',
- 'options': '\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC',
+ 'oldfieldname': u'maintenance_status',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC',
'permlevel': 0,
'search_index': 1,
- 'width': '150px'
+ 'width': u'150px'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'warranty_period',
- 'fieldtype': 'Int',
- 'label': 'Warranty Period (Days)',
- 'oldfieldname': 'warranty_period',
- 'oldfieldtype': 'Int',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'warranty_period',
+ 'fieldtype': u'Int',
+ 'label': u'Warranty Period (Days)',
+ 'oldfieldname': u'warranty_period',
+ 'oldfieldtype': u'Int',
'permlevel': 0,
- 'trigger': 'Client',
- 'width': '150px'
+ 'trigger': u'Client',
+ 'width': u'150px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break7',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'warranty_expiry_date',
- 'fieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'warranty_expiry_date',
+ 'fieldtype': u'Date',
'in_filter': 1,
- 'label': 'Warranty Expiry Date',
- 'oldfieldname': 'warranty_expiry_date',
- 'oldfieldtype': 'Date',
+ 'label': u'Warranty Expiry Date',
+ 'oldfieldname': u'warranty_expiry_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
- 'width': '150px'
+ 'width': u'150px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amc_expiry_date',
- 'fieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'amc_expiry_date',
+ 'fieldtype': u'Date',
'in_filter': 1,
- 'label': 'AMC Expiry Date',
- 'oldfieldname': 'amc_expiry_date',
- 'oldfieldtype': 'Date',
+ 'label': u'AMC Expiry Date',
+ 'oldfieldname': u'amc_expiry_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'search_index': 0,
- 'width': '150px'
+ 'width': u'150px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'More Info',
+ 'doctype': u'DocField',
+ 'fieldname': u'more_info',
+ 'fieldtype': u'Section Break',
+ 'label': u'More Info',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'serial_no_details',
- 'fieldtype': 'Text Editor',
- 'label': 'Serial No Details',
+ 'doctype': u'DocField',
+ 'fieldname': u'serial_no_details',
+ 'fieldtype': u'Text Editor',
+ 'label': u'Serial No Details',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'company',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'company',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Company',
- 'options': 'link:Company',
+ 'label': u'Company',
+ 'options': u'link:Company',
'permlevel': 0,
'reqd': 1,
'search_index': 1
@@ -667,12 +680,12 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'fiscal_year',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'fiscal_year',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Fiscal Year',
- 'options': 'link:Fiscal Year',
+ 'label': u'Fiscal Year',
+ 'options': u'link:Fiscal Year',
'permlevel': 0,
'reqd': 1,
'search_index': 1
@@ -680,12 +693,12 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
}
]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.txt b/erpnext/stock/doctype/stock_entry/stock_entry.txt
index 9792fc9..cccc608 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.txt
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:25',
+ 'creation': '2012-03-27 14:36:37',
'docstatus': 0,
- 'modified': '2012-03-21 11:00:48',
+ 'modified': '2012-03-27 14:45:52',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -26,6 +26,7 @@
'hide_toolbar': 0,
'in_create': 0,
'in_dialog': 0,
+ 'is_submittable': 1,
'is_transaction_doc': 0,
'issingle': 0,
'max_attachments': 0,
@@ -71,14 +72,14 @@
# DocPerm
{
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
+ 'amend': 1,
+ 'cancel': 1,
+ 'create': 1,
'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Material Manager',
- 'submit': 0,
- 'write': 0
+ 'permlevel': 0,
+ 'role': u'Material User',
+ 'submit': 1,
+ 'write': 1
},
# DocPerm
@@ -95,6 +96,23 @@
# DocPerm
{
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 2,
+ 'role': u'Production User',
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 2,
+ 'role': u'Production Manager',
+ 'write': 1
+ },
+
+ # DocPerm
+ {
'amend': 1,
'cancel': 1,
'create': 1,
@@ -107,26 +125,9 @@
# DocPerm
{
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
- 'role': u'Production User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 2,
- 'role': u'Production User',
- 'submit': 0,
- 'write': 1
+ 'role': u'Production User'
},
# DocPerm
@@ -143,14 +144,9 @@
# DocPerm
{
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
- 'role': u'Production Manager',
- 'submit': 0,
- 'write': 0
+ 'role': u'Production Manager'
},
# DocPerm
@@ -159,15 +155,28 @@
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
- 'permlevel': 2,
- 'role': u'Production Manager',
+ 'permlevel': 1,
+ 'role': u'Material Manager',
'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 1,
+ 'cancel': 1,
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Material Manager',
+ 'submit': 1,
'write': 1
},
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'warehouse',
'fieldtype': u'Section Break',
'label': u'Warehouse',
'oldfieldtype': u'Section Break',
@@ -177,6 +186,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break0',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -495,6 +505,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'warehouse_html',
'fieldtype': u'HTML',
'label': u'Warehouse HTML',
'no_copy': 0,
@@ -563,6 +574,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break1',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -755,6 +767,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'items',
'fieldtype': u'Section Break',
'label': u'Items',
'oldfieldtype': u'Section Break',
@@ -764,6 +777,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'get_stock_and_rate',
'fieldtype': u'Button',
'label': u'Get Stock and Rate',
'oldfieldtype': u'Button',
@@ -775,6 +789,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break2',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0
@@ -785,6 +800,7 @@
'allow_on_submit': 0,
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'get_items',
'fieldtype': u'Button',
'hidden': 0,
'in_filter': 0,
@@ -801,6 +817,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'section_break0',
'fieldtype': u'Section Break',
'oldfieldtype': u'Section Break',
'options': u'Simple',
@@ -846,6 +863,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'other_details',
'fieldtype': u'Section Break',
'label': u'Other Details',
'oldfieldtype': u'Section Break',
diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.txt b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.txt
index 03ee1af..1c64c1e 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.txt
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.txt
@@ -3,134 +3,134 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:25',
+ 'creation': '2012-03-27 14:36:38',
'docstatus': 0,
- 'modified': '2012-01-12 11:51:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:38',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'autoname': 'MTND/.######',
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'autoname': u'MTND/.######',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Stock',
+ 'module': u'Stock',
'name': '__common__',
- 'section_style': 'Tray',
- 'server_code_error': ' ',
+ 'section_style': u'Tray',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 26
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Stock Entry Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Stock Entry Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# DocType, Stock Entry Detail
{
'doctype': 'DocType',
- 'name': 'Stock Entry Detail'
+ 'name': u'Stock Entry Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 's_warehouse',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u's_warehouse',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Source Warehouse',
- 'oldfieldname': 's_warehouse',
- 'oldfieldtype': 'Link',
- 'options': 'Warehouse',
+ 'label': u'Source Warehouse',
+ 'oldfieldname': u's_warehouse',
+ 'oldfieldtype': u'Link',
+ 'options': u'Warehouse',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 't_warehouse',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u't_warehouse',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Target Warehouse',
- 'oldfieldname': 't_warehouse',
- 'oldfieldtype': 'Link',
- 'options': 'Warehouse',
+ 'label': u'Target Warehouse',
+ 'oldfieldname': u't_warehouse',
+ 'oldfieldtype': u'Link',
+ 'options': u'Warehouse',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'fg_item',
- 'fieldtype': 'Check',
+ 'doctype': u'DocField',
+ 'fieldname': u'fg_item',
+ 'fieldtype': u'Check',
'in_filter': 1,
- 'label': 'FG Item',
- 'oldfieldname': 'fg_item',
- 'oldfieldtype': 'Check',
+ 'label': u'FG Item',
+ 'oldfieldname': u'fg_item',
+ 'oldfieldtype': u'Check',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'item_code',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'item_code',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Item Code',
- 'oldfieldname': 'item_code',
- 'oldfieldtype': 'Link',
- 'options': 'Item',
+ 'label': u'Item Code',
+ 'oldfieldname': u'item_code',
+ 'oldfieldtype': u'Link',
+ 'options': u'Item',
'permlevel': 0,
'reqd': 1,
'search_index': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Text',
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Text',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Text',
'permlevel': 0,
- 'width': '300px'
+ 'width': u'300px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'batch_no',
- 'fieldtype': 'Link',
- 'label': 'Batch No',
- 'oldfieldname': 'batch_no',
- 'oldfieldtype': 'Link',
- 'options': 'Batch',
+ 'doctype': u'DocField',
+ 'fieldname': u'batch_no',
+ 'fieldtype': u'Link',
+ 'label': u'Batch No',
+ 'oldfieldname': u'batch_no',
+ 'oldfieldtype': u'Link',
+ 'options': u'Batch',
'permlevel': 0,
'print_hide': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'actual_qty',
- 'fieldtype': 'Read Only',
+ 'doctype': u'DocField',
+ 'fieldname': u'actual_qty',
+ 'fieldtype': u'Read Only',
'in_filter': 1,
- 'label': 'Actual Qty (at source)',
+ 'label': u'Actual Qty (at source)',
'no_copy': 1,
- 'oldfieldname': 'actual_qty',
- 'oldfieldtype': 'Read Only',
+ 'oldfieldname': u'actual_qty',
+ 'oldfieldtype': u'Read Only',
'permlevel': 1,
'print_hide': 1,
'reqd': 0,
@@ -139,67 +139,67 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'qty',
- 'fieldtype': 'Currency',
- 'label': 'Qty',
- 'oldfieldname': 'qty',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Qty',
+ 'oldfieldname': u'qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'reqd': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'reqd_qty',
- 'fieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'reqd_qty',
+ 'fieldtype': u'Currency',
'in_filter': 0,
- 'label': 'Reqd Qty',
- 'oldfieldname': 'reqd_qty',
- 'oldfieldtype': 'Currency',
+ 'label': u'Reqd Qty',
+ 'oldfieldname': u'reqd_qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 3,
'print_hide': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'uom',
- 'fieldtype': 'Link',
- 'label': 'UOM',
- 'oldfieldname': 'uom',
- 'oldfieldtype': 'Link',
- 'options': 'UOM',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'uom',
+ 'fieldtype': u'Link',
+ 'label': u'UOM',
+ 'oldfieldname': u'uom',
+ 'oldfieldtype': u'Link',
+ 'options': u'UOM',
'permlevel': 0,
'reqd': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'conversion_factor',
- 'fieldtype': 'Currency',
- 'label': 'Conversion Factor',
- 'oldfieldname': 'conversion_factor',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'conversion_factor',
+ 'fieldtype': u'Currency',
+ 'label': u'Conversion Factor',
+ 'oldfieldname': u'conversion_factor',
+ 'oldfieldtype': u'Currency',
'permlevel': 1,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'stock_uom',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'stock_uom',
+ 'fieldtype': u'Link',
'in_filter': 0,
- 'label': 'Stock UOM',
- 'oldfieldname': 'stock_uom',
- 'oldfieldtype': 'Link',
- 'options': 'UOM',
+ 'label': u'Stock UOM',
+ 'oldfieldname': u'stock_uom',
+ 'oldfieldtype': u'Link',
+ 'options': u'UOM',
'permlevel': 1,
'reqd': 1,
'search_index': 0
@@ -207,60 +207,60 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'transfer_qty',
- 'fieldtype': 'Currency',
- 'label': 'Stock Qty',
- 'oldfieldname': 'transfer_qty',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'transfer_qty',
+ 'fieldtype': u'Currency',
+ 'label': u'Stock Qty',
+ 'oldfieldname': u'transfer_qty',
+ 'oldfieldtype': u'Currency',
'permlevel': 1,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'serial_no',
- 'fieldtype': 'Text',
- 'label': 'Serial No',
+ 'doctype': u'DocField',
+ 'fieldname': u'serial_no',
+ 'fieldtype': u'Text',
+ 'label': u'Serial No',
'no_copy': 1,
- 'oldfieldname': 'serial_no',
- 'oldfieldtype': 'Text',
+ 'oldfieldname': u'serial_no',
+ 'oldfieldtype': u'Text',
'permlevel': 0,
'reqd': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'incoming_rate',
- 'fieldtype': 'Currency',
- 'label': 'Incoming Rate',
- 'oldfieldname': 'incoming_rate',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'incoming_rate',
+ 'fieldtype': u'Currency',
+ 'label': u'Incoming Rate',
+ 'oldfieldname': u'incoming_rate',
+ 'oldfieldtype': u'Currency',
'permlevel': 0,
'reqd': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amount',
- 'fieldtype': 'Currency',
- 'label': 'Amount',
- 'oldfieldname': 'amount',
- 'oldfieldtype': 'Currency',
+ 'doctype': u'DocField',
+ 'fieldname': u'amount',
+ 'fieldtype': u'Currency',
+ 'label': u'Amount',
+ 'oldfieldname': u'amount',
+ 'oldfieldtype': u'Currency',
'permlevel': 1
},
# DocField
{
- 'description': 'BOM No. for a Finished Good Item',
- 'doctype': 'DocField',
- 'fieldname': 'bom_no',
- 'fieldtype': 'Link',
- 'label': 'BOM No.',
- 'options': 'Bill Of Materials',
+ 'description': u'BOM No. for a Finished Good Item',
+ 'doctype': u'DocField',
+ 'fieldname': u'bom_no',
+ 'fieldtype': u'Link',
+ 'label': u'BOM No.',
+ 'options': u'Bill Of Materials',
'permlevel': 0
}
]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_ledger/stock_ledger.txt b/erpnext/stock/doctype/stock_ledger/stock_ledger.txt
index 2bbfbb9..cebe0d0 100644
--- a/erpnext/stock/doctype/stock_ledger/stock_ledger.txt
+++ b/erpnext/stock/doctype/stock_ledger/stock_ledger.txt
@@ -3,36 +3,36 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:25',
+ 'creation': '2012-03-27 14:36:38',
'docstatus': 0,
- 'modified': '2010-12-16 23:57:05',
- 'modified_by': 'nabin@webnotestech.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:38',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'hide_toolbar': 1,
'in_create': 1,
'issingle': 1,
- 'module': 'Stock',
+ 'module': u'Stock',
'name': '__common__',
'read_only': 1,
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 10
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Stock Ledger',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Stock Ledger',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 1,
'read': 1
},
@@ -40,20 +40,18 @@
# DocType, Stock Ledger
{
'doctype': 'DocType',
- 'name': 'Stock Ledger'
+ 'name': u'Stock Ledger'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'role': 'All'
+ 'doctype': u'DocPerm',
+ 'role': u'All'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'role': 'Material User'
+ 'doctype': u'DocPerm',
+ 'role': u'Material User'
}
]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
index bef15f8..d5ea870 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:25',
+ 'creation': '2012-03-27 14:36:38',
'docstatus': 0,
- 'modified': '2012-03-21 14:04:38',
+ 'modified': '2012-03-27 14:36:38',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -38,17 +38,12 @@
# These values are common for all DocPerm
{
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
'doctype': u'DocPerm',
'name': '__common__',
'parent': u'Stock Ledger Entry',
'parentfield': u'permissions',
'parenttype': u'DocType',
- 'read': 1,
- 'submit': 0,
- 'write': 0
+ 'read': 1
},
# DocType, Stock Ledger Entry
@@ -60,29 +55,32 @@
# DocPerm
{
'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'System Manager'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Material User'
- },
-
- # DocPerm
- {
- 'doctype': u'DocPerm',
'permlevel': 1,
'role': u'All'
},
# DocPerm
{
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
- 'role': u'Material User'
+ 'role': u'Material User',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Material User',
+ 'submit': 0,
+ 'write': 0
},
# DocPerm
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.txt b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.txt
index 9a21130..c77af1b 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.txt
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.txt
@@ -3,76 +3,78 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:26',
+ 'creation': '2012-03-27 14:36:40',
'docstatus': 0,
- 'modified': '2011-11-24 12:04:03',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:45:52',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1321617741',
+ '_last_update': u'1321617741',
'allow_attach': 1,
- 'autoname': 'SR/.######',
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'autoname': u'SR/.######',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
+ 'is_submittable': 1,
'max_attachments': 1,
- 'module': 'Stock',
+ 'module': u'Stock',
'name': '__common__',
- 'search_fields': 'reconciliation_date',
- 'section_style': 'Tray',
- 'server_code_error': ' ',
+ 'search_fields': u'reconciliation_date',
+ 'section_style': u'Tray',
+ 'server_code_error': u' ',
'show_in_menu': 0,
- 'subject': 'Date: %(reconciliation_date)s, Time: %(reconciliation_time)s',
+ 'subject': u'Date: %(reconciliation_date)s, Time: %(reconciliation_time)s',
'version': 107
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Stock Reconciliation',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Stock Reconciliation',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'amend': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Stock Reconciliation',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Stock Reconciliation',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Stock Reconciliation
{
'doctype': 'DocType',
- 'name': 'Stock Reconciliation'
+ 'name': u'Stock Reconciliation'
},
# DocPerm
{
+ 'amend': 0,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Material Manager',
+ 'role': u'Material Manager',
'submit': 1,
'write': 1
},
# DocPerm
{
+ 'amend': 0,
'cancel': 0,
'create': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Material Manager',
+ 'role': u'Material Manager',
'submit': 0,
'write': 0
},
@@ -81,77 +83,104 @@
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'submit': 1,
'write': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'label': 'Steps',
- 'options': '<div class="field_description"><b>Steps:</b><br>1. Enter Reconciliation Date and Time<br>2. Save the document<br>3. Attach csv file as per template.<br>4. Submit the document<br>5. Enter tilde (~) sign if no difference in qty or valuation rate</div>',
+ 'doctype': u'DocField',
+ 'fieldname': u'steps',
+ 'fieldtype': u'HTML',
+ 'label': u'Steps',
+ 'options': u'<div class="field_description"><b>Steps:</b><br>1. Enter Reconciliation Date and Time<br>2. Save the document<br>3. Attach csv file as per template.<br>4. Submit the document<br>5. Enter tilde (~) sign if no difference in qty or valuation rate</div>',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'reconciliation_date',
- 'fieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'reconciliation_date',
+ 'fieldtype': u'Date',
'in_filter': 0,
- 'label': 'Reconciliation Date',
- 'oldfieldname': 'reconciliation_date',
- 'oldfieldtype': 'Date',
+ 'label': u'Reconciliation Date',
+ 'oldfieldname': u'reconciliation_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'reconciliation_time',
- 'fieldtype': 'Time',
+ 'doctype': u'DocField',
+ 'fieldname': u'reconciliation_time',
+ 'fieldtype': u'Time',
'in_filter': 0,
- 'label': 'Reconciliation Time',
- 'oldfieldname': 'reconciliation_time',
- 'oldfieldtype': 'Time',
+ 'label': u'Reconciliation Time',
+ 'oldfieldname': u'reconciliation_time',
+ 'oldfieldtype': u'Time',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'remark',
- 'fieldtype': 'Text',
- 'label': 'Remark',
- 'oldfieldname': 'remark',
- 'oldfieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'remark',
+ 'fieldtype': u'Text',
+ 'label': u'Remark',
+ 'oldfieldname': u'remark',
+ 'oldfieldtype': u'Text',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Download Template',
+ 'doctype': u'DocField',
+ 'fieldname': u'download_template',
+ 'fieldtype': u'Button',
+ 'label': u'Download Template',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'file_list',
- 'fieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'file_list',
+ 'fieldtype': u'Text',
'hidden': 1,
- 'label': 'File List',
+ 'label': u'File List',
'no_copy': 1,
- 'oldfieldname': 'file_list',
- 'oldfieldtype': 'Text',
+ 'oldfieldname': u'file_list',
+ 'oldfieldtype': u'Text',
+ 'permlevel': 1,
+ 'print_hide': 1
+ },
+
+ # DocField
+ {
+ 'depends_on': u'eval:doc.amended_from',
+ 'description': u'The date at which current entry is corrected in the system.',
+ 'doctype': u'DocField',
+ 'fieldname': u'amendment_date',
+ 'fieldtype': u'Date',
+ 'label': u'Amendment Date',
+ 'no_copy': 1,
+ 'permlevel': 0,
+ 'print_hide': 1
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
+ 'fieldname': u'amended_from',
+ 'fieldtype': u'Link',
+ 'label': u'Amended From',
+ 'no_copy': 1,
+ 'options': u'Receivable Voucher',
'permlevel': 1,
'print_hide': 1
}
diff --git a/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt b/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt
index 7818530..87241b5 100644
--- a/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt
+++ b/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt
@@ -3,159 +3,149 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:26',
+ 'creation': '2012-03-27 14:36:40',
'docstatus': 0,
- 'modified': '2010-12-23 14:40:02',
- 'modified_by': 'umair@iwebnotes.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:40',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'in_create': 0,
'issingle': 1,
- 'module': 'Stock',
+ 'module': u'Stock',
'name': '__common__',
'read_only': 0,
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 25
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Stock UOM Replace Utility',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Stock UOM Replace Utility',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Stock UOM Replace Utility',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Stock UOM Replace Utility',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Stock UOM Replace Utility
{
'doctype': 'DocType',
- 'name': 'Stock UOM Replace Utility'
+ 'name': u'Stock UOM Replace Utility'
},
# DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 0
},
# DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 3,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Material Master Manager',
+ 'role': u'Material Master Manager',
'write': 1
},
# DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 4,
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Material Manager',
+ 'role': u'Material Manager',
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 5,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Material Master Manager'
+ 'role': u'Material Master Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 6,
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Material Manager'
+ 'role': u'Material Manager'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'item_code',
- 'fieldtype': 'Link',
- 'idx': 1,
- 'label': 'Item',
- 'options': 'Item',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'item_code',
+ 'fieldtype': u'Link',
+ 'label': u'Item',
+ 'options': u'Item',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'current_stock_uom',
- 'fieldtype': 'Link',
- 'idx': 2,
- 'label': 'Current Stock UOM',
- 'options': 'UOM',
+ 'doctype': u'DocField',
+ 'fieldname': u'current_stock_uom',
+ 'fieldtype': u'Link',
+ 'label': u'Current Stock UOM',
+ 'options': u'UOM',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'new_stock_uom',
- 'fieldtype': 'Link',
- 'idx': 3,
- 'label': 'New Stock UOM',
- 'options': 'UOM',
+ 'doctype': u'DocField',
+ 'fieldname': u'new_stock_uom',
+ 'fieldtype': u'Link',
+ 'label': u'New Stock UOM',
+ 'options': u'UOM',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'idx': 5,
- 'label': 'Update',
- 'options': 'update_stock_uom',
+ 'doctype': u'DocField',
+ 'fieldname': u'update',
+ 'fieldtype': u'Button',
+ 'label': u'Update',
+ 'options': u'update_stock_uom',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'conversion_factor',
- 'fieldtype': 'Currency',
- 'idx': 11,
- 'label': 'Conversion Factor',
+ 'doctype': u'DocField',
+ 'fieldname': u'conversion_factor',
+ 'fieldtype': u'Currency',
+ 'label': u'Conversion Factor',
'permlevel': 0
}
]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.txt b/erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.txt
index 14608be..e3ee023 100644
--- a/erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.txt
+++ b/erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.txt
@@ -3,63 +3,61 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:29',
+ 'creation': '2012-03-27 14:36:40',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'umair@iwebnotes.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:40',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'autoname': 'UCDD/.#####',
- 'colour': 'White:FFF',
+ 'autoname': u'UCDD/.#####',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Stock',
+ 'module': u'Stock',
'name': '__common__',
- 'section_style': 'Tray',
- 'server_code_error': ' ',
+ 'section_style': u'Tray',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 1
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'UOM Conversion Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'UOM Conversion Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, UOM Conversion Detail
{
'doctype': 'DocType',
- 'name': 'UOM Conversion Detail'
+ 'name': u'UOM Conversion Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'uom',
- 'fieldtype': 'Link',
- 'idx': 10,
- 'label': 'UOM',
- 'oldfieldname': 'uom',
- 'oldfieldtype': 'Link',
- 'options': 'UOM'
+ 'doctype': u'DocField',
+ 'fieldname': u'uom',
+ 'fieldtype': u'Link',
+ 'label': u'UOM',
+ 'oldfieldname': u'uom',
+ 'oldfieldtype': u'Link',
+ 'options': u'UOM'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'conversion_factor',
- 'fieldtype': 'Float',
- 'idx': 11,
- 'label': 'Conversion Factor',
- 'oldfieldname': 'conversion_factor',
- 'oldfieldtype': 'Float'
+ 'doctype': u'DocField',
+ 'fieldname': u'conversion_factor',
+ 'fieldtype': u'Float',
+ 'label': u'Conversion Factor',
+ 'oldfieldname': u'conversion_factor',
+ 'oldfieldtype': u'Float'
}
]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/valuation_control/valuation_control.txt b/erpnext/stock/doctype/valuation_control/valuation_control.txt
index c2a2935..abaaa7b 100644
--- a/erpnext/stock/doctype/valuation_control/valuation_control.txt
+++ b/erpnext/stock/doctype/valuation_control/valuation_control.txt
@@ -3,29 +3,29 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:30',
+ 'creation': '2012-03-27 14:36:40',
'docstatus': 0,
- 'modified': '2010-12-23 11:18:22',
- 'modified_by': 'umair@iwebnotes.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:40',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'in_create': 1,
'issingle': 1,
- 'module': 'Stock',
+ 'module': u'Stock',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 4
},
# DocType, Valuation Control
{
'doctype': 'DocType',
- 'name': 'Valuation Control'
+ 'name': u'Valuation Control'
}
]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/warehouse/warehouse.txt b/erpnext/stock/doctype/warehouse/warehouse.txt
index 87b0eda..2af4eac 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.txt
+++ b/erpnext/stock/doctype/warehouse/warehouse.txt
@@ -3,133 +3,61 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:30',
+ 'creation': '2012-03-27 14:36:40',
'docstatus': 0,
- 'modified': '2011-11-15 15:06:24',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:40',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1319016431',
+ '_last_update': u'1319016431',
'allow_trash': 1,
- 'autoname': 'field:warehouse_name',
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'autoname': u'field:warehouse_name',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
- 'document_type': 'Master',
- 'module': 'Stock',
+ 'document_type': u'Master',
+ 'module': u'Stock',
'name': '__common__',
- 'search_fields': 'warehouse_type',
- 'section_style': 'Tabbed',
- 'server_code_error': ' ',
+ 'search_fields': u'warehouse_type',
+ 'section_style': u'Tabbed',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 58
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Warehouse',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Warehouse',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Warehouse',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Warehouse',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Warehouse
{
'doctype': 'DocType',
- 'name': 'Warehouse'
+ 'name': u'Warehouse'
},
# DocPerm
{
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'permlevel': 2,
- 'role': 'Material User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'permlevel': 0,
- 'role': 'Material User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Material User',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'permlevel': 2,
- 'role': 'Material Manager',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'permlevel': 0,
- 'role': 'Material Manager',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'amend': 0,
- 'cancel': 0,
- 'create': 0,
- 'doctype': 'DocPerm',
- 'permlevel': 1,
- 'role': 'Material Manager',
- 'submit': 0,
- 'write': 0
- },
-
- # DocPerm
- {
- 'doctype': 'DocPerm',
- 'permlevel': 1,
- 'role': 'All'
+ 'role': u'All'
},
# DocPerm
@@ -137,239 +65,315 @@
'amend': 0,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Material Master Manager',
+ 'role': u'Material Master Manager',
'submit': 0,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Material Master Manager'
+ 'role': u'Material Master Manager'
+ },
+
+ # DocPerm
+ {
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 2,
+ 'role': u'System Manager',
+ 'write': 1
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Material Manager',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Material Manager',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 2,
+ 'role': u'Material Manager',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Material User',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Material User',
+ 'submit': 0,
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'amend': 0,
+ 'cancel': 0,
+ 'create': 0,
+ 'doctype': u'DocPerm',
+ 'permlevel': 2,
+ 'role': u'Material User',
+ 'submit': 0,
+ 'write': 0
},
# DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
- 'write': 1
- },
-
- # DocPerm
- {
- 'create': 0,
- 'doctype': 'DocPerm',
- 'permlevel': 2,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Warehouse Detail',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'warehouse_detail',
+ 'fieldtype': u'Section Break',
+ 'label': u'Warehouse Detail',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'warehouse_name',
- 'fieldtype': 'Data',
- 'label': 'Warehouse Name',
- 'oldfieldname': 'warehouse_name',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'warehouse_name',
+ 'fieldtype': u'Data',
+ 'label': u'Warehouse Name',
+ 'oldfieldname': u'warehouse_name',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'warehouse_type',
- 'fieldtype': 'Link',
- 'label': 'Warehouse Type',
- 'oldfieldname': 'warehouse_type',
- 'oldfieldtype': 'Link',
- 'options': 'Warehouse Type',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'warehouse_type',
+ 'fieldtype': u'Link',
+ 'label': u'Warehouse Type',
+ 'oldfieldname': u'warehouse_type',
+ 'oldfieldtype': u'Link',
+ 'options': u'Warehouse Type',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'The valuation of items in this warehouse will be considered for the company that is specified',
- 'doctype': 'DocField',
- 'fieldname': 'company',
- 'fieldtype': 'Link',
+ 'colour': u'White:FFF',
+ 'description': u'The valuation of items in this warehouse will be considered for the company that is specified',
+ 'doctype': u'DocField',
+ 'fieldname': u'company',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Company',
- 'oldfieldname': 'company',
- 'oldfieldtype': 'Link',
- 'options': 'Company',
+ 'label': u'Company',
+ 'oldfieldname': u'company',
+ 'oldfieldtype': u'Link',
+ 'options': u'Company',
'permlevel': 0,
'search_index': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'email_id',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'email_id',
+ 'fieldtype': u'Data',
'hidden': 1,
- 'label': 'Email Id',
- 'oldfieldname': 'email_id',
- 'oldfieldtype': 'Data',
+ 'label': u'Email Id',
+ 'oldfieldname': u'email_id',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'print_hide': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'auto_indent_mail',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'auto_indent_mail',
+ 'fieldtype': u'Select',
'hidden': 1,
- 'label': 'Send Reorder Alert Mail ',
+ 'label': u'Send Reorder Alert Mail ',
'no_copy': 1,
- 'oldfieldname': 'auto_indent_mail',
- 'oldfieldtype': 'Select',
- 'options': 'No\nYes',
+ 'oldfieldname': u'auto_indent_mail',
+ 'oldfieldtype': u'Select',
+ 'options': u'No\nYes',
'permlevel': 0,
'print_hide': 1,
'report_hide': 1,
'reqd': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'phone_no',
- 'fieldtype': 'Int',
- 'label': 'Phone No',
- 'oldfieldname': 'phone_no',
- 'oldfieldtype': 'Int',
- 'options': 'Phone',
+ 'doctype': u'DocField',
+ 'fieldname': u'phone_no',
+ 'fieldtype': u'Int',
+ 'label': u'Phone No',
+ 'oldfieldname': u'phone_no',
+ 'oldfieldtype': u'Int',
+ 'options': u'Phone',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'mobile_no',
- 'fieldtype': 'Int',
- 'label': 'Mobile No',
- 'oldfieldname': 'mobile_no',
- 'oldfieldtype': 'Int',
- 'options': 'Phone',
+ 'doctype': u'DocField',
+ 'fieldname': u'mobile_no',
+ 'fieldtype': u'Int',
+ 'label': u'Mobile No',
+ 'oldfieldname': u'mobile_no',
+ 'oldfieldtype': u'Int',
+ 'options': u'Phone',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'address_line_1',
- 'fieldtype': 'Data',
- 'label': 'Address Line 1',
- 'oldfieldname': 'address_line_1',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'address_line_1',
+ 'fieldtype': u'Data',
+ 'label': u'Address Line 1',
+ 'oldfieldname': u'address_line_1',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'address_line_2',
- 'fieldtype': 'Data',
- 'label': 'Address Line 2',
- 'oldfieldname': 'address_line_2',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'address_line_2',
+ 'fieldtype': u'Data',
+ 'label': u'Address Line 2',
+ 'oldfieldname': u'address_line_2',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'state',
- 'fieldtype': 'Select',
- 'label': 'State',
- 'oldfieldname': 'state',
- 'oldfieldtype': 'Select',
- 'options': '\nSelect country first',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'state',
+ 'fieldtype': u'Select',
+ 'label': u'State',
+ 'oldfieldname': u'state',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nSelect country first',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'city',
- 'fieldtype': 'Data',
- 'label': 'City',
- 'oldfieldname': 'city',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'city',
+ 'fieldtype': u'Data',
+ 'label': u'City',
+ 'oldfieldname': u'city',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'pin',
- 'fieldtype': 'Int',
- 'label': 'PIN',
- 'oldfieldname': 'pin',
- 'oldfieldtype': 'Int',
+ 'doctype': u'DocField',
+ 'fieldname': u'pin',
+ 'fieldtype': u'Int',
+ 'label': u'PIN',
+ 'oldfieldname': u'pin',
+ 'oldfieldtype': u'Int',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Repost Stock',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'repost_stock',
+ 'fieldtype': u'Section Break',
+ 'label': u'Repost Stock',
+ 'oldfieldtype': u'Section Break',
'permlevel': 2
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
+ 'doctype': u'DocField',
+ 'fieldname': u'repost_stock_ledger',
+ 'fieldtype': u'Button',
'hidden': 0,
- 'label': 'Repost Stock Ledger',
- 'oldfieldtype': 'Button',
- 'options': 'repost_stock',
+ 'label': u'Repost Stock Ledger',
+ 'oldfieldtype': u'Button',
+ 'options': u'repost_stock',
'permlevel': 2
}
]
\ No newline at end of file
diff --git a/erpnext/support/DocType Label/Ticket/Ticket.txt b/erpnext/support/DocType Label/Ticket/Ticket.txt
deleted file mode 100644
index 8707e8f..0000000
--- a/erpnext/support/DocType Label/Ticket/Ticket.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'modified_by': 'Administrator', 'name': 'Ticket', 'parent': None, 'dt_label': 'Task', 'creation': '2010-06-28 12:55:47', 'modified': '2010-06-28 12:55:47', 'module': 'Accounts', 'doctype': 'DocType Label', 'idx': None, 'parenttype': None, 'owner': 'Administrator', 'docstatus': 0, 'dt': 'Ticket', 'parentfield': None}]
\ No newline at end of file
diff --git a/erpnext/support/Module Def/Support/Support.txt b/erpnext/support/Module Def/Support/Support.txt
deleted file mode 100644
index 9c66c3d..0000000
--- a/erpnext/support/Module Def/Support/Support.txt
+++ /dev/null
@@ -1,149 +0,0 @@
-# Module Def, Support
-[
-
- # These values are common in all dictionaries
- {
- 'creation': '2011-07-01 17:42:15',
- 'docstatus': 0,
- 'modified': '2011-10-10 16:59:49',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
- },
-
- # These values are common for all Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'name': '__common__',
- 'parent': 'Support',
- 'parentfield': 'roles',
- 'parenttype': 'Module Def'
- },
-
- # These values are common for all Module Def Item
- {
- 'doctype': 'Module Def Item',
- 'name': '__common__',
- 'parent': 'Support',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
-
- # These values are common for all Module Def
- {
- 'disabled': 'No',
- 'doctype': u'Module Def',
- 'doctype_list': 'DocType Label, Ticket',
- 'is_hidden': 'No',
- 'module_desc': 'Manage maintenance quotes, orders, schedule etc.',
- 'module_icon': 'Maintenance.gif',
- 'module_label': 'Support',
- 'module_name': 'Support',
- 'module_seq': 8,
- 'name': '__common__'
- },
-
- # Module Def, Support
- {
- 'doctype': u'Module Def',
- 'name': 'Support'
- },
-
- # Module Def Item
- {
- 'description': "Database of Support Ticket's raised by Customers",
- 'display_name': 'Support Ticket',
- 'doc_name': 'Support Ticket',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'status\nopening_date\ncustomer\nallocated_to'
- },
-
- # Module Def Item
- {
- 'description': 'Create schedule based on maintenance order',
- 'display_name': 'Maintenance Schedule',
- 'doc_name': 'Maintenance Schedule',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'status\ntransaction_date\ncustomer\nsales_order_no'
- },
-
- # Module Def Item
- {
- 'description': 'Database of issues raised your Customers',
- 'display_name': 'Customer Issue',
- 'doc_name': 'Customer Issue',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'status\ncomplaint_date\ncustomer\nallocated_to\nallocated_on'
- },
-
- # Module Def Item
- {
- 'display_name': 'Maintenance Visit',
- 'doc_name': 'Maintenance Visit',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'fields': 'status\nmntc_date\ncustomer\nmaintenance_type\ncompletion_status'
- },
-
- # Module Def Item
- {
- 'description': 'List of all scheduled mainteance. You can filter by sales person, date, serial no etc. ',
- 'display_name': 'Maintenance Schedule Details',
- 'doc_name': 'Maintenance Schedule Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'description': 'List of all issues raised by customer',
- 'display_name': 'Customer Issues',
- 'doc_name': 'Customer Issue',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Warranty/AMC Expiry Details',
- 'doc_name': 'Serial No',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Warranty/AMC Summary',
- 'doc_name': 'Serial No',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Maintenance Orderwise Pending Amount To Bill',
- 'doc_name': 'Sales Order Detail',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'role': 'Administrator'
- },
-
- # Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'role': 'Maintenance User'
- },
-
- # Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'role': 'Maintenance Manager'
- }
-]
\ No newline at end of file
diff --git a/erpnext/support/Role/Maintenance Manager/Maintenance Manager.txt b/erpnext/support/Role/Maintenance Manager/Maintenance Manager.txt
deleted file mode 100644
index 291a52c..0000000
--- a/erpnext/support/Role/Maintenance Manager/Maintenance Manager.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-# Role, Maintenance Manager
-[
-
- # These values are common in all dictionaries
- {
- 'creation': '2010-08-08 17:08:51',
- 'docstatus': 0,
- 'modified': '2010-07-22 15:19:33',
- 'modified_by': 'Administrator',
- 'owner': 'ashwini@webnotestech.com'
- },
-
- # These values are common for all Role
- {
- 'doctype': 'Role',
- 'module': 'Support',
- 'name': '__common__',
- 'role_name': 'Maintenance Manager'
- },
-
- # Role, Maintenance Manager
- {
- 'doctype': 'Role',
- 'name': 'Maintenance Manager'
- }
-]
\ No newline at end of file
diff --git a/erpnext/support/Role/Maintenance User/Maintenance User.txt b/erpnext/support/Role/Maintenance User/Maintenance User.txt
deleted file mode 100644
index c0a9e4e..0000000
--- a/erpnext/support/Role/Maintenance User/Maintenance User.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-# Role, Maintenance User
-[
-
- # These values are common in all dictionaries
- {
- 'creation': '2010-08-08 17:08:51',
- 'docstatus': 0,
- 'modified': '2010-07-22 15:19:19',
- 'modified_by': 'Administrator',
- 'owner': 'ashwini@webnotestech.com'
- },
-
- # These values are common for all Role
- {
- 'doctype': 'Role',
- 'module': 'Support',
- 'name': '__common__',
- 'role_name': 'Maintenance User'
- },
-
- # Role, Maintenance User
- {
- 'doctype': 'Role',
- 'name': 'Maintenance User'
- }
-]
\ No newline at end of file
diff --git a/erpnext/support/Role/Support Manager/Support Manager.txt b/erpnext/support/Role/Support Manager/Support Manager.txt
deleted file mode 100644
index 409280f..0000000
--- a/erpnext/support/Role/Support Manager/Support Manager.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-# Role, Support Manager
-[
-
- # These values are common in all dictionaries
- {
- 'creation': '2010-12-28 17:02:39',
- 'docstatus': 0,
- 'modified': '2010-12-28 15:17:40',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
- },
-
- # These values are common for all Role
- {
- 'doctype': 'Role',
- 'module': 'Support',
- 'name': '__common__',
- 'role_name': 'Support Manager'
- },
-
- # Role, Support Manager
- {
- 'doctype': 'Role',
- 'name': 'Support Manager'
- }
-]
\ No newline at end of file
diff --git a/erpnext/support/Role/Support Team/Support Team.txt b/erpnext/support/Role/Support Team/Support Team.txt
deleted file mode 100644
index f5bcca6..0000000
--- a/erpnext/support/Role/Support Team/Support Team.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-# Role, Support Team
-[
-
- # These values are common in all dictionaries
- {
- 'creation': '2010-12-28 17:02:39',
- 'docstatus': 0,
- 'modified': '2010-12-28 15:19:11',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
- },
-
- # These values are common for all Role
- {
- 'doctype': 'Role',
- 'module': 'Support',
- 'name': '__common__',
- 'role_name': 'Support Team'
- },
-
- # Role, Support Team
- {
- 'doctype': 'Role',
- 'name': 'Support Team'
- }
-]
\ No newline at end of file
diff --git a/erpnext/support/__init__.py b/erpnext/support/__init__.py
index e69de29..b94538b 100644
--- a/erpnext/support/__init__.py
+++ b/erpnext/support/__init__.py
@@ -0,0 +1,6 @@
+install_docs = [
+ {'doctype':'Role', 'name':'Support Team'},
+ {'doctype':'Role', 'name':'Support Manager'},
+ {'doctype':'Role', 'name':'Maintenance User'},
+ {'doctype':'Role', 'name':'Maintenance Manager'}
+]
\ No newline at end of file
diff --git a/erpnext/support/doctype/customer_issue/customer_issue.txt b/erpnext/support/doctype/customer_issue/customer_issue.txt
index b19a1a8..2c27735 100644
--- a/erpnext/support/doctype/customer_issue/customer_issue.txt
+++ b/erpnext/support/doctype/customer_issue/customer_issue.txt
@@ -3,62 +3,54 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:57',
+ 'creation': '2012-03-27 14:36:40',
'docstatus': 0,
- 'modified': '2012-01-19 12:29:40',
- 'modified_by': 'Administrator',
- 'owner': 'harshada@webnotestech.com'
+ 'modified': '2012-03-27 14:45:47',
+ 'modified_by': u'Administrator',
+ 'owner': u'harshada@webnotestech.com'
},
# These values are common for all DocType
{
- '_last_update': '1325570647',
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ '_last_update': u'1325570647',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
- 'module': 'Support',
+ 'is_submittable': 1,
+ 'module': u'Support',
'name': '__common__',
- 'search_fields': 'status,customer,customer_name,allocated_to,allocated_on, territory',
- 'section_style': 'Tabbed',
- 'server_code_error': ' ',
+ 'search_fields': u'status,customer,customer_name,allocated_to,allocated_on, territory',
+ 'section_style': u'Tabbed',
+ 'server_code_error': u' ',
'show_in_menu': 0,
- 'subject': '%(complaint)s By %(complaint_raised_by)s on %(issue_date)s',
- 'tag_fields': 'status',
+ 'subject': u'%(complaint)s By %(complaint_raised_by)s on %(issue_date)s',
+ 'tag_fields': u'status',
'version': 97
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Customer Issue',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Customer Issue',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Customer Issue',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Customer Issue',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Customer Issue
{
'doctype': 'DocType',
- 'name': 'Customer Issue'
- },
-
- # DocPerm
- {
- 'create': 1,
- 'doctype': 'DocPerm',
- 'permlevel': 0,
- 'role': 'Guest',
- 'write': 1
+ 'name': u'Customer Issue'
},
# DocPerm
@@ -66,18 +58,18 @@
'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'submit': 1,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'System Manager'
+ 'role': u'System Manager'
},
# DocPerm
@@ -85,18 +77,18 @@
'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Maintenance Manager',
+ 'role': u'Maintenance Manager',
'submit': 1,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Maintenance Manager'
+ 'role': u'Maintenance Manager'
},
# DocPerm
@@ -104,40 +96,50 @@
'amend': 1,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Maintenance User',
+ 'role': u'Maintenance User',
'submit': 1,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Maintenance User'
+ 'role': u'Maintenance User'
+ },
+
+ # DocPerm
+ {
+ 'create': 1,
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Guest',
+ 'write': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Customer Issue',
- 'oldfieldtype': 'Section Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'customer_issue',
+ 'fieldtype': u'Section Break',
+ 'label': u'Customer Issue',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'naming_series',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'naming_series',
+ 'fieldtype': u'Select',
'in_filter': 0,
- 'label': 'Series',
+ 'label': u'Series',
'no_copy': 1,
- 'oldfieldname': 'naming_series',
- 'oldfieldtype': 'Select',
- 'options': '\nCI/2010-2011/',
+ 'oldfieldname': u'naming_series',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nCI/2010-2011/',
'permlevel': 0,
'reqd': 1,
'search_index': 0
@@ -145,17 +147,17 @@
# DocField
{
- 'colour': 'White:FFF',
- 'default': 'Open',
- 'doctype': 'DocField',
- 'fieldname': 'status',
- 'fieldtype': 'Select',
+ 'colour': u'White:FFF',
+ 'default': u'Open',
+ 'doctype': u'DocField',
+ 'fieldname': u'status',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Status',
+ 'label': u'Status',
'no_copy': 1,
- 'oldfieldname': 'status',
- 'oldfieldtype': 'Select',
- 'options': '\nOpen\nClosed\nWork In Progress\nCancelled',
+ 'oldfieldname': u'status',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nOpen\nClosed\nWork In Progress\nCancelled',
'permlevel': 0,
'reqd': 1,
'search_index': 1
@@ -163,14 +165,14 @@
# DocField
{
- 'default': 'Today',
- 'doctype': 'DocField',
- 'fieldname': 'complaint_date',
- 'fieldtype': 'Date',
+ 'default': u'Today',
+ 'doctype': u'DocField',
+ 'fieldname': u'complaint_date',
+ 'fieldtype': u'Date',
'in_filter': 1,
- 'label': 'Issue Date',
- 'oldfieldname': 'complaint_date',
- 'oldfieldtype': 'Date',
+ 'label': u'Issue Date',
+ 'oldfieldname': u'complaint_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'reqd': 1,
'search_index': 1
@@ -178,142 +180,143 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'complaint_raised_by',
- 'fieldtype': 'Data',
- 'label': 'Raised By',
- 'oldfieldname': 'complaint_raised_by',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'complaint_raised_by',
+ 'fieldtype': u'Data',
+ 'label': u'Raised By',
+ 'oldfieldname': u'complaint_raised_by',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'from_company',
- 'fieldtype': 'Data',
- 'label': 'From Company',
- 'oldfieldname': 'from_company',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'from_company',
+ 'fieldtype': u'Data',
+ 'label': u'From Company',
+ 'oldfieldname': u'from_company',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'service_address',
- 'fieldtype': 'Small Text',
- 'label': 'Service Address',
- 'oldfieldname': 'service_address',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'service_address',
+ 'fieldtype': u'Small Text',
+ 'label': u'Service Address',
+ 'oldfieldname': u'service_address',
+ 'oldfieldtype': u'Small Text',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'customer',
- 'fieldtype': 'Link',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'customer',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Customer',
- 'oldfieldname': 'customer',
- 'oldfieldtype': 'Link',
- 'options': 'Customer',
+ 'label': u'Customer',
+ 'oldfieldname': u'customer',
+ 'oldfieldtype': u'Link',
+ 'options': u'Customer',
'permlevel': 0,
'print_hide': 1,
'reqd': 1,
'search_index': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'customer_address',
- 'fieldtype': 'Link',
- 'label': 'Customer Address',
- 'options': 'Address',
+ 'doctype': u'DocField',
+ 'fieldname': u'customer_address',
+ 'fieldtype': u'Link',
+ 'label': u'Customer Address',
+ 'options': u'Address',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'contact_person',
- 'fieldtype': 'Link',
- 'label': 'Contact Person',
- 'options': 'Contact',
+ 'doctype': u'DocField',
+ 'fieldname': u'contact_person',
+ 'fieldtype': u'Link',
+ 'label': u'Contact Person',
+ 'options': u'Contact',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'customer_name',
- 'fieldtype': 'Data',
- 'label': 'Name',
+ 'doctype': u'DocField',
+ 'fieldname': u'customer_name',
+ 'fieldtype': u'Data',
+ 'label': u'Name',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'address_display',
- 'fieldtype': 'Small Text',
- 'label': 'Address',
+ 'doctype': u'DocField',
+ 'fieldname': u'address_display',
+ 'fieldtype': u'Small Text',
+ 'label': u'Address',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'contact_display',
- 'fieldtype': 'Small Text',
- 'label': 'Contact',
+ 'doctype': u'DocField',
+ 'fieldname': u'contact_display',
+ 'fieldtype': u'Small Text',
+ 'label': u'Contact',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'contact_mobile',
- 'fieldtype': 'Data',
- 'label': 'Mobile No',
+ 'doctype': u'DocField',
+ 'fieldname': u'contact_mobile',
+ 'fieldtype': u'Data',
+ 'label': u'Mobile No',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'contact_email',
- 'fieldtype': 'Data',
- 'label': 'Contact Email',
+ 'doctype': u'DocField',
+ 'fieldname': u'contact_email',
+ 'fieldtype': u'Data',
+ 'label': u'Contact Email',
'permlevel': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'territory',
- 'fieldtype': 'Link',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'territory',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Territory',
- 'oldfieldname': 'territory',
- 'oldfieldtype': 'Link',
- 'options': 'Territory',
+ 'label': u'Territory',
+ 'oldfieldname': u'territory',
+ 'oldfieldtype': u'Link',
+ 'options': u'Territory',
'permlevel': 0,
'print_hide': 1,
'reqd': 0,
@@ -322,11 +325,11 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'customer_group',
- 'fieldtype': 'Link',
- 'label': 'Customer Group',
- 'options': 'Customer Group',
+ 'doctype': u'DocField',
+ 'fieldname': u'customer_group',
+ 'fieldtype': u'Link',
+ 'label': u'Customer Group',
+ 'options': u'Customer Group',
'permlevel': 0,
'print_hide': 1,
'reqd': 0
@@ -334,32 +337,32 @@
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'company',
- 'fieldtype': 'Link',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'company',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Company',
- 'oldfieldname': 'company',
- 'oldfieldtype': 'Link',
- 'options': 'Company',
+ 'label': u'Company',
+ 'oldfieldname': u'company',
+ 'oldfieldtype': u'Link',
+ 'options': u'Company',
'permlevel': 0,
'print_hide': 1,
'reqd': 1,
'search_index': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'fiscal_year',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'fiscal_year',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Fiscal Year',
- 'oldfieldname': 'fiscal_year',
- 'oldfieldtype': 'Select',
- 'options': 'link:Fiscal Year',
+ 'label': u'Fiscal Year',
+ 'oldfieldname': u'fiscal_year',
+ 'oldfieldtype': u'Select',
+ 'options': u'link:Fiscal Year',
'permlevel': 0,
'print_hide': 1,
'reqd': 1,
@@ -368,235 +371,239 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amended_from',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'amended_from',
+ 'fieldtype': u'Data',
'hidden': 1,
- 'label': 'Amended From',
+ 'label': u'Amended From',
'no_copy': 1,
- 'oldfieldname': 'amended_from',
- 'oldfieldtype': 'Data',
+ 'oldfieldname': u'amended_from',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'print_hide': 1,
- 'width': '150px'
+ 'width': u'150px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amendment_date',
- 'fieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'amendment_date',
+ 'fieldtype': u'Date',
'hidden': 1,
- 'label': 'Amendment Date',
+ 'label': u'Amendment Date',
'no_copy': 1,
- 'oldfieldname': 'amendment_date',
- 'oldfieldtype': 'Date',
+ 'oldfieldname': u'amendment_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'print_hide': 1,
- 'width': '100px'
+ 'width': u'100px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Issue Details',
- 'oldfieldtype': 'Section Break',
- 'options': 'Simple',
+ 'doctype': u'DocField',
+ 'fieldname': u'issue_details',
+ 'fieldtype': u'Section Break',
+ 'label': u'Issue Details',
+ 'oldfieldtype': u'Section Break',
+ 'options': u'Simple',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'serial_no',
- 'fieldtype': 'Link',
- 'label': 'Serial No',
- 'options': 'Serial No',
+ 'doctype': u'DocField',
+ 'fieldname': u'serial_no',
+ 'fieldtype': u'Link',
+ 'label': u'Serial No',
+ 'options': u'Serial No',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'item_code',
- 'fieldtype': 'Link',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'item_code',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Item Code',
- 'oldfieldname': 'item_code',
- 'oldfieldtype': 'Link',
- 'options': 'Item',
+ 'label': u'Item Code',
+ 'oldfieldname': u'item_code',
+ 'oldfieldtype': u'Link',
+ 'options': u'Item',
'permlevel': 0,
'reqd': 0,
'search_index': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': 'eval:doc.item_code',
- 'doctype': 'DocField',
- 'fieldname': 'item_name',
- 'fieldtype': 'Data',
- 'label': 'Item Name',
- 'oldfieldname': 'item_name',
- 'oldfieldtype': 'Data',
+ 'colour': u'White:FFF',
+ 'depends_on': u'eval:doc.item_code',
+ 'doctype': u'DocField',
+ 'fieldname': u'item_name',
+ 'fieldtype': u'Data',
+ 'label': u'Item Name',
+ 'oldfieldname': u'item_name',
+ 'oldfieldtype': u'Data',
'permlevel': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': 'eval:doc.item_code',
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Small Text',
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Small Text',
+ 'colour': u'White:FFF',
+ 'depends_on': u'eval:doc.item_code',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Small Text',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1,
- 'width': '300px'
+ 'width': u'300px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'complaint',
- 'fieldtype': 'Small Text',
- 'label': 'Issue',
+ 'doctype': u'DocField',
+ 'fieldname': u'complaint',
+ 'fieldtype': u'Small Text',
+ 'label': u'Issue',
'no_copy': 1,
- 'oldfieldname': 'complaint',
- 'oldfieldtype': 'Small Text',
+ 'oldfieldname': u'complaint',
+ 'oldfieldtype': u'Small Text',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'warranty_amc_status',
- 'fieldtype': 'Select',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'warranty_amc_status',
+ 'fieldtype': u'Select',
'hidden': 0,
'in_filter': 1,
- 'label': 'Warranty / AMC Status',
- 'options': '\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC',
+ 'label': u'Warranty / AMC Status',
+ 'options': u'\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'warranty_expiry_date',
- 'fieldtype': 'Date',
- 'label': 'Warranty Expiry Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'warranty_expiry_date',
+ 'fieldtype': u'Date',
+ 'label': u'Warranty Expiry Date',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'amc_expiry_date',
- 'fieldtype': 'Date',
- 'label': 'AMC Expiry Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'amc_expiry_date',
+ 'fieldtype': u'Date',
+ 'label': u'AMC Expiry Date',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'allocated_on',
- 'fieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'allocated_on',
+ 'fieldtype': u'Date',
'in_filter': 1,
- 'label': 'Allocated On',
- 'oldfieldname': 'allocated_on',
- 'oldfieldtype': 'Date',
+ 'label': u'Allocated On',
+ 'oldfieldname': u'allocated_on',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'search_index': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'allocated_to',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'allocated_to',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Allocated To',
- 'oldfieldname': 'allocated_to',
- 'oldfieldtype': 'Link',
- 'options': 'Profile',
+ 'label': u'Allocated To',
+ 'oldfieldname': u'allocated_to',
+ 'oldfieldtype': u'Link',
+ 'options': u'Profile',
'permlevel': 0,
'search_index': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Resolution Detail',
- 'oldfieldtype': 'Section Break',
- 'options': 'Simple',
+ 'doctype': u'DocField',
+ 'fieldname': u'resolution_detail',
+ 'fieldtype': u'Section Break',
+ 'label': u'Resolution Detail',
+ 'oldfieldtype': u'Section Break',
+ 'options': u'Simple',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'resolution_details',
- 'fieldtype': 'Text',
- 'label': 'Resolution Details',
+ 'doctype': u'DocField',
+ 'fieldname': u'resolution_details',
+ 'fieldtype': u'Text',
+ 'label': u'Resolution Details',
'no_copy': 1,
- 'oldfieldname': 'resolution_details',
- 'oldfieldtype': 'Text',
+ 'oldfieldname': u'resolution_details',
+ 'oldfieldtype': u'Text',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break2',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'resolution_date',
- 'fieldtype': 'Date',
+ 'doctype': u'DocField',
+ 'fieldname': u'resolution_date',
+ 'fieldtype': u'Date',
'in_filter': 1,
- 'label': 'Resolution Date',
+ 'label': u'Resolution Date',
'no_copy': 1,
- 'oldfieldname': 'resolution_date',
- 'oldfieldtype': 'Date',
+ 'oldfieldname': u'resolution_date',
+ 'oldfieldtype': u'Date',
'permlevel': 0,
'search_index': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'resolved_by',
- 'fieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'resolved_by',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Resolved By',
+ 'label': u'Resolved By',
'no_copy': 1,
- 'oldfieldname': 'resolved_by',
- 'oldfieldtype': 'Link',
- 'options': 'Sales Person',
+ 'oldfieldname': u'resolved_by',
+ 'oldfieldtype': u'Link',
+ 'options': u'Sales Person',
'permlevel': 0,
'search_index': 1
},
@@ -604,24 +611,26 @@
# DocField
{
'allow_on_submit': 0,
- 'colour': 'White:FFF',
- 'depends_on': 'eval:!doc.__islocal',
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Next Steps',
- 'oldfieldtype': 'Section Break',
+ 'colour': u'White:FFF',
+ 'depends_on': u'eval:!doc.__islocal',
+ 'doctype': u'DocField',
+ 'fieldname': u'next_steps',
+ 'fieldtype': u'Section Break',
+ 'label': u'Next Steps',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
'allow_on_submit': 1,
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Make Maintenance Visit',
- 'oldfieldtype': 'Button',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'make_maintenance_visit',
+ 'fieldtype': u'Button',
+ 'label': u'Make Maintenance Visit',
+ 'oldfieldtype': u'Button',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
}
]
\ No newline at end of file
diff --git a/erpnext/support/doctype/item_maintenance_detail/item_maintenance_detail.txt b/erpnext/support/doctype/item_maintenance_detail/item_maintenance_detail.txt
index e323498..b6345d7 100644
--- a/erpnext/support/doctype/item_maintenance_detail/item_maintenance_detail.txt
+++ b/erpnext/support/doctype/item_maintenance_detail/item_maintenance_detail.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:06',
+ 'creation': '2012-03-27 14:36:41',
'docstatus': 0,
- 'modified': '2012-03-21 14:57:06',
+ 'modified': '2012-03-27 14:36:41',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.txt b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.txt
index 5048c85..56469c3 100644
--- a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.txt
+++ b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:09',
+ 'creation': '2012-03-27 14:36:41',
'docstatus': 0,
- 'modified': '2012-03-21 14:09:46',
+ 'modified': '2012-03-27 14:45:49',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -17,6 +17,7 @@
'colour': u'White:FFF',
'default_print_format': u'Standard',
'doctype': 'DocType',
+ 'is_submittable': 1,
'module': u'Support',
'name': '__common__',
'search_fields': u'status,customer,customer_name, sales_order_no',
@@ -92,6 +93,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'customer_details',
'fieldtype': u'Section Break',
'label': u'Customer Details',
'oldfieldtype': u'Section Break',
@@ -102,6 +104,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break0',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0
@@ -201,6 +204,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break1',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0
@@ -310,6 +314,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'items',
'fieldtype': u'Section Break',
'label': u'Items',
'oldfieldtype': u'Section Break',
@@ -336,6 +341,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'get_items',
'fieldtype': u'Button',
'label': u'Get Items',
'oldfieldtype': u'Button',
@@ -359,6 +365,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'schedule',
'fieldtype': u'Section Break',
'label': u'Schedule',
'oldfieldtype': u'Section Break',
@@ -370,6 +377,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'generate_schedule',
'fieldtype': u'Button',
'label': u'Generate Schedule',
'oldfieldtype': u'Button',
diff --git a/erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt b/erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt
index b526538..8dc9b91 100644
--- a/erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt
+++ b/erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:09',
+ 'creation': '2012-03-27 14:36:42',
'docstatus': 0,
- 'modified': '2012-03-21 14:10:17',
+ 'modified': '2012-03-27 14:36:42',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/support/doctype/maintenance_visit/maintenance_visit.txt b/erpnext/support/doctype/maintenance_visit/maintenance_visit.txt
index 6643db5..8b39a1e 100644
--- a/erpnext/support/doctype/maintenance_visit/maintenance_visit.txt
+++ b/erpnext/support/doctype/maintenance_visit/maintenance_visit.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:09',
+ 'creation': '2012-03-27 14:36:42',
'docstatus': 0,
- 'modified': '2012-03-21 14:11:12',
+ 'modified': '2012-03-27 14:45:49',
'modified_by': u'Administrator',
'owner': u'ashwini@webnotestech.com'
},
@@ -17,6 +17,7 @@
'colour': u'White:FFF',
'default_print_format': u'Standard',
'doctype': 'DocType',
+ 'is_submittable': 1,
'module': u'Support',
'name': '__common__',
'search_fields': u'status,maintenance_type,customer,customer_name, address,mntc_date,company,fiscal_year',
@@ -113,6 +114,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'customer_details',
'fieldtype': u'Section Break',
'label': u'Customer Details',
'oldfieldtype': u'Section Break',
@@ -123,6 +125,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break0',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0
@@ -247,6 +250,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break1',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -348,6 +352,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'maintenance_details',
'fieldtype': u'Section Break',
'label': u'Maintenance Details',
'oldfieldtype': u'Section Break',
@@ -388,6 +393,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break2',
'fieldtype': u'Column Break',
'oldfieldtype': u'Column Break',
'permlevel': 0,
@@ -429,6 +435,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'get_items',
'fieldtype': u'Button',
'label': u'Get Items',
'oldfieldtype': u'Button',
@@ -441,6 +448,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'section_break0',
'fieldtype': u'Section Break',
'oldfieldtype': u'Section Break',
'options': u'Simple',
@@ -462,6 +470,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'feedback',
'fieldtype': u'Section Break',
'label': u'Feedback',
'oldfieldtype': u'Section Break',
diff --git a/erpnext/support/doctype/maintenance_visit_detail/maintenance_visit_detail.txt b/erpnext/support/doctype/maintenance_visit_detail/maintenance_visit_detail.txt
index df72e47..cc63aa2 100644
--- a/erpnext/support/doctype/maintenance_visit_detail/maintenance_visit_detail.txt
+++ b/erpnext/support/doctype/maintenance_visit_detail/maintenance_visit_detail.txt
@@ -3,170 +3,161 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:09',
+ 'creation': '2012-03-27 14:36:43',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'ashwini@webnotestech.com'
+ 'modified': '2012-03-27 14:36:43',
+ 'modified_by': u'Administrator',
+ 'owner': u'ashwini@webnotestech.com'
},
# These values are common for all DocType
{
- 'autoname': 'MVD.#####',
- 'colour': 'White:FFF',
+ 'autoname': u'MVD.#####',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Support',
+ 'module': u'Support',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 13
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Maintenance Visit Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Maintenance Visit Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# DocType, Maintenance Visit Detail
{
'doctype': 'DocType',
- 'name': 'Maintenance Visit Detail'
+ 'name': u'Maintenance Visit Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Small Text',
- 'idx': 1,
- 'label': 'Description',
- 'oldfieldname': 'description',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Small Text',
+ 'label': u'Description',
+ 'oldfieldname': u'description',
+ 'oldfieldtype': u'Small Text',
'permlevel': 0,
'reqd': 1,
- 'width': '300px'
+ 'width': u'300px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'service_person',
- 'fieldtype': 'Link',
- 'idx': 2,
- 'label': 'Service Person',
- 'oldfieldname': 'service_person',
- 'oldfieldtype': 'Link',
- 'options': 'Sales Person',
+ 'doctype': u'DocField',
+ 'fieldname': u'service_person',
+ 'fieldtype': u'Link',
+ 'label': u'Service Person',
+ 'oldfieldname': u'service_person',
+ 'oldfieldtype': u'Link',
+ 'options': u'Sales Person',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'work_done',
- 'fieldtype': 'Small Text',
- 'idx': 3,
- 'label': 'Work Done',
- 'oldfieldname': 'work_done',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'work_done',
+ 'fieldtype': u'Small Text',
+ 'label': u'Work Done',
+ 'oldfieldname': u'work_done',
+ 'oldfieldtype': u'Small Text',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'item_code',
- 'fieldtype': 'Link',
- 'idx': 4,
- 'label': 'Item Code',
- 'oldfieldname': 'item_code',
- 'oldfieldtype': 'Link',
- 'options': 'Item',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'item_code',
+ 'fieldtype': u'Link',
+ 'label': u'Item Code',
+ 'oldfieldname': u'item_code',
+ 'oldfieldtype': u'Link',
+ 'options': u'Item',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'item_name',
- 'fieldtype': 'Data',
- 'idx': 5,
- 'label': 'Item Name',
- 'oldfieldname': 'item_name',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'item_name',
+ 'fieldtype': u'Data',
+ 'label': u'Item Name',
+ 'oldfieldname': u'item_name',
+ 'oldfieldtype': u'Data',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'serial_no',
- 'fieldtype': 'Small Text',
- 'idx': 6,
- 'label': 'Serial No',
- 'oldfieldname': 'serial_no',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'serial_no',
+ 'fieldtype': u'Small Text',
+ 'label': u'Serial No',
+ 'oldfieldname': u'serial_no',
+ 'oldfieldtype': u'Small Text',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'prevdoc_docname',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'prevdoc_docname',
+ 'fieldtype': u'Data',
'hidden': 0,
- 'idx': 7,
- 'label': 'Against Document No',
+ 'label': u'Against Document No',
'no_copy': 1,
- 'oldfieldname': 'prevdoc_docname',
- 'oldfieldtype': 'Data',
+ 'oldfieldname': u'prevdoc_docname',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'print_hide': 1,
'report_hide': 1,
- 'width': '160px'
+ 'width': u'160px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'prevdoc_detail_docname',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'prevdoc_detail_docname',
+ 'fieldtype': u'Data',
'hidden': 1,
- 'idx': 8,
- 'label': 'Against Document Detail No',
+ 'label': u'Against Document Detail No',
'no_copy': 1,
- 'oldfieldname': 'prevdoc_detail_docname',
- 'oldfieldtype': 'Data',
+ 'oldfieldname': u'prevdoc_detail_docname',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'print_hide': 1,
'report_hide': 1,
- 'width': '160px'
+ 'width': u'160px'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'prevdoc_doctype',
- 'fieldtype': 'Data',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'prevdoc_doctype',
+ 'fieldtype': u'Data',
'hidden': 0,
- 'idx': 9,
- 'label': 'Document Type',
+ 'label': u'Document Type',
'no_copy': 1,
- 'oldfieldname': 'prevdoc_doctype',
- 'oldfieldtype': 'Data',
+ 'oldfieldname': u'prevdoc_doctype',
+ 'oldfieldtype': u'Data',
'permlevel': 1,
'print_hide': 1,
'report_hide': 1,
- 'width': '150px'
+ 'width': u'150px'
}
]
\ No newline at end of file
diff --git a/erpnext/support/doctype/support_ticket/listview.js b/erpnext/support/doctype/support_ticket/listview.js
new file mode 100644
index 0000000..87c1224
--- /dev/null
+++ b/erpnext/support/doctype/support_ticket/listview.js
@@ -0,0 +1,45 @@
+// render
+wn.doclistviews['Support Ticket'] = wn.views.ListView.extend({
+ init: function(d) {
+ this._super(d)
+ this.fields = this.fields.concat([
+ "`tabSupport Ticket`.status",
+ "`tabSupport Ticket`.subject",
+ "`tabSupport Ticket`.description"
+ ]);
+ this.stats = this.stats.concat(['status']);
+ },
+
+ prepare_data: function(data) {
+ this._super(data);
+ if(data.status=='Open' || data.status=='To Reply') {
+ data.label_type = 'important'
+ }
+ else if(data.status=='Closed') {
+ data.label_type = 'success'
+ }
+ else if(data.status=='Hold') {
+ data.label_type = 'info'
+ }
+ else if(data.status=='Waiting for Customer') {
+ data.label_type = 'info'
+ data.status = 'Waiting'
+ }
+ data.status_html = repl('<span class="label label-%(label_type)s">%(status)s</span>', data);
+
+ data.description = data.description + ' | ' + data.subject;
+
+ // description
+ if(data.description && data.description.length > 50) {
+ data.description = '<span title="'+data.description+'">' + data.description.substr(0,50) + '...</span>';
+ }
+ },
+
+ columns: [
+ {width: '20%', content:'name'},
+ {width: '10%', content:'status_html'},
+ {width: '56%', content:'tags+description', css: {color:'#aaa'}},
+ {width: '14%', content:'modified', css: {'text-align': 'right', 'color':'#777'}}
+ ]
+
+});
diff --git a/erpnext/support/doctype/support_ticket/support_ticket.js b/erpnext/support/doctype/support_ticket/support_ticket.js
index 86264a6..a51b83a 100644
--- a/erpnext/support/doctype/support_ticket/support_ticket.js
+++ b/erpnext/support/doctype/support_ticket/support_ticket.js
@@ -73,7 +73,7 @@
cur_frm.fields_dict['Thread HTML'].wrapper.innerHTML = '';
// render first message
- new EmailMessage(cur_frm.fields_dict['Thread HTML'].wrapper, {
+ new EmailMessage($a(cur_frm.fields_dict['Thread HTML'].wrapper, 'div'), {
from_email: doc.raised_by,
creation: doc.creation,
mail: doc.description,
@@ -81,8 +81,8 @@
}, null, -1)
// render thread
- cs.thread_list = new wn.widgets.Listing({
- parent: cur_frm.fields_dict['Thread HTML'].wrapper,
+ cs.thread_list = new wn.ui.Listing({
+ parent: $a(cur_frm.fields_dict['Thread HTML'].wrapper, 'div'),
no_result_message: 'No responses yet',
get_query: function() {
return 'select mail, from_email, creation, content_type '+
@@ -188,7 +188,7 @@
);
// show only first and last message
- if(idx==-1 || list && list.values.length-1==idx) {
+ if(idx==-1 || list && list.data.length-1==idx) {
$ds(this.message)
}
diff --git a/erpnext/support/doctype/support_ticket/support_ticket.txt b/erpnext/support/doctype/support_ticket/support_ticket.txt
index bcdda14..67e60c2 100644
--- a/erpnext/support/doctype/support_ticket/support_ticket.txt
+++ b/erpnext/support/doctype/support_ticket/support_ticket.txt
@@ -3,50 +3,49 @@
# These values are common in all dictionaries
{
- 'creation': '2011-05-23 12:37:01',
+ 'creation': '2012-03-27 14:36:43',
'docstatus': 0,
- 'modified': '2012-01-05 16:29:45',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:43',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1311584009',
+ '_last_update': u'1311584009',
'allow_attach': 1,
'allow_trash': 1,
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
- 'module': 'Support',
+ 'module': u'Support',
'name': '__common__',
- 'search_fields': 'status,customer,allocated_to,subject,raised_by',
- 'section_style': 'Tray',
- 'server_code_error': ' ',
+ 'search_fields': u'status,customer,allocated_to,subject,raised_by',
+ 'section_style': u'Tray',
+ 'server_code_error': u' ',
'show_in_menu': 0,
- 'subject': '%(subject)s',
- 'tag_fields': 'status,allocated_to',
+ 'subject': u'%(subject)s',
+ 'tag_fields': u'status,allocated_to',
'version': 153
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Support Ticket',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Support Ticket',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
'amend': 0,
- 'cancel': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Support Ticket',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Support Ticket',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1,
'submit': 0
},
@@ -54,67 +53,72 @@
# DocType, Support Ticket
{
'doctype': 'DocType',
- 'name': 'Support Ticket'
+ 'name': u'Support Ticket'
},
# DocPerm
{
+ 'cancel': 0,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Guest',
+ 'role': u'Guest',
'write': 1
},
# DocPerm
{
+ 'cancel': 0,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Customer',
+ 'role': u'Customer',
'write': 1
},
# DocPerm
{
+ 'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Support Team',
+ 'role': u'Support Team',
'write': 1
},
# DocPerm
{
+ 'cancel': 0,
'create': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'Support Team',
+ 'role': u'Support Team',
'write': 1
},
# DocPerm
{
+ 'cancel': 0,
'create': 0,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 2,
- 'role': 'Support Team',
+ 'role': u'Support Team',
'write': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'default': 'Open',
- 'doctype': 'DocField',
- 'fieldname': 'status',
- 'fieldtype': 'Select',
+ 'colour': u'White:FFF',
+ 'default': u'Open',
+ 'doctype': u'DocField',
+ 'fieldname': u'status',
+ 'fieldtype': u'Select',
'in_filter': 0,
- 'label': 'Status',
+ 'label': u'Status',
'no_copy': 1,
- 'oldfieldname': 'status',
- 'oldfieldtype': 'Select',
- 'options': '\nOpen\nTo Reply\nWaiting for Customer\nHold\nClosed',
+ 'oldfieldname': u'status',
+ 'oldfieldtype': u'Select',
+ 'options': u'\nOpen\nTo Reply\nWaiting for Customer\nHold\nClosed',
'permlevel': 1,
'reqd': 0,
'search_index': 1
@@ -122,116 +126,120 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'subject',
- 'fieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'subject',
+ 'fieldtype': u'Text',
'in_filter': 1,
- 'label': 'Subject',
+ 'label': u'Subject',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'depends_on': 'eval:doc.__islocal',
- 'doctype': 'DocField',
- 'fieldname': 'raised_by',
- 'fieldtype': 'Data',
+ 'depends_on': u'eval:doc.__islocal',
+ 'doctype': u'DocField',
+ 'fieldname': u'raised_by',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Raised By (Email)',
- 'oldfieldname': 'raised_by',
- 'oldfieldtype': 'Data',
+ 'label': u'Raised By (Email)',
+ 'oldfieldname': u'raised_by',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'depends_on': 'eval:doc.__islocal',
- 'doctype': 'DocField',
- 'fieldname': 'description',
- 'fieldtype': 'Text',
- 'label': 'Description',
- 'oldfieldname': 'problem_description',
- 'oldfieldtype': 'Text',
+ 'depends_on': u'eval:doc.__islocal',
+ 'doctype': u'DocField',
+ 'fieldname': u'description',
+ 'fieldtype': u'Text',
+ 'label': u'Description',
+ 'oldfieldname': u'problem_description',
+ 'oldfieldtype': u'Text',
'permlevel': 0,
'reqd': 0
},
# DocField
{
- 'depends_on': 'eval:!doc.__islocal',
- 'doctype': 'DocField',
- 'fieldtype': 'HTML',
- 'label': 'Thread HTML',
+ 'depends_on': u'eval:!doc.__islocal',
+ 'doctype': u'DocField',
+ 'fieldname': u'thread_html',
+ 'fieldtype': u'HTML',
+ 'label': u'Thread HTML',
'permlevel': 1
},
# DocField
{
- 'depends_on': 'eval:!doc.__islocal',
- 'doctype': 'DocField',
- 'fieldname': 'new_response',
- 'fieldtype': 'Text',
- 'label': 'New Response',
+ 'depends_on': u'eval:!doc.__islocal',
+ 'doctype': u'DocField',
+ 'fieldname': u'new_response',
+ 'fieldtype': u'Text',
+ 'label': u'New Response',
'permlevel': 0
},
# DocField
{
- 'depends_on': 'eval:!doc.__islocal',
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'label': 'Send',
+ 'depends_on': u'eval:!doc.__islocal',
+ 'doctype': u'DocField',
+ 'fieldname': u'send',
+ 'fieldtype': u'Button',
+ 'label': u'Send',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Additional Info',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'additional_info',
+ 'fieldtype': u'Section Break',
+ 'label': u'Additional Info',
'permlevel': 1
},
# DocField
{
- 'depends_on': 'eval:!doc.__islocal',
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'oldfieldtype': 'Column Break',
+ 'depends_on': u'eval:!doc.__islocal',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 1,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'customer',
- 'fieldtype': 'Link',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'customer',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Customer',
- 'oldfieldname': 'customer',
- 'oldfieldtype': 'Link',
- 'options': 'Customer',
+ 'label': u'Customer',
+ 'oldfieldname': u'customer',
+ 'oldfieldtype': u'Link',
+ 'options': u'Customer',
'permlevel': 1,
'print_hide': 1,
'reqd': 0,
'search_index': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'customer_name',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'customer_name',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Customer Name',
- 'oldfieldname': 'customer_name',
- 'oldfieldtype': 'Data',
+ 'label': u'Customer Name',
+ 'oldfieldname': u'customer_name',
+ 'oldfieldtype': u'Data',
'permlevel': 2,
'reqd': 0,
'search_index': 0
@@ -239,151 +247,152 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'address_display',
- 'fieldtype': 'Small Text',
- 'label': 'Address',
+ 'doctype': u'DocField',
+ 'fieldname': u'address_display',
+ 'fieldtype': u'Small Text',
+ 'label': u'Address',
'permlevel': 2
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'contact_display',
- 'fieldtype': 'Data',
- 'label': 'Contact Name',
+ 'doctype': u'DocField',
+ 'fieldname': u'contact_display',
+ 'fieldtype': u'Data',
+ 'label': u'Contact Name',
'permlevel': 2
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'contact_mobile',
- 'fieldtype': 'Data',
- 'label': 'Mobile No',
+ 'doctype': u'DocField',
+ 'fieldname': u'contact_mobile',
+ 'fieldtype': u'Data',
+ 'label': u'Mobile No',
'permlevel': 2
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'contact_email',
- 'fieldtype': 'Data',
- 'label': 'Contact Email',
- 'oldfieldname': 'contact_no',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'contact_email',
+ 'fieldtype': u'Data',
+ 'label': u'Contact Email',
+ 'oldfieldname': u'contact_no',
+ 'oldfieldtype': u'Data',
'permlevel': 2
},
# DocField
{
- 'default': 'Today',
- 'doctype': 'DocField',
- 'fieldname': 'opening_date',
- 'fieldtype': 'Date',
- 'label': 'Opening Date',
+ 'default': u'Today',
+ 'doctype': u'DocField',
+ 'fieldname': u'opening_date',
+ 'fieldtype': u'Date',
+ 'label': u'Opening Date',
'no_copy': 1,
- 'oldfieldname': 'opening_date',
- 'oldfieldtype': 'Date',
+ 'oldfieldname': u'opening_date',
+ 'oldfieldtype': u'Date',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'opening_time',
- 'fieldtype': 'Time',
- 'label': 'Opening Time',
+ 'doctype': u'DocField',
+ 'fieldname': u'opening_time',
+ 'fieldtype': u'Time',
+ 'label': u'Opening Time',
'no_copy': 1,
- 'oldfieldname': 'opening_time',
- 'oldfieldtype': 'Time',
+ 'oldfieldname': u'opening_time',
+ 'oldfieldtype': u'Time',
'permlevel': 1
},
# DocField
{
- 'depends_on': 'eval:!doc.__islocal',
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'oldfieldtype': 'Column Break',
+ 'depends_on': u'eval:!doc.__islocal',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': 'eval:!doc.__islocal',
- 'doctype': 'DocField',
- 'fieldname': 'allocated_to',
- 'fieldtype': 'Link',
+ 'colour': u'White:FFF',
+ 'depends_on': u'eval:!doc.__islocal',
+ 'doctype': u'DocField',
+ 'fieldname': u'allocated_to',
+ 'fieldtype': u'Link',
'in_filter': 1,
- 'label': 'Allocated To',
- 'oldfieldname': 'allocated_to',
- 'oldfieldtype': 'Link',
- 'options': 'Profile',
+ 'label': u'Allocated To',
+ 'oldfieldname': u'allocated_to',
+ 'oldfieldtype': u'Link',
+ 'options': u'Profile',
'permlevel': 1,
'search_index': 1
},
# DocField
{
- 'depends_on': 'eval:!doc.__islocal',
- 'doctype': 'DocField',
- 'fieldname': 'resolution_details',
- 'fieldtype': 'Text',
- 'label': 'Resolution Details',
+ 'depends_on': u'eval:!doc.__islocal',
+ 'doctype': u'DocField',
+ 'fieldname': u'resolution_details',
+ 'fieldtype': u'Text',
+ 'label': u'Resolution Details',
'no_copy': 1,
- 'oldfieldname': 'resolution_details',
- 'oldfieldtype': 'Text',
+ 'oldfieldname': u'resolution_details',
+ 'oldfieldtype': u'Text',
'permlevel': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': 'eval:!doc.__islocal',
- 'doctype': 'DocField',
- 'fieldname': 'resolution_date',
- 'fieldtype': 'Date',
+ 'colour': u'White:FFF',
+ 'depends_on': u'eval:!doc.__islocal',
+ 'doctype': u'DocField',
+ 'fieldname': u'resolution_date',
+ 'fieldtype': u'Date',
'in_filter': 0,
- 'label': 'Resolution Date',
+ 'label': u'Resolution Date',
'no_copy': 1,
- 'oldfieldname': 'resolution_date',
- 'oldfieldtype': 'Date',
+ 'oldfieldname': u'resolution_date',
+ 'oldfieldtype': u'Date',
'permlevel': 1,
'search_index': 0
},
# DocField
{
- 'depends_on': 'eval:!doc.__islocal',
- 'doctype': 'DocField',
- 'fieldname': 'resolution_time',
- 'fieldtype': 'Time',
- 'label': 'Resolution Time',
- 'oldfieldname': 'resolution_time',
- 'oldfieldtype': 'Time',
+ 'depends_on': u'eval:!doc.__islocal',
+ 'doctype': u'DocField',
+ 'fieldname': u'resolution_time',
+ 'fieldtype': u'Time',
+ 'label': u'Resolution Time',
+ 'oldfieldname': u'resolution_time',
+ 'oldfieldtype': u'Time',
'permlevel': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'content_type',
- 'fieldtype': 'Data',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'content_type',
+ 'fieldtype': u'Data',
'hidden': 1,
- 'label': 'Content Type',
+ 'label': u'Content Type',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'file_list',
- 'fieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'file_list',
+ 'fieldtype': u'Text',
'hidden': 1,
- 'label': 'File List',
+ 'label': u'File List',
'no_copy': 1,
'permlevel': 0,
'print_hide': 1
@@ -391,13 +400,13 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'naming_series',
- 'fieldtype': 'Select',
+ 'doctype': u'DocField',
+ 'fieldname': u'naming_series',
+ 'fieldtype': u'Select',
'hidden': 1,
- 'label': 'Series',
+ 'label': u'Series',
'no_copy': 1,
- 'options': 'SUP',
+ 'options': u'SUP',
'permlevel': 0,
'print_hide': 1,
'reqd': 0,
diff --git a/erpnext/support/doctype/support_ticket_response/support_ticket_response.txt b/erpnext/support/doctype/support_ticket_response/support_ticket_response.txt
index 036601f..7209264 100644
--- a/erpnext/support/doctype/support_ticket_response/support_ticket_response.txt
+++ b/erpnext/support/doctype/support_ticket_response/support_ticket_response.txt
@@ -3,65 +3,62 @@
# These values are common in all dictionaries
{
- 'creation': '2011-05-23 14:50:48',
+ 'creation': '2012-03-27 14:36:44',
'docstatus': 0,
- 'modified': '2011-05-24 10:17:30',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:44',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Support',
+ 'module': u'Support',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 4
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Support Ticket Response',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Support Ticket Response',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, Support Ticket Response
{
'doctype': 'DocType',
- 'name': 'Support Ticket Response'
+ 'name': u'Support Ticket Response'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'mail',
- 'fieldtype': 'Text',
- 'idx': 1,
- 'label': 'Mail'
+ 'doctype': u'DocField',
+ 'fieldname': u'mail',
+ 'fieldtype': u'Text',
+ 'label': u'Mail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'from_email',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'From Email'
+ 'doctype': u'DocField',
+ 'fieldname': u'from_email',
+ 'fieldtype': u'Data',
+ 'label': u'From Email'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'content_type',
- 'fieldtype': 'Data',
- 'idx': 3,
- 'label': 'Content Type'
+ 'doctype': u'DocField',
+ 'fieldname': u'content_type',
+ 'fieldtype': u'Data',
+ 'label': u'Content Type'
}
]
\ No newline at end of file
diff --git a/erpnext/utilities/Module Def/Utilities/Utilities.txt b/erpnext/utilities/Module Def/Utilities/Utilities.txt
deleted file mode 100644
index 98b4d0f..0000000
--- a/erpnext/utilities/Module Def/Utilities/Utilities.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-# Module Def, Utilities
-[
-
- # These values are common in all dictionaries
- {
- 'creation': '2011-07-01 17:46:25',
- 'docstatus': 0,
- 'modified': '2011-07-01 17:47:34',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
- },
-
- # These values are common for all Module Def
- {
- 'disabled': 'No',
- 'doctype': 'Module Def',
- 'is_hidden': 'No',
- 'module_label': 'Utilities',
- 'module_name': 'Utilities',
- 'name': '__common__'
- },
-
- # Module Def, Utilities
- {
- 'doctype': 'Module Def',
- 'name': 'Utilities'
- }
-]
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/activity_dashboard_control/activity_dashboard_control.txt b/erpnext/utilities/doctype/activity_dashboard_control/activity_dashboard_control.txt
index 58f489e..054f2d4 100644
--- a/erpnext/utilities/doctype/activity_dashboard_control/activity_dashboard_control.txt
+++ b/erpnext/utilities/doctype/activity_dashboard_control/activity_dashboard_control.txt
@@ -3,28 +3,28 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:51',
+ 'creation': '2012-03-27 14:36:45',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:45',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'issingle': 1,
- 'module': 'Utilities',
+ 'module': u'Utilities',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 42
},
# DocType, Activity Dashboard Control
{
'doctype': 'DocType',
- 'name': 'Activity Dashboard Control'
+ 'name': u'Activity Dashboard Control'
}
]
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/address/address.js b/erpnext/utilities/doctype/address/address.js
index fc274ef..8949c5a 100644
--- a/erpnext/utilities/doctype/address/address.js
+++ b/erpnext/utilities/doctype/address/address.js
@@ -17,5 +17,28 @@
cur_frm.cscript.onload = function(doc, cdt, cdn) {
if(doc.customer) cur_frm.add_fetch('customer', 'customer_name', 'customer_name');
if(doc.supplier) cur_frm.add_fetch('supplier', 'supplier_name', 'supplier_name');
+
+ var route = wn.get_route();
+ if(route[1]=='Supplier') {
+ var supplier = locals.Supplier[route[2]]
+ doc.supplier = supplier.name;
+ doc.supplier_name = supplier.supplier_name;
+ doc.address_type = 'Office';
+ } else if(route[1]=='Customer') {
+ var customer = locals.Customer[route[2]]
+ doc.customer = customer.name;
+ doc.customer_name = customer.customer_name;
+ doc.address_type = 'Office';
+ } else if(route[1]=='Sales Partner') {
+ var sp = locals['Sales Partner'][route[2]];
+ doc.sales_partner = sp.name;
+ doc.address_type = 'Office';
+ }
}
+cur_frm.cscript.hide_dialog = function() {
+ if(cur_frm.address_list)
+ cur_frm.address_list.run();
+}
+
+
diff --git a/erpnext/utilities/doctype/address/address.txt b/erpnext/utilities/doctype/address/address.txt
index 776321b..56bbbe5 100644
--- a/erpnext/utilities/doctype/address/address.txt
+++ b/erpnext/utilities/doctype/address/address.txt
@@ -3,114 +3,115 @@
# These values are common in all dictionaries
{
- 'creation': '2011-05-24 14:57:59',
+ 'creation': '2012-03-27 14:36:45',
'docstatus': 0,
- 'modified': '2011-11-23 13:21:00',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:45',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1319016431',
+ '_last_update': u'1319016431',
'allow_trash': 1,
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
- 'document_type': 'Master',
+ 'document_type': u'Master',
'in_dialog': 1,
- 'module': 'Utilities',
+ 'module': u'Utilities',
'name': '__common__',
- 'search_fields': 'customer, supplier, sales_partner, country, state',
- 'section_style': 'Simple',
+ 'search_fields': u'customer, supplier, sales_partner, country, state',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 43
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Address',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Address',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Address',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Address',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
- 'role': 'All',
+ 'role': u'All',
'write': 1
},
# DocType, Address
{
'doctype': 'DocType',
- 'name': 'Address'
+ 'name': u'Address'
},
# DocPerm
{
- 'doctype': 'DocPerm'
+ 'doctype': u'DocPerm'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Address Details',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'address_details',
+ 'fieldtype': u'Section Break',
+ 'label': u'Address Details',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': '<em>e.g. Office, Billing, Shipping</em>',
- 'doctype': 'DocField',
- 'fieldname': 'address_type',
- 'fieldtype': 'Data',
- 'label': 'Address Type',
+ 'colour': u'White:FFF',
+ 'description': u'<em>e.g. Office, Billing, Shipping</em>',
+ 'doctype': u'DocField',
+ 'fieldname': u'address_type',
+ 'fieldtype': u'Data',
+ 'label': u'Address Type',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'address_line1',
- 'fieldtype': 'Data',
- 'label': 'Address Line1',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'address_line1',
+ 'fieldtype': u'Data',
+ 'label': u'Address Line1',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'address_line2',
- 'fieldtype': 'Data',
- 'label': 'Address Line2',
+ 'doctype': u'DocField',
+ 'fieldname': u'address_line2',
+ 'fieldtype': u'Data',
+ 'label': u'Address Line2',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'city',
- 'fieldtype': 'Data',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'city',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'City/Town',
+ 'label': u'City/Town',
'permlevel': 0,
'reqd': 1,
'search_index': 1
@@ -118,172 +119,173 @@
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'pincode',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'pincode',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Pincode',
+ 'label': u'Pincode',
'permlevel': 0,
'search_index': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'country',
- 'fieldtype': 'Select',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'country',
+ 'fieldtype': u'Select',
'in_filter': 1,
- 'label': 'Country',
- 'options': 'link:Country',
+ 'label': u'Country',
+ 'options': u'link:Country',
'permlevel': 0,
'reqd': 1,
'search_index': 1,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldname': 'state',
- 'fieldtype': 'Data',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'state',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'State',
- 'options': 'Suggest',
+ 'label': u'State',
+ 'options': u'Suggest',
'permlevel': 0,
'search_index': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
'permlevel': 0,
'print_hide': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'phone',
- 'fieldtype': 'Data',
- 'label': 'Phone',
+ 'doctype': u'DocField',
+ 'fieldname': u'phone',
+ 'fieldtype': u'Data',
+ 'label': u'Phone',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'email_id',
- 'fieldtype': 'Data',
- 'label': 'Email Id',
+ 'doctype': u'DocField',
+ 'fieldname': u'email_id',
+ 'fieldtype': u'Data',
+ 'label': u'Email Id',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'fax',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'fax',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Fax',
+ 'label': u'Fax',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': 'eval:!doc.supplier && !doc.sales_partner',
- 'doctype': 'DocField',
- 'fieldname': 'customer',
- 'fieldtype': 'Link',
- 'label': 'Customer',
- 'options': 'Customer',
+ 'colour': u'White:FFF',
+ 'depends_on': u'eval:!doc.supplier && !doc.sales_partner',
+ 'doctype': u'DocField',
+ 'fieldname': u'customer',
+ 'fieldtype': u'Link',
+ 'label': u'Customer',
+ 'options': u'Customer',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': 'eval:!doc.supplier && !doc.sales_partner',
- 'doctype': 'DocField',
- 'fieldname': 'customer_name',
- 'fieldtype': 'Data',
+ 'colour': u'White:FFF',
+ 'depends_on': u'eval:!doc.supplier && !doc.sales_partner',
+ 'doctype': u'DocField',
+ 'fieldname': u'customer_name',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Customer Name',
+ 'label': u'Customer Name',
'permlevel': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': 'eval:!doc.customer && !doc.sales_partner',
- 'doctype': 'DocField',
- 'fieldname': 'supplier',
- 'fieldtype': 'Link',
- 'label': 'Supplier',
- 'options': 'Supplier',
+ 'colour': u'White:FFF',
+ 'depends_on': u'eval:!doc.customer && !doc.sales_partner',
+ 'doctype': u'DocField',
+ 'fieldname': u'supplier',
+ 'fieldtype': u'Link',
+ 'label': u'Supplier',
+ 'options': u'Supplier',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': 'eval:!doc.customer && !doc.sales_partner',
- 'doctype': 'DocField',
- 'fieldname': 'supplier_name',
- 'fieldtype': 'Data',
+ 'colour': u'White:FFF',
+ 'depends_on': u'eval:!doc.customer && !doc.sales_partner',
+ 'doctype': u'DocField',
+ 'fieldname': u'supplier_name',
+ 'fieldtype': u'Data',
'in_filter': 1,
- 'label': 'Supplier Name',
+ 'label': u'Supplier Name',
'permlevel': 1,
'search_index': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': 'eval:!doc.customer && !doc.supplier',
- 'doctype': 'DocField',
- 'fieldname': 'sales_partner',
- 'fieldtype': 'Link',
- 'label': 'Sales Partner',
- 'options': 'Sales Partner',
+ 'colour': u'White:FFF',
+ 'depends_on': u'eval:!doc.customer && !doc.supplier',
+ 'doctype': u'DocField',
+ 'fieldname': u'sales_partner',
+ 'fieldtype': u'Link',
+ 'label': u'Sales Partner',
+ 'options': u'Sales Partner',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'default': '0',
- 'description': 'Check to make primary address',
- 'doctype': 'DocField',
- 'fieldname': 'is_primary_address',
- 'fieldtype': 'Check',
- 'label': 'Is Primary Address',
+ 'colour': u'White:FFF',
+ 'default': u'0',
+ 'description': u'Check to make primary address',
+ 'doctype': u'DocField',
+ 'fieldname': u'is_primary_address',
+ 'fieldtype': u'Check',
+ 'label': u'Is Primary Address',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'default': '0',
- 'description': 'Check to make Shipping Address',
- 'doctype': 'DocField',
- 'fieldname': 'is_shipping_address',
- 'fieldtype': 'Check',
- 'label': 'Is Shipping Address',
+ 'colour': u'White:FFF',
+ 'default': u'0',
+ 'description': u'Check to make Shipping Address',
+ 'doctype': u'DocField',
+ 'fieldname': u'is_shipping_address',
+ 'fieldtype': u'Check',
+ 'label': u'Is Shipping Address',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'label': 'Trash Reason',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
'permlevel': 0
}
]
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/bulk_rename_tool/bulk_rename_tool.txt b/erpnext/utilities/doctype/bulk_rename_tool/bulk_rename_tool.txt
index 0a5d877..c18a60f 100644
--- a/erpnext/utilities/doctype/bulk_rename_tool/bulk_rename_tool.txt
+++ b/erpnext/utilities/doctype/bulk_rename_tool/bulk_rename_tool.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2011-07-07 17:47:52',
+ 'creation': '2012-03-27 14:36:46',
'docstatus': 0,
- 'modified': '2012-03-21 14:56:46',
+ 'modified': '2012-03-27 14:45:46',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -18,6 +18,7 @@
'colour': u'White:FFF',
'default_print_format': u'Standard',
'doctype': 'DocType',
+ 'is_submittable': 1,
'module': u'Utilities',
'name': '__common__',
'section_style': u'Simple',
@@ -91,9 +92,35 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'rename',
'fieldtype': u'Button',
'label': u'Rename',
'options': u'do_rename',
'permlevel': 0
+ },
+
+ # DocField
+ {
+ 'depends_on': u'eval:doc.amended_from',
+ 'description': u'The date at which current entry is corrected in the system.',
+ 'doctype': u'DocField',
+ 'fieldname': u'amendment_date',
+ 'fieldtype': u'Date',
+ 'label': u'Amendment Date',
+ 'no_copy': 1,
+ 'permlevel': 0,
+ 'print_hide': 1
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
+ 'fieldname': u'amended_from',
+ 'fieldtype': u'Link',
+ 'label': u'Amended From',
+ 'no_copy': 1,
+ 'options': u'Receivable Voucher',
+ 'permlevel': 1,
+ 'print_hide': 1
}
]
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/contact/contact.js b/erpnext/utilities/doctype/contact/contact.js
index 2aa89c1..9244b79 100644
--- a/erpnext/utilities/doctype/contact/contact.js
+++ b/erpnext/utilities/doctype/contact/contact.js
@@ -18,54 +18,28 @@
cur_frm.cscript.onload = function(doc, cdt, cdn) {
if(doc.customer) cur_frm.add_fetch('customer', 'customer_name', 'customer_name');
if(doc.supplier) cur_frm.add_fetch('supplier', 'supplier_name', 'supplier_name');
-}
-/*
-//---------- on refresh ----------------------
-cur_frm.cscript.refresh = function(doc,cdt,cdn){
-
-}
-
-
-//------------- Trigger on customer ---------------------
-cur_frm.cscript.is_customer = function(doc,cdt,cdn){
- if(!doc.is_customer){
- doc.customer = doc.customer_name = doc.customer_address = doc.customer_group = '';
- refresh_many(['customer','customer_name','customer_address','customer_group']);
+ var route = wn.get_route();
+ if(route[1]=='Supplier') {
+ var supplier = locals.Supplier[route[2]]
+ doc.supplier = supplier.name;
+ doc.supplier_name = supplier.supplier_name;
+ } else if(route[1]=='Customer') {
+ var customer = locals.Customer[route[2]];
+ doc.customer = customer.name;
+ doc.customer_name = customer.customer_name;
+ if(customer.customer_type == 'Individual') {
+ doc.first_name = customer.customer_name;
+ }
+ } else if(route[1]=='Sales Partner') {
+ var sp = locals['Sales Partner'][route[2]];
+ doc.sales_partner = sp.name;
}
}
-//------------- Trigger on supplier -----------------------
-cur_frm.cscript.is_supplier = function(doc,cdt,cdn){
- if(!doc.is_supplier){
- doc.supplier = doc.supplier_name = doc.supplier_address = doc.supplier_type = '';
- refresh_many(['supplier','supplier_address','supplier_name','supplier_type']);
- }
-}
-
-//--------------- Trigger on sales partner ---------------------
-cur_frm.cscript.is_sales_partner = function(doc,cdt,cdn){
- if(!doc.is_sales_partner){
- doc.sales_partner = doc.sales_partner_address = doc.partner_type = '';
- refresh_many(['sales_partner','sales_partner_address','partner_type']);
- }
+cur_frm.cscript.hide_dialog = function() {
+ if(cur_frm.contact_list)
+ cur_frm.contact_list.run();
}
-//----------- Trigger on supplier name ------------------------
-cur_frm.cscript.supplier = function(doc,cdt,cdn){
- arg = {'dt':'Supplier','dn':doc.supplier,'nm':'supplier_name','fld':'supplier_address','type':'supplier_type'};
- get_server_fields('get_address',docstring(arg),'',doc,cdt,cdn,1);
-}
-//------------ Trigger on customer name ------------------------
-cur_frm.cscript.customer = function(doc,cdt,cdn){
- arg = {'dt':'Customer','dn':doc.customer,'nm':'customer_name','fld':'customer_address','type':'customer_group'};
- get_server_fields('get_address',docstring(arg),'',doc,cdt,cdn,1);
-}
-
-//------------ Trigger on sales partner ------------------------
-cur_frm.cscript.sales_partner = function(doc,cdt,cdn){
- arg = {'dt':'Sales Partner','dn':doc.sales_partner,'nm':'partner_name','fld':'sales_partner_address','type':'partner_type'};
- get_server_fields('get_address',docstring(arg),'',doc,cdt,cdn,1);
-}
-*/
diff --git a/erpnext/utilities/doctype/contact/contact.txt b/erpnext/utilities/doctype/contact/contact.txt
index 9167ed4..f385bd6 100644
--- a/erpnext/utilities/doctype/contact/contact.txt
+++ b/erpnext/utilities/doctype/contact/contact.txt
@@ -3,69 +3,55 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:55',
+ 'creation': '2012-03-27 14:36:46',
'docstatus': 0,
- 'modified': '2012-01-23 16:07:56',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:46',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1327314958',
+ '_last_update': u'1327314958',
'allow_trash': 1,
- 'colour': 'White:FFF',
- 'default_print_format': 'Standard',
+ 'colour': u'White:FFF',
+ 'default_print_format': u'Standard',
'doctype': 'DocType',
- 'document_type': 'Master',
+ 'document_type': u'Master',
'in_create': 0,
'in_dialog': 1,
- 'module': 'Utilities',
+ 'module': u'Utilities',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
- 'subject': '%(first_name)s %(last_name)s - Email: %(email_id)s | Contact: %(phone)s | Mobile: %(mobile_no)s',
+ 'subject': u'%(first_name)s %(last_name)s - Email: %(email_id)s | Contact: %(phone)s | Mobile: %(mobile_no)s',
'version': 245
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Contact',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Contact',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Contact',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Contact',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1
},
# DocType, Contact
{
'doctype': 'DocType',
- 'name': 'Contact'
- },
-
- # DocPerm
- {
- 'doctype': 'DocPerm',
- 'permlevel': 0,
- 'role': 'Sales User'
- },
-
- # DocPerm
- {
- 'doctype': 'DocPerm',
- 'permlevel': 0,
- 'role': 'Purchase User'
+ 'name': u'Contact'
},
# DocPerm
@@ -73,35 +59,35 @@
'amend': 0,
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Sales Master Manager',
+ 'role': u'Sales Master Manager',
'submit': 0,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1,
- 'role': 'All',
+ 'role': u'All',
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 2,
- 'role': 'All'
+ 'role': u'All'
},
# DocPerm
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'Purchase Master Manager',
+ 'role': u'Purchase Master Manager',
'write': 1
},
@@ -109,208 +95,225 @@
{
'cancel': 1,
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 1
},
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Sales User'
+ },
+
+ # DocPerm
+ {
+ 'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Purchase User'
+ },
+
# DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
- 'fieldtype': 'Section Break',
- 'label': 'Contact Details',
- 'oldfieldtype': 'Section Break',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
+ 'fieldname': u'contact_details',
+ 'fieldtype': u'Section Break',
+ 'label': u'Contact Details',
+ 'oldfieldtype': u'Section Break',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'first_name',
- 'fieldtype': 'Data',
- 'label': 'First Name',
- 'oldfieldname': 'first_name',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'first_name',
+ 'fieldtype': u'Data',
+ 'label': u'First Name',
+ 'oldfieldname': u'first_name',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'last_name',
- 'fieldtype': 'Data',
- 'label': 'Last Name',
- 'oldfieldname': 'last_name',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'last_name',
+ 'fieldtype': u'Data',
+ 'label': u'Last Name',
+ 'oldfieldname': u'last_name',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': 'eval:!doc.supplier && !doc.sales_partner',
- 'doctype': 'DocField',
- 'fieldname': 'customer',
- 'fieldtype': 'Link',
- 'label': 'Customer',
- 'oldfieldname': 'customer',
- 'oldfieldtype': 'Link',
- 'options': 'Customer',
+ 'colour': u'White:FFF',
+ 'depends_on': u'eval:!doc.supplier && !doc.sales_partner',
+ 'doctype': u'DocField',
+ 'fieldname': u'customer',
+ 'fieldtype': u'Link',
+ 'label': u'Customer',
+ 'oldfieldname': u'customer',
+ 'oldfieldtype': u'Link',
+ 'options': u'Customer',
'permlevel': 0,
'print_hide': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': 'eval:!doc.supplier && !doc.sales_partner',
- 'doctype': 'DocField',
- 'fieldname': 'customer_name',
- 'fieldtype': 'Data',
- 'label': 'Customer Name',
+ 'colour': u'White:FFF',
+ 'depends_on': u'eval:!doc.supplier && !doc.sales_partner',
+ 'doctype': u'DocField',
+ 'fieldname': u'customer_name',
+ 'fieldtype': u'Data',
+ 'label': u'Customer Name',
'permlevel': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': 'eval:!doc.customer && !doc.sales_partner',
- 'doctype': 'DocField',
- 'fieldname': 'supplier',
- 'fieldtype': 'Link',
- 'label': 'Supplier',
- 'options': 'Supplier',
+ 'colour': u'White:FFF',
+ 'depends_on': u'eval:!doc.customer && !doc.sales_partner',
+ 'doctype': u'DocField',
+ 'fieldname': u'supplier',
+ 'fieldtype': u'Link',
+ 'label': u'Supplier',
+ 'options': u'Supplier',
'permlevel': 0,
- 'trigger': 'Client'
+ 'trigger': u'Client'
},
# DocField
{
'allow_on_submit': 0,
- 'colour': 'White:FFF',
- 'depends_on': 'eval:!doc.customer && !doc.sales_partner',
- 'doctype': 'DocField',
- 'fieldname': 'supplier_name',
- 'fieldtype': 'Data',
- 'label': 'Supplier Name',
+ 'colour': u'White:FFF',
+ 'depends_on': u'eval:!doc.customer && !doc.sales_partner',
+ 'doctype': u'DocField',
+ 'fieldname': u'supplier_name',
+ 'fieldtype': u'Data',
+ 'label': u'Supplier Name',
'permlevel': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'depends_on': 'eval:!doc.customer && !doc.supplier',
- 'doctype': 'DocField',
- 'fieldname': 'sales_partner',
- 'fieldtype': 'Link',
- 'label': 'Sales Partner',
- 'options': 'Sales Partner',
+ 'colour': u'White:FFF',
+ 'depends_on': u'eval:!doc.customer && !doc.supplier',
+ 'doctype': u'DocField',
+ 'fieldname': u'sales_partner',
+ 'fieldtype': u'Link',
+ 'label': u'Sales Partner',
+ 'options': u'Sales Partner',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'default': '0',
- 'depends_on': 'eval:(doc.customer || doc.supplier || doc.sales_partner)',
- 'doctype': 'DocField',
- 'fieldname': 'is_primary_contact',
- 'fieldtype': 'Check',
- 'label': 'Is Primary Contact',
- 'oldfieldname': 'is_primary_contact',
- 'oldfieldtype': 'Select',
+ 'colour': u'White:FFF',
+ 'default': u'0',
+ 'depends_on': u'eval:(doc.customer || doc.supplier || doc.sales_partner)',
+ 'doctype': u'DocField',
+ 'fieldname': u'is_primary_contact',
+ 'fieldtype': u'Check',
+ 'label': u'Is Primary Contact',
+ 'oldfieldname': u'is_primary_contact',
+ 'oldfieldtype': u'Select',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'oldfieldtype': 'Column Break',
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break',
+ 'oldfieldtype': u'Column Break',
'permlevel': 0,
- 'width': '50%'
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'email_id',
- 'fieldtype': 'Data',
- 'label': 'Email Id',
- 'oldfieldname': 'email_id',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'email_id',
+ 'fieldtype': u'Data',
+ 'label': u'Email Id',
+ 'oldfieldname': u'email_id',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'phone',
- 'fieldtype': 'Data',
- 'label': 'Phone',
- 'oldfieldname': 'contact_no',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'phone',
+ 'fieldtype': u'Data',
+ 'label': u'Phone',
+ 'oldfieldname': u'contact_no',
+ 'oldfieldtype': u'Data',
'permlevel': 0,
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'mobile_no',
- 'fieldtype': 'Data',
- 'label': 'Mobile No',
- 'oldfieldname': 'mobile_no',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'mobile_no',
+ 'fieldtype': u'Data',
+ 'label': u'Mobile No',
+ 'oldfieldname': u'mobile_no',
+ 'oldfieldtype': u'Data',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Enter department to which this Contact belongs',
- 'doctype': 'DocField',
- 'fieldname': 'department',
- 'fieldtype': 'Data',
- 'label': 'Department',
- 'options': 'Suggest',
+ 'colour': u'White:FFF',
+ 'description': u'Enter department to which this Contact belongs',
+ 'doctype': u'DocField',
+ 'fieldname': u'department',
+ 'fieldtype': u'Data',
+ 'label': u'Department',
+ 'options': u'Suggest',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Enter designation of this Contact',
- 'doctype': 'DocField',
- 'fieldname': 'designation',
- 'fieldtype': 'Data',
- 'label': 'Designation',
- 'options': 'Suggest',
+ 'colour': u'White:FFF',
+ 'description': u'Enter designation of this Contact',
+ 'doctype': u'DocField',
+ 'fieldname': u'designation',
+ 'fieldtype': u'Data',
+ 'label': u'Designation',
+ 'options': u'Suggest',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'trash_reason',
- 'fieldtype': 'Small Text',
- 'label': 'Trash Reason',
- 'oldfieldname': 'trash_reason',
- 'oldfieldtype': 'Small Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'trash_reason',
+ 'fieldtype': u'Small Text',
+ 'label': u'Trash Reason',
+ 'oldfieldname': u'trash_reason',
+ 'oldfieldtype': u'Small Text',
'permlevel': 1
}
]
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/contact_detail/contact_detail.txt b/erpnext/utilities/doctype/contact_detail/contact_detail.txt
index 306491f..e890654 100644
--- a/erpnext/utilities/doctype/contact_detail/contact_detail.txt
+++ b/erpnext/utilities/doctype/contact_detail/contact_detail.txt
@@ -3,96 +3,91 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:08:56',
+ 'creation': '2012-03-27 14:36:46',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:46',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'autoname': 'CD/.#####',
- 'colour': 'White:FFF',
+ 'autoname': u'CD/.#####',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Utilities',
+ 'module': u'Utilities',
'name': '__common__',
- 'section_style': 'Tray',
+ 'section_style': u'Tray',
'show_in_menu': 0,
'version': 5
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Contact Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Contact Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, Contact Detail
{
'doctype': 'DocType',
- 'name': 'Contact Detail'
+ 'name': u'Contact Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'contact_person',
- 'fieldtype': 'Data',
- 'idx': 1,
- 'label': 'Contact Person',
- 'oldfieldname': 'contact_person',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'contact_person',
+ 'fieldtype': u'Data',
+ 'label': u'Contact Person',
+ 'oldfieldname': u'contact_person',
+ 'oldfieldtype': u'Data',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'contact_no',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Contact No',
- 'oldfieldname': 'contact_no',
- 'oldfieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldname': u'contact_no',
+ 'fieldtype': u'Data',
+ 'label': u'Contact No',
+ 'oldfieldname': u'contact_no',
+ 'oldfieldtype': u'Data',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'department',
- 'fieldtype': 'Data',
- 'idx': 3,
- 'label': 'Department',
- 'oldfieldname': 'department',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'department',
+ 'fieldtype': u'Data',
+ 'label': u'Department',
+ 'oldfieldname': u'department',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'designation',
- 'fieldtype': 'Data',
- 'idx': 4,
- 'label': 'Designation',
- 'oldfieldname': 'designation',
- 'oldfieldtype': 'Data'
+ 'doctype': u'DocField',
+ 'fieldname': u'designation',
+ 'fieldtype': u'Data',
+ 'label': u'Designation',
+ 'oldfieldname': u'designation',
+ 'oldfieldtype': u'Data'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'email_id',
- 'fieldtype': 'Small Text',
- 'idx': 5,
- 'label': 'Email Id',
- 'oldfieldname': 'email_id',
- 'oldfieldtype': 'Small Text'
+ 'doctype': u'DocField',
+ 'fieldname': u'email_id',
+ 'fieldtype': u'Small Text',
+ 'label': u'Email Id',
+ 'oldfieldname': u'email_id',
+ 'oldfieldtype': u'Small Text'
}
]
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/gl_mapper/gl_mapper.txt b/erpnext/utilities/doctype/gl_mapper/gl_mapper.txt
index e1ce2a9..ef45427 100644
--- a/erpnext/utilities/doctype/gl_mapper/gl_mapper.txt
+++ b/erpnext/utilities/doctype/gl_mapper/gl_mapper.txt
@@ -3,44 +3,44 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:03',
+ 'creation': '2012-03-27 14:36:46',
'docstatus': 0,
- 'modified': '2011-05-10 11:16:01',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:46',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1305006361',
- 'autoname': 'field:doc_type',
- 'colour': 'White:FFF',
+ '_last_update': u'1305006361',
+ 'autoname': u'field:doc_type',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'module': 'Utilities',
+ 'module': u'Utilities',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 3
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'GL Mapper',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'GL Mapper',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'GL Mapper',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'GL Mapper',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1
},
@@ -48,7 +48,7 @@
# DocType, GL Mapper
{
'doctype': 'DocType',
- 'name': 'GL Mapper'
+ 'name': u'GL Mapper'
},
# DocPerm
@@ -56,43 +56,38 @@
'amend': 0,
'cancel': 0,
'create': 0,
- 'doctype': 'DocPerm',
- 'idx': 1,
- 'role': 'Accounts User',
+ 'doctype': u'DocPerm',
+ 'role': u'Accounts User',
'submit': 0,
'write': 0
},
# DocPerm
{
- 'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 2,
- 'role': 'System Manager',
+ 'doctype': u'DocPerm',
+ 'role': u'System Manager',
'write': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'doc_type',
- 'fieldtype': 'Data',
- 'idx': 1,
- 'label': 'Doc Type',
- 'oldfieldname': 'doc_type',
- 'oldfieldtype': 'Link',
+ 'doctype': u'DocField',
+ 'fieldname': u'doc_type',
+ 'fieldtype': u'Data',
+ 'label': u'Doc Type',
+ 'oldfieldname': u'doc_type',
+ 'oldfieldtype': u'Link',
'reqd': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'fields',
- 'fieldtype': 'Table',
- 'idx': 2,
- 'label': 'Fields',
- 'oldfieldname': 'fields',
- 'oldfieldtype': 'Table',
- 'options': 'GL Mapper Detail'
+ 'doctype': u'DocField',
+ 'fieldname': u'fields',
+ 'fieldtype': u'Table',
+ 'label': u'Fields',
+ 'oldfieldname': u'fields',
+ 'oldfieldtype': u'Table',
+ 'options': u'GL Mapper Detail'
}
]
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/gl_mapper_detail/gl_mapper_detail.txt b/erpnext/utilities/doctype/gl_mapper_detail/gl_mapper_detail.txt
index d35cc06..a62d2e7 100644
--- a/erpnext/utilities/doctype/gl_mapper_detail/gl_mapper_detail.txt
+++ b/erpnext/utilities/doctype/gl_mapper_detail/gl_mapper_detail.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:03',
+ 'creation': '2012-03-27 14:36:46',
'docstatus': 0,
- 'modified': '2012-03-21 14:44:47',
+ 'modified': '2012-03-27 14:36:46',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/utilities/doctype/patch_util/patch_util.txt b/erpnext/utilities/doctype/patch_util/patch_util.txt
index 3ed62b7..9d64305 100644
--- a/erpnext/utilities/doctype/patch_util/patch_util.txt
+++ b/erpnext/utilities/doctype/patch_util/patch_util.txt
@@ -3,28 +3,28 @@
# These values are common in all dictionaries
{
- 'creation': '2010-10-27 14:33:29',
+ 'creation': '2012-03-27 14:36:47',
'docstatus': 0,
- 'modified': '2010-12-21 10:19:44',
- 'modified_by': 'sneha@webnotestech.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:47',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'issingle': 1,
- 'module': 'Utilities',
+ 'module': u'Utilities',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 5
},
# DocType, Patch Util
{
'doctype': 'DocType',
- 'name': 'Patch Util'
+ 'name': u'Patch Util'
}
]
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/profile_control/profile_control.txt b/erpnext/utilities/doctype/profile_control/profile_control.txt
index caaa440..3e6affe 100644
--- a/erpnext/utilities/doctype/profile_control/profile_control.txt
+++ b/erpnext/utilities/doctype/profile_control/profile_control.txt
@@ -3,22 +3,22 @@
# These values are common in all dictionaries
{
- 'creation': '2009-05-29 12:19:21',
+ 'creation': '2012-03-27 14:36:47',
'docstatus': 0,
- 'modified': '2010-11-03 11:03:11',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:47',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'issingle': 1,
- 'module': 'Utilities',
+ 'module': u'Utilities',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 12
},
@@ -26,6 +26,6 @@
# DocType, Profile Control
{
'doctype': 'DocType',
- 'name': 'Profile Control'
+ 'name': u'Profile Control'
}
]
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/receiver_detail/receiver_detail.txt b/erpnext/utilities/doctype/receiver_detail/receiver_detail.txt
index 9e330ba..196883b 100644
--- a/erpnext/utilities/doctype/receiver_detail/receiver_detail.txt
+++ b/erpnext/utilities/doctype/receiver_detail/receiver_detail.txt
@@ -3,70 +3,67 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:19',
+ 'creation': '2012-03-27 14:36:47',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:47',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Utilities',
+ 'module': u'Utilities',
'name': '__common__',
- 'section_style': 'Tray',
- 'server_code_error': ' ',
+ 'section_style': u'Tray',
+ 'server_code_error': u' ',
'version': 2
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Data',
+ 'doctype': u'DocField',
+ 'fieldtype': u'Data',
'name': '__common__',
- 'oldfieldtype': 'Data',
- 'parent': 'Receiver Detail',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'oldfieldtype': u'Data',
+ 'parent': u'Receiver Detail',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, Receiver Detail
{
'doctype': 'DocType',
- 'name': 'Receiver Detail'
+ 'name': u'Receiver Detail'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'customer_name',
- 'idx': 1,
- 'label': 'Customer Name',
- 'oldfieldname': 'customer_name'
+ 'doctype': u'DocField',
+ 'fieldname': u'customer_name',
+ 'label': u'Customer Name',
+ 'oldfieldname': u'customer_name'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'receiver_name',
- 'idx': 2,
- 'label': 'Receiver Name',
- 'oldfieldname': 'receiver_name',
- 'width': '350px'
+ 'doctype': u'DocField',
+ 'fieldname': u'receiver_name',
+ 'label': u'Receiver Name',
+ 'oldfieldname': u'receiver_name',
+ 'width': u'350px'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'mobile_no',
- 'idx': 3,
- 'label': 'Mobile No',
- 'oldfieldname': 'mobile_no',
+ 'doctype': u'DocField',
+ 'fieldname': u'mobile_no',
+ 'label': u'Mobile No',
+ 'oldfieldname': u'mobile_no',
'reqd': 1,
- 'width': '200px'
+ 'width': u'200px'
}
]
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/rename_tool/rename_tool.txt b/erpnext/utilities/doctype/rename_tool/rename_tool.txt
index 3b8a5dd..f84fbd5 100755
--- a/erpnext/utilities/doctype/rename_tool/rename_tool.txt
+++ b/erpnext/utilities/doctype/rename_tool/rename_tool.txt
@@ -3,100 +3,96 @@
# These values are common in all dictionaries
{
- 'creation': '2011-06-27 10:52:02',
+ 'creation': '2012-03-27 14:36:47',
'docstatus': 0,
- 'modified': '2011-07-26 00:59:27',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:47',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1308739509',
+ '_last_update': u'1308739509',
'allow_email': 1,
'allow_print': 1,
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'hide_heading': 0,
'hide_toolbar': 0,
'issingle': 1,
- 'module': 'Utilities',
+ 'module': u'Utilities',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 7
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Rename Tool',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Rename Tool',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Rename Tool',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Rename Tool',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
- 'role': 'System Manager',
+ 'role': u'System Manager',
'write': 1
},
# DocType, Rename Tool
{
'doctype': 'DocType',
- 'name': 'Rename Tool'
+ 'name': u'Rename Tool'
},
# DocPerm
{
- 'doctype': 'DocPerm'
+ 'doctype': u'DocPerm'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'select_doctype',
- 'fieldtype': 'Select',
- 'idx': 1,
- 'label': 'Select DocType',
- 'options': '\nAccount\nCompany\nCustomer\nSupplier\nEmployee\nWarehouse\nItem'
+ 'doctype': u'DocField',
+ 'fieldname': u'select_doctype',
+ 'fieldtype': u'Select',
+ 'label': u'Select DocType',
+ 'options': u'\nAccount\nCompany\nCustomer\nSupplier\nEmployee\nWarehouse\nItem'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'document_to_rename',
- 'fieldtype': 'Link',
- 'idx': 2,
- 'label': 'Document to rename'
+ 'doctype': u'DocField',
+ 'fieldname': u'document_to_rename',
+ 'fieldtype': u'Link',
+ 'label': u'Document to rename'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'new_name',
- 'fieldtype': 'Data',
- 'idx': 3,
- 'label': 'New Name'
+ 'doctype': u'DocField',
+ 'fieldname': u'new_name',
+ 'fieldtype': u'Data',
+ 'label': u'New Name'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Button',
- 'idx': 4,
- 'label': 'Rename',
- 'options': 'rename'
+ 'doctype': u'DocField',
+ 'fieldname': u'rename',
+ 'fieldtype': u'Button',
+ 'label': u'Rename',
+ 'options': u'rename'
}
]
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/reposting_tool/reposting_tool.txt b/erpnext/utilities/doctype/reposting_tool/reposting_tool.txt
index ba165de..453902b 100644
--- a/erpnext/utilities/doctype/reposting_tool/reposting_tool.txt
+++ b/erpnext/utilities/doctype/reposting_tool/reposting_tool.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:19',
+ 'creation': '2012-03-27 14:36:47',
'docstatus': 0,
- 'modified': '2012-03-21 14:56:21',
+ 'modified': '2012-03-27 14:36:47',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -77,6 +77,7 @@
{
'colour': u'White:FFF',
'doctype': u'DocField',
+ 'fieldname': u'repost_bin',
'fieldtype': u'Button',
'label': u'Repost Bin',
'trigger': u'Client'
@@ -85,6 +86,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'repost_account_balances',
'fieldtype': u'Button',
'label': u'Repost Account Balances',
'trigger': u'Client'
diff --git a/erpnext/utilities/doctype/sms_control/sms_control.txt b/erpnext/utilities/doctype/sms_control/sms_control.txt
index 7f8d071..c69a34f 100644
--- a/erpnext/utilities/doctype/sms_control/sms_control.txt
+++ b/erpnext/utilities/doctype/sms_control/sms_control.txt
@@ -3,57 +3,55 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:24',
+ 'creation': '2012-03-27 14:36:47',
'docstatus': 0,
- 'modified': '2011-01-11 18:40:35',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:47',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'in_create': 0,
'issingle': 1,
- 'module': 'Utilities',
+ 'module': u'Utilities',
'name': '__common__',
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'show_in_menu': 0,
'version': 8
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'SMS Control',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'SMS Control',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1,
- 'role': 'System Manager'
+ 'role': u'System Manager'
},
# DocType, SMS Control
{
'doctype': 'DocType',
- 'name': 'SMS Control'
+ 'name': u'SMS Control'
},
# DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'doctype': u'DocPerm',
'permlevel': 0,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'idx': 2,
+ 'doctype': u'DocPerm',
'permlevel': 1
}
]
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/sms_log/sms_log.txt b/erpnext/utilities/doctype/sms_log/sms_log.txt
index c2b7ba9..55acd7d 100644
--- a/erpnext/utilities/doctype/sms_log/sms_log.txt
+++ b/erpnext/utilities/doctype/sms_log/sms_log.txt
@@ -3,128 +3,121 @@
# These values are common in all dictionaries
{
- 'creation': '2011-01-11 13:00:09',
+ 'creation': '2012-03-27 14:36:47',
'docstatus': 0,
- 'modified': '2011-01-11 12:51:46',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:47',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'autoname': 'SMSLOG/.########',
- 'colour': 'White:FFF',
+ 'autoname': u'SMSLOG/.########',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'module': 'Utilities',
+ 'module': u'Utilities',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 3
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'SMS Log',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'SMS Log',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
- 'create': 1,
- 'doctype': 'DocPerm',
- 'idx': 1,
+ 'create': 0,
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'SMS Log',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'SMS Log',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
- 'role': 'System Manager',
- 'write': 1
+ 'role': u'System Manager',
+ 'write': 0
},
# DocType, SMS Log
{
'doctype': 'DocType',
- 'name': 'SMS Log'
+ 'name': u'SMS Log'
},
# DocPerm
{
- 'doctype': 'DocPerm'
+ 'doctype': u'DocPerm'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 1,
- 'width': '50%'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break0',
+ 'fieldtype': u'Column Break',
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'sender_name',
- 'fieldtype': 'Data',
- 'idx': 2,
- 'label': 'Sender Name'
+ 'doctype': u'DocField',
+ 'fieldname': u'sender_name',
+ 'fieldtype': u'Data',
+ 'label': u'Sender Name'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'sent_on',
- 'fieldtype': 'Date',
- 'idx': 3,
- 'label': 'Sent On'
+ 'doctype': u'DocField',
+ 'fieldname': u'sent_on',
+ 'fieldtype': u'Date',
+ 'label': u'Sent On'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'receiver_list',
- 'fieldtype': 'Small Text',
- 'idx': 4,
- 'label': 'Receiver List'
+ 'doctype': u'DocField',
+ 'fieldname': u'receiver_list',
+ 'fieldtype': u'Small Text',
+ 'label': u'Receiver List'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldtype': 'Column Break',
- 'idx': 5,
- 'width': '50%'
+ 'doctype': u'DocField',
+ 'fieldname': u'column_break1',
+ 'fieldtype': u'Column Break',
+ 'width': u'50%'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'no_of_requested_sms',
- 'fieldtype': 'Int',
- 'idx': 6,
- 'label': 'No of Requested SMS'
+ 'doctype': u'DocField',
+ 'fieldname': u'no_of_requested_sms',
+ 'fieldtype': u'Int',
+ 'label': u'No of Requested SMS'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'no_of_sent_sms',
- 'fieldtype': 'Int',
- 'idx': 7,
- 'label': 'No of Sent SMS'
+ 'doctype': u'DocField',
+ 'fieldname': u'no_of_sent_sms',
+ 'fieldtype': u'Int',
+ 'label': u'No of Sent SMS'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'message',
- 'fieldtype': 'Small Text',
- 'idx': 8,
- 'label': 'Message'
+ 'doctype': u'DocField',
+ 'fieldname': u'message',
+ 'fieldtype': u'Small Text',
+ 'label': u'Message'
}
]
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/todo_item/todo_item.txt b/erpnext/utilities/doctype/todo_item/todo_item.txt
index 86f5d0d..c7765f4 100644
--- a/erpnext/utilities/doctype/todo_item/todo_item.txt
+++ b/erpnext/utilities/doctype/todo_item/todo_item.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2009-05-12 16:43:58',
+ 'creation': '2012-03-27 14:36:47',
'docstatus': 0,
- 'modified': '2012-02-17 15:48:54',
+ 'modified': '2012-03-27 14:36:47',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/utilities/doctype/trash_control/trash_control.txt b/erpnext/utilities/doctype/trash_control/trash_control.txt
index b7a4a1e..3688342 100644
--- a/erpnext/utilities/doctype/trash_control/trash_control.txt
+++ b/erpnext/utilities/doctype/trash_control/trash_control.txt
@@ -3,30 +3,30 @@
# These values are common in all dictionaries
{
- 'creation': '2010-08-08 17:09:29',
+ 'creation': '2012-03-27 14:36:47',
'docstatus': 0,
- 'modified': '2010-12-30 11:44:36',
- 'modified_by': 'umair@iwebnotes.com',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:47',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'in_create': 1,
'issingle': 1,
- 'module': 'Utilities',
+ 'module': u'Utilities',
'name': '__common__',
'read_only': 1,
- 'section_style': 'Simple',
- 'server_code_error': ' ',
+ 'section_style': u'Simple',
+ 'server_code_error': u' ',
'version': 35
},
# DocType, Trash Control
{
'doctype': 'DocType',
- 'name': 'Trash Control'
+ 'name': u'Trash Control'
}
]
\ No newline at end of file
diff --git a/erpnext/utilities/page/calendar/calendar.js b/erpnext/utilities/page/calendar/calendar.js
index ac1ac88..9aa5df8 100644
--- a/erpnext/utilities/page/calendar/calendar.js
+++ b/erpnext/utilities/page/calendar/calendar.js
@@ -24,7 +24,11 @@
if(!erpnext.calendar) {
erpnext.calendar = new Calendar();
erpnext.calendar.init(wrapper);
- rename_observers.push(erpnext.calendar);
+
+ var me = this;
+ $(document).bind('rename', function(event, dt, old_name, new_name) {
+ erpnext.calendar.rename_notify(dt, old_name, new_name)
+ });
}
}
@@ -63,7 +67,7 @@
Calendar.prototype.rename_notify = function(dt, old_name, new_name) {
// calendar
- if(dt = 'Event'){
+ if(dt = 'Event'){
if(this.events_by_name[old_name]) {
delete this.events_by_name[old_name];
}
diff --git a/erpnext/utilities/page/messages/messages.css b/erpnext/utilities/page/messages/messages.css
index 81260ab..49b3771 100644
--- a/erpnext/utilities/page/messages/messages.css
+++ b/erpnext/utilities/page/messages/messages.css
@@ -1,9 +1,9 @@
#message-post-text {
- height: 3em;
+ width: 50%;
}
#message-list {
- margin: 0px 40px;
+
}
.message {
diff --git a/erpnext/utilities/page/messages/messages.html b/erpnext/utilities/page/messages/messages.html
index b645d3f..7538785 100644
--- a/erpnext/utilities/page/messages/messages.html
+++ b/erpnext/utilities/page/messages/messages.html
@@ -3,7 +3,7 @@
<a class="close" onclick="window.history.back();">×</a>
<h1>Messages</h1>
<div class="well">
- <textarea id="message-post-text"></textarea>
+ <input id="message-post-text"></input>
<button disabled="disabled" id="message-post" class="btn btn-small"><i class="icon-play"></i> Post</button>
</div>
<div id="message-list">
diff --git a/erpnext/utilities/page/messages/messages.js b/erpnext/utilities/page/messages/messages.js
index 6937796..ef56020 100644
--- a/erpnext/utilities/page/messages/messages.js
+++ b/erpnext/utilities/page/messages/messages.js
@@ -43,20 +43,24 @@
});
// enable, disable button
- $('#message-post-text').keyup(function() {
+ $('#message-post-text').keyup(function(e) {
if($(this).val()) {
$('#message-post').attr('disabled', false);
} else {
$('#message-post').attr('disabled', true);
}
+
+ if(e.which==13) {
+ $('#message-post').click();
+ }
})
}
-wn.pages.messages.onshow = function(wrapper) {
+$(wn.pages.messages).bind('show', function() {
erpnext.messages.show();
- setTimeout(erpnext.messages.refresh, 5000);
+ setTimeout(erpnext.messages.refresh, 7000);
$('#message-post-text').focus();
-}
+})
erpnext.messages = {
show: function() {
@@ -75,8 +79,8 @@
},
// check for updates every 5 seconds if page is active
refresh: function() {
- setTimeout(erpnext.messages.refresh, 10000);
- if(page_body.cur_page_label != 'messages') return;
+ setTimeout(erpnext.messages.refresh, 7000);
+ if(wn.container.page.label != 'Messages') return;
erpnext.messages.show();
},
get_contact: function() {
@@ -91,13 +95,15 @@
return user;
},
make_list: function() {
- erpnext.messages.list = new wn.widgets.Listing({
+ erpnext.messages.list = new wn.ui.Listing({
parent: $('#message-list').get(0),
method: 'utilities.page.messages.messages.get_list',
args: {
contact: null
},
render_row: function(wrapper, data) {
+ $(wrapper).removeClass('list-row');
+
data.creation = dateutil.comment_when(data.creation);
data.comment_by_fullname = wn.user_info(data.owner).fullname;
diff --git a/erpnext/utilities/page/messages/messages.py b/erpnext/utilities/page/messages/messages.py
index b282991..3a407dd 100644
--- a/erpnext/utilities/page/messages/messages.py
+++ b/erpnext/utilities/page/messages/messages.py
@@ -56,8 +56,12 @@
@webnotes.whitelist()
def post(arg=None):
"""post message"""
- import json
- arg = json.loads(arg)
+ if arg:
+ import json
+ arg = json.loads(arg)
+ else:
+ arg = {}
+ arg.update(webnotes.form_dict)
from webnotes.model.doc import Document
d = Document('Comment Widget Record')
d.comment = arg['txt']
@@ -69,4 +73,4 @@
def delete(arg=None):
webnotes.conn.sql("""delete from `tabComment Widget Record` where name=%s""",
webnotes.form_dict['name']);
-
\ No newline at end of file
+
diff --git a/erpnext/utilities/page/todo/todo.css b/erpnext/utilities/page/todo/todo.css
index 01a4d24..704e600 100644
--- a/erpnext/utilities/page/todo/todo.css
+++ b/erpnext/utilities/page/todo/todo.css
@@ -3,6 +3,7 @@
border-bottom: 1px solid #DEB85F;
margin-bottom: 5px;
height: 14px;
+ clear: both;
}
.todoitem .label {
diff --git a/erpnext/utilities/page/todo/todo.html b/erpnext/utilities/page/todo/todo.html
index 3400455..32a0a78 100644
--- a/erpnext/utilities/page/todo/todo.html
+++ b/erpnext/utilities/page/todo/todo.html
@@ -4,7 +4,7 @@
<br>
<div id="todo-list">
</div>
- <div style="margin-top: 21px">
+ <div style="margin-top: 21px; clear: both">
<button id="add-todo" class="btn btn-small"><i class="icon-plus"></i> Add</button>
</div>
</div>
\ No newline at end of file
diff --git a/erpnext/utilities/page/users/users.js b/erpnext/utilities/page/users/users.js
index 130e538..ad238ae 100644
--- a/erpnext/utilities/page/users/users.js
+++ b/erpnext/utilities/page/users/users.js
@@ -232,7 +232,7 @@
$c_page('utilities', 'users', 'add_user', v, function(r,rt) {
if(r.exc) { msgprint(r.exc); return; }
else {
- wn.boot.user_info[v.user] = {fullname:v.first_name + ' ' + v.last_name};
+ wn.boot.user_info[v.user] = {fullname:v.first_name + ' ' + (v.last_name || '')};
d.hide();
me.refresh();
}
@@ -269,8 +269,8 @@
</div>', {role: this.roles[i]}));
}
$(this.dialog.body).append('<div style="clear: both">\
- <button class="btn btn-small btn-primary">Save</button></div>');
- $(this.dialog.body).find('button.btn-primary').click(function() {
+ <button class="btn btn-small btn-info">Save</button></div>');
+ $(this.dialog.body).find('button.btn-info').click(function() {
me.save();
});
$(this.dialog.body).find('.user-role a').click(function() {
@@ -314,7 +314,7 @@
unset_roles: JSON.stringify(unset_roles),
uid: this.uid
},
- btn: $(this.dialog.body).find('.btn-primary').get(0),
+ btn: $(this.dialog.body).find('.btn-info').get(0),
callback: function() {
}
diff --git a/erpnext/utilities/page/users/users.py b/erpnext/utilities/page/users/users.py
index f2bb1a5..ec01479 100644
--- a/erpnext/utilities/page/users/users.py
+++ b/erpnext/utilities/page/users/users.py
@@ -83,7 +83,10 @@
webnotes.conn.set_value('Profile', args['user'], 'enabled', int(args.get('enabled',0)) or 0)
if args.get('new_password') and args.get('sys_admin_pwd'):
- if cint(webnotes.conn.get_value('Control Panel',None,'sync_with_gateway')):
+ import webnotes.defs
+ from webnotes.utils import cint
+ if hasattr(webnotes.defs, 'sync_with_gateway') and \
+ cint(webnotes.defs.sync_with_gateway) or 0:
import server_tools.gateway_utils
res = server_tools.gateway_utils.change_password('', args['new_password'],
args['user'], args['sys_admin_pwd'])
@@ -104,7 +107,10 @@
def add_user(args):
args = json.loads(args)
# erpnext-saas
- if cint(webnotes.conn.get_value('Control Panel', None, 'sync_with_gateway')):
+ import webnotes.defs
+ from webnotes.utils import cint
+ if hasattr(webnotes.defs, 'sync_with_gateway') and \
+ cint(webnotes.defs.sync_with_gateway) or 0:
from server_tools.gateway_utils import add_user_gateway
add_user_gateway(args)
@@ -169,7 +175,10 @@
webnotes.conn.sql("update tabProfile set enabled=0, docstatus=2 where name=%s",
webnotes.form_dict['uid'])
# erpnext-saas
- if int(webnotes.conn.get_value('Control Panel', None, 'sync_with_gateway')):
+ import webnotes.defs
+ from webnotes.utils import cint
+ if hasattr(webnotes.defs, 'sync_with_gateway') and \
+ cint(webnotes.defs.sync_with_gateway) or 0:
from server_tools.gateway_utils import remove_user_gateway
remove_user_gateway(webnotes.form_dict['uid'])
diff --git a/erpnext/website/Module Def/Website/Website.txt b/erpnext/website/Module Def/Website/Website.txt
deleted file mode 100644
index e423869..0000000
--- a/erpnext/website/Module Def/Website/Website.txt
+++ /dev/null
@@ -1,142 +0,0 @@
-# Module Def, Website
-[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-01-23 17:05:32',
- 'docstatus': 0,
- 'modified': '2012-02-02 13:23:41',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
- },
-
- # These values are common for all Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'name': '__common__',
- 'parent': 'Website',
- 'parentfield': 'roles',
- 'parenttype': 'Module Def'
- },
-
- # These values are common for all Module Def Item
- {
- 'doctype': 'Module Def Item',
- 'name': '__common__',
- 'parent': 'Website',
- 'parentfield': 'items',
- 'parenttype': 'Module Def'
- },
-
- # These values are common for all Module Def
- {
- 'disabled': 'No',
- 'doctype': u'Module Def',
- 'is_hidden': 'No',
- 'module_label': 'Website',
- 'module_name': 'Website',
- 'name': '__common__'
- },
-
- # Module Def, Website
- {
- 'doctype': u'Module Def',
- 'name': 'Website'
- },
-
- # Module Def Item
- {
- 'display_name': 'Web Page',
- 'doc_name': 'Web Page',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Product',
- 'doc_name': 'Product',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Blog',
- 'doc_name': 'Blog',
- 'doc_type': 'Forms',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Style Settings',
- 'doc_name': 'Style Settings',
- 'doc_type': 'Single DocType',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Website Settings',
- 'doc_name': 'Website Settings',
- 'doc_type': 'Single DocType',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Home Settings',
- 'doc_name': 'Home Settings',
- 'doc_type': 'Single DocType',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'About Us Settings',
- 'doc_name': 'About Us Settings',
- 'doc_type': 'Single DocType',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Contact Us Settings',
- 'doc_name': 'Contact Us Settings',
- 'doc_type': 'Single DocType',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Item
- {
- 'display_name': 'Products Settings',
- 'doc_name': 'Products Settings',
- 'doc_type': 'Single DocType',
- 'doctype': 'Module Def Item'
- },
-
- # Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'role': 'System Manager'
- },
-
- # Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'role': 'System Manager'
- },
-
- # Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'role': 'Website Manager'
- },
-
- # Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'role': 'Website Manager'
- }
-]
\ No newline at end of file
diff --git a/erpnext/website/Role/Blogger/Blogger.txt b/erpnext/website/Role/Blogger/Blogger.txt
deleted file mode 100644
index a380d4c..0000000
--- a/erpnext/website/Role/Blogger/Blogger.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-# Role, Blogger
-[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-01-27 12:22:24',
- 'docstatus': 0,
- 'modified': '2012-01-27 12:22:24',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Role
- {
- 'doctype': 'Role',
- 'module': u'Website',
- 'name': '__common__',
- 'role_name': u'Blogger'
- },
-
- # Role, Blogger
- {
- 'doctype': 'Role',
- 'name': u'Blogger'
- }
-]
\ No newline at end of file
diff --git a/erpnext/website/Role/Website Manager/Website Manager.txt b/erpnext/website/Role/Website Manager/Website Manager.txt
deleted file mode 100644
index ad1ad9a..0000000
--- a/erpnext/website/Role/Website Manager/Website Manager.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-# Role, Website Manager
-[
-
- # These values are common in all dictionaries
- {
- 'creation': '2012-01-24 10:18:47',
- 'docstatus': 0,
- 'modified': '2012-02-06 15:22:27',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
- },
-
- # These values are common for all Role
- {
- 'doctype': 'Role',
- 'module': u'Website',
- 'name': '__common__',
- 'role_name': u'Website Manager'
- },
-
- # Role, Website Manager
- {
- 'doctype': 'Role',
- 'name': u'Website Manager'
- }
-]
\ No newline at end of file
diff --git a/erpnext/website/__init__.py b/erpnext/website/__init__.py
index e69de29..1ed1cf1 100644
--- a/erpnext/website/__init__.py
+++ b/erpnext/website/__init__.py
@@ -0,0 +1,4 @@
+install_docs = [
+ {"doctype":"Role", "name":"Blogger"},
+ {"doctype":"Role", "name":"Website Manager"},
+]
\ No newline at end of file
diff --git a/erpnext/website/css/website.css b/erpnext/website/css/website.css
index 693b8fb..b56b55e 100644
--- a/erpnext/website/css/website.css
+++ b/erpnext/website/css/website.css
@@ -14,6 +14,10 @@
margin-bottom: 7px;
}
+p, li {
+ line-height: 1.6em;
+}
+
pre {
background-color: #F8F8F8;
border: 1px solid #CCCCCC;
diff --git a/erpnext/website/doctype/about_us_settings/about_us_settings.txt b/erpnext/website/doctype/about_us_settings/about_us_settings.txt
index 5ecae16..1682ca3 100644
--- a/erpnext/website/doctype/about_us_settings/about_us_settings.txt
+++ b/erpnext/website/doctype/about_us_settings/about_us_settings.txt
@@ -3,103 +3,103 @@
# These values are common in all dictionaries
{
- 'creation': '2012-01-27 10:13:16',
+ 'creation': '2012-03-27 14:36:47',
'docstatus': 0,
- 'modified': '2012-01-27 11:36:44',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:47',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1327641155',
+ '_last_update': u'1327641155',
'allow_attach': 1,
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'issingle': 1,
'max_attachments': 10,
- 'module': 'Website',
+ 'module': u'Website',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 4
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'About Us Settings',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'About Us Settings',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'About Us Settings',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'About Us Settings',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
- 'role': 'Website Manager',
+ 'role': u'Website Manager',
'write': 1
},
# DocType, About Us Settings
{
'doctype': 'DocType',
- 'name': 'About Us Settings'
+ 'name': u'About Us Settings'
},
# DocPerm
{
- 'doctype': 'DocPerm'
+ 'doctype': u'DocPerm'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'headline',
- 'fieldtype': 'Data',
- 'label': 'Headline'
+ 'doctype': u'DocField',
+ 'fieldname': u'headline',
+ 'fieldtype': u'Data',
+ 'label': u'Headline'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'main_section',
- 'fieldtype': 'Code',
- 'label': 'Main Section'
+ 'doctype': u'DocField',
+ 'fieldname': u'main_section',
+ 'fieldtype': u'Code',
+ 'label': u'Main Section'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'team',
- 'fieldtype': 'Table',
- 'label': 'Team',
- 'options': 'About Us Team'
+ 'doctype': u'DocField',
+ 'fieldname': u'team',
+ 'fieldtype': u'Table',
+ 'label': u'Team',
+ 'options': u'About Us Team'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'side_section',
- 'fieldtype': 'Code',
- 'label': 'Side Section'
+ 'doctype': u'DocField',
+ 'fieldname': u'side_section',
+ 'fieldtype': u'Code',
+ 'label': u'Side Section'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'file_list',
- 'fieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'file_list',
+ 'fieldtype': u'Text',
'hidden': 1,
- 'label': 'File List',
+ 'label': u'File List',
'no_copy': 1,
'print_hide': 1
}
diff --git a/erpnext/website/doctype/about_us_team/about_us_team.txt b/erpnext/website/doctype/about_us_team/about_us_team.txt
index bbbf47d..3e60290 100644
--- a/erpnext/website/doctype/about_us_team/about_us_team.txt
+++ b/erpnext/website/doctype/about_us_team/about_us_team.txt
@@ -3,72 +3,72 @@
# These values are common in all dictionaries
{
- 'creation': '2012-01-27 10:14:18',
+ 'creation': '2012-03-27 14:36:47',
'docstatus': 0,
- 'modified': '2012-01-27 11:54:18',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:47',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Website',
+ 'module': u'Website',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 5
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'About Us Team',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'About Us Team',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, About Us Team
{
'doctype': 'DocType',
- 'name': 'About Us Team'
+ 'name': u'About Us Team'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'person_name',
- 'fieldtype': 'Data',
- 'label': 'Person Name'
+ 'doctype': u'DocField',
+ 'fieldname': u'person_name',
+ 'fieldtype': u'Data',
+ 'label': u'Person Name'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'designation',
- 'fieldtype': 'Data',
- 'label': 'Designation'
+ 'doctype': u'DocField',
+ 'fieldname': u'designation',
+ 'fieldtype': u'Data',
+ 'label': u'Designation'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'image',
- 'fieldtype': 'Select',
- 'label': 'Image',
- 'options': 'attach_files:'
+ 'doctype': u'DocField',
+ 'fieldname': u'image',
+ 'fieldtype': u'Select',
+ 'label': u'Image',
+ 'options': u'attach_files:'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'bio',
- 'fieldtype': 'Text',
- 'label': 'Bio (markdown)',
- 'width': '300px'
+ 'doctype': u'DocField',
+ 'fieldname': u'bio',
+ 'fieldtype': u'Text',
+ 'label': u'Bio (markdown)',
+ 'width': u'300px'
}
]
\ No newline at end of file
diff --git a/erpnext/website/doctype/blog/blog.txt b/erpnext/website/doctype/blog/blog.txt
index 59444f8..f9ff6fd 100644
--- a/erpnext/website/doctype/blog/blog.txt
+++ b/erpnext/website/doctype/blog/blog.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2012-01-27 12:24:03',
+ 'creation': '2012-03-27 14:36:47',
'docstatus': 0,
- 'modified': '2012-02-07 13:55:17',
+ 'modified': '2012-03-27 14:36:47',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -35,12 +35,15 @@
# These values are common for all DocPerm
{
+ 'create': 1,
'doctype': u'DocPerm',
'name': '__common__',
'parent': u'Blog',
'parentfield': u'permissions',
'parenttype': u'DocType',
- 'read': 1
+ 'permlevel': 0,
+ 'read': 1,
+ 'write': 1
},
# DocType, Blog
@@ -51,27 +54,14 @@
# DocPerm
{
- 'create': 1,
'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Website Manager',
- 'write': 1
- },
-
- # DocPerm
- {
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Blogger',
- 'write': 1
+ 'role': u'Website Manager'
},
# DocPerm
{
'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'All'
+ 'role': u'Blogger'
},
# DocField
diff --git a/erpnext/website/doctype/blog/blog_page.js b/erpnext/website/doctype/blog/blog_page.js
index 76cbf81..d419a0b 100644
--- a/erpnext/website/doctype/blog/blog_page.js
+++ b/erpnext/website/doctype/blog/blog_page.js
@@ -21,7 +21,7 @@
var side = $(wrapper).find('.web-side-section')
.append('<h4>Recent Posts</h4>').get(0);
- wrapper.recent_list = new wn.widgets.Listing({
+ wrapper.recent_list = new wn.ui.Listing({
parent: side,
query: 'select name, title, left(content, 100) as content from tabBlog\
where ifnull(published,1)=1',
@@ -39,7 +39,7 @@
// comments
$(wrapper).find('.web-main-section').append('<hr><h3>Comments</h3>');
- wrapper.comment_list = new wn.widgets.Listing({
+ wrapper.comment_list = new wn.ui.Listing({
parent: $(wrapper).find('.web-main-section').get(0),
query: 'select comment, comment_by_fullname, modified\
from `tabComment Widget Record` where comment_doctype="Page"\
diff --git a/erpnext/website/doctype/blog_subscriber/blog_subscriber.txt b/erpnext/website/doctype/blog_subscriber/blog_subscriber.txt
index 1b4a987..1fa8223 100644
--- a/erpnext/website/doctype/blog_subscriber/blog_subscriber.txt
+++ b/erpnext/website/doctype/blog_subscriber/blog_subscriber.txt
@@ -3,20 +3,20 @@
# These values are common in all dictionaries
{
- 'creation': '2012-01-27 17:18:33',
+ 'creation': '2012-03-27 14:36:47',
'docstatus': 0,
- 'modified': '2012-01-27 17:18:33',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:47',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'module': 'Website',
+ 'module': u'Website',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 1
},
@@ -24,6 +24,6 @@
# DocType, Blog Subscriber
{
'doctype': 'DocType',
- 'name': 'Blog Subscriber'
+ 'name': u'Blog Subscriber'
}
]
\ No newline at end of file
diff --git a/erpnext/website/doctype/contact_us_settings/contact_us_settings.txt b/erpnext/website/doctype/contact_us_settings/contact_us_settings.txt
index ff43a0a..bb518b6 100644
--- a/erpnext/website/doctype/contact_us_settings/contact_us_settings.txt
+++ b/erpnext/website/doctype/contact_us_settings/contact_us_settings.txt
@@ -3,45 +3,45 @@
# These values are common in all dictionaries
{
- 'creation': '2012-01-25 16:01:33',
+ 'creation': '2012-03-27 14:36:47',
'docstatus': 0,
- 'modified': '2012-01-25 16:01:33',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:47',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
- 'document_type': 'Other',
+ 'document_type': u'Other',
'issingle': 1,
- 'module': 'Website',
+ 'module': u'Website',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 1
},
# These values are common for all DocField
{
- 'colour': 'White:FFF',
- 'doctype': 'DocField',
+ 'colour': u'White:FFF',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Contact Us Settings',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Contact Us Settings',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Contact Us Settings',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Contact Us Settings',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'permlevel': 0,
'read': 1,
'write': 1
@@ -50,51 +50,51 @@
# DocType, Contact Us Settings
{
'doctype': 'DocType',
- 'name': 'Contact Us Settings'
+ 'name': u'Contact Us Settings'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'role': 'Website Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'Website Manager'
},
# DocPerm
{
- 'doctype': 'DocPerm',
- 'role': 'System Manager'
+ 'doctype': u'DocPerm',
+ 'role': u'System Manager'
},
# DocField
{
- 'default': 'Contact Us',
- 'doctype': 'DocField',
- 'fieldname': 'headline',
- 'fieldtype': 'Data',
- 'label': 'Headline'
+ 'default': u'Contact Us',
+ 'doctype': u'DocField',
+ 'fieldname': u'headline',
+ 'fieldtype': u'Data',
+ 'label': u'Headline'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'send_email_notification',
- 'fieldtype': 'Check',
- 'label': 'Send Email Notification'
+ 'doctype': u'DocField',
+ 'fieldname': u'send_email_notification',
+ 'fieldtype': u'Check',
+ 'label': u'Send Email Notification'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'main_section',
- 'fieldtype': 'Code',
- 'label': 'Main Section'
+ 'doctype': u'DocField',
+ 'fieldname': u'main_section',
+ 'fieldtype': u'Code',
+ 'label': u'Main Section'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'side_section',
- 'fieldtype': 'Code',
- 'label': 'Side Section'
+ 'doctype': u'DocField',
+ 'fieldname': u'side_section',
+ 'fieldtype': u'Code',
+ 'label': u'Side Section'
}
]
\ No newline at end of file
diff --git a/erpnext/website/doctype/product/product.txt b/erpnext/website/doctype/product/product.txt
index 1c2b472..7d9c770 100644
--- a/erpnext/website/doctype/product/product.txt
+++ b/erpnext/website/doctype/product/product.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2012-02-17 15:53:22',
+ 'creation': '2012-03-27 14:36:47',
'docstatus': 0,
- 'modified': '2012-02-22 18:32:46',
+ 'modified': '2012-03-27 14:36:47',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -38,13 +38,17 @@
# These values are common for all DocPerm
{
+ 'amend': 0,
+ 'create': 1,
'doctype': u'DocPerm',
'name': '__common__',
'parent': u'Product',
'parentfield': u'permissions',
'parenttype': u'DocType',
+ 'permlevel': 0,
'read': 1,
- 'role': u'Website Manager'
+ 'submit': 0,
+ 'write': 1
},
# DocType, Product
@@ -55,16 +59,23 @@
# DocPerm
{
- 'create': 1,
+ 'cancel': 0,
'doctype': u'DocPerm',
- 'permlevel': 0,
- 'write': 1
+ 'role': u'Sales Manager'
},
# DocPerm
{
+ 'cancel': 0,
'doctype': u'DocPerm',
- 'permlevel': 1
+ 'role': u'Sales User'
+ },
+
+ # DocPerm
+ {
+ 'cancel': 1,
+ 'doctype': u'DocPerm',
+ 'role': u'Website Manager'
},
# DocField
@@ -124,6 +135,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'column_break0',
'fieldtype': u'Column Break',
'permlevel': 0
},
@@ -166,6 +178,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'section_break0',
'fieldtype': u'Section Break',
'permlevel': 0
},
@@ -185,6 +198,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'section_break1',
'fieldtype': u'Section Break',
'permlevel': 0
},
@@ -249,4 +263,4 @@
'permlevel': 0,
'print_hide': 1
}
-]
+]
\ No newline at end of file
diff --git a/erpnext/website/doctype/product/product_page.js b/erpnext/website/doctype/product/product_page.js
index 0f0c56b..926ef69 100644
--- a/erpnext/website/doctype/product/product_page.js
+++ b/erpnext/website/doctype/product/product_page.js
@@ -30,7 +30,7 @@
});
// similar products
- wrapper.similar = new wn.widgets.Listing({
+ wrapper.similar = new wn.ui.Listing({
parent: $(wrapper).find('.similar-products').get(0),
hide_refresh: true,
page_length: 5,
diff --git a/erpnext/website/doctype/product_group/product_group.txt b/erpnext/website/doctype/product_group/product_group.txt
index b26ec13..e199b86 100644
--- a/erpnext/website/doctype/product_group/product_group.txt
+++ b/erpnext/website/doctype/product_group/product_group.txt
@@ -3,55 +3,55 @@
# These values are common in all dictionaries
{
- 'creation': '2012-01-30 12:17:12',
+ 'creation': '2012-03-27 14:36:48',
'docstatus': 0,
- 'modified': '2012-01-30 12:17:12',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:48',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- 'colour': 'White:FFF',
+ 'colour': u'White:FFF',
'doctype': 'DocType',
'istable': 1,
- 'module': 'Website',
+ 'module': u'Website',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 1
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Product Group',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Product Group',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# DocType, Product Group
{
'doctype': 'DocType',
- 'name': 'Product Group'
+ 'name': u'Product Group'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'item_group',
- 'fieldtype': 'Link',
- 'label': 'Item Group',
- 'options': 'Item Group'
+ 'doctype': u'DocField',
+ 'fieldname': u'item_group',
+ 'fieldtype': u'Link',
+ 'label': u'Item Group',
+ 'options': u'Item Group'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'label',
- 'fieldtype': 'Data',
- 'label': 'Label'
+ 'doctype': u'DocField',
+ 'fieldname': u'label',
+ 'fieldtype': u'Data',
+ 'label': u'Label'
}
]
\ No newline at end of file
diff --git a/erpnext/website/doctype/products_settings/products_settings.txt b/erpnext/website/doctype/products_settings/products_settings.txt
index aa0fbb3..31d2074 100644
--- a/erpnext/website/doctype/products_settings/products_settings.txt
+++ b/erpnext/website/doctype/products_settings/products_settings.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2012-01-30 12:15:00',
+ 'creation': '2012-03-27 14:36:48',
'docstatus': 0,
- 'modified': '2012-02-14 14:29:41',
+ 'modified': '2012-03-27 14:36:48',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/website/doctype/related_page/related_page.txt b/erpnext/website/doctype/related_page/related_page.txt
index 67a30b7..b107286 100644
--- a/erpnext/website/doctype/related_page/related_page.txt
+++ b/erpnext/website/doctype/related_page/related_page.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2012-02-01 16:16:47',
+ 'creation': '2012-03-27 14:36:48',
'docstatus': 0,
- 'modified': '2012-02-06 12:24:29',
+ 'modified': '2012-03-27 14:36:48',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/website/doctype/style_settings/custom_template.css b/erpnext/website/doctype/style_settings/custom_template.css
index 8eb3d63..72c15a1 100644
--- a/erpnext/website/doctype/style_settings/custom_template.css
+++ b/erpnext/website/doctype/style_settings/custom_template.css
@@ -5,13 +5,19 @@
background-color: #{{ doc.background_color }};
{% endif %}
{% if doc.font %}
- font-family: {{ doc.font }} !important;
+ font-family: '{{ doc.font }}', Verdana, Sans !important;
{% endif %}
{% if doc.font_size %}
font-size: {{ doc.font_size }} !important;
{% endif %}
}
+{% if doc.font_size %}
+.small {
+ font-size: {{ doc.small_font_size }} !important;
+}
+{% endif %}
+
{% if doc.footer_font_color %}
footer {
color: {{ doc.footer_font_color }};
@@ -26,6 +32,6 @@
{% if doc.heading_font %}
h1, h2, h3, h4, h5 {
- font-family: {{ doc.heading_font}} !important;
+ font-family: '{{ doc.heading_font}}', Arial, 'Helvetica Neue' !important;
}
{% endif %}
diff --git a/erpnext/website/doctype/style_settings/style_settings.py b/erpnext/website/doctype/style_settings/style_settings.py
index 83961e0..282cd93 100644
--- a/erpnext/website/doctype/style_settings/style_settings.py
+++ b/erpnext/website/doctype/style_settings/style_settings.py
@@ -25,9 +25,13 @@
with open('erpnext/website/doctype/style_settings/custom_template.css', 'r') as f:
temp = Template(f.read())
+ self.doc.small_font_size = str(int(self.doc.font_size[:-2])-2) + 'px'
+
self.doc.custom_css = temp.render(doc = self.doc)
from webnotes.session_cache import clear_cache
clear_cache('Guest')
+ del self.doc.fields['small_font_size']
+
\ No newline at end of file
diff --git a/erpnext/website/doctype/style_settings/style_settings.txt b/erpnext/website/doctype/style_settings/style_settings.txt
index f07a947..18a4d1a 100644
--- a/erpnext/website/doctype/style_settings/style_settings.txt
+++ b/erpnext/website/doctype/style_settings/style_settings.txt
@@ -3,154 +3,154 @@
# These values are common in all dictionaries
{
- 'creation': '2012-02-02 09:57:25',
+ 'creation': '2012-03-27 14:36:48',
'docstatus': 0,
- 'modified': '2012-02-02 10:47:38',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:48',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1328159294',
+ '_last_update': u'1330594969',
'allow_attach': 1,
- 'colour': 'White:FFF',
- 'description': 'Set your background color, font and image (tiled)',
+ 'colour': u'White:FFF',
+ 'description': u'Set your background color, font and image (tiled)',
'doctype': 'DocType',
'issingle': 1,
'max_attachments': 1,
- 'module': 'Website',
+ 'module': u'Website',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
- 'version': 9
+ 'version': 18
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Style Settings',
- 'parentfield': 'fields',
- 'parenttype': 'DocType'
+ 'parent': u'Style Settings',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType'
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Style Settings',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Style Settings',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1,
- 'role': 'Website Manager'
+ 'role': u'Website Manager'
},
# DocType, Style Settings
{
'doctype': 'DocType',
- 'name': 'Style Settings'
+ 'name': u'Style Settings'
},
# DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Solid background color (default light gray)',
- 'doctype': 'DocField',
- 'fieldname': 'background_color',
- 'fieldtype': 'Data',
- 'label': 'Background Color',
+ 'colour': u'White:FFF',
+ 'description': u'If image is selected, color will be ignored (attach first)',
+ 'doctype': u'DocField',
+ 'fieldname': u'background_image',
+ 'fieldtype': u'Select',
+ 'label': u'Background Image',
+ 'options': u'attach_files:',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'If image is selected, color will be ignored (attach first)',
- 'doctype': 'DocField',
- 'fieldname': 'background_image',
- 'fieldtype': 'Select',
- 'label': 'Background Image',
- 'options': 'attach_files:',
+ 'colour': u'White:FFF',
+ 'description': u'Solid background color (default light gray)',
+ 'doctype': u'DocField',
+ 'fieldname': u'background_color',
+ 'fieldtype': u'Data',
+ 'label': u'Background Color',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'font',
- 'fieldtype': 'Select',
- 'label': 'Font',
- 'options': '\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma',
+ 'doctype': u'DocField',
+ 'fieldname': u'font',
+ 'fieldtype': u'Select',
+ 'label': u'Font',
+ 'options': u'\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma\nLato\nOpen Sans',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'font_size',
- 'fieldtype': 'Select',
- 'label': 'Font Size',
- 'options': '\n12px\n13px\n14px',
+ 'doctype': u'DocField',
+ 'fieldname': u'font_size',
+ 'fieldtype': u'Select',
+ 'label': u'Font Size',
+ 'options': u'\n12px\n13px\n14px\n15px\n16px',
'permlevel': 0
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'heading_font',
- 'fieldtype': 'Select',
- 'label': 'Heaing Font',
- 'options': '\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma',
+ 'doctype': u'DocField',
+ 'fieldname': u'heading_font',
+ 'fieldtype': u'Select',
+ 'label': u'Heading Font',
+ 'options': u'\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma\nLato\nOpen Sans',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Select a white footer foreground color if you have a dark background',
- 'doctype': 'DocField',
- 'fieldname': 'footer_font_color',
- 'fieldtype': 'Select',
- 'label': 'Footer Font Color',
- 'options': '\nwhite',
+ 'colour': u'White:FFF',
+ 'description': u'Select a white footer foreground color if you have a dark background',
+ 'doctype': u'DocField',
+ 'fieldname': u'footer_font_color',
+ 'fieldtype': u'Select',
+ 'label': u'Footer Font Color',
+ 'options': u'\nwhite',
'permlevel': 0
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Auto generated',
- 'doctype': 'DocField',
- 'fieldname': 'custom_css',
- 'fieldtype': 'Code',
- 'label': 'Custom CSS',
+ 'colour': u'White:FFF',
+ 'description': u'Auto generated',
+ 'doctype': u'DocField',
+ 'fieldname': u'custom_css',
+ 'fieldtype': u'Code',
+ 'label': u'Custom CSS',
'permlevel': 1
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'file_list',
- 'fieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'file_list',
+ 'fieldtype': u'Text',
'hidden': 1,
- 'label': 'File List',
+ 'label': u'File List',
'no_copy': 1,
'permlevel': 0,
'print_hide': 1
}
-]
\ No newline at end of file
+]
diff --git a/erpnext/website/doctype/top_bar_item/top_bar_item.txt b/erpnext/website/doctype/top_bar_item/top_bar_item.txt
index 3ff23b3..632425e 100644
--- a/erpnext/website/doctype/top_bar_item/top_bar_item.txt
+++ b/erpnext/website/doctype/top_bar_item/top_bar_item.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2012-01-24 10:24:19',
+ 'creation': '2012-03-27 14:36:48',
'docstatus': 0,
- 'modified': '2012-02-07 10:35:19',
+ 'modified': '2012-03-27 14:36:48',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
diff --git a/erpnext/website/doctype/web_page/template.html b/erpnext/website/doctype/web_page/template.html
index 1fb613c..6950069 100644
--- a/erpnext/website/doctype/web_page/template.html
+++ b/erpnext/website/doctype/web_page/template.html
@@ -23,6 +23,6 @@
<div style="clear: both"></div>
</div>
</div>
-<div class="web-page-status">
+<div class="web-page-status small">
Last Modified: {{ doc.updated }} <a href="#contact">Feedback</a>
</div>
diff --git a/erpnext/website/doctype/web_page/web_page.txt b/erpnext/website/doctype/web_page/web_page.txt
index 0bacc43..d4303a1 100644
--- a/erpnext/website/doctype/web_page/web_page.txt
+++ b/erpnext/website/doctype/web_page/web_page.txt
@@ -3,139 +3,139 @@
# These values are common in all dictionaries
{
- 'creation': '2012-01-31 15:18:49',
+ 'creation': '2012-03-27 14:36:48',
'docstatus': 0,
- 'modified': '2012-02-02 13:15:36',
- 'modified_by': 'Administrator',
- 'owner': 'Administrator'
+ 'modified': '2012-03-27 14:36:48',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1328093379',
+ '_last_update': u'1328093379',
'allow_attach': 1,
- 'colour': 'White:FFF',
- 'description': 'A custom page is a simple page with the layout - headline, main section, side section\n\nEditing:\n\n- Editing is in [markdown format](http://daringfireball.net/projects/markdown/syntax)\n- You can also add images and embed html code\n\nAccessing the page:\n\n- The page can be accessed as #![page-name] after the main url\n\nIdeal for pages like FAQ, Terms, Help etc.\n\n',
+ 'colour': u'White:FFF',
+ 'description': u'A custom page is a simple page with the layout - headline, main section, side section\n\nEditing:\n\n- Editing is in [markdown format](http://daringfireball.net/projects/markdown/syntax)\n- You can also add images and embed html code\n\nAccessing the page:\n\n- The page can be accessed as #![page-name] after the main url\n\nIdeal for pages like FAQ, Terms, Help etc.\n\n',
'doctype': 'DocType',
'max_attachments': 5,
- 'module': 'Website',
+ 'module': u'Website',
'name': '__common__',
- 'section_style': 'Simple',
+ 'section_style': u'Simple',
'show_in_menu': 0,
'version': 6
},
# These values are common for all DocField
{
- 'doctype': 'DocField',
+ 'doctype': u'DocField',
'name': '__common__',
- 'parent': 'Web Page',
- 'parentfield': 'fields',
- 'parenttype': 'DocType',
+ 'parent': u'Web Page',
+ 'parentfield': u'fields',
+ 'parenttype': u'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'name': '__common__',
- 'parent': 'Web Page',
- 'parentfield': 'permissions',
- 'parenttype': 'DocType',
+ 'parent': u'Web Page',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
'read': 1,
- 'role': 'Website Manager'
+ 'role': u'Website Manager'
},
# DocType, Web Page
{
'doctype': 'DocType',
- 'name': 'Web Page'
+ 'name': u'Web Page'
},
# DocPerm
{
'create': 1,
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 0,
'write': 1
},
# DocPerm
{
- 'doctype': 'DocPerm',
+ 'doctype': u'DocPerm',
'permlevel': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Title / headline of your page',
- 'doctype': 'DocField',
- 'fieldname': 'title',
- 'fieldtype': 'Data',
- 'label': 'Title',
+ 'colour': u'White:FFF',
+ 'description': u'Title / headline of your page',
+ 'doctype': u'DocField',
+ 'fieldname': u'title',
+ 'fieldtype': u'Data',
+ 'label': u'Title',
'reqd': 1
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Section that will span 2 columns, formatted as markdown. If no head, leave blank. If you are displaying a banner, it must be 860px',
- 'doctype': 'DocField',
- 'fieldname': 'head_section',
- 'fieldtype': 'Text',
- 'label': 'Head Section'
+ 'colour': u'White:FFF',
+ 'description': u'Section that will span 2 columns, formatted as markdown. If no head, leave blank. If you are displaying a banner, it must be 860px',
+ 'doctype': u'DocField',
+ 'fieldname': u'head_section',
+ 'fieldtype': u'Text',
+ 'label': u'Head Section'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Content in markdown format that appears on the main side of your page',
- 'doctype': 'DocField',
- 'fieldname': 'main_section',
- 'fieldtype': 'Code',
- 'label': 'Main Section'
+ 'colour': u'White:FFF',
+ 'description': u'Content in markdown format that appears on the main side of your page',
+ 'doctype': u'DocField',
+ 'fieldname': u'main_section',
+ 'fieldtype': u'Code',
+ 'label': u'Main Section'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Content in markdown format that appears on the right side',
- 'doctype': 'DocField',
- 'fieldname': 'side_section',
- 'fieldtype': 'Code',
- 'label': 'Side Section'
+ 'colour': u'White:FFF',
+ 'description': u'Content in markdown format that appears on the right side',
+ 'doctype': u'DocField',
+ 'fieldname': u'side_section',
+ 'fieldtype': u'Code',
+ 'label': u'Side Section'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Link for next page appears at the bottom of the page',
- 'doctype': 'DocField',
- 'fieldname': 'next_page',
- 'fieldtype': 'Link',
- 'label': 'Next Page',
- 'options': 'Page'
+ 'colour': u'White:FFF',
+ 'description': u'Link for next page appears at the bottom of the page',
+ 'doctype': u'DocField',
+ 'fieldname': u'next_page',
+ 'fieldtype': u'Link',
+ 'label': u'Next Page',
+ 'options': u'Page'
},
# DocField
{
- 'colour': 'White:FFF',
- 'description': 'Related pages appear on the right side of the link and are linked both ways.',
- 'doctype': 'DocField',
- 'fieldname': 'related_pages',
- 'fieldtype': 'Table',
- 'label': 'Related Pages',
- 'options': 'Related Page'
+ 'colour': u'White:FFF',
+ 'description': u'Related pages appear on the right side of the link and are linked both ways.',
+ 'doctype': u'DocField',
+ 'fieldname': u'related_pages',
+ 'fieldtype': u'Table',
+ 'label': u'Related Pages',
+ 'options': u'Related Page'
},
# DocField
{
- 'doctype': 'DocField',
- 'fieldname': 'file_list',
- 'fieldtype': 'Text',
+ 'doctype': u'DocField',
+ 'fieldname': u'file_list',
+ 'fieldtype': u'Text',
'hidden': 1,
- 'label': 'File List',
+ 'label': u'File List',
'no_copy': 1,
'print_hide': 1
}
diff --git a/erpnext/website/doctype/website_settings/website_settings.txt b/erpnext/website/doctype/website_settings/website_settings.txt
index b6ea7a3..32e31c0 100644
--- a/erpnext/website/doctype/website_settings/website_settings.txt
+++ b/erpnext/website/doctype/website_settings/website_settings.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2012-02-02 13:19:50',
+ 'creation': '2012-03-27 14:36:48',
'docstatus': 0,
- 'modified': '2012-02-14 16:13:59',
+ 'modified': '2012-03-27 14:36:48',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -79,6 +79,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'top_bar',
'fieldtype': u'Section Break',
'label': u'Top Bar',
'permlevel': 0
@@ -132,6 +133,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'footer',
'fieldtype': u'Section Break',
'label': u'Footer',
'permlevel': 0
@@ -180,6 +182,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'domains',
'fieldtype': u'Section Break',
'label': u'Domains',
'permlevel': 0
@@ -210,6 +213,7 @@
# DocField
{
'doctype': u'DocField',
+ 'fieldname': u'analytics',
'fieldtype': u'Section Break',
'label': u'Analytics',
'permlevel': 0
diff --git a/erpnext/website/js/product_category.js b/erpnext/website/js/product_category.js
index 9e0c7f0..956d7a6 100644
--- a/erpnext/website/js/product_category.js
+++ b/erpnext/website/js/product_category.js
@@ -18,7 +18,7 @@
erpnext.product_item_group = {}
erpnext.make_product_categories = function(wrapper) {
- wrapper.category_list = new wn.widgets.Listing({
+ wrapper.category_list = new wn.ui.Listing({
parent: $(wrapper).find('.more-categories').get(0),
query: 'select label, count(t2.name) as items, t1.item_group \
from `tabProduct Group` t1, `tabProduct` t2, tabItem t3\
diff --git a/erpnext/website/js/topbar.js b/erpnext/website/js/topbar.js
index 90ad3e8..aec0f02 100644
--- a/erpnext/website/js/topbar.js
+++ b/erpnext/website/js/topbar.js
@@ -24,7 +24,7 @@
</li>\
*/
-erpnext.navbar.navbar = Class.extend({
+erpnext.navbar.Navbar = Class.extend({
init: function() {
this.make();
$('.brand').html(wn.boot.website_settings.brand_html);
@@ -113,5 +113,5 @@
$(document).bind('startup', function() {
erpnext.footer = new erpnext.Footer();
- erpnext.navbar.navbar = new erpnext.navbar.navbar();
+ erpnext.navbar.navbar = new erpnext.navbar.Navbar();
})
diff --git a/erpnext/website/page/blog/blog.js b/erpnext/website/page/blog/blog.js
index 9ca7392..bc7aec4 100644
--- a/erpnext/website/page/blog/blog.js
+++ b/erpnext/website/page/blog/blog.js
@@ -16,7 +16,7 @@
pscript.onload_blog = function(wrapper) {
- wrapper.blog_list = new wn.widgets.Listing({
+ wrapper.blog_list = new wn.ui.Listing({
parent: $(wrapper).find('.web-main-section').get(0),
query: 'select tabBlog.name, title, left(content, 300) as content, tabBlog.modified, \
ifnull(first_name, "") as first_name, ifnull(last_name, "") as last_name \
diff --git a/erpnext/website/page/products/products.js b/erpnext/website/page/products/products.js
index 7af551e..09ccba0 100644
--- a/erpnext/website/page/products/products.js
+++ b/erpnext/website/page/products/products.js
@@ -57,7 +57,7 @@
}
erpnext.products.make_product_list = function(wrapper) {
- wrapper.mainlist = new wn.widgets.Listing({
+ wrapper.mainlist = new wn.ui.Listing({
parent: $(wrapper).find('.web-main-section').get(0),
run_btn: $(wrapper).find('.products-search .btn').get(0),
hide_refresh: true,
diff --git a/images/redbeech.jpg b/images/redbeech.jpg
new file mode 100644
index 0000000..2480dc9
--- /dev/null
+++ b/images/redbeech.jpg
Binary files differ
diff --git a/js/all-app.js b/js/all-app.js
index 6987da6..fe634e3 100644
--- a/js/all-app.js
+++ b/js/all-app.js
Binary files differ
diff --git a/js/all-web.js b/js/all-web.js
index 5133644..f905fa4 100644
--- a/js/all-web.js
+++ b/js/all-web.js
@@ -1,7 +1,8 @@
/*
* lib/js/lib/history/history.min.js
- *//*
+ */
+/*
* jQuery hashchange event - v1.3 - 7/21/2010
* http://benalman.com/projects/jquery-hashchange-plugin/
*
@@ -11,26 +12,13 @@
*/
(function($,e,b){var c="hashchange",h=document,f,g=$.event.special,i=h.documentMode,d="on"+c in e&&(i===b||i>7);function a(j){j=j||location.href;return"#"+j.replace(/^[^#]*#?(.*)$/,"$1")}$.fn[c]=function(j){return j?this.bind(c,j):this.trigger(c)};$.fn[c].delay=50;g[c]=$.extend(g[c],{setup:function(){if(d){return false}$(f.start)},teardown:function(){if(d){return false}$(f.stop)}});f=(function(){var j={},p,m=a(),k=function(q){return q},l=k,o=k;j.start=function(){p||n()};j.stop=function(){p&&clearTimeout(p);p=b};function n(){var r=a(),q=o(m);if(r!==m){l(m=r,q);$(e).trigger(c)}else{if(q!==m){location.href=location.href.replace(/#.*/,"")+q}}p=setTimeout(n,$.fn[c].delay)}$.browser.msie&&!d&&(function(){var q,r;j.start=function(){if(!q){r=$.fn[c].src;r=r&&r+a();q=$('<iframe tabindex="-1" title="empty"/>').hide().one("load",function(){r||l(a());n()}).attr("src",r||"javascript:0").insertAfter("body")[0].contentWindow;h.onpropertychange=function(){try{if(event.propertyName==="title"){q.document.title=h.title}}catch(s){}}}};j.stop=k;o=function(){return a(q.location.href)};l=function(v,s){var u=q.document,t=$.fn[c].domain;if(v!==s){u.title=h.title;u.open();t&&u.write('<script>document.domain="'+t+'"<\/script>');u.close();q.location.hash=v}}})();return j})()})(jQuery,this);
-// manage history
-// load pages via ajax
-// setup the history adapter
-// if settings no_history is set, no history will be bound
-// this can be used to make it work with legacy
-$(document).bind('ready', function() {
- // standard page openener
- $(window).bind('hashchange', function() {
- if(wn.settings.no_history)
- return;
-
- // load the state on the browser
- wn.page.set(location.hash);
- });
-})
/*
* lib/js/lib/bootstrap.min.js
- */!function(a){a(function(){"use strict",a.support.transition=function(){var b=document.body||document.documentElement,c=b.style,d=c.transition!==undefined||c.WebkitTransition!==undefined||c.MozTransition!==undefined||c.MsTransition!==undefined||c.OTransition!==undefined;return d&&{end:function(){var b="TransitionEnd";return a.browser.webkit?b="webkitTransitionEnd":a.browser.mozilla?b="transitionend":a.browser.opera&&(b="oTransitionEnd"),b}()}}()})}(window.jQuery),!function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype={constructor:c,close:function(b){function f(){e.remove(),e.trigger("closed")}var c=a(this),d=c.attr("data-target"),e;d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),e=a(d),e.trigger("close"),b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.removeClass("in"),a.support.transition&&e.hasClass("fade")?e.on(a.support.transition.end,f):f()}},a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("alert");e||d.data("alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a(function(){a("body").on("click.alert.data-api",b,c.prototype.close)})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.button.defaults,c)};b.prototype={constructor:b,setState:function(a){var b="disabled",c=this.$element,d=c.data(),e=c.is("input")?"val":"html";a+="Text",d.resetText||c.data("resetText",c[e]()),c[e](d[a]||this.options[a]),setTimeout(function(){a=="loadingText"?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},toggle:function(){var a=this.$element.parent('[data-toggle="buttons-radio"]');a&&a.find(".active").removeClass("active"),this.$element.toggleClass("active")}},a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("button"),f=typeof c=="object"&&c;e||d.data("button",e=new b(this,f)),c=="toggle"?e.toggle():c&&e.setState(c)})},a.fn.button.defaults={loadingText:"loading..."},a.fn.button.Constructor=b,a(function(){a("body").on("click.button.data-api","[data-toggle^=button]",function(b){a(b.target).button("toggle")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.carousel.defaults,c),this.options.slide&&this.slide(this.options.slide)};b.prototype={cycle:function(){return this.interval=setInterval(a.proxy(this.next,this),this.options.interval),this},to:function(b){var c=this.$element.find(".active"),d=c.parent().children(),e=d.index(c),f=this;if(b>d.length-1||b<0)return;return this.sliding?this.$element.one("slid",function(){f.to(b)}):e==b?this.pause().cycle():this.slide(b>e?"next":"prev",a(d[b]))},pause:function(){return clearInterval(this.interval),this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(b,c){var d=this.$element.find(".active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this;return this.sliding=!0,f&&this.pause(),e=e.length?e:this.$element.find(".item")[h](),!a.support.transition&&this.$element.hasClass("slide")?(this.$element.trigger("slide"),d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")):(e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),this.$element.trigger("slide"),this.$element.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)})),f&&this.cycle(),this}},a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("carousel"),f=typeof c=="object"&&c;e||d.data("carousel",e=new b(this,f)),typeof c=="number"?e.to(c):typeof c=="string"||(c=f.slide)?e[c]():e.cycle()})},a.fn.carousel.defaults={interval:5e3},a.fn.carousel.Constructor=b,a(function(){a("body").on("click.carousel.data-api","[data-slide]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=!e.data("modal")&&a.extend({},e.data(),c.data());e.carousel(f),b.preventDefault()})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.collapse.defaults,c),this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.prototype={constructor:b,dimension:function(){var a=this.$element.hasClass("width");return a?"width":"height"},show:function(){var b=this.dimension(),c=a.camelCase(["scroll",b].join("-")),d=this.$parent&&this.$parent.find(".in"),e;d&&d.length&&(e=d.data("collapse"),d.collapse("hide"),e||d.data("collapse",null)),this.$element[b](0),this.transition("addClass","show","shown"),this.$element[b](this.$element[0][c])},hide:function(){var a=this.dimension();this.reset(this.$element[a]()),this.transition("removeClass","hide","hidden"),this.$element[a](0)},reset:function(a){var b=this.dimension();this.$element.removeClass("collapse")[b](a||"auto")[0].offsetWidth,this.$element.addClass("collapse")},transition:function(b,c,d){var e=this,f=function(){c=="show"&&e.reset(),e.$element.trigger(d)};this.$element.trigger(c)[b]("in"),a.support.transition&&this.$element.hasClass("collapse")?this.$element.one(a.support.transition.end,f):f()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("collapse"),f=typeof c=="object"&&c;e||d.data("collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.defaults={toggle:!0},a.fn.collapse.Constructor=b,a(function(){a("body").on("click.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e).data("collapse")?"toggle":c.data();a(e).collapse(f)})})}(window.jQuery),!function(a){function d(){a(b).parent().removeClass("open")}"use strict";var b='[data-toggle="dropdown"]',c=function(b){var c=a(b).on("click.dropdown.data-api",this.toggle);a("html").on("click.dropdown.data-api",function(){c.parent().removeClass("open")})};c.prototype={constructor:c,toggle:function(b){var c=a(this),e=c.attr("data-target"),f,g;return e||(e=c.attr("href"),e=e&&e.replace(/.*(?=#[^\s]*$)/,"")),f=a(e),f.length||(f=c.parent()),g=f.hasClass("open"),d(),!g&&f.toggleClass("open"),!1}},a.fn.dropdown=function(b){return this.each(function(){var d=a(this),e=d.data("dropdown");e||d.data("dropdown",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.dropdown.Constructor=c,a(function(){a("html").on("click.dropdown.data-api",d),a("body").on("click.dropdown.data-api",b,c.prototype.toggle)})}(window.jQuery),!function(a){function c(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),d.call(b)},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),d.call(b)})}function d(a){this.$element.hide().trigger("hidden"),e.call(this)}function e(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('<div class="modal-backdrop '+d+'" />').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(a.proxy(this.hide,this)),e&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),e?this.$backdrop.one(a.support.transition.end,b):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,a.proxy(f,this)):f.call(this)):b&&b()}function f(){this.$backdrop.remove(),this.$backdrop=null}function g(){var b=this;this.isShown&&this.options.keyboard?a(document).on("keyup.dismiss.modal",function(a){a.which==27&&b.hide()}):this.isShown||a(document).off("keyup.dismiss.modal")}"use strict";var b=function(b,c){this.options=a.extend({},a.fn.modal.defaults,c),this.$element=a(b).delegate('[data-dismiss="modal"]',"click.dismiss.modal",a.proxy(this.hide,this))};b.prototype={constructor:b,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var b=this;if(this.isShown)return;a("body").addClass("modal-open"),this.isShown=!0,this.$element.trigger("show"),g.call(this),e.call(this,function(){var c=a.support.transition&&b.$element.hasClass("fade");!b.$element.parent().length&&b.$element.appendTo(document.body),b.$element.show(),c&&b.$element[0].offsetWidth,b.$element.addClass("in"),c?b.$element.one(a.support.transition.end,function(){b.$element.trigger("shown")}):b.$element.trigger("shown")})},hide:function(b){b&&b.preventDefault();if(!this.isShown)return;var e=this;this.isShown=!1,a("body").removeClass("modal-open"),g.call(this),this.$element.trigger("hide").removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?c.call(this):d.call(this)}},a.fn.modal=function(c){return this.each(function(){var d=a(this),e=d.data("modal"),f=typeof c=="object"&&c;e||d.data("modal",e=new b(this,f)),typeof c=="string"?e[c]():e.show()})},a.fn.modal.defaults={backdrop:!0,keyboard:!0},a.fn.modal.Constructor=b,a(function(){a("body").on("click.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({},e.data(),c.data());b.preventDefault(),e.modal(f)})})}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("tooltip",a,b)};b.prototype={constructor:b,init:function(b,c,d){var e,f;this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.enabled=!0,this.options.trigger!="manual"&&(e=this.options.trigger=="hover"?"mouseenter":"focus",f=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(e,this.options.selector,a.proxy(this.enter,this)),this.$element.on(f,this.options.selector,a.proxy(this.leave,this))),this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(b){return b=a.extend({},a.fn[this.type].defaults,b,this.$element.data()),b.delay&&typeof b.delay=="number"&&(b.delay={show:b.delay,hide:b.delay}),b},enter:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);!c.options.delay||!c.options.delay.show?c.show():(c.hoverState="in",setTimeout(function(){c.hoverState=="in"&&c.show()},c.options.delay.show))},leave:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);!c.options.delay||!c.options.delay.hide?c.hide():(c.hoverState="out",setTimeout(function(){c.hoverState=="out"&&c.hide()},c.options.delay.hide))},show:function(){var a,b,c,d,e,f,g;if(this.hasContent()&&this.enabled){a=this.tip(),this.setContent(),this.options.animation&&a.addClass("fade"),f=typeof this.options.placement=="function"?this.options.placement.call(this,a[0],this.$element[0]):this.options.placement,b=/in/.test(f),a.remove().css({top:0,left:0,display:"block"}).appendTo(b?this.$element:document.body),c=this.getPosition(b),d=a[0].offsetWidth,e=a[0].offsetHeight;switch(b?f.split(" ")[1]:f){case"bottom":g={top:c.top+c.height,left:c.left+c.width/2-d/2};break;case"top":g={top:c.top-e,left:c.left+c.width/2-d/2};break;case"left":g={top:c.top+c.height/2-e/2,left:c.left-d};break;case"right":g={top:c.top+c.height/2-e/2,left:c.left+c.width}}a.css(g).addClass(f).addClass("in")}},setContent:function(){var a=this.tip();a.find(".tooltip-inner").html(this.getTitle()),a.removeClass("fade in top bottom left right")},hide:function(){function d(){var b=setTimeout(function(){c.off(a.support.transition.end).remove()},500);c.one(a.support.transition.end,function(){clearTimeout(b),c.remove()})}var b=this,c=this.tip();c.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d():c.remove()},fixTitle:function(){var a=this.$element;(a.attr("title")||typeof a.attr("data-original-title")!="string")&&a.attr("data-original-title",a.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(b){return a.extend({},b?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||(typeof c.title=="function"?c.title.call(b[0]):c.title),a=a.toString().replace(/(^\s*|\s*$)/,""),a},tip:function(){return this.$tip=this.$tip||a(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()}},a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("tooltip"),f=typeof c=="object"&&c;e||d.data("tooltip",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.defaults={animation:!0,delay:0,selector:!1,placement:"top",trigger:"hover",title:"",template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'}}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("popover",a,b)};b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype,{constructor:b,setContent:function(){var b=this.tip(),c=this.getTitle(),d=this.getContent();b.find(".popover-title")[a.type(c)=="object"?"append":"html"](c),b.find(".popover-content > *")[a.type(d)=="object"?"append":"html"](d),b.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-content")||(typeof c.content=="function"?c.content.call(b[0]):c.content),a=a.toString().replace(/(^\s*|\s*$)/,""),a},tip:function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip}}),a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("popover"),f=typeof c=="object"&&c;e||d.data("popover",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.defaults=a.extend({},a.fn.tooltip.defaults,{placement:"right",content:"",template:'<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'})}(window.jQuery),!function(a){function b(b,c){var d=a.proxy(this.process,this),e=a(b).is("body")?a(window):a(b),f;this.options=a.extend({},a.fn.scrollspy.defaults,c),this.$scrollElement=e.on("scroll.scroll.data-api",d),this.selector=(this.options.target||(f=a(b).attr("href"))&&f.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=a("body").on("click.scroll.data-api",this.selector,d),this.refresh(),this.process()}"use strict",b.prototype={constructor:b,refresh:function(){this.targets=this.$body.find(this.selector).map(function(){var b=a(this).attr("href");return/^#\w/.test(b)&&a(b).length?b:null}),this.offsets=a.map(this.targets,function(b){return a(b).position().top})},process:function(){var a=this.$scrollElement.scrollTop()+this.options.offset,b=this.offsets,c=this.targets,d=this.activeTarget,e;for(e=b.length;e--;)d!=c[e]&&a>=b[e]&&(!b[e+1]||a<=b[e+1])&&this.activate(c[e])},activate:function(a){var b;this.activeTarget=a,this.$body.find(this.selector).parent(".active").removeClass("active"),b=this.$body.find(this.selector+'[href="'+a+'"]').parent("li").addClass("active"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active")}},a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("scrollspy"),f=typeof c=="object"&&c;e||d.data("scrollspy",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.defaults={offset:10},a(function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(window.jQuery),!function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype={constructor:b,show:function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.attr("data-target"),e,f;d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));if(b.parent("li").hasClass("active"))return;e=c.find(".active a").last()[0],b.trigger({type:"show",relatedTarget:e}),f=a(d),this.activate(b.parent("li"),c),this.activate(f,f.parent(),function(){b.trigger({type:"shown",relatedTarget:e})})},activate:function(b,c,d){function g(){e.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),f?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var e=c.find("> .active"),f=d&&a.support.transition&&e.hasClass("fade");f?e.one(a.support.transition.end,g):g(),e.removeClass("in")}},a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("tab");e||d.data("tab",e=new b(this)),typeof c=="string"&&e[c]()})},a.fn.tab.Constructor=b,a(function(){a("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.typeahead.defaults,c),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.$menu=a(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};b.prototype={constructor:b,select:function(){var a=this.$menu.find(".active").attr("data-value");return this.$element.val(a),this.hide()},show:function(){var b=a.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:b.top+b.height,left:b.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(b){var c=this,d,e;return this.query=this.$element.val(),this.query?(d=a.grep(this.source,function(a){if(c.matcher(a))return a}),d=this.sorter(d),d.length?this.render(d.slice(0,this.options.items)).show():this.shown?this.hide():this):this.shown?this.hide():this},matcher:function(a){return~a.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(a){var b=[],c=[],d=[],e;while(e=a.shift())e.toLowerCase().indexOf(this.query.toLowerCase())?~e.indexOf(this.query)?c.push(e):d.push(e):b.push(e);return b.concat(c,d)},highlighter:function(a){return a.replace(new RegExp("("+this.query+")","ig"),function(a,b){return"<strong>"+b+"</strong>"})},render:function(b){var c=this;return b=a(b).map(function(b,d){return b=a(c.options.item).attr("data-value",d),b.find("a").html(c.highlighter(d)),b[0]}),b.first().addClass("active"),this.$menu.html(b),this},next:function(b){var c=this.$menu.find(".active").removeClass("active"),d=c.next();d.length||(d=a(this.$menu.find("li")[0])),d.addClass("active")},prev:function(a){var b=this.$menu.find(".active").removeClass("active"),c=b.prev();c.length||(c=this.$menu.find("li").last()),c.addClass("active")},listen:function(){this.$element.on("blur",a.proxy(this.blur,this)).on("keypress",a.proxy(this.keypress,this)).on("keyup",a.proxy(this.keyup,this)),(a.browser.webkit||a.browser.msie)&&this.$element.on("keydown",a.proxy(this.keypress,this)),this.$menu.on("click",a.proxy(this.click,this)).on("mouseenter","li",a.proxy(this.mouseenter,this))},keyup:function(a){a.stopPropagation(),a.preventDefault();switch(a.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:this.hide();break;default:this.lookup()}},keypress:function(a){a.stopPropagation();if(!this.shown)return;switch(a.keyCode){case 9:case 13:case 27:a.preventDefault();break;case 38:a.preventDefault(),this.prev();break;case 40:a.preventDefault(),this.next()}},blur:function(a){var b=this;a.stopPropagation(),a.preventDefault(),setTimeout(function(){b.hide()},150)},click:function(a){a.stopPropagation(),a.preventDefault(),this.select()},mouseenter:function(b){this.$menu.find(".active").removeClass("active"),a(b.currentTarget).addClass("active")}},a.fn.typeahead=function(c){return this.each(function(){var d=a(this),e=d.data("typeahead"),f=typeof c=="object"&&c;e||d.data("typeahead",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>'},a.fn.typeahead.Constructor=b,a(function(){a("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(b){var c=a(this);if(c.data("typeahead"))return;b.preventDefault(),c.typeahead(c.data())})})}(window.jQuery);
+ */
+!function(a){a(function(){"use strict",a.support.transition=function(){var b=document.body||document.documentElement,c=b.style,d=c.transition!==undefined||c.WebkitTransition!==undefined||c.MozTransition!==undefined||c.MsTransition!==undefined||c.OTransition!==undefined;return d&&{end:function(){var b="TransitionEnd";return a.browser.webkit?b="webkitTransitionEnd":a.browser.mozilla?b="transitionend":a.browser.opera&&(b="oTransitionEnd"),b}()}}()})}(window.jQuery),!function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype={constructor:c,close:function(b){function f(){e.remove(),e.trigger("closed")}var c=a(this),d=c.attr("data-target"),e;d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),e=a(d),e.trigger("close"),b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.removeClass("in"),a.support.transition&&e.hasClass("fade")?e.on(a.support.transition.end,f):f()}},a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("alert");e||d.data("alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a(function(){a("body").on("click.alert.data-api",b,c.prototype.close)})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.button.defaults,c)};b.prototype={constructor:b,setState:function(a){var b="disabled",c=this.$element,d=c.data(),e=c.is("input")?"val":"html";a+="Text",d.resetText||c.data("resetText",c[e]()),c[e](d[a]||this.options[a]),setTimeout(function(){a=="loadingText"?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},toggle:function(){var a=this.$element.parent('[data-toggle="buttons-radio"]');a&&a.find(".active").removeClass("active"),this.$element.toggleClass("active")}},a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("button"),f=typeof c=="object"&&c;e||d.data("button",e=new b(this,f)),c=="toggle"?e.toggle():c&&e.setState(c)})},a.fn.button.defaults={loadingText:"loading..."},a.fn.button.Constructor=b,a(function(){a("body").on("click.button.data-api","[data-toggle^=button]",function(b){a(b.target).button("toggle")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.carousel.defaults,c),this.options.slide&&this.slide(this.options.slide)};b.prototype={cycle:function(){return this.interval=setInterval(a.proxy(this.next,this),this.options.interval),this},to:function(b){var c=this.$element.find(".active"),d=c.parent().children(),e=d.index(c),f=this;if(b>d.length-1||b<0)return;return this.sliding?this.$element.one("slid",function(){f.to(b)}):e==b?this.pause().cycle():this.slide(b>e?"next":"prev",a(d[b]))},pause:function(){return clearInterval(this.interval),this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(b,c){var d=this.$element.find(".active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this;return this.sliding=!0,f&&this.pause(),e=e.length?e:this.$element.find(".item")[h](),!a.support.transition&&this.$element.hasClass("slide")?(this.$element.trigger("slide"),d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")):(e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),this.$element.trigger("slide"),this.$element.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)})),f&&this.cycle(),this}},a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("carousel"),f=typeof c=="object"&&c;e||d.data("carousel",e=new b(this,f)),typeof c=="number"?e.to(c):typeof c=="string"||(c=f.slide)?e[c]():e.cycle()})},a.fn.carousel.defaults={interval:5e3},a.fn.carousel.Constructor=b,a(function(){a("body").on("click.carousel.data-api","[data-slide]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=!e.data("modal")&&a.extend({},e.data(),c.data());e.carousel(f),b.preventDefault()})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.collapse.defaults,c),this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.prototype={constructor:b,dimension:function(){var a=this.$element.hasClass("width");return a?"width":"height"},show:function(){var b=this.dimension(),c=a.camelCase(["scroll",b].join("-")),d=this.$parent&&this.$parent.find(".in"),e;d&&d.length&&(e=d.data("collapse"),d.collapse("hide"),e||d.data("collapse",null)),this.$element[b](0),this.transition("addClass","show","shown"),this.$element[b](this.$element[0][c])},hide:function(){var a=this.dimension();this.reset(this.$element[a]()),this.transition("removeClass","hide","hidden"),this.$element[a](0)},reset:function(a){var b=this.dimension();this.$element.removeClass("collapse")[b](a||"auto")[0].offsetWidth,this.$element.addClass("collapse")},transition:function(b,c,d){var e=this,f=function(){c=="show"&&e.reset(),e.$element.trigger(d)};this.$element.trigger(c)[b]("in"),a.support.transition&&this.$element.hasClass("collapse")?this.$element.one(a.support.transition.end,f):f()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("collapse"),f=typeof c=="object"&&c;e||d.data("collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.defaults={toggle:!0},a.fn.collapse.Constructor=b,a(function(){a("body").on("click.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e).data("collapse")?"toggle":c.data();a(e).collapse(f)})})}(window.jQuery),!function(a){function d(){a(b).parent().removeClass("open")}"use strict";var b='[data-toggle="dropdown"]',c=function(b){var c=a(b).on("click.dropdown.data-api",this.toggle);a("html").on("click.dropdown.data-api",function(){c.parent().removeClass("open")})};c.prototype={constructor:c,toggle:function(b){var c=a(this),e=c.attr("data-target"),f,g;return e||(e=c.attr("href"),e=e&&e.replace(/.*(?=#[^\s]*$)/,"")),f=a(e),f.length||(f=c.parent()),g=f.hasClass("open"),d(),!g&&f.toggleClass("open"),!1}},a.fn.dropdown=function(b){return this.each(function(){var d=a(this),e=d.data("dropdown");e||d.data("dropdown",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.dropdown.Constructor=c,a(function(){a("html").on("click.dropdown.data-api",d),a("body").on("click.dropdown.data-api",b,c.prototype.toggle)})}(window.jQuery),!function(a){function c(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),d.call(b)},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),d.call(b)})}function d(a){this.$element.hide().trigger("hidden"),e.call(this)}function e(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('<div class="modal-backdrop '+d+'" />').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(a.proxy(this.hide,this)),e&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),e?this.$backdrop.one(a.support.transition.end,b):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,a.proxy(f,this)):f.call(this)):b&&b()}function f(){this.$backdrop.remove(),this.$backdrop=null}function g(){var b=this;this.isShown&&this.options.keyboard?a(document).on("keyup.dismiss.modal",function(a){a.which==27&&b.hide()}):this.isShown||a(document).off("keyup.dismiss.modal")}"use strict";var b=function(b,c){this.options=a.extend({},a.fn.modal.defaults,c),this.$element=a(b).delegate('[data-dismiss="modal"]',"click.dismiss.modal",a.proxy(this.hide,this))};b.prototype={constructor:b,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var b=this;if(this.isShown)return;a("body").addClass("modal-open"),this.isShown=!0,this.$element.trigger("show"),g.call(this),e.call(this,function(){var c=a.support.transition&&b.$element.hasClass("fade");!b.$element.parent().length&&b.$element.appendTo(document.body),b.$element.show(),c&&b.$element[0].offsetWidth,b.$element.addClass("in"),c?b.$element.one(a.support.transition.end,function(){b.$element.trigger("shown")}):b.$element.trigger("shown")})},hide:function(b){b&&b.preventDefault();if(!this.isShown)return;var e=this;this.isShown=!1,a("body").removeClass("modal-open"),g.call(this),this.$element.trigger("hide").removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?c.call(this):d.call(this)}},a.fn.modal=function(c){return this.each(function(){var d=a(this),e=d.data("modal"),f=typeof c=="object"&&c;e||d.data("modal",e=new b(this,f)),typeof c=="string"?e[c]():e.show()})},a.fn.modal.defaults={backdrop:!0,keyboard:!0},a.fn.modal.Constructor=b,a(function(){a("body").on("click.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({},e.data(),c.data());b.preventDefault(),e.modal(f)})})}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("tooltip",a,b)};b.prototype={constructor:b,init:function(b,c,d){var e,f;this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.enabled=!0,this.options.trigger!="manual"&&(e=this.options.trigger=="hover"?"mouseenter":"focus",f=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(e,this.options.selector,a.proxy(this.enter,this)),this.$element.on(f,this.options.selector,a.proxy(this.leave,this))),this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(b){return b=a.extend({},a.fn[this.type].defaults,b,this.$element.data()),b.delay&&typeof b.delay=="number"&&(b.delay={show:b.delay,hide:b.delay}),b},enter:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);!c.options.delay||!c.options.delay.show?c.show():(c.hoverState="in",setTimeout(function(){c.hoverState=="in"&&c.show()},c.options.delay.show))},leave:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);!c.options.delay||!c.options.delay.hide?c.hide():(c.hoverState="out",setTimeout(function(){c.hoverState=="out"&&c.hide()},c.options.delay.hide))},show:function(){var a,b,c,d,e,f,g;if(this.hasContent()&&this.enabled){a=this.tip(),this.setContent(),this.options.animation&&a.addClass("fade"),f=typeof this.options.placement=="function"?this.options.placement.call(this,a[0],this.$element[0]):this.options.placement,b=/in/.test(f),a.remove().css({top:0,left:0,display:"block"}).appendTo(b?this.$element:document.body),c=this.getPosition(b),d=a[0].offsetWidth,e=a[0].offsetHeight;switch(b?f.split(" ")[1]:f){case"bottom":g={top:c.top+c.height,left:c.left+c.width/2-d/2};break;case"top":g={top:c.top-e,left:c.left+c.width/2-d/2};break;case"left":g={top:c.top+c.height/2-e/2,left:c.left-d};break;case"right":g={top:c.top+c.height/2-e/2,left:c.left+c.width}}a.css(g).addClass(f).addClass("in")}},setContent:function(){var a=this.tip();a.find(".tooltip-inner").html(this.getTitle()),a.removeClass("fade in top bottom left right")},hide:function(){function d(){var b=setTimeout(function(){c.off(a.support.transition.end).remove()},500);c.one(a.support.transition.end,function(){clearTimeout(b),c.remove()})}var b=this,c=this.tip();c.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d():c.remove()},fixTitle:function(){var a=this.$element;(a.attr("title")||typeof a.attr("data-original-title")!="string")&&a.attr("data-original-title",a.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(b){return a.extend({},b?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||(typeof c.title=="function"?c.title.call(b[0]):c.title),a=a.toString().replace(/(^\s*|\s*$)/,""),a},tip:function(){return this.$tip=this.$tip||a(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()}},a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("tooltip"),f=typeof c=="object"&&c;e||d.data("tooltip",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.defaults={animation:!0,delay:0,selector:!1,placement:"top",trigger:"hover",title:"",template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'}}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("popover",a,b)};b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype,{constructor:b,setContent:function(){var b=this.tip(),c=this.getTitle(),d=this.getContent();b.find(".popover-title")[a.type(c)=="object"?"append":"html"](c),b.find(".popover-content > *")[a.type(d)=="object"?"append":"html"](d),b.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-content")||(typeof c.content=="function"?c.content.call(b[0]):c.content),a=a.toString().replace(/(^\s*|\s*$)/,""),a},tip:function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip}}),a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("popover"),f=typeof c=="object"&&c;e||d.data("popover",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.defaults=a.extend({},a.fn.tooltip.defaults,{placement:"right",content:"",template:'<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'})}(window.jQuery),!function(a){function b(b,c){var d=a.proxy(this.process,this),e=a(b).is("body")?a(window):a(b),f;this.options=a.extend({},a.fn.scrollspy.defaults,c),this.$scrollElement=e.on("scroll.scroll.data-api",d),this.selector=(this.options.target||(f=a(b).attr("href"))&&f.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=a("body").on("click.scroll.data-api",this.selector,d),this.refresh(),this.process()}"use strict",b.prototype={constructor:b,refresh:function(){this.targets=this.$body.find(this.selector).map(function(){var b=a(this).attr("href");return/^#\w/.test(b)&&a(b).length?b:null}),this.offsets=a.map(this.targets,function(b){return a(b).position().top})},process:function(){var a=this.$scrollElement.scrollTop()+this.options.offset,b=this.offsets,c=this.targets,d=this.activeTarget,e;for(e=b.length;e--;)d!=c[e]&&a>=b[e]&&(!b[e+1]||a<=b[e+1])&&this.activate(c[e])},activate:function(a){var b;this.activeTarget=a,this.$body.find(this.selector).parent(".active").removeClass("active"),b=this.$body.find(this.selector+'[href="'+a+'"]').parent("li").addClass("active"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active")}},a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("scrollspy"),f=typeof c=="object"&&c;e||d.data("scrollspy",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.defaults={offset:10},a(function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(window.jQuery),!function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype={constructor:b,show:function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.attr("data-target"),e,f;d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));if(b.parent("li").hasClass("active"))return;e=c.find(".active a").last()[0],b.trigger({type:"show",relatedTarget:e}),f=a(d),this.activate(b.parent("li"),c),this.activate(f,f.parent(),function(){b.trigger({type:"shown",relatedTarget:e})})},activate:function(b,c,d){function g(){e.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),f?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var e=c.find("> .active"),f=d&&a.support.transition&&e.hasClass("fade");f?e.one(a.support.transition.end,g):g(),e.removeClass("in")}},a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("tab");e||d.data("tab",e=new b(this)),typeof c=="string"&&e[c]()})},a.fn.tab.Constructor=b,a(function(){a("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.typeahead.defaults,c),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.$menu=a(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};b.prototype={constructor:b,select:function(){var a=this.$menu.find(".active").attr("data-value");return this.$element.val(a),this.hide()},show:function(){var b=a.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:b.top+b.height,left:b.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(b){var c=this,d,e;return this.query=this.$element.val(),this.query?(d=a.grep(this.source,function(a){if(c.matcher(a))return a}),d=this.sorter(d),d.length?this.render(d.slice(0,this.options.items)).show():this.shown?this.hide():this):this.shown?this.hide():this},matcher:function(a){return~a.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(a){var b=[],c=[],d=[],e;while(e=a.shift())e.toLowerCase().indexOf(this.query.toLowerCase())?~e.indexOf(this.query)?c.push(e):d.push(e):b.push(e);return b.concat(c,d)},highlighter:function(a){return a.replace(new RegExp("("+this.query+")","ig"),function(a,b){return"<strong>"+b+"</strong>"})},render:function(b){var c=this;return b=a(b).map(function(b,d){return b=a(c.options.item).attr("data-value",d),b.find("a").html(c.highlighter(d)),b[0]}),b.first().addClass("active"),this.$menu.html(b),this},next:function(b){var c=this.$menu.find(".active").removeClass("active"),d=c.next();d.length||(d=a(this.$menu.find("li")[0])),d.addClass("active")},prev:function(a){var b=this.$menu.find(".active").removeClass("active"),c=b.prev();c.length||(c=this.$menu.find("li").last()),c.addClass("active")},listen:function(){this.$element.on("blur",a.proxy(this.blur,this)).on("keypress",a.proxy(this.keypress,this)).on("keyup",a.proxy(this.keyup,this)),(a.browser.webkit||a.browser.msie)&&this.$element.on("keydown",a.proxy(this.keypress,this)),this.$menu.on("click",a.proxy(this.click,this)).on("mouseenter","li",a.proxy(this.mouseenter,this))},keyup:function(a){a.stopPropagation(),a.preventDefault();switch(a.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:this.hide();break;default:this.lookup()}},keypress:function(a){a.stopPropagation();if(!this.shown)return;switch(a.keyCode){case 9:case 13:case 27:a.preventDefault();break;case 38:a.preventDefault(),this.prev();break;case 40:a.preventDefault(),this.next()}},blur:function(a){var b=this;a.stopPropagation(),a.preventDefault(),setTimeout(function(){b.hide()},150)},click:function(a){a.stopPropagation(),a.preventDefault(),this.select()},mouseenter:function(b){this.$menu.find(".active").removeClass("active"),a(b.currentTarget).addClass("active")}},a.fn.typeahead=function(c){return this.each(function(){var d=a(this),e=d.data("typeahead"),f=typeof c=="object"&&c;e||d.data("typeahead",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>'},a.fn.typeahead.Constructor=b,a(function(){a("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(b){var c=a(this);if(c.data("typeahead"))return;b.preventDefault(),c.typeahead(c.data())})})}(window.jQuery);
+
/*
* lib/js/lib/sprintf.js
*/
@@ -61,6 +49,7 @@
/*
* lib/js/core.min.js
*/
+
/*
* lib/js/wn/class.js
*/;(function(){var initializing=false,fnTest=/xyz/.test(function(){xyz;})?/\b_super\b/:/.*/;this.Class=function(){};Class.extend=function(prop){var _super=this.prototype;initializing=true;var prototype=new this();initializing=false;for(var name in prop){prototype[name]=typeof prop[name]=="function"&&typeof _super[name]=="function"&&fnTest.test(prop[name])?(function(name,fn){return function(){var tmp=this._super;this._super=_super[name];var ret=fn.apply(this,arguments);this._super=tmp;return ret;};})(name,prop[name]):prop[name];}
@@ -75,13 +64,6 @@
parent=parent[n];}}
wn.provide('wn.settings');wn.provide('wn.ui');
/*
- * lib/js/wn/xmlhttp.js
- */
-wn.xmlhttp={request:function(){if(window.XMLHttpRequest)
-return new XMLHttpRequest();else if(window.ActiveXObject)
-return new ActiveXObject("MsXml2.XmlHttp");},complete:function(req,callback,url){if(req.status==200||req.status==304){callback(req.responseText);}else{alert(url+' request error: '+req.statusText+' ('+req.status+')');}},get:function(url,callback,args,async){if(async===null)async=true;var req=wn.xmlhttp.request();req.onreadystatechange=function(){if(req.readyState==4){wn.xmlhttp.complete(req,callback,url)}}
-var sep=((args&&args.indexOf('?'))==-1)?'?':'&';var u=args?(url+sep+args):url;req.open('GET',u,async);req.send(null);if(!async){wn.xmlhttp.complete(req,callback,url)}}}
-/*
* lib/js/wn/versions.js
*/
wn.versions={check:function(){if(window.localStorage){if(window._version_number==-1||parseInt(localStorage._version_number)!=parseInt(window._version_number)){var localversion=localStorage._version_number;localStorage.clear();console.log("Cache cleared - version: "+localversion
@@ -92,9 +74,8 @@
*/
wn.assets={executed_:{},exists:function(src){if('localStorage'in window&&localStorage.getItem(src))
return true},add:function(src,txt){if('localStorage'in window){localStorage.setItem(src,txt);}},get:function(src){return localStorage.getItem(src);},extn:function(src){if(src.indexOf('?')!=-1){src=src.split('?').slice(-1)[0];}
-return src.split('.').slice(-1)[0];},load:function(src){var t=src;wn.xmlhttp.get(t,function(txt){wn.assets.add(src,txt);},'q='+Math.floor(Math.random()*1000),false)},execute:function(src){if(!wn.assets.exists(src)){wn.assets.load(src);}
-var type=wn.assets.extn(src);if(wn.assets.handler[type]){wn.assets.handler[type](wn.assets.get(src),src);wn.assets.executed_[src]=1;}},handler:{js:function(txt,src){wn.dom.eval(txt);},css:function(txt,src){var se=document.createElement('style');se.type="text/css";if(se.styleSheet){se.styleSheet.cssText=txt;}else{se.appendChild(document.createTextNode(txt));}
-document.getElementsByTagName('head')[0].appendChild(se);},cgi:function(txt,src){wn.dom.eval(txt)}}}
+return src.split('.').slice(-1)[0];},load:function(src){var t=src;$.ajax({url:t,data:{q:Math.floor(Math.random()*1000)},dataType:'text',success:function(txt){wn.assets.add(src,txt);},async:false})},execute:function(src){if(!wn.assets.exists(src)){wn.assets.load(src);}
+var type=wn.assets.extn(src);if(wn.assets.handler[type]){wn.assets.handler[type](wn.assets.get(src),src);wn.assets.executed_[src]=1;}},handler:{js:function(txt,src){wn.dom.eval(txt);},css:function(txt,src){wn.dom.set_style(txt);},cgi:function(txt,src){wn.dom.eval(txt)}}}
/*
* lib/js/wn/require.js
*/
@@ -104,7 +85,9 @@
* lib/js/wn/dom.js
*/
wn.provide('wn.dom');wn.dom.by_id=function(id){return document.getElementById(id);}
-wn.dom.eval=function(txt){var el=document.createElement('script');el.appendChild(document.createTextNode(txt));document.getElementsByTagName('head')[0].appendChild(el);}
+wn.dom.eval=function(txt){if(!txt)return;var el=document.createElement('script');el.appendChild(document.createTextNode(txt));document.getElementsByTagName('head')[0].appendChild(el);}
+wn.dom.set_style=function(txt){if(!txt)return;var se=document.createElement('style');se.type="text/css";if(se.styleSheet){se.styleSheet.cssText=txt;}else{se.appendChild(document.createTextNode(txt));}
+document.getElementsByTagName('head')[0].appendChild(se);}
wn.dom.add=function(parent,newtag,className,cs,innerHTML,onclick){if(parent&&parent.substr)parent=wn.dom.by_id(parent);var c=document.createElement(newtag);if(parent)
parent.appendChild(c);if(className){if(newtag.toLowerCase()=='img')
c.src=className
@@ -112,15 +95,19 @@
c.className=className;}
if(cs)wn.dom.css(c,cs);if(innerHTML)c.innerHTML=innerHTML;if(onclick)c.onclick=onclick;return c;}
wn.dom.css=function(ele,s){if(ele&&s){for(var i in s)ele.style[i]=s[i];};return ele;}
-wn.dom.hide=function(ele){ele.style.display='none';}
-wn.dom.show=function(ele,value){if(!value)value='block';ele.style.display=value;}
+wn.get_cookie=function(c){var t=""+document.cookie;var ind=t.indexOf(c);if(ind==-1||c=="")return"";var ind1=t.indexOf(';',ind);if(ind1==-1)ind1=t.length;return unescape(t.substring(ind+c.length+1,ind1));}
+wn.dom.set_box_shadow=function(ele,spread){$(ele).css('-moz-box-shadow','0px 0px '+spread+'px rgba(0,0,0,0.3);')
+$(ele).css('-webkit-box-shadow','0px 0px '+spread+'px rgba(0,0,0,0.3);')
+$(ele).css('-box-shadow','0px 0px '+spread+'px rgba(0,0,0,0.3);')}
/*
- * lib/js/wn/page.js
+ * lib/js/wn/model.js
*/
-wn.page={set:function(src){var new_selection=$('.inner div.content[_src="'+src+'"]');if(!new_selection.length){wn.assets.execute(src);new_selection=$('.inner div.content[_src="'+src+'"]');}
-$('.inner .current_page').removeClass('current_page');new_selection.addClass('current_page');var title=$('nav ul li a[href*="'+src+'"]').attr('title')||'No Title'
-state=window.location.hash;if(state!=src){window.location.hash=state;}
-else{document.title=title;}}}
+wn.provide('wn.model');wn.model={no_value_type:['Section Break','Column Break','HTML','Table','Button','Image'],new_names:{},with_doctype:function(doctype,callback){if(locals.DocType[doctype]){callback();}else{wn.call({method:'webnotes.widgets.form.load.getdoctype',args:{doctype:doctype},callback:callback});}},with_doc:function(doctype,name,callback){if(!name)name=doctype;if(locals[doctype]&&locals[doctype][name]){callback(name);}else{if(name&&name.indexOf('New '+doctype)!=-1){name=LocalDB.create(doctype);callback(name);}else{wn.call({method:'webnotes.widgets.form.load.getdoc',args:{doctype:doctype,name:name},callback:function(r){callback(name);}});}}},can_delete:function(doctype){if(!doctype)return false;return locals.DocType[doctype].allow_trash&&wn.boot.profile.can_cancel.indexOf(doctype)!=-1;}}
+/*
+ * lib/js/wn/misc/tools.js
+ */
+wn.markdown=function(txt){if(!wn.md2html){wn.require('lib/js/lib/showdown.js');wn.md2html=new Showdown.converter();}
+return wn.md2html.makeHtml(txt);}
/*
* lib/js/wn/misc/user.js
*/
@@ -130,6 +117,8 @@
if(!wn.boot.user_info[uid].fullname)
wn.boot.user_info[uid].fullname=uid;if(!wn.boot.user_info[uid].image)
wn.boot.user_info[uid].image=def.image;return wn.boot.user_info[uid];}
+wn.session_alive=true;$(document).bind('mousemove',function(){wn.session_alive=true;if(wn.session_alive_timeout)
+clearTimeout(wn.session_alive_timeout);wn.session_alive_timeout=setTimeout('wn.session_alive=false;',30000);})
/*
* lib/js/lib/json2.js
*/
@@ -159,19 +148,248 @@
if(/^[\],:{}\s]*$/.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,'@').replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,']').replace(/(?:^|:|,)(?:\s*\[)+/g,''))){j=eval('('+text+')');return typeof reviver==='function'?walk({'':j},''):j;}
throw new SyntaxError('JSON.parse');};}}());
/*
+ * lib/js/wn/router.js
+ */
+wn.route=function(){wn._cur_route=window.location.hash;route=wn.get_route();switch(route[0]){case"List":wn.views.doclistview.show(route[1]);break;case"Form":if(route.length>3){route[2]=route.splice(2).join('/');}
+wn.views.formview.show(route[1],route[2]);break;case"Report":wn.views.reportview.show(route[1],route[2]);break;default:wn.views.pageview.show(route[0]);}}
+wn.get_route=function(route){if(!route)
+route=window.location.hash;if(route.substr(0,1)=='#')route=route.substr(1);if(route.substr(0,1)=='!')route=route.substr(1);return $.map(route.split('/'),function(r){return decodeURIComponent(r);});}
+wn.set_route=function(){route=$.map(arguments,function(a){return encodeURIComponent(a)}).join('/');window.location.hash=route;}
+wn._cur_route=null;$(window).bind('hashchange',function(){if(location.hash==wn._cur_route)
+return;wn.route();if(wn.boot.analytics_code){try{eval(wn.boot.analytics_code);}catch(e){console.log(e);}}});
+/*
+ * lib/js/wn/ui/listing.js
+ */
+wn.provide('wn.ui');wn.ui.Listing=Class.extend({init:function(opts){this.opts=opts||{};this.page_length=20;this.start=0;this.data=[];if(opts){this.make();}},prepare_opts:function(){if(this.opts.new_doctype){if(wn.boot.profile.can_read.indexOf(this.opts.new_doctype)==-1){this.opts.new_doctype=null;}else{this.opts.new_doctype=get_doctype_label(this.opts.new_doctype);}}
+if(!this.opts.no_result_message){this.opts.no_result_message='Nothing to show'}},make:function(opts){if(opts){this.opts=opts;}
+this.prepare_opts();$.extend(this,this.opts);$(this.parent).html(repl('\
+ <div class="wnlist">\
+ <h3 class="title hide">%(title)s</h3>\
+ \
+ <div class="list-filters hide">\
+ <div class="show_filters well">\
+ <div>\
+ <button class="btn btn-small add-filter-btn">\
+ <i class="icon-plus"></i> Add Filter</button>\
+ </div>\
+ <div class="filter_area"></div>\
+ </div>\
+ </div>\
+ \
+ <div style="height: 37px; margin-bottom:9px" class="list-toolbar-wrapper">\
+ <div class="list-toolbar btn-group" style="display:inline-block; margin-right: 10px;">\
+ <a class="btn btn-small btn-refresh btn-info">\
+ <i class="icon-refresh icon-white"></i> Refresh</a>\
+ <a class="btn btn-small btn-new">\
+ <i class="icon-plus"></i> New</a>\
+ <a class="btn btn-small btn-filter">\
+ <i class="icon-search"></i> Filter</a>\
+ </div>\
+ <div style="display:inline-block; width: 24px; margin-left: 4px">\
+ <img src="lib/images/ui/button-load.gif" \
+ class="img-load"/></div>\
+ </div><div style="clear:both"></div>\
+ \
+ <div class="no-result help hide">\
+ %(no_result_message)s\
+ </div>\
+ \
+ <div class="result">\
+ <div class="result-list"></div>\
+ <div class="result-grid hide"></div>\
+ </div>\
+ \
+ <div class="paging-button">\
+ <button class="btn btn-small btn-more hide">More...</div>\
+ </div>\
+ </div>\
+ ',this.opts));this.$w=$(this.parent).find('.wnlist');this.set_events();if(this.show_filters){this.make_filters();}},add_button:function(html,onclick,before){$(html).click(onclick).insertBefore(this.$w.find('.list-toolbar '+before));this.btn_groupify();},show_view:function($btn,$div,$btn_unsel,$div_unsel){$btn_unsel.removeClass('btn-info');$btn_unsel.find('i').removeClass('icon-white');$div_unsel.toggle(false);$btn.addClass('btn-info');$btn.find('i').addClass('icon-white');$div.toggle(true);},set_events:function(){var me=this;this.$w.find('.btn-refresh').click(function(){me.run();});this.$w.find('.btn-more').click(function(){me.run({append:true});});if(this.title){this.$w.find('h3').html(this.title).toggle(true);}
+if(this.new_doctype){this.$w.find('.btn-new').toggle(true).click(function(){newdoc(me.new_doctype);})}else{this.$w.find('.btn-new').remove();}
+if(!me.show_filters){this.$w.find('.btn-filter').remove();}
+if(this.hide_refresh||this.no_refresh){this.$w.find('.btn-refresh').remove();}
+this.btn_groupify();},btn_groupify:function(){var nbtns=this.$w.find('.list-toolbar a').length;if(nbtns==0){this.$w.find('.list-toolbar-wrapper').toggle(false);}},make_filters:function(){this.filter_list=new wn.ui.FilterList({listobj:this,$parent:this.$w.find('.list-filters').toggle(true),doctype:this.doctype,filter_fields:this.filter_fields});},clear:function(){this.data=[];this.$w.find('.result-list').empty();this.$w.find('.result').toggle(true);this.$w.find('.no-result').toggle(false);this.start=0;},run:function(){var me=this;var a0=arguments[0];var a1=arguments[1];if(a0&&typeof a0=='function')
+this.onrun=a0;if(a0&&a0.callback)
+this.onrun=a0.callback;if(!a1&&!(a0&&a0.append))
+this.start=0;me.set_working(true);wn.call({method:this.opts.method||'webnotes.widgets.query_builder.runquery',args:this.get_call_args(),callback:function(r){me.set_working(false);me.render_results(r)},no_spinner:this.opts.no_loading});},set_working:function(flag){this.$w.find('.img-load').toggle(flag);},get_call_args:function(){if(!this.method){this.query=this.get_query?this.get_query():this.query;this.add_limits();var args={query_max:this.query_max,as_dict:1}
+args.simple_query=this.query;}else{var args={limit_start:this.start,limit_page_length:this.page_length}}
+if(this.args)
+$.extend(args,this.args)
+if(this.get_args){$.extend(args,this.get_args());}
+return args;},render_results:function(r){if(this.start==0)this.clear();this.$w.find('.btn-more').toggle(false);if(r.message)r.values=r.message;if(r.values&&r.values.length){this.data=this.data.concat(r.values);this.render_list(r.values);}else{if(this.start==0){this.$w.find('.result').toggle(false);this.$w.find('.no-result').toggle(true);}}
+if(this.onrun)this.onrun();if(this.callback)this.callback(r);},render_list:function(values){var m=Math.min(values.length,this.page_length);for(var i=0;i<m;i++){this.render_row(this.add_row(),values[i],this,i);}
+this.start+=m;if(values.length>=this.page_length)
+this.$w.find('.btn-more').toggle(true);},add_row:function(){return this.$w.find('.result-list').append('<div class="list-row">').find('.list-row:last').get(0);},refresh:function(){this.run();},add_limits:function(){this.query+=' LIMIT '+this.start+','+(this.page_length+1);}});wn.ui.FilterList=Class.extend({init:function(opts){wn.require('lib/js/legacy/widgets/form/fields.js');$.extend(this,opts);this.filters=[];this.$w=this.$parent;this.set_events();},set_events:function(){var me=this;this.listobj.$w.find('.btn-filter').bind('click',function(){me.$w.find('.show_filters').slideToggle();if(!me.filters.length)
+me.add_filter();});this.$w.find('.add-filter-btn').bind('click',function(){me.add_filter();});},add_filter:function(fieldname,condition,value){this.filters.push(new wn.ui.Filter({flist:this,fieldname:fieldname,condition:condition,value:value}));if(fieldname){this.$w.find('.show_filters').slideDown();}},get_filters:function(){var values=[];$.each(this.filters,function(i,f){if(f.field)
+values.push(f.get_value());})
+return values;},update_filters:function(){var fl=[];$.each(this.filters,function(i,f){if(f.field)fl.push(f);})
+this.filters=fl;},get_filter:function(fieldname){for(var i in this.filters){if(this.filters[i].field.df.fieldname==fieldname)
+return this.filters[i];}}});wn.ui.Filter=Class.extend({init:function(opts){$.extend(this,opts);this.doctype=this.flist.doctype;this.fields_by_name={};this.make();this.make_options();this.set_events();},make:function(){this.flist.$w.find('.filter_area').append('<div class="list_filter">\
+ <select class="fieldname_select"></select>\
+ <select class="condition">\
+ <option value="=">Equals</option>\
+ <option value="like">Like</option>\
+ <option value=">=">Greater or equals</option>\
+ <option value=">=">Less or equals</option>\
+ <option value=">">Greater than</option>\
+ <option value="<">Less than</option>\
+ <option value="in">In</option>\
+ <option value="!=">Not equals</option>\
+ </select>\
+ <span class="filter_field"></span>\
+ <a class="close">×</a>\
+ </div>');this.$w=this.flist.$w.find('.list_filter:last-child');this.$select=this.$w.find('.fieldname_select');},make_options:function(){if(this.filter_fields){for(var i in this.filter_fields)
+this.add_field_option(this.filter_fields[i])}else{this.render_field_select();}},set_events:function(){var me=this;this.$w.find('.fieldname_select').bind('change',function(){me.set_field(this.value);});this.$w.find('a.close').bind('click',function(){me.$w.css('display','none');var value=me.field.get_value();me.field=null;if(!me.flist.get_filters().length){me.flist.$w.find('.set_filters').toggle(true);me.flist.$w.find('.show_filters').toggle(false);}
+if(value){me.flist.listobj.run();}
+me.flist.update_filters();return false;});me.$w.find('.condition').change(function(){if($(this).val()=='in'){me.set_field(me.field.df.fieldname,'Data');if(!me.field.desc_area)
+me.field.desc_area=$a(me.field.wrapper,'span','help',null,'values separated by comma');}else{me.set_field(me.field.df.fieldname);}});if(me.fieldname){this.set_values(me.fieldname,me.condition,me.value);}else{me.set_field('name');}},set_values:function(fieldname,condition,value){this.set_field(fieldname);if(condition)this.$w.find('.condition').val(condition).change();if(value)this.field.set_input(value)},render_field_select:function(){var me=this;me.table_fields=[];var std_filters=[{fieldname:'name',fieldtype:'Data',label:'ID',parent:me.doctype},{fieldname:'modified',fieldtype:'Date',label:'Last Modified',parent:me.doctype},{fieldname:'owner',fieldtype:'Data',label:'Created By',parent:me.doctype},{fieldname:'_user_tags',fieldtype:'Data',label:'Tags',parent:me.doctype}];$.each(std_filters.concat(fields_list[me.doctype]),function(i,df){me.add_field_option(df);});$.each(me.table_fields,function(i,table_df){if(table_df.options){$.each(fields_list[table_df.options],function(i,df){me.add_field_option(df);});}})},add_field_option:function(df){var me=this;if(me.doctype&&df.parent==me.doctype){var label=df.label;var table=get_label_doctype(me.doctype);if(df.fieldtype=='Table')me.table_fields.push(df);}else{var label=df.label+' ('+df.parent+')';var table=df.parent;}
+if(wn.model.no_value_type.indexOf(df.fieldtype)==-1&&!me.fields_by_name[df.fieldname]){this.$select.append($('<option>',{value:df.fieldname,table:table}).text(label));me.fields_by_name[df.fieldname]=df;}},set_field:function(fieldname,fieldtype){var me=this;var cur=me.field?{fieldname:me.field.df.fieldname,fieldtype:me.field.df.fieldtype}:{}
+var df=me.fields_by_name[fieldname];this.set_fieldtype(df,fieldtype);if(me.field&&cur.fieldname==fieldname&&df.fieldtype==cur.fieldtype){return;}
+me.$w.find('.fieldname_select').val(fieldname);var field_area=me.$w.find('.filter_field').empty().get(0);f=make_field(df,null,field_area,null,0,1);f.df.single_select=1;f.not_in_form=1;f.with_label=0;f.refresh();me.field=f;this.set_default_condition(df,fieldtype);$(me.field.wrapper).find(':input').keydown(function(ev){if(ev.which==13){me.flist.listobj.run();}})},set_fieldtype:function(df,fieldtype){if(df.original_type)
+df.fieldtype=df.original_type;else
+df.original_type=df.fieldtype;df.description='';df.reqd=0;if(fieldtype){df.fieldtype=fieldtype;return;}
+if(df.fieldtype=='Check'){df.fieldtype='Select';df.options='No\nYes';}else if(['Text','Text Editor','Code','Link'].indexOf(df.fieldtype)!=-1){df.fieldtype='Data';}},set_default_condition:function(df,fieldtype){if(!fieldtype){if(df.fieldtype=='Data'){this.$w.find('.condition').val('like');}else{this.$w.find('.condition').val('=');}}},get_value:function(){var me=this;var val=me.field.get_value();var cond=me.$w.find('.condition').val();if(me.field.df.original_type=='Check'){val=(val=='Yes'?1:0);}
+if(cond=='like'){val=val+'%';}
+return[me.$w.find('.fieldname_select option:selected').attr('table'),me.field.df.fieldname,me.$w.find('.condition').val(),cstr(val)];}});
+/*
+ * lib/js/wn/views/container.js
+ */
+wn.provide('wn.pages');wn.provide('wn.views');wn.views.Container=Class.extend({init:function(){this.container=$('#body_div').get(0);this.page=null;this.pagewidth=$('#body_div').width();this.pagemargin=50;},add_page:function(label,onshow,onhide){var page=$('<div class="content"></div>').appendTo(this.container).get(0);if(onshow)
+$(page).bind('show',onshow);if(onshow)
+$(page).bind('hide',onhide);page.label=label;wn.pages[label]=page;return page;},change_to:function(label){if(this.page&&this.page.label==label){return;}
+var me=this;if(label.tagName){var page=label;}else{var page=wn.pages[label];}
+if(!page){console.log('Page not found '+label);return;}
+if(this.page){$(this.page).toggle(false);$(this.page).trigger('hide');}
+this.page=page;$(this.page).fadeIn();$(this.page).trigger('show');this.page._route=window.location.hash;document.title=this.page.label;scroll(0,0);return this.page;}});wn.views.add_module_btn=function(parent,module){$(parent).append(repl('<span class="label" style="margin-right: 8px; cursor: pointer;"\
+ onclick="wn.set_route(\'%(module_small)s-home\')">\
+ <i class="icon-home icon-white"></i> %(module)s Home\
+ </span>',{module:module,module_small:module.toLowerCase()}));}
+wn.views.add_list_btn=function(parent,doctype){$(parent).append(repl('<span class="label" style="margin-right: 8px; cursor: pointer;"\
+ onclick="wn.set_route(\'List\', \'%(doctype)s\')">\
+ <i class="icon-list icon-white"></i> %(doctype)s List\
+ </span>',{doctype:doctype}));}
+/*
+ * lib/js/wn/views/doclistview.js
+ */
+wn.provide('wn.views.doclistview');wn.provide('wn.doclistviews');wn.views.doclistview.pages={};wn.views.doclistview.show=function(doctype){var pagename=doctype+' List';var doctype=get_label_doctype(doctype);wn.model.with_doctype(doctype,function(){var page=wn.views.doclistview.pages[pagename];if(!page){var page=wn.container.add_page(pagename);page.doclistview=new wn.views.DocListView(doctype,page);wn.views.doclistview.pages[pagename]=page;}
+document.title=page.doclistview.label;wn.container.change_to(pagename);})}
+wn.views.DocListView=wn.ui.Listing.extend({init:function(doctype,page){this.doctype=doctype;this.$page=$(page);this.label=get_doctype_label(doctype);this.label=(this.label.toLowerCase().substr(-4)=='list')?this.label:(this.label+' List');this.make_page();this.setup();},make_page:function(){var me=this;this.$page.html(repl('<div class="layout-wrapper layout-wrapper-background">\
+ <div class="layout-main-section">\
+ <a class="close" onclick="window.history.back();">×</a>\
+ <div class="breadcrumbs-area"></div>\
+ <h1>%(label)s</h1>\
+ <hr>\
+ <div class="wnlist-area"><div class="help">Loading...</div></div>\
+ </div>\
+ <div class="layout-side-section">\
+ <div class="stat-wrapper show-docstatus hide">\
+ <h4>Show</h4>\
+ <div><input data-docstatus="0" type="checkbox" checked="checked" /> Drafts</div>\
+ <div><input data-docstatus="1" type="checkbox" checked="checked" /> Submitted</div>\
+ <div><input data-docstatus="2" type="checkbox" /> Cancelled</div>\
+ </div>\
+ </div>\
+ <div style="clear: both"></div>\
+ </div>',{label:this.label}));wn.views.breadcrumbs(this.$page.find('.breadcrumbs-area').get(0),locals.DocType[this.doctype].module);},setup:function(){var me=this;me.can_delete=wn.model.can_delete(me.doctype);me.meta=locals.DocType[me.doctype];me.$page.find('.wnlist-area').empty(),me.setup_docstatus_filter();me.setup_listview();me.init_list();me.init_stats();me.add_delete_option();},setup_docstatus_filter:function(){var me=this;this.can_submit=$.map(locals.DocPerm,function(d){if(d.parent==me.meta.name&&d.submit)return 1
+else return null;}).length;if(this.can_submit){this.$page.find('.show-docstatus').removeClass('hide');this.$page.find('.show-docstatus input').click(function(){me.run();})}},setup_listview:function(){if(this.meta.__listjs){eval(this.meta.__listjs);this.listview=new wn.doclistviews[this.doctype](this);}else{this.listview=new wn.views.ListView(this);}
+this.listview.parent=this;},init_list:function(){this.make({method:'webnotes.widgets.doclistview.get',get_args:this.get_args,parent:this.$page.find('.wnlist-area'),start:0,page_length:20,show_filters:true,show_grid:true,new_doctype:this.doctype,allow_delete:true,no_result_message:this.make_no_result(),columns:this.listview.fields});this.run();},make_no_result:function(){return repl('<div class="well"><p>No %(doctype_label)s found</p>\
+ %(description)s\
+ <hr>\
+ <p><button class="btn btn-info btn-small"\
+ onclick="wn.set_route(\'Form\', \'%(doctype)s\', \'New %(doctype)s\');"\
+ >Make a new %(doctype_label)s</button>\
+ </p></div>',{doctype_label:get_doctype_label(this.doctype),doctype:this.doctype,description:wn.markdown(locals.DocType[this.doctype].description||'')});},render_row:function(row,data){data.doctype=this.doctype;this.listview.render(row,data,this);},get_query_fields:function(){return this.listview.fields;},get_args:function(){return{doctype:this.doctype,fields:this.get_query_fields(),filters:this.filter_list.get_filters(),docstatus:this.can_submit?$.map(this.$page.find('.show-docstatus :checked'),function(inp){return $(inp).attr('data-docstatus')}):[]}},add_delete_option:function(){var me=this;if(this.can_delete){this.add_button('<a class="btn btn-small btn-delete">\
+ <i class="icon-remove"></i> Delete</a>',function(){me.delete_items();},'.btn-filter')}},delete_items:function(){var me=this;var dl=$.map(me.$page.find('.list-delete:checked'),function(e){return $(e).data('name');});if(!dl.length)
+return;if(!confirm('This is PERMANENT action and you cannot undo. Continue?')){return;}
+me.set_working(true);wn.call({method:'webnotes.widgets.doclistview.delete_items',args:{items:dl,doctype:me.doctype},callback:function(){me.set_working(false);me.refresh();}})},init_stats:function(){var me=this
+wn.call({method:'webnotes.widgets.doclistview.get_stats',args:{stats:me.listview.stats,doctype:me.doctype},callback:function(r){$.each(r.message,function(field,stat){me.render_stat(field,stat);});}});},render_stat:function(field,stat){var me=this;if(!stat||!stat.length){if(field=='_user_tags'){this.$page.find('.layout-side-section').append('<div class="stat-wrapper"><h4>Tags</h4>\
+ <div class="help small"><i>No records tagged.</i><br><br> \
+ To add a tag, open the document and click on \
+ "Add Tag" on the sidebar</div></div>');}
+return;}
+var label=fields[this.doctype][field]?fields[this.doctype][field].label:field;if(label=='_user_tags')label='Tags';var $w=$('<div class="stat-wrapper">\
+ <h4>'+label+'</h4>\
+ <div class="stat-grid">\
+ </div>\
+ </div>');stat=stat.sort(function(a,b){return b[1]-a[1]});var sum=0;$.each(stat,function(i,v){sum=sum+v[1];})
+$.each(stat,function(i,v){me.render_stat_item(i,v,sum,field).appendTo($w.find('.stat-grid'));});$w.appendTo(this.$page.find('.layout-side-section'));},render_stat_item:function(i,v,max,field){var me=this;var args={}
+args.label=v[0];args.width=flt(v[1])/max*100;args.count=v[1];args.field=field;$item=$(repl('<div class="stat-item">\
+ <div class="stat-bar" style="width: %(width)s%"></div>\
+ <div class="stat-label">\
+ <a href="#" data-label="%(label)s" data-field="%(field)s">\
+ %(label)s</a> \
+ (%(count)s)</div>\
+ </div>',args));this.setup_stat_item_click($item);return $item;},setup_stat_item_click:function($item){var me=this;$item.find('a').click(function(){var fieldname=$(this).attr('data-field');var label=$(this).attr('data-label');me.set_filter(fieldname,label);return false;});},set_filter:function(fieldname,label){var filter=this.filter_list.get_filter(fieldname);if(filter){var v=filter.field.get_value();if(v.indexOf(label)!=-1){return false;}else{if(fieldname=='_user_tags'){this.filter_list.add_filter(fieldname,'like','%'+label);}else{filter.set_values(fieldname,'in',v+', '+label);}}}else{if(fieldname=='_user_tags'){this.filter_list.add_filter(fieldname,'like','%'+label);}else{this.filter_list.add_filter(fieldname,'=',label);}}
+this.run();}});wn.views.ListView=Class.extend({init:function(doclistview){this.doclistview=doclistview;this.doctype=doclistview.doctype;var t="`tab"+this.doctype+"`.";this.fields=[t+'name',t+'owner',t+'docstatus',t+'_user_tags',t+'modified'];this.stats=['_user_tags'];if(!this.doclistview.can_delete){this.columns=$.map(this.columns,function(v,i){if(v.content!='check')return v});}},columns:[{width:'3%',content:'check'},{width:'4%',content:'avatar'},{width:'3%',content:'docstatus',css:{"text-align":"center"}},{width:'35%',content:'name'},{width:'40%',content:'tags',css:{'color':'#aaa'}},{width:'15%',content:'modified',css:{'text-align':'right','color':'#777'}}],render_column:function(data,parent,opts){var me=this;if(opts.css){$.each(opts.css,function(k,v){$(parent).css(k,v)});}
+if(opts.content.indexOf&&opts.content.indexOf('+')!=-1){$.map(opts.content.split('+'),function(v){me.render_column(data,parent,{content:v});});return;}
+if(typeof opts.content=='function'){opts.content(parent,data);}
+else if(opts.content=='name'){$(parent).html(repl('<a href="#!Form/%(doctype)s/%(name)s">%(name)s</a>',data));}
+else if(opts.content=='avatar'){$(parent).html(repl('<span class="avatar-small"><img src="%(avatar)s" \
+ title="%(fullname)s"/></span>',data));}
+else if(opts.content=='check'){$(parent).html('<input class="list-delete" type="checkbox">');$(parent).find('input').data('name',data.name);}
+else if(opts.content=='docstatus'){$(parent).html(repl('<span class="docstatus"><i class="%(docstatus_icon)s" \
+ title="%(docstatus_title)s"></i></span>',data));}
+else if(opts.content=='tags'){this.add_user_tags(parent,data);}
+else if(opts.content=='modified'){$(parent).append(data.when);}
+else if(opts.type=='bar-graph'){args={percent:data[opts.content],fully_delivered:(data[opts.content]>99?'bar-complete':''),label:opts.label}
+$(parent).html(repl('<span class="bar-outer" style="width: 30px; float: right" \
+ title="%(percent)s% %(label)s">\
+ <span class="bar-inner %(fully_delivered)s" \
+ style="width: %(percent)s%;"></span>\
+ </span>',args));}
+else if(data[opts.content]){$(parent).append(' '+data[opts.content]);}},render:function(row,data){var me=this;this.prepare_data(data);rowhtml='';$.each(this.columns,function(i,v){rowhtml+=repl('<td style="width: %(width)s"></td>',v);});var tr=$(row).html('<table><tbody><tr>'+rowhtml+'</tr></tbody></table>').find('tr').get(0);$.each(this.columns,function(i,v){me.render_column(data,tr.cells[i],v);});},prepare_data:function(data){data.fullname=wn.user_info(data.owner).fullname;data.avatar=wn.user_info(data.owner).image;data.when=dateutil.str_to_user(data.modified).split(' ')[0];var diff=dateutil.get_diff(dateutil.get_today(),data.modified.split(' ')[0]);if(diff==0){data.when='Today'}
+if(diff==1){data.when='Yesterday'}
+if(diff==2){data.when='2 days ago'}
+if(data.docstatus==0||data.docstatus==null){data.docstatus_icon='icon-pencil';data.docstatus_title='Editable';}else if(data.docstatus==1){data.docstatus_icon='icon-lock';data.docstatus_title='Submitted';}else if(data.docstatus==2){data.docstatus_icon='icon-remove';data.docstatus_title='Cancelled';}},add_user_tags:function(parent,data){var me=this;if(data._user_tags){$.each(data._user_tags.split(','),function(i,t){if(t){$('<span class="label label-info" style="cursor: pointer">'
++strip(t)+'</span>').click(function(){me.doclistview.set_filter('_user_tags',$(this).text())}).appendTo(parent);}});}}})
+/*
+ * lib/js/wn/views/pageview.js
+ */
+wn.provide('wn.views.pageview');wn.views.pageview={pages:{},with_page:function(name,callback){if(!locals.Page[name]){wn.call({method:'webnotes.widgets.page.getpage',args:{'name':name},callback:callback});}else{callback();}},show:function(name){wn.views.pageview.with_page(name,function(){if(!wn.pages[name]){wn.views.pageview.pages[name]=new wn.views.Page(name);}
+wn.container.change_to(name);});}}
+wn.views.Page=Class.extend({init:function(name){this.name=name;var me=this;this.pagedoc=locals.Page[this.name];this.wrapper=wn.container.add_page(this.name);this.wrapper.label=this.pagedoc.title||this.pagedoc.name;this.wrapper.innerHTML=this.pagedoc.content;wn.dom.eval(this.pagedoc.__script||this.pagedoc.script||'');wn.dom.set_style(this.pagedoc.style);this.trigger('onload');$(this.wrapper).bind('show',function(){cur_frm=null;me.trigger('onshow');me.trigger('refresh');});},trigger:function(eventname){var me=this;try{if(pscript[eventname+'_'+this.name]){pscript[eventname+'_'+this.name](me.wrapper);}else if(me.wrapper[eventname]){me.wrapper[eventname](me.wrapper);}}catch(e){console.log(e);}}})
+/*
+ * lib/js/wn/views/formview.js
+ */
+wn.provide('wn.views.formview');wn.views.formview={show:function(dt,dn){if(wn.model.new_names[dn])
+dn=wn.model.new_names[dn];wn.model.with_doctype(dt,function(){wn.model.with_doc(dt,dn,function(dn){if(!wn.views.formview[dt]){wn.views.formview[dt]=wn.container.add_page('Form - '+dt);wn.views.formview[dt].frm=new _f.Frm(dt,wn.views.formview[dt]);}
+wn.container.change_to('Form - '+dt);wn.views.formview[dt].frm.refresh(dn);});})}}
+/*
+ * lib/js/wn/views/reportview.js
+ */
+wn.views.reportview={show:function(dt,rep_name){wn.require('lib/js/legacy/report.compressed.js');dt=get_label_doctype(dt);if(!_r.rb_con){_r.rb_con=new _r.ReportContainer();}
+_r.rb_con.set_dt(dt,function(rb){if(rep_name){var t=rb.current_loaded;rb.load_criteria(rep_name);if(onload)
+onload(rb);if((rb.dt)&&(!rb.dt.has_data()||rb.current_loaded!=t))
+rb.dt.run();}
+if(!rb.forbidden){wn.container.change_to('Report Builder');}});}}
+/*
+ * lib/js/wn/request.js
+ */
+wn.provide('wn.request');wn.request.url='index.cgi';wn.request.prepare=function(opts){if(opts.btn)$(opts.btn).set_working();if(opts.show_spinner)set_loading();if(opts.freeze)freeze();if(!opts.args.cmd){console.log(opts)
+throw"Incomplete Request";}}
+wn.request.cleanup=function(opts,r){if(opts.btn)$(opts.btn).done_working();if(opts.show_spinner)hide_loading();if(opts.freeze)unfreeze();if(wn.boot.sid&&wn.get_cookie('sid')!=wn.boot.sid){msgprint('Session expired');setTimeout('redirect_to_login()',3000);return;}
+if(r.server_messages)msgprint(r.server_messages)
+if(r.exc){errprint(r.exc);console.log(r.exc);};if(r.docs)LocalDB.sync(r.docs);}
+wn.request.call=function(opts){wn.request.prepare(opts);$.ajax({url:opts.url||wn.request.url,data:opts.args,type:opts.type||'POST',dataType:opts.dataType||'json',success:function(r,xhr){wn.request.cleanup(opts,r);opts.success(r,xhr.responseText);},error:function(xhr,textStatus){wn.request.cleanup(opts,{});msgprint('Unable to complete request: '+textStatus)
+if(opts.error)opts.error(xhr)}})}
+wn.call=function(opts){var args=$.extend({},opts.args)
+if(opts.module&&opts.page){args.cmd=opts.module+'.page.'+opts.page+'.'+opts.page+'.'+opts.method}else if(opts.method){args.cmd=opts.method;}
+for(key in args){if(args[key]&&typeof args[key]!='string'){args[key]=JSON.stringify(args[key]);}}
+wn.request.call({args:args,success:opts.callback,error:opts.error,btn:opts.btn,freeze:opts.freeze,show_spinner:!opts.no_spinner});}
+/*
* lib/js/core.js
*/
if(!console){var console={log:function(txt){errprint(txt);}}}
wn.versions.check();$(document).bind('ready',function(){var base=window.location.href.split('#')[0];$.each($('a[softlink!="false"]'),function(i,v){if(v.href.substr(0,base.length)==base){var path=(v.href.substr(base.length));if(path.substr(0,1)!='#'){v.href=base+'#'+path;}}});if(!wn.settings.no_history&&window.location.hash){wn.page.set(window.location.hash.substr(1));}});
+
/*
* lib/js/legacy/globals.js
*/
wn.provide('wn.widgets.form');wn.provide('wn.widgets.report');wn.provide('wn.utils');wn.provide('wn.model');wn.provide('wn.profile');wn.provide('wn.session');wn.provide('_f');wn.provide('_p');wn.provide('_r');wn.provide('_c');wn.provide('_e');wn.provide('_startup_data')
-wn.settings.no_history=1;var NEWLINE='\n';var login_file='';var version='v170';var profile=null;var session={};var is_testing=false;var user=null;var user_defaults=null;var user_roles=null;var user_fullname=null;var user_email=null;var user_img={};var home_page=null;var hide_autosuggest=null;var page_body=null;var pscript={};var selector=null;var top_index=91;var _f={};var _p={};var _e={};var _r={};var FILTER_SEP='\1';var frms={};var cur_frm=null;var pscript={};var validated=true;var validation_message='';var tinymce_loaded=null;var cur_autosug=null;
+wn.settings.no_history=1;var NEWLINE='\n';var login_file='';var version='v170';var profile=null;var session={};var is_testing=false;var user=null;var user_defaults=null;var user_roles=null;var user_fullname=null;var user_email=null;var user_img={};var home_page=null;var pscript={};var selector=null;var top_index=91;var _f={};var _p={};var _e={};var _r={};var FILTER_SEP='\1';var frms={};var cur_frm=null;var pscript={};var validated=true;var validation_message='';var tinymce_loaded=null;
/*
* lib/js/legacy/utils/datatype.js
*/
-var startup_list=[];wn.utils.full_name=function(fn,ln){return fn+(ln?' ':'')+(ln?ln:'')}
+wn.utils.full_name=function(fn,ln){return fn+(ln?' ':'')+(ln?ln:'')}
function fmt_money(v){if(v==null||v=='')return'0.00';v=(v+'').replace(/,/g,'');v=parseFloat(v);if(isNaN(v)){return'';}else{var cp=wn.control_panel;var val=2;if(cp.currency_format=='Millions')val=3;v=v.toFixed(2);var delimiter=",";amount=v+'';var a=amount.split('.',2)
var d=a[1];var i=parseInt(a[0]);if(isNaN(i)){return'';}
var minus='';if(v<0){minus='-';}
@@ -198,7 +416,7 @@
function nth(number){number=cint(number);var s='th';if((number+'').substr(-1)=='1')s='st';if((number+'').substr(-1)=='2')s='nd';if((number+'').substr(-1)=='3')s='rd';return number+s;}
function flt(v,decimals){if(v==null||v=='')return 0;v=(v+'').replace(/,/g,'');v=parseFloat(v);if(isNaN(v))
v=0;if(decimals!=null)
-return v.toFixed(decimals);return v;}
+return parseFloat(v.toFixed(decimals));return v;}
function esc_quotes(s){if(s==null)s='';return s.replace(/'/,"\'");}
var crop=function(s,len){if(s.length>len)
return s.substr(0,len-3)+'...';else
@@ -239,7 +457,7 @@
var month_list=['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'];var month_last={1:31,2:28,3:31,4:30,5:31,6:30,7:31,8:31,9:30,10:31,11:30,12:31}
var month_list_full=['January','February','March','April','May','June','July','August','September','October','November','December'];var week_list=['Sun','Mon','Tue','Wed','Thu','Fri','Sat'];var week_list_full=['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'];function int_to_str(i,len){i=''+i;if(i.length<len)for(c=0;c<(len-i.length);c++)i='0'+i;return i}
wn.datetime={str_to_obj:function(d){if(!d)return new Date();var tm=[null,null];if(d.search(' ')!=-1){var tm=d.split(' ')[1].split(':');var d=d.split(' ')[0];}
-if(d.search('-')!=-1){var t=d.split('-');return new Date(t[0],t[1]-1,t[2],tm[0],tm[1]);}else if(d.search('/')!=-1){var t=d.split('/');return new Date(t[0],t[1]-1,t[2],tm[0],tm[1]);}else{return new Date();}},obj_to_str:function(d){return d.getFullYear()+'-'+int_to_str(d.getMonth()+1,2)+'-'+int_to_str(d.getDate(),2);},obj_to_user:function(d){return dateutil.str_to_user(dateutil.obj_to_str(d));},get_diff:function(d1,d2){return((d1-d2)/86400000);},get_day_diff:function(d1,d2){return dateutil.get_diff(new Date(d1.getYear(),d1.getMonth(),d1.getDate(),0,0),new Date(d2.getYear(),d2.getMonth(),d2.getDate(),0,0))},add_days:function(d,days){d.setTime(d.getTime()+(days*24*60*60*1000));return d},add_months:function(d,months){dt=dateutil.str_to_obj(d)
+if(d.search('-')!=-1){var t=d.split('-');return new Date(t[0],t[1]-1,t[2],tm[0],tm[1]);}else if(d.search('/')!=-1){var t=d.split('/');return new Date(t[0],t[1]-1,t[2],tm[0],tm[1]);}else{return new Date();}},obj_to_str:function(d){return d.getFullYear()+'-'+int_to_str(d.getMonth()+1,2)+'-'+int_to_str(d.getDate(),2);},obj_to_user:function(d){return dateutil.str_to_user(dateutil.obj_to_str(d));},get_diff:function(d1,d2){if(typeof d1=='string')d1=dateutil.str_to_obj(d1);if(typeof d2=='string')d2=dateutil.str_to_obj(d2);return((d1-d2)/86400000);},get_day_diff:function(d1,d2){return dateutil.get_diff(new Date(d1.getYear(),d1.getMonth(),d1.getDate(),0,0),new Date(d2.getYear(),d2.getMonth(),d2.getDate(),0,0))},add_days:function(d,days){d.setTime(d.getTime()+(days*24*60*60*1000));return d},add_months:function(d,months){dt=dateutil.str_to_obj(d)
new_dt=new Date(dt.getFullYear(),dt.getMonth()+months,dt.getDate())
if(new_dt.getDate()!=dt.getDate()){return dateutil.month_end(new Date(dt.getFullYear(),dt.getMonth()+months,1))}
return dateutil.obj_to_str(new_dt);},month_start:function(){var d=new Date();return d.getFullYear()+'-'+int_to_str(d.getMonth()+1,2)+'-01';},month_end:function(d){if(!d)var d=new Date();var m=d.getMonth()+1;var y=d.getFullYear();last_date=month_last[m];if(m==2&&(y%4)==0&&((y%100)!=0||(y%400)==0))
@@ -280,13 +498,13 @@
*/
wn.dom.set_unique_id=function(ele){var id='unique-'+wn.dom.id_count;ele.setAttribute('id',id);wn.dom.id_count++;return id;}
wn.tinymce={add_simple:function(ele,height){if(ele.myid){tinyMCE.execCommand('mceAddControl',true,ele.myid);return;}
-ele.myid=wn.dom.set_unique_id(ele);$(ele).tinymce({script_url:'lib/js/legacy/tiny_mce_33/tiny_mce.js',height:height?height:'200px',theme:"advanced",theme_advanced_buttons1:"bold,italic,underline,separator,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,bullist,numlist,outdent,indent,link,unlink,forecolor,backcolor,code,",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"left",theme_advanced_path:false,theme_advanced_resizing:false});},remove:function(ele){tinyMCE.execCommand('mceRemoveControl',true,ele.myid);},get_value:function(ele){return tinymce.get(ele.myid).getContent();}}
+ele.myid=wn.dom.set_unique_id(ele);$(ele).tinymce({script_url:'lib/js/lib/tiny_mce_33/tiny_mce.js',height:height?height:'200px',theme:"advanced",theme_advanced_buttons1:"bold,italic,underline,separator,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,bullist,numlist,outdent,indent,link,unlink,forecolor,backcolor,code,",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"left",theme_advanced_path:false,theme_advanced_resizing:false});},remove:function(ele){tinyMCE.execCommand('mceRemoveControl',true,ele.myid);},get_value:function(ele){return tinymce.get(ele.myid).getContent();}}
wn.ele={link:function(args){var span=$a(args.parent,'span','link_type',args.style);span.loading_img=$a(args.parent,'img','',{margin:'0px 4px -2px 4px',display:'none'});span.loading_img.src='lib/images/ui/button-load.gif';span.innerHTML=args.label;span.user_onclick=args.onclick;span.onclick=function(){if(!this.disabled)this.user_onclick(this);}
span.set_working=function(){this.disabled=1;$di(this.loading_img);}
span.done_working=function(){this.disabled=0;$dh(this.loading_img);}
return span;}}
function $ln(parent,label,onclick,style){return wn.ele.link({parent:parent,label:label,onclick:onclick,style:style})}
-function $btn(parent,label,onclick,style,css_class,is_ajax){wn.require('lib/js/wn/ui/button.js');if(css_class==='green')css_class='btn-primary';return new wn.ui.Button({parent:parent,label:label,onclick:onclick,style:style,is_ajax:is_ajax,css_class:css_class}).btn;}
+function $btn(parent,label,onclick,style,css_class,is_ajax){if(css_class==='green')css_class='btn-info';return new wn.ui.Button({parent:parent,label:label,onclick:onclick,style:style,is_ajax:is_ajax,css_class:css_class}).btn;}
$item_normal=function(ele){$y(ele,{padding:'6px 8px',cursor:'pointer',marginRight:'8px',whiteSpace:'nowrap',overflow:'hidden',borderBottom:'1px solid #DDD'});$bg(ele,'#FFF');$fg(ele,'#000');}
$item_active=function(ele){$bg(ele,'#FE8');$fg(ele,'#000');}
$item_selected=function(ele){$bg(ele,'#777');$fg(ele,'#FFF');}
@@ -294,6 +512,9 @@
$.fn.done_working=function(){var ele=this.get(0);ele.disabled=0;if(ele.loading_img){$dh(ele.loading_img)};}})(jQuery);function set_opacity(ele,ieop){var op=ieop/100;if(ele.filters){try{ele.filters.item("DXImageTransform.Microsoft.Alpha").opacity=ieop;}catch(e){ele.style.filter='progid:DXImageTransform.Microsoft.Alpha(opacity='+ieop+')';}}else{ele.style.opacity=op;}}
$br=function(ele,r,corners){if(corners){var cl=['top-left','top-right','bottom-right','bottom-left'];for(var i=0;i<4;i++){if(corners[i]){$(ele).css('-moz-border-radius-'+cl[i].replace('-',''),r).css('-webkit-'+cl[i]+'-border-radius',r);}}}else{$(ele).css('-moz-border-radius',r).css('-webkit-border-radius',r).css('border-radius',r);}}
$bs=function(ele,r){$(ele).css('-moz-box-shadow',r).css('-webkit-box-shadow',r).css('box-shadow',r);}
+function SelectWidget(parent,options,width,editable,bg_color){var me=this;this.inp=$a(parent,'select');if(options)add_sel_options(this.inp,options);if(width)$y(this.inp,{width:width});this.set_width=function(w){$y(this.inp,{width:w})};this.set_options=function(o){add_sel_options(this.inp,o);}
+this.inp.onchange=function(){if(me.onchange)me.onchange(this);}
+return;}
function empty_select(s){if(s.custom_select){s.empty();return;}
if(s.inp)s=s.inp;if(s){var tmplen=s.length;for(var i=0;i<tmplen;i++)s.options[0]=null;}}
function sel_val(s){if(s.custom_select){return s.inp.value?s.inp.value:'';}
@@ -323,12 +544,9 @@
d.style.display=t;}
function $di(d){if(d&&d.substr)d=$i(d);if(d)d.style.display='inline';}
function $i(id){if(!id)return null;if(id&&id.appendChild)return id;return document.getElementById(id);}
-function $t(parent,txt){if(parent.substr)parent=$i(parent);return parent.appendChild(document.createTextNode(txt));}
function $w(e,w){if(e&&e.style&&w)e.style.width=w;}
function $h(e,h){if(e&&e.style&&h)e.style.height=h;}
function $bg(e,w){if(e&&e.style&&w)e.style.backgroundColor=w;}
-function $fg(e,w){if(e&&e.style&&w)e.style.color=w;}
-function $op(e,w){if(e&&e.style&&w){set_opacity(e,w);}}
function $y(ele,s){if(ele&&s){for(var i in s)ele.style[i]=s[i];};return ele;}
function $yt(tab,r,c,s){var rmin=r;var rmax=r;if(r=='*'){rmin=0;rmax=tab.rows.length-1;}
if(r.search&&r.search('-')!=-1){r=r.split('-');rmin=cint(r[0]);rmax=cint(r[1]);}
@@ -336,8 +554,7 @@
if(c.search&&c.search('-')!=-1){c=c.split('-');rmin=cint(c[0]);rmax=cint(c[1]);}
for(var ri=rmin;ri<=rmax;ri++){for(var ci=cmin;ci<=cmax;ci++)
$y($td(tab,ri,ci),s);}}
-function set_style(txt){var se=document.createElement('style');se.type="text/css";if(se.styleSheet){se.styleSheet.cssText=txt;}else{se.appendChild(document.createTextNode(txt));}
-document.getElementsByTagName('head')[0].appendChild(se);}
+function set_style(txt){wn.dom.set_style(txt);}
function make_table(parent,nr,nc,table_width,widths,cell_style,table_style){var t=$a(parent,'table');t.style.borderCollapse='collapse';if(table_width)t.style.width=table_width;if(cell_style)t.cell_style=cell_style;for(var ri=0;ri<nr;ri++){var r=t.insertRow(ri);for(var ci=0;ci<nc;ci++){var c=r.insertCell(ci);if(ri==0&&widths&&widths[ci]){c.style.width=widths[ci];}
if(cell_style){for(var s in cell_style)c.style[s]=cell_style[s];}}}
t.append_row=function(){return append_row(this);}
@@ -354,54 +571,26 @@
function get_scroll_top(){var st=0;if(document.documentElement&&document.documentElement.scrollTop)
st=document.documentElement.scrollTop;else if(document.body&&document.body.scrollTop)
st=document.body.scrollTop;return st;}
-function get_cookie(c){var t=""+document.cookie;var ind=t.indexOf(c);if(ind==-1||c=="")return"";var ind1=t.indexOf(';',ind);if(ind1==-1)ind1=t.length;return unescape(t.substring(ind+c.length+1,ind1));}
wn.urllib={get_arg:function(name){name=name.replace(/[\[]/,"\\\[").replace(/[\]]/,"\\\]");var regexS="[\\?&]"+name+"=([^&#]*)";var regex=new RegExp(regexS);var results=regex.exec(window.location.href);if(results==null)
return"";else
return decodeURIComponent(results[1]);},get_dict:function(){var d={}
var t=window.location.href.split('?')[1];if(!t)return d;if(t.indexOf('#')!=-1)t=t.split('#')[0];if(!t)return d;t=t.split('&');for(var i=0;i<t.length;i++){var a=t[i].split('=');d[decodeURIComponent(a[0])]=decodeURIComponent(a[1]);}
return d;},get_base_url:function(){var url=window.location.href.split('#')[0].split('?')[0].split('index.cgi')[0];if(url.substr(url.length-1,1)=='/')url=url.substr(0,url.length-1)
return url},get_file_url:function(file_id){return repl('files/%(fn)s',{fn:file_id})}}
-get_url_arg=wn.urllib.get_arg;get_url_dict=wn.urllib.get_dict;var user_img={}
-var user_img_queue={};var user_img_loading=[];set_user_img=function(img,username,get_latest,img_id){function set_it(i){if(user_img[username]=='no_img_m')
-i.src='lib/images/ui/no_img_m.gif';else if(user_img[username]=='no_img_f')
-i.src='lib/images/ui/no_img_f.gif';else{ac_id=wn.control_panel.account_id;i.src=repl('cgi-bin/getfile.cgi?ac=%(ac)s&name=%(fn)s',{fn:user_img[username],ac:ac_id});}}
-if(img_id){user_img[username]=img_id;set_it(img);return;}
-if(user_img[username]&&!get_latest){set_it(img);}else{if(in_list(user_img_loading,username)){if(!user_img_queue[username])
-user_img_queue[username]=[];user_img_queue[username].push(img);return;}
-$c('webnotes.profile.get_user_img',{username:username},function(r,rt){delete user_img_loading[user_img_loading.indexOf(username)];user_img[username]=r.message;if(user_img_queue[username]){var q=user_img_queue[username];for(var i in q){set_it(q[i]);}}
-set_it(img);},null,1);user_img_loading.push(username);}}
+get_url_arg=wn.urllib.get_arg;get_url_dict=wn.urllib.get_dict;
/*
* lib/js/legacy/utils/handler.js
*/
-var outUrl="index.cgi";var NULL_CHAR='^\5*';function checkResponse(r,on_timeout,no_spinner,freeze_msg){try{if(r.readyState==4&&r.status==200)return true;else return false;}catch(e){msgprint("error:Request timed out, try again");if(on_timeout)
-on_timeout();hide_loading();if(freeze_msg)
-unfreeze();return false;}}
-var pending_req=0;function newHttpReq(){if(!$.browser.msie)
-var r=new XMLHttpRequest();else if(window.ActiveXObject)
-var r=new ActiveXObject("Microsoft.XMLHTTP");return r;}
-function $c(command,args,fn,on_timeout,no_spinner,freeze_msg,btn){var req=newHttpReq();ret_fn=function(){if(checkResponse(req,on_timeout,no_spinner,freeze_msg)){if(btn)$(btn).done_working();if(!no_spinner)
-hide_loading();var rtxt=req.responseText;try{var r=JSON.parse(rtxt);}catch(e){msgprint('Handler Exception:'+rtxt);return;}
-if(freeze_msg)unfreeze();if(!validate_session(r,rtxt))return;if(r.exc){errprint(r.exc);console.log(r.exc);};if(r.server_messages){msgprint(r.server_messages);};if(r.docs){LocalDB.sync(r.docs);}
-saveAllowed=true;if(fn)fn(r,rtxt);}}
-if(btn)$(btn).set_working();req.onreadystatechange=ret_fn;req.open("POST",outUrl,true);req.setRequestHeader("ENCTYPE","multipart/form-data");req.setRequestHeader("Content-Type","application/x-www-form-urlencoded; charset=UTF-8");args['cmd']=command;req.send(makeArgString(args));if(!no_spinner)set_loading();if(freeze_msg)freeze(freeze_msg,1);}
-function validate_session(r,rt){if(r.message=='Logged In'){start_sid=get_cookie('sid');return true;}
-if(start_sid&&start_sid!=get_cookie('sid')&&user&&user!='Guest'){page_body.set_session_changed();return;}
-if(r.exc&&r.session_status=='Session Expired'){resume_session();return;}
-if(r.exc&&r.session_status=='Logged Out'){msgprint('You have been logged out');setTimeout('redirect_to_login()',3000);return;}
-if(r.exc&&r.exc_type&&r.exc_type=='PermissionError'){loadpage('_home');}
-return true;}
-function $c_obj(doclist,method,arg,call_back,no_spinner,freeze_msg,btn){var args={'method':method,'arg':(typeof arg=='string'?arg:JSON.stringify(arg))}
-if(typeof doclist=='string')args.doctype=doclist;else args.docs=compress_doclist(doclist)
-$c('runserverobj',args,call_back,null,no_spinner,freeze_msg,btn);}
-function $c_page(module,page,method,arg,call_back,no_spinner,freeze_msg,btn){if(arg&&!arg.substr)arg=JSON.stringify(arg);$c(module+'.page.'+page+'.'+page+'.'+method,{'arg':arg},call_back,null,no_spinner,freeze_msg,btn);}
-wn.call=function(args){if(!args.args)args.args={};if(args.module&&args.page){$c_page(args.module,args.page,args.method,args.args,args.callback,args.no_spinner,false,args.btn);}else if(args.docs){$c_obj(args.doc,args.method,args.args,args.callback,args.no_spinner,false,args.btn);}else{$c(args.method,args.args,args.callback,false,args.no_spinner,false,args.btn);}}
+function $c(command,args,callback,error,no_spinner,freeze_msg,btn){wn.request.call({args:$.extend(args,{cmd:command}),success:callback,error:error,btn:btn,freeze:freeze_msg,show_spinner:!no_spinner})}
+function $c_obj(doclist,method,arg,callback,no_spinner,freeze_msg,btn){if(arg&&typeof arg!='string')arg=JSON.stringify(arg);args={cmd:'runserverobj',arg:arg,method:method};if(typeof doclist=='string')
+args.doctype=doclist;else
+args.docs=compress_doclist(doclist)
+wn.request.call({args:args,success:callback,btn:btn,freeze:freeze_msg,show_spinner:!no_spinner});}
+function $c_page(module,page,method,arg,callback,no_spinner,freeze_msg,btn){if(arg&&typeof arg!='string')arg=JSON.stringify(arg);wn.request.call({args:{cmd:module+'.page.'+page+'.'+page+'.'+method,arg:arg,method:method},success:callback,btn:btn,freeze:freeze_msg,show_spinner:!no_spinner});}
function $c_obj_csv(doclist,method,arg){var args={}
args.cmd='runserverobj';args.as_csv=1;args.method=method;args.arg=arg;if(doclist.substr)
args.doctype=doclist;else
-args.docs=compress_doclist(doclist);open_url_post(outUrl,args);}
-function my_eval(co){var w=window;if(!w.execScript){if(/Gecko/.test(navigator.userAgent)){eval(co,w);}else{eval.call(w,co);}}else{w.execScript(co);}}
-function makeArgString(dict){var varList=[];for(key in dict){varList[varList.length]=key+'='+encodeURIComponent(dict[key]);}
-return varList.join('&');}
+args.docs=compress_doclist(doclist);open_url_post(wn.request.url,args);}
function open_url_post(URL,PARAMS,new_window){var temp=document.createElement("form");temp.action=URL;temp.method="POST";temp.style.display="none";if(new_window){temp.target='_blank';}
for(var x in PARAMS){var opt=document.createElement("textarea");opt.name=x;opt.value=PARAMS[x];temp.appendChild(opt);}
document.body.appendChild(temp);temp.submit();return temp;}
@@ -438,22 +627,22 @@
*/
var no_value_fields=['Section Break','Column Break','HTML','Table','FlexTable','Button','Image'];var codeid=0;var code_editors={};function Field(){this.with_label=1;}
Field.prototype.make_body=function(){var ischk=(this.df.fieldtype=='Check'?1:0);if(this.parent)
-this.wrapper=$a(this.parent,'div');else
-this.wrapper=document.createElement('div');this.label_area=$a(this.wrapper,'div','',{margin:'8px 0px 2px 0px'});if(ischk&&!this.in_grid){this.input_area=$a(this.label_area,'span','',{marginRight:'4px'});this.disp_area=$a(this.label_area,'span','',{marginRight:'4px'});}
-if(this.with_label){this.label_span=$a(this.label_area,'span','field_label')
+this.wrapper=$a(this.parent,(this.with_label?'div':'span'));else
+this.wrapper=document.createElement((this.with_label?'div':'span'));this.label_area=$a(this.wrapper,'div','',{margin:'0px 0px 2px 0px'});if(ischk&&!this.in_grid){this.input_area=$a(this.label_area,'span','',{marginRight:'4px'});this.disp_area=$a(this.label_area,'span','',{marginRight:'4px'});}
+if(this.with_label){this.label_span=$a(this.label_area,'span','small')
this.label_icon=$a(this.label_area,'img','',{margin:'-3px 4px -3px 4px'});$dh(this.label_icon);this.label_icon.src='lib/images/icons/error.gif';this.label_icon.title='Mandatory value needs to be entered';this.suggest_icon=$a(this.label_area,'img','',{margin:'-3px 4px -3px 0px'});$dh(this.suggest_icon);this.suggest_icon.src='lib/images/icons/bullet_arrow_down.png';this.suggest_icon.title='With suggestions';}else{this.label_span=$a(this.label_area,'span','',{marginRight:'4px'})
$dh(this.label_area);}
-if(!this.input_area){this.input_area=$a(this.wrapper,'div');this.disp_area=$a(this.wrapper,'div');}
-if(this.in_grid){if(this.label_area)$dh(this.label_area);}else{this.input_area.className='input_area';$y(this.wrapper,{marginBottom:'4px'});this.set_description();}
+if(!this.input_area){this.input_area=$a(this.wrapper,(this.with_label?'div':'span'));this.disp_area=$a(this.wrapper,(this.with_label?'div':'span'));}
+if(this.in_grid){if(this.label_area)$dh(this.label_area);}else{this.input_area.className='input_area';$y(this.wrapper,{marginBottom:'9px'});this.set_description();}
if(this.onmake)this.onmake();}
Field.prototype.set_max_width=function(){var no_max=['Code','Text Editor','Text','Table','HTML']
if(this.wrapper&&this.layout_cell&&this.layout_cell.parentNode.cells&&this.layout_cell.parentNode.cells.length==1&&!in_list(no_max,this.df.fieldtype)){$y(this.wrapper,{paddingRight:'50%'});}}
Field.prototype.set_label=function(){if(this.with_label&&this.label_area&&this.label!=this.df.label){this.label_span.innerHTML=this.df.label;this.label=this.df.label;}}
-Field.prototype.set_description=function(){if(this.df.description){var p=in_list(['Text Editor','Code','Check'],this.df.fieldtype)?this.label_area:this.wrapper;this.desc_area=$a(p,'div','field_description','',this.df.description)
+Field.prototype.set_description=function(){if(this.df.description){var p=in_list(['Text Editor','Code','Check'],this.df.fieldtype)?this.label_area:this.wrapper;this.desc_area=$a(p,'div','help small','',this.df.description)
if(in_list(['Text Editor','Code'],this.df.fieldtype))
-$(this.desc_area).addClass('field_description_top');}}
+$(this.desc_area).addClass('help small');}}
Field.prototype.get_status=function(){if(this.in_filter)this.not_in_form=this.in_filter;if(this.not_in_form){return'Write';}
-var fn=this.df.fieldname?this.df.fieldname:this.df.label;this.df=get_field(this.doctype,fn,this.docname);if(!this.df.permlevel)this.df.permlevel=0;var p=this.perm[this.df.permlevel];var ret;if(cur_frm.editable&&p&&p[WRITE])ret='Write';else if(p&&p[READ])ret='Read';else ret='None';if(this.df.fieldtype=='Binary')
+if(!this.df.permlevel)this.df.permlevel=0;var p=this.perm[this.df.permlevel];var ret;if(cur_frm.editable&&p&&p[WRITE])ret='Write';else if(p&&p[READ])ret='Read';else ret='None';if(this.df.fieldtype=='Binary')
ret='None';if(cint(this.df.hidden))
ret='None';if(ret=='Write'&&cint(cur_frm.doc.docstatus)>0)ret='Read';var a_o_s=cint(this.df.allow_on_submit);if(a_o_s&&(this.in_grid||(this.frm&&this.frm.not_in_container))){a_o_s=null;if(this.in_grid)a_o_s=this.grid.field.df.allow_on_submit;if(this.frm&&this.frm.not_in_container){a_o_s=cur_grid.field.df.allow_on_submit;}}
if(cur_frm.editable&&a_o_s&&cint(cur_frm.doc.docstatus)>0&&!this.df.hidden){tmp_perm=get_perm(cur_frm.doctype,cur_frm.docname,1);if(tmp_perm[this.df.permlevel]&&tmp_perm[this.df.permlevel][WRITE])ret='Write';}
@@ -479,8 +668,7 @@
Field.prototype.refresh_label_icon=function(){if(this.df.reqd){if(this.get_value&&is_null(this.get_value())){if(this.label_icon)$ds(this.label_icon);$(this.txt?this.txt:this.input).addClass('field-to-update')}else{if(this.label_icon)$dh(this.label_icon);$(this.txt?this.txt:this.input).removeClass('field-to-update')}}}
Field.prototype.set=function(val){if(this.not_in_form)
return;if((!this.docname)&&this.grid){this.docname=this.grid.add_newrow();}
-if(in_list(['Data','Text','Small Text','Code'],this.df.fieldtype))
-val=clean_smart_quotes(val);var set_val=val;if(this.validate)set_val=this.validate(val);_f.set_value(this.doctype,this.docname,this.df.fieldname,set_val);this.value=val;}
+var set_val=val;if(this.validate)set_val=this.validate(val);_f.set_value(this.doctype,this.docname,this.df.fieldname,set_val);this.value=val;}
Field.prototype.set_input=function(val){this.value=val;if(this.input&&this.input.set_input){if(val==null)this.input.set_input('');else this.input.set_input(val);}
var disp_val=val;if(val==null)disp_val='';this.set_disp(disp_val);}
Field.prototype.run_trigger=function(){this.refresh_label_icon();if(this.df.reqd&&this.get_value&&!is_null(this.get_value())&&this.set_as_error)
@@ -497,15 +685,15 @@
if(this.input.focus){try{this.input.focus();}catch(e){}}}
if(this.txt){try{this.txt.focus();}catch(e){}
this.txt.field_object=this;}}
-function DataField(){}DataField.prototype=new Field();DataField.prototype.make_input=function(){var me=this;this.input=$a_input(this.input_area,this.df.fieldtype=='Password'?'password':'text');this.get_value=function(){var v=this.input.value;if(this.validate)v=this.validate(v);return v;}
-this.input.name=this.df.fieldname;this.input.onchange=function(){if(!me.last_value)me.last_value='';if(me.validate)
-me.input.value=me.validate(me.input.value);me.set(me.input.value);if(me.format_input)
-me.format_input();if(in_list(['Currency','Float','Int'],me.df.fieldtype)){if(flt(me.last_value)==flt(me.input.value)){me.last_value=me.input.value;return;}}
-me.last_value=me.input.value;me.run_trigger();}
+function DataField(){}DataField.prototype=new Field();DataField.prototype.make_input=function(){var me=this;this.input=$a_input(this.input_area,this.df.fieldtype=='Password'?'password':'text');this.get_value=function(){var v=this.input.value;if(this.validate)
+v=this.validate(v);return v;}
+this.input.name=this.df.fieldname;$(this.input).change(function(){me.set_value($(this).val());});this.set_value=function(val){if(!me.last_value)me.last_value='';if(me.validate){val=me.validate(val);me.input.value=val;}
+me.set(val);if(me.format_input)
+me.format_input();if(in_list(['Currency','Float','Int'],me.df.fieldtype)){if(flt(me.last_value)==flt(val)){me.last_value=val;return;}}
+me.last_value=val;me.run_trigger();}
this.input.set_input=function(val){if(val==null)val='';me.input.value=val;if(me.format_input)me.format_input();}
-if(this.df.options=='Suggest'){wn.require('lib/js/legacy/widgets/autosuggest.js');if(this.suggest_icon)$di(this.suggest_icon);this.set_get_query=function(){}
-this.get_query=function(doc,dt,dn){return repl('SELECT DISTINCT `%(fieldname)s` FROM `tab%(dt)s` WHERE `%(fieldname)s` LIKE "%s" LIMIT 50',{fieldname:me.df.fieldname,dt:me.df.parent})}
-var opts={script:'',json:true,maxresults:10,link_field:this};this.as=new AutoSuggest(this.input,opts);}}
+if(this.df.options=='Suggest'){if(this.suggest_icon)$di(this.suggest_icon);$(me.input).autocomplete({source:function(request,response){wn.call({method:'webnotes.widgets.search.search_link',args:{'txt':request.term,'dt':me.df.options,'query':repl('SELECT DISTINCT `%(fieldname)s` FROM \
+ `tab%(dt)s` WHERE `%(fieldname)s` LIKE "%s" LIMIT 50',{fieldname:me.df.fieldname,dt:me.df.parent})},callback:function(r){response(r.results);}});}});}}
DataField.prototype.validate=function(v){if(this.df.options=='Phone'){if(v+''=='')return'';v1=''
v=v.replace(/ /g,'').replace(/-/g,'').replace(/\(/g,'').replace(/\)/g,'');if(v&&v.substr(0,1)=='+'){v1='+';v=v.substr(1);}
if(v&&v.substr(0,2)=='00'){v1+='00';v=v.substr(2);}
@@ -518,7 +706,7 @@
HTMLField.prototype=new Field();HTMLField.prototype.with_label=0;HTMLField.prototype.set_disp=function(val){this.disp_area.innerHTML=val;}
HTMLField.prototype.set_input=function(val){if(val)this.set_disp(val);}
HTMLField.prototype.onrefresh=function(){this.set_disp(this.df.options?this.df.options:'');}
-var datepicker_active=0;function DateField(){}DateField.prototype=new Field();DateField.prototype.make_input=function(){var me=this;this.user_fmt=wn.control_panel.date_format;if(!this.user_fmt)this.user_fmt='dd-mm-yy';this.input=$a(this.input_area,'input');wn.require('lib/css/legacy/jquery-ui.css');$(this.input).datepicker({dateFormat:me.user_fmt.replace('yyyy','yy'),altFormat:'yy-mm-dd',changeYear:true,beforeShow:function(input,inst){datepicker_active=1},onClose:function(dateText,inst){datepicker_active=0;if(_f.cur_grid_cell)
+var datepicker_active=0;function DateField(){}DateField.prototype=new Field();DateField.prototype.make_input=function(){var me=this;this.user_fmt=wn.control_panel.date_format;if(!this.user_fmt)this.user_fmt='dd-mm-yy';this.input=$a(this.input_area,'input');$(this.input).datepicker({dateFormat:me.user_fmt.replace('yyyy','yy'),altFormat:'yy-mm-dd',changeYear:true,beforeShow:function(input,inst){datepicker_active=1},onClose:function(dateText,inst){datepicker_active=0;if(_f.cur_grid_cell)
_f.cur_grid_cell.grid.cell_deselect();}});var me=this;me.input.onchange=function(){if(this.value==null)this.value='';if(!this.not_in_form)
me.set(dateutil.user_to_str(me.input.value));me.run_trigger();}
me.input.set_input=function(val){if(val==null)val='';else val=dateutil.str_to_user(val);me.input.value=val;}
@@ -529,23 +717,27 @@
var t=v.split('-');if(t.length!=3){return this.clear();}
else if(cint(t[1])>12||cint(t[1])<1){return this.clear();}
else if(cint(t[2])>31||cint(t[2])<1){return this.clear();}
-return v;};var _link_onchange_flag=null;function LinkField(){}LinkField.prototype=new Field();LinkField.prototype.make_input=function(){var me=this;if(me.df.no_buttons){this.txt=$a(this.input_area,'input');this.input=this.txt;}else{makeinput_popup(this,'icon-search','icon-play','icon-plus');me.setup_buttons();me.onrefresh=function(){if(me.can_create&&cur_frm.doc.docstatus==0)
+return v;};function LinkField(){}LinkField.prototype=new Field();LinkField.prototype.make_input=function(){var me=this;if(me.df.no_buttons){this.txt=$a(this.input_area,'input');this.input=this.txt;}else{makeinput_popup(this,'icon-search','icon-play','icon-plus');me.setup_buttons();me.onrefresh=function(){if(me.can_create&&cur_frm.doc.docstatus==0)
$(me.btn2).css('display','inline-block');else $dh(me.btn2);}}
-me.txt.field_object=this;me.set_onchange();me.input.set_input=function(val){if(val==undefined)val='';me.txt.value=val;}
+me.txt.field_object=this;me.input.set_input=function(val){if(val==undefined)val='';me.txt.value=val;}
me.get_value=function(){return me.txt.value;}
-wn.require('lib/js/legacy/widgets/autosuggest.js');var opts={script:'',json:true,maxresults:10,link_field:me};this.as=new AutoSuggest(me.txt,opts);}
+$(me.txt).autocomplete({source:function(request,response){wn.call({method:'webnotes.widgets.search.search_link',args:{'txt':request.term,'dt':me.df.options,'query':me.get_custom_query()},callback:function(r){response(r.results);},});},select:function(event,ui){me.set_input_value(ui.item.value);}}).data('autocomplete')._renderItem=function(ul,item){return $('<li></li>').data('item.autocomplete',item).append(repl('<a>%(label)s<br><span style="font-size:10px">%(info)s</span></a>',item)).appendTo(ul);};$(this.txt).change(function(){if(!$(this).val())
+me.set_input_value('');})}
+LinkField.prototype.get_custom_query=function(){this.set_get_query();if(this.get_query){if(cur_frm)
+var doc=locals[cur_frm.doctype][cur_frm.docname];return this.get_query(doc,this.doctype,this.docname);}}
LinkField.prototype.setup_buttons=function(){var me=this;me.btn.onclick=function(){selector.set(me,me.df.options,me.df.label);selector.show(me.txt);}
if(me.btn1)me.btn1.onclick=function(){if(me.txt.value&&me.df.options){loaddoc(me.df.options,me.txt.value);}}
me.can_create=0;if((!me.not_in_form)&&in_list(profile.can_create,me.df.options)){me.can_create=1;me.btn2.onclick=function(){var on_save_callback=function(new_rec){if(new_rec){var d=_f.calling_doc_stack.pop();locals[d[0]][d[1]][me.df.fieldname]=new_rec;me.refresh();if(me.grid)me.grid.refresh();me.run_trigger();}}
_f.calling_doc_stack.push([me.doctype,me.docname]);new_doc(me.df.options,me.on_new,1,on_save_callback,me.doctype,me.docname,me.frm.not_in_container);}}else{$dh(me.btn2);$y($td(me.tab,0,2),{width:'0px'});}}
-LinkField.prototype.set_onchange=function(){var me=this;me.txt.onchange=function(e){if(cur_autosug)return;if(_link_onchange_flag){return;}
-_link_onchange_flag=1;me.refresh_label_icon();if(me.not_in_form){_link_onchange_flag=0;return;}
-if(cur_frm){if(me.txt.value==locals[me.doctype][me.docname][me.df.fieldname]){me.set(me.txt.value);me.run_trigger();setTimeout('_link_onchange_flag = 0',500);return;}}
-me.set(me.txt.value);if(_f.cur_grid_cell)
-_f.cur_grid_cell.grid.cell_deselect();if(!me.txt.value){me.run_trigger();setTimeout('_link_onchange_flag = 0',500);return;}
+LinkField.prototype.set_input_value=function(val){var me=this;me.refresh_label_icon();if(me.not_in_form){$(this.txt).val(val);return;}
+if(cur_frm){if(val==locals[me.doctype][me.docname][me.df.fieldname]){me.set(val);me.run_trigger();return;}}
+me.set(val);if(_f.cur_grid_cell)
+_f.cur_grid_cell.grid.cell_deselect();if(!val){me.run_trigger();return;}
var fetch='';if(cur_frm.fetch_dict[me.df.fieldname])
-fetch=cur_frm.fetch_dict[me.df.fieldname].columns.join(', ');$c('webnotes.widgets.form.utils.validate_link',{'value':me.txt.value,'options':me.df.options,'fetch':fetch},function(r,rt){setTimeout('_link_onchange_flag = 0',500);if(selector&&selector.display)return;if(r.message=='Ok'){if(r.fetch_values)me.set_fetch_values(r.fetch_values);me.run_trigger();}else{var astr='';if(in_list(profile.can_create,me.df.options))astr=repl('<br><br><span class="link_type" onclick="newdoc(\'%(dt)s\')">Click here</span> to create a new %(dtl)s',{dt:me.df.options,dtl:get_doctype_label(me.df.options)})
-msgprint(repl('error:<b>%(val)s</b> is not a valid %(dt)s.<br><br>You must first create a new %(dt)s <b>%(val)s</b> and then select its value. To find an existing %(dt)s, click on the magnifying glass next to the field.%(add)s',{val:me.txt.value,dt:get_doctype_label(me.df.options),add:astr}));me.txt.value='';me.set('');}});}}
+fetch=cur_frm.fetch_dict[me.df.fieldname].columns.join(', ');$c('webnotes.widgets.form.utils.validate_link',{'value':val,'options':me.df.options,'fetch':fetch},function(r,rt){if(selector&&selector.display)return;if(r.message=='Ok'){if($(me.txt).val()!=val){me.set_input(val);}
+if(r.fetch_values)
+me.set_fetch_values(r.fetch_values);me.run_trigger();}else{var astr='';if(in_list(profile.can_create,me.df.options))astr=repl('<br><br><span class="link_type" onclick="newdoc(\'%(dt)s\')">Click here</span> to create a new %(dtl)s',{dt:me.df.options,dtl:get_doctype_label(me.df.options)})
+msgprint(repl('error:<b>%(val)s</b> is not a valid %(dt)s.<br><br>You must first create a new %(dt)s <b>%(val)s</b> and then select its value. To find an existing %(dt)s, click on the magnifying glass next to the field.%(add)s',{val:me.txt.value,dt:get_doctype_label(me.df.options),add:astr}));me.txt.value='';me.set('');}});}
LinkField.prototype.set_fetch_values=function(fetch_values){var fl=cur_frm.fetch_dict[this.df.fieldname].fields;var changed_fields=[];for(var i=0;i<fl.length;i++){if(locals[this.doctype][this.docname][fl[i]]!=fetch_values[i]){locals[this.doctype][this.docname][fl[i]]=fetch_values[i];if(!this.grid){refresh_field(fl[i]);changed_fields.push(fl[i]);}}}
for(i=0;i<changed_fields.length;i++){if(cur_frm.fields_dict[changed_fields[i]])
cur_frm.fields_dict[changed_fields[i]].run_trigger();}
@@ -553,7 +745,8 @@
LinkField.prototype.set_get_query=function(){if(this.get_query)return;if(this.grid){var f=this.grid.get_field(this.df.fieldname);if(f.get_query)this.get_query=f.get_query;}}
LinkField.prototype.set_disp=function(val){var t=null;if(val)t="<a href=\'javascript:loaddoc(\""+this.df.options+"\", \""+val+"\")\'>"+val+"</a>";this.set_disp_html(t);}
function IntField(){}IntField.prototype=new DataField();IntField.prototype.validate=function(v){if(isNaN(parseInt(v)))return null;return cint(v);};IntField.prototype.format_input=function(){if(this.input.value==null)this.input.value='';}
-function FloatField(){}FloatField.prototype=new DataField();FloatField.prototype.validate=function(v){var v=parseFloat(v);if(isNaN(v))return null;return v;};FloatField.prototype.format_input=function(){if(this.input.value==null)this.input.value='';}
+function FloatField(){}FloatField.prototype=new DataField();FloatField.prototype.validate=function(v){var v=parseFloat(v);if(isNaN(v))
+return null;return v;};FloatField.prototype.format_input=function(){if(this.input.value==null)this.input.value='';}
function CurrencyField(){}CurrencyField.prototype=new DataField();CurrencyField.prototype.format_input=function(){var v=fmt_money(this.input.value);if(this.not_in_form){if(!flt(this.input.value))v='';}
this.input.value=v;}
CurrencyField.prototype.validate=function(v){if(v==null||v=='')
@@ -575,7 +768,7 @@
var text_dialog;function make_text_dialog(){var d=new Dialog(520,410,'Edit Text');d.make_body([['Text','Enter Text'],['HTML','Description'],['Button','Update']]);d.widgets['Update'].onclick=function(){var t=this.dialog;t.field.set(t.widgets['Enter Text'].value);t.hide();}
d.onshow=function(){this.widgets['Enter Text'].style.height='300px';var v=_f.get_value(this.field.doctype,this.field.docname,this.field.df.fieldname);this.widgets['Enter Text'].value=v==null?'':v;this.widgets['Enter Text'].focus();this.widgets['Description'].innerHTML=''
if(this.field.df.description)
-$a(this.widgets['Description'],'div','field_description','',this.field.df.description);}
+$a(this.widgets['Description'],'div','help small','',this.field.df.description);}
d.onhide=function(){if(_f.cur_grid_cell)
_f.cur_grid_cell.grid.cell_deselect();}
text_dialog=d;}
@@ -644,7 +837,7 @@
*/
wn.widgets.FieldGroup=function(){this.first_button=false;this.make_fields=function(body,fl){$y(this.body,{padding:'11px'});this.fields_dict={};for(var i=0;i<fl.length;i++){var df=fl[i];var div=$a(body,'div','',{margin:'6px 0px'})
f=make_field(df,null,div,null);f.not_in_form=1;this.fields_dict[df.fieldname]=f
-f.refresh();if(df.fieldtype=='Button'&&!this.first_button){$(f.input).addClass('btn-primary');this.first_button=true;}}}
+f.refresh();if(df.fieldtype=='Button'&&!this.first_button){$(f.input).addClass('btn-info');this.first_button=true;}}}
this.get_values=function(){var ret={};var errors=[];for(var key in this.fields_dict){var f=this.fields_dict[key];var v=f.get_value?f.get_value():null;if(f.df.reqd&&!v)
errors.push(f.df.label+' is mandatory');if(v)ret[f.df.fieldname]=v;}
if(errors.length){msgprint('<b>Please check the following Errors</b>\n'+errors.join('\n'));return null;}
@@ -662,11 +855,20 @@
this.set_postion=function(){var d=get_screen_dims();this.wrapper.style.left=((d.w-cint(this.wrapper.style.width))/2)+'px';this.wrapper.style.top=(get_scroll_top()+60)+'px';top_index++;$y(this.wrapper,{zIndex:top_index});}
this.show=function(){if(this.display)return;this.set_postion()
$ds(this.wrapper);freeze();this.display=true;cur_dialog=this;if(this.onshow)this.onshow();}
-this.hide=function(){if(this.onhide)this.onhide();unfreeze();$dh(this.wrapper);if(cur_autosug)cur_autosug.clearSuggestions();this.display=false;cur_dialog=null;}
+this.hide=function(){if(this.onhide)this.onhide();unfreeze();$dh(this.wrapper);this.display=false;cur_dialog=null;}
this.no_cancel=function(){$dh(this.cancel_img);}
if(opts)this.make();}
wn.widgets.Dialog.prototype=new wn.widgets.FieldGroup();$(document).bind('keydown',function(e){if(cur_dialog&&!cur_dialog.no_cancel_flag&&e.which==27){cur_dialog.hide();}});
/*
+ * lib/js/wn/ui/button.js
+ */
+wn.ui.Button=function(args){var me=this;$.extend(this,{make:function(){me.btn=wn.dom.add(args.parent,'button','btn btn-small '+(args.css_class||''));me.btn.args=args;me.loading_img=wn.dom.add(me.btn.args.parent,'img','',{margin:'0px 4px -2px 4px',display:'none'});me.loading_img.src='lib/images/ui/button-load.gif';if(args.is_ajax)wn.dom.css(me.btn,{marginRight:'24px'});me.btn.innerHTML=args.label;me.btn.user_onclick=args.onclick;$(me.btn).bind('click',function(){if(!this.disabled&&this.user_onclick)
+this.user_onclick(this);})
+me.btn.set_working=me.set_working;me.btn.done_working=me.done_working;if(me.btn.args.style)
+wn.dom.css(me.btn,args.style);},set_working:function(){me.btn.disabled='disabled';if(me.btn.args.is_ajax){$(me.btn).css('margin-right','0px');}
+$(me.loading_img).css('display','inline');},done_working:function(){me.btn.disabled=false;if(me.btn.args.is_ajax){$(me.btn).css('margin-right','24px');}
+$(me.loading_img).toggle(false);}});this.make();}
+/*
* lib/js/legacy/widgets/dialog.js
*/
var cur_dialog;var top_index=91;function Dialog(w,h,title,content){this.make({width:w,title:title});if(content)this.make_body(content);this.onshow='';this.oncancel='';this.no_cancel_flag=0;this.display=false;this.first_button=false;}
@@ -674,7 +876,7 @@
Dialog.prototype.make_body=function(content){this.rows={};this.widgets={};for(var i in content)this.make_row(content[i]);}
Dialog.prototype.clear_inputs=function(d){for(var wid in this.widgets){var w=this.widgets[wid];var tn=w.tagName?w.tagName.toLowerCase():'';if(tn=='input'||tn=='textarea'){w.value='';}else if(tn=='select'){sel_val(w.options[0].value);}else if(w.txt){w.txt.value='';}else if(w.input){w.input.value='';}}}
Dialog.prototype.make_row=function(d){var me=this;this.rows[d[1]]=$a(this.body,'div','dialog_row');var row=this.rows[d[1]];if(d[0]!='HTML'){var t=make_table(row,1,2,'100%',['30%','70%']);row.tab=t;var c1=$td(t,0,0);var c2=$td(t,0,1);if(d[0]!='Check'&&d[0]!='Button')
-$t(c1,d[1]);}
+$(c1).text(d[1]);}
if(d[0]=='HTML'){if(d[2])row.innerHTML=d[2];this.widgets[d[1]]=row;}
else if(d[0]=='Check'){var i=$a_input(c2,'checkbox','',{width:'20px'});c1.innerHTML=d[1];this.widgets[d[1]]=i;}
else if(d[0]=='Data'){c1.innerHTML=d[1];c2.style.overflow='auto';this.widgets[d[1]]=$a_input(c2,'text');if(d[2])$a(c2,'div','field_description').innerHTML=d[2];}
@@ -684,35 +886,102 @@
else if(d[0]=='Select'){c1.innerHTML=d[1];this.widgets[d[1]]=$a(c2,'select','',{width:'160px'})
if(d[2])$a(c2,'div','field_description').innerHTML=d[2];if(d[3])add_sel_options(this.widgets[d[1]],d[3],d[3][0]);}
else if(d[0]=='Text'){c1.innerHTML=d[1];c2.style.overflow='auto';this.widgets[d[1]]=$a(c2,'textarea');if(d[2])$a(c2,'div','field_description').innerHTML=d[2];}
-else if(d[0]=='Button'){c2.style.height='32px';var b=$btn(c2,d[1],function(btn){if(btn._onclick)btn._onclick(me)},null,null,1);b.dialog=me;if(!this.first_button){$(b).addClass('btn-primary');this.first_button=true;}
+else if(d[0]=='Button'){c2.style.height='32px';var b=$btn(c2,d[1],function(btn){if(btn._onclick)btn._onclick(me)},null,null,1);b.dialog=me;if(!this.first_button){$(b).addClass('btn-info');this.first_button=true;}
if(d[2]){b._onclick=d[2];}
this.widgets[d[1]]=b;}}
/*
* lib/js/wn/ui/listing.js
*/
-wn.widgets.Listing=function(opts){this.opts=opts;this.page_length=20;this.btns={};this.start=0;var me=this;this.make=function(opts){if(this.opts.parent.jquery)
-this.opts.parent=this.opts.parent.get(0);this.wrapper=$a(this.opts.parent,'div');this.filters_area=$a(this.wrapper,'div','listing-filters');this.toolbar_area=$a(this.wrapper,'div','listing-toolbar');this.results_area=$a(this.wrapper,'div','listing-results');this.more_button_area=$a(this.wrapper,'div','listing-more');this.no_results_area=$a(this.wrapper,'div','help_box',{display:'none'},(this.opts.no_result_message?this.opts.no_result_message:'No results'));if(opts)this.opts=opts;this.page_length=this.opts.page_length?this.opts.page_length:this.page_length;this.make_toolbar();this.make_filters();this.make_more_button();}
-this.make_filters=function(){if(this.opts.filters){$ds(this.filters_area);this.filters=new wn.widgets.FieldGroup(this.filters_area,this.opts.fields);}}
-this.make_toolbar=function(){if(!(this.opts.hide_refresh||this.opts.no_refresh)){if(this.opts.title){$a(this.toolbar_area,'h3','',{display:'inline-block',marginRight:'15px'},this.opts.title);}
-this.ref_img=$a(this.toolbar_area,'span','link_type',{color:'#888'},'[refresh]');this.ref_img.onclick=function(){me.run();}
-this.loading_img=$a(this.toolbar_area,'img','lib/images/ui/button-load.gif',{display:'none',marginLeft:'3px',marginBottom:'-2px'});}
-if(this.opts.new_doctype){this.new_btn=$btn(this.toolbar_area,'New '+get_doctype_label(this.opts.new_doctype),function(){newdoc(me.opts.new_doctype,me.opts.new_doc_onload,me.opts.new_doc_indialog,me.opts.new_doc_onsave);},{marginLeft:'7px'});}}
-this.make_more_button=function(){this.more_btn=$btn(this.more_button_area,'More...',function(){me.more_btn.set_working();me.run(function(){me.more_btn.done_working();},1);},'',0,1);$y(this.more_btn.loading_img,{marginBottom:'0px'});}
-this.clear=function(){this.results_area.innerHTML='';this.table=null;$ds(this.results_area);$dh(this.no_results_area);}
-this.make_results=function(r,rt){if(this.start==0)this.clear();$dh(this.more_button_area);if(this.loading_img)$dh(this.loading_img)
-if(r.message)r.values=r.message;if(r.values&&r.values.length){this.values=r.values;var m=Math.min(r.values.length,this.page_length);for(var i=0;i<m;i++){var row=this.add_row();this.opts.render_row(row,r.values[i],this,i);}
-this.start+=m;if(r.values.length>=this.page_length)$ds(this.more_button_area);}else{if(this.start==0){$dh(this.results_area);$ds(this.no_results_area);}}
-if(this.onrun)this.onrun();if(this.opts.onrun)this.opts.onrun();if(this.opts.callback)this.opts.callback(r);}
-this.add_row=function(){return $a(this.results_area,'div','',(opts.cell_style?opts.cell_style:{padding:'3px 0px'}));}
-this.run=function(callback,append){if(callback)
-this.onrun=callback;if(!append)
-this.start=0;if(!this.opts.method){this.query=this.opts.get_query?this.opts.get_query():this.opts.query;this.add_limits();var args={query_max:this.query_max||this.opts.query_max||'',as_dict:1}
+wn.provide('wn.ui');wn.ui.Listing=Class.extend({init:function(opts){this.opts=opts||{};this.page_length=20;this.start=0;this.data=[];if(opts){this.make();}},prepare_opts:function(){if(this.opts.new_doctype){if(wn.boot.profile.can_read.indexOf(this.opts.new_doctype)==-1){this.opts.new_doctype=null;}else{this.opts.new_doctype=get_doctype_label(this.opts.new_doctype);}}
+if(!this.opts.no_result_message){this.opts.no_result_message='Nothing to show'}},make:function(opts){if(opts){this.opts=opts;}
+this.prepare_opts();$.extend(this,this.opts);$(this.parent).html(repl('\
+ <div class="wnlist">\
+ <h3 class="title hide">%(title)s</h3>\
+ \
+ <div class="list-filters hide">\
+ <div class="show_filters well">\
+ <div>\
+ <button class="btn btn-small add-filter-btn">\
+ <i class="icon-plus"></i> Add Filter</button>\
+ </div>\
+ <div class="filter_area"></div>\
+ </div>\
+ </div>\
+ \
+ <div style="height: 37px; margin-bottom:9px" class="list-toolbar-wrapper">\
+ <div class="list-toolbar btn-group" style="display:inline-block; margin-right: 10px;">\
+ <a class="btn btn-small btn-refresh btn-info">\
+ <i class="icon-refresh icon-white"></i> Refresh</a>\
+ <a class="btn btn-small btn-new">\
+ <i class="icon-plus"></i> New</a>\
+ <a class="btn btn-small btn-filter">\
+ <i class="icon-search"></i> Filter</a>\
+ </div>\
+ <div style="display:inline-block; width: 24px; margin-left: 4px">\
+ <img src="lib/images/ui/button-load.gif" \
+ class="img-load"/></div>\
+ </div><div style="clear:both"></div>\
+ \
+ <div class="no-result help hide">\
+ %(no_result_message)s\
+ </div>\
+ \
+ <div class="result">\
+ <div class="result-list"></div>\
+ <div class="result-grid hide"></div>\
+ </div>\
+ \
+ <div class="paging-button">\
+ <button class="btn btn-small btn-more hide">More...</div>\
+ </div>\
+ </div>\
+ ',this.opts));this.$w=$(this.parent).find('.wnlist');this.set_events();if(this.show_filters){this.make_filters();}},add_button:function(html,onclick,before){$(html).click(onclick).insertBefore(this.$w.find('.list-toolbar '+before));this.btn_groupify();},show_view:function($btn,$div,$btn_unsel,$div_unsel){$btn_unsel.removeClass('btn-info');$btn_unsel.find('i').removeClass('icon-white');$div_unsel.toggle(false);$btn.addClass('btn-info');$btn.find('i').addClass('icon-white');$div.toggle(true);},set_events:function(){var me=this;this.$w.find('.btn-refresh').click(function(){me.run();});this.$w.find('.btn-more').click(function(){me.run({append:true});});if(this.title){this.$w.find('h3').html(this.title).toggle(true);}
+if(this.new_doctype){this.$w.find('.btn-new').toggle(true).click(function(){newdoc(me.new_doctype);})}else{this.$w.find('.btn-new').remove();}
+if(!me.show_filters){this.$w.find('.btn-filter').remove();}
+if(this.hide_refresh||this.no_refresh){this.$w.find('.btn-refresh').remove();}
+this.btn_groupify();},btn_groupify:function(){var nbtns=this.$w.find('.list-toolbar a').length;if(nbtns==0){this.$w.find('.list-toolbar-wrapper').toggle(false);}},make_filters:function(){this.filter_list=new wn.ui.FilterList({listobj:this,$parent:this.$w.find('.list-filters').toggle(true),doctype:this.doctype,filter_fields:this.filter_fields});},clear:function(){this.data=[];this.$w.find('.result-list').empty();this.$w.find('.result').toggle(true);this.$w.find('.no-result').toggle(false);this.start=0;},run:function(){var me=this;var a0=arguments[0];var a1=arguments[1];if(a0&&typeof a0=='function')
+this.onrun=a0;if(a0&&a0.callback)
+this.onrun=a0.callback;if(!a1&&!(a0&&a0.append))
+this.start=0;me.set_working(true);wn.call({method:this.opts.method||'webnotes.widgets.query_builder.runquery',args:this.get_call_args(),callback:function(r){me.set_working(false);me.render_results(r)},no_spinner:this.opts.no_loading});},set_working:function(flag){this.$w.find('.img-load').toggle(flag);},get_call_args:function(){if(!this.method){this.query=this.get_query?this.get_query():this.query;this.add_limits();var args={query_max:this.query_max,as_dict:1}
args.simple_query=this.query;}else{var args={limit_start:this.start,limit_page_length:this.page_length}}
-if(this.opts.args)
-$.extend(args,this.opts.args)
-if(this.loading_img)$di(this.loading_img);wn.call({method:this.opts.method||'webnotes.widgets.query_builder.runquery',args:args,callback:function(r,rt){me.make_results(r,rt)},no_spinner:this.opts.no_loading,btn:this.opts.run_btn});}
-this.refresh=this.run;this.add_limits=function(){this.query+=' LIMIT '+this.start+','+(this.page_length+1);}
-if(opts)this.make();}
+if(this.args)
+$.extend(args,this.args)
+if(this.get_args){$.extend(args,this.get_args());}
+return args;},render_results:function(r){if(this.start==0)this.clear();this.$w.find('.btn-more').toggle(false);if(r.message)r.values=r.message;if(r.values&&r.values.length){this.data=this.data.concat(r.values);this.render_list(r.values);}else{if(this.start==0){this.$w.find('.result').toggle(false);this.$w.find('.no-result').toggle(true);}}
+if(this.onrun)this.onrun();if(this.callback)this.callback(r);},render_list:function(values){var m=Math.min(values.length,this.page_length);for(var i=0;i<m;i++){this.render_row(this.add_row(),values[i],this,i);}
+this.start+=m;if(values.length>=this.page_length)
+this.$w.find('.btn-more').toggle(true);},add_row:function(){return this.$w.find('.result-list').append('<div class="list-row">').find('.list-row:last').get(0);},refresh:function(){this.run();},add_limits:function(){this.query+=' LIMIT '+this.start+','+(this.page_length+1);}});wn.ui.FilterList=Class.extend({init:function(opts){wn.require('lib/js/legacy/widgets/form/fields.js');$.extend(this,opts);this.filters=[];this.$w=this.$parent;this.set_events();},set_events:function(){var me=this;this.listobj.$w.find('.btn-filter').bind('click',function(){me.$w.find('.show_filters').slideToggle();if(!me.filters.length)
+me.add_filter();});this.$w.find('.add-filter-btn').bind('click',function(){me.add_filter();});},add_filter:function(fieldname,condition,value){this.filters.push(new wn.ui.Filter({flist:this,fieldname:fieldname,condition:condition,value:value}));if(fieldname){this.$w.find('.show_filters').slideDown();}},get_filters:function(){var values=[];$.each(this.filters,function(i,f){if(f.field)
+values.push(f.get_value());})
+return values;},update_filters:function(){var fl=[];$.each(this.filters,function(i,f){if(f.field)fl.push(f);})
+this.filters=fl;},get_filter:function(fieldname){for(var i in this.filters){if(this.filters[i].field.df.fieldname==fieldname)
+return this.filters[i];}}});wn.ui.Filter=Class.extend({init:function(opts){$.extend(this,opts);this.doctype=this.flist.doctype;this.fields_by_name={};this.make();this.make_options();this.set_events();},make:function(){this.flist.$w.find('.filter_area').append('<div class="list_filter">\
+ <select class="fieldname_select"></select>\
+ <select class="condition">\
+ <option value="=">Equals</option>\
+ <option value="like">Like</option>\
+ <option value=">=">Greater or equals</option>\
+ <option value=">=">Less or equals</option>\
+ <option value=">">Greater than</option>\
+ <option value="<">Less than</option>\
+ <option value="in">In</option>\
+ <option value="!=">Not equals</option>\
+ </select>\
+ <span class="filter_field"></span>\
+ <a class="close">×</a>\
+ </div>');this.$w=this.flist.$w.find('.list_filter:last-child');this.$select=this.$w.find('.fieldname_select');},make_options:function(){if(this.filter_fields){for(var i in this.filter_fields)
+this.add_field_option(this.filter_fields[i])}else{this.render_field_select();}},set_events:function(){var me=this;this.$w.find('.fieldname_select').bind('change',function(){me.set_field(this.value);});this.$w.find('a.close').bind('click',function(){me.$w.css('display','none');var value=me.field.get_value();me.field=null;if(!me.flist.get_filters().length){me.flist.$w.find('.set_filters').toggle(true);me.flist.$w.find('.show_filters').toggle(false);}
+if(value){me.flist.listobj.run();}
+me.flist.update_filters();return false;});me.$w.find('.condition').change(function(){if($(this).val()=='in'){me.set_field(me.field.df.fieldname,'Data');if(!me.field.desc_area)
+me.field.desc_area=$a(me.field.wrapper,'span','help',null,'values separated by comma');}else{me.set_field(me.field.df.fieldname);}});if(me.fieldname){this.set_values(me.fieldname,me.condition,me.value);}else{me.set_field('name');}},set_values:function(fieldname,condition,value){this.set_field(fieldname);if(condition)this.$w.find('.condition').val(condition).change();if(value)this.field.set_input(value)},render_field_select:function(){var me=this;me.table_fields=[];var std_filters=[{fieldname:'name',fieldtype:'Data',label:'ID',parent:me.doctype},{fieldname:'modified',fieldtype:'Date',label:'Last Modified',parent:me.doctype},{fieldname:'owner',fieldtype:'Data',label:'Created By',parent:me.doctype},{fieldname:'_user_tags',fieldtype:'Data',label:'Tags',parent:me.doctype}];$.each(std_filters.concat(fields_list[me.doctype]),function(i,df){me.add_field_option(df);});$.each(me.table_fields,function(i,table_df){if(table_df.options){$.each(fields_list[table_df.options],function(i,df){me.add_field_option(df);});}})},add_field_option:function(df){var me=this;if(me.doctype&&df.parent==me.doctype){var label=df.label;var table=get_label_doctype(me.doctype);if(df.fieldtype=='Table')me.table_fields.push(df);}else{var label=df.label+' ('+df.parent+')';var table=df.parent;}
+if(wn.model.no_value_type.indexOf(df.fieldtype)==-1&&!me.fields_by_name[df.fieldname]){this.$select.append($('<option>',{value:df.fieldname,table:table}).text(label));me.fields_by_name[df.fieldname]=df;}},set_field:function(fieldname,fieldtype){var me=this;var cur=me.field?{fieldname:me.field.df.fieldname,fieldtype:me.field.df.fieldtype}:{}
+var df=me.fields_by_name[fieldname];this.set_fieldtype(df,fieldtype);if(me.field&&cur.fieldname==fieldname&&df.fieldtype==cur.fieldtype){return;}
+me.$w.find('.fieldname_select').val(fieldname);var field_area=me.$w.find('.filter_field').empty().get(0);f=make_field(df,null,field_area,null,0,1);f.df.single_select=1;f.not_in_form=1;f.with_label=0;f.refresh();me.field=f;this.set_default_condition(df,fieldtype);$(me.field.wrapper).find(':input').keydown(function(ev){if(ev.which==13){me.flist.listobj.run();}})},set_fieldtype:function(df,fieldtype){if(df.original_type)
+df.fieldtype=df.original_type;else
+df.original_type=df.fieldtype;df.description='';df.reqd=0;if(fieldtype){df.fieldtype=fieldtype;return;}
+if(df.fieldtype=='Check'){df.fieldtype='Select';df.options='No\nYes';}else if(['Text','Text Editor','Code','Link'].indexOf(df.fieldtype)!=-1){df.fieldtype='Data';}},set_default_condition:function(df,fieldtype){if(!fieldtype){if(df.fieldtype=='Data'){this.$w.find('.condition').val('like');}else{this.$w.find('.condition').val('=');}}},get_value:function(){var me=this;var val=me.field.get_value();var cond=me.$w.find('.condition').val();if(me.field.df.original_type=='Check'){val=(val=='Yes'?1:0);}
+if(cond=='like'){val=val+'%';}
+return[me.$w.find('.fieldname_select option:selected').attr('table'),me.field.df.fieldname,me.$w.find('.condition').val(),cstr(val)];}});
/*
* lib/js/legacy/widgets/layout.js
*/
@@ -726,13 +995,13 @@
Layout.prototype.show=function(){$ds(this.wrapper);}
Layout.prototype.hide=function(){$dh(this.wrapper);}
Layout.prototype.close_borders=function(){if(this.with_border){this.myrows[this.myrows.length-1].wrapper.style.borderBottom='1px solid #000';}}
-function LayoutRow(layout,parent){this.layout=layout;this.wrapper=$a(parent,'div');this.main_head=$a(this.wrapper,'div');this.main_body=$a(this.wrapper,'div');if(layout.with_border){this.wrapper.style.border='1px solid #000';this.wrapper.style.borderBottom='0px';}
+function LayoutRow(layout,parent){this.layout=layout;this.wrapper=$a(parent,'div','form-layout-row');this.main_head=$a(this.wrapper,'div');this.main_body=$a(this.wrapper,'div');if(layout.with_border){this.wrapper.style.border='1px solid #000';this.wrapper.style.borderBottom='0px';}
this.header=$a(this.main_body,'div','',{padding:(layout.with_border?'0px 8px':'0px')});this.body=$a(this.main_body,'div');this.table=$a(this.body,'table','',{width:'100%',borderCollapse:'collapse'});this.row=this.table.insertRow(0);this.mycells=[];}
LayoutRow.prototype.hide=function(){$dh(this.wrapper);}
LayoutRow.prototype.show=function(){$ds(this.wrapper);}
LayoutRow.prototype.addCell=function(wid){var lc=new LayoutCell(this.layout,this,wid);this.mycells[this.mycells.length]=lc;return lc;}
function LayoutCell(layout,layoutRow,width){if(width){var w=width+'';if(w.substr(w.length-2,2)!='px'){if(w.substr(w.length-1,1)!="%"){width=width+'%'};}}
-this.width=width;this.layout=layout;var cidx=layoutRow.row.cells.length;this.cell=layoutRow.row.insertCell(cidx);this.cell.style.verticalAlign='top';this.set_width(layoutRow.row,width);var h=$a(this.cell,'div','',{padding:(layout.with_border?'0px 8px':'0px')});this.wrapper=$a(this.cell,'div','',{padding:(layout.with_border?'8px':'8px 0px')});layout.cur_cell=this.wrapper;layout.cur_cell.header=h;}
+this.width=width;this.layout=layout;var cidx=layoutRow.row.cells.length;this.cell=layoutRow.row.insertCell(cidx);this.cell.style.verticalAlign='top';this.set_width(layoutRow.row,width);var h=$a(this.cell,'div','',{padding:(layout.with_border?'0px 8px':'0px')});this.wrapper=$a(this.cell,'div','',{padding:(layout.with_border?'8px':'0px')});layout.cur_cell=this.wrapper;layout.cur_cell.header=h;}
LayoutCell.prototype.set_width=function(row,width){var w=100;var n_cells=row.cells.length;var cells_with_no_width=n_cells;if(width){$y(row.cells[n_cells-1],{width:cint(width)+'%'})}else{row.cells[n_cells-1].estimated_width=1;}
for(var i=0;i<n_cells;i++){if(!row.cells[i].estimated_width){w=w-cint(row.cells[i].style.width);cells_with_no_width--;}}
for(var i=0;i<n_cells;i++){if(row.cells[i].estimated_width)
@@ -742,48 +1011,16 @@
/*
* lib/js/legacy/webpage/page_header.js
*/
-var def_ph_style={wrapper:{marginBottom:'16px',backgroundColor:'#EEE'},main_heading:{},sub_heading:{marginBottom:'8px',color:'#555',display:'none'},separator:{borderTop:'3px solid #777'},toolbar_area:{padding:'3px 0px',display:'none',borderBottom:'1px solid #AAA'}}
-function PageHeader(parent,main_text,sub_text){this.wrapper=$a(parent,'div','page_header');this.t1=make_table($a(this.wrapper,'div','',def_ph_style.wrapper.backgroundColor),1,2,'100%',[null,'100px'],{padding:'2px'});$y(this.t1,{borderCollapse:'collapse'})
-this.lhs=$td(this.t1,0,0);this.main_head=$a(this.lhs,'h1','',def_ph_style.main_heading);this.sub_head=$a(this.lhs,'h4','',def_ph_style.sub_heading);this.separator=$a(this.wrapper,'div','',def_ph_style.separator);this.toolbar_area=$a(this.wrapper,'div','',def_ph_style.toolbar_area);this.padding_area=$a(this.wrapper,'div','',{padding:'3px'});$y($td(this.t1,0,1),{textAlign:'right',padding:'3px'});this.close_btn=$a($td(this.t1,0,1),'span','close',{},'×');this.close_btn.onclick=function(){nav_obj.show_last_open();};if(main_text)this.main_head.innerHTML=main_text;if(sub_text)this.sub_head.innerHTML=sub_text;this.buttons={};this.buttons2={};}
-PageHeader.prototype.add_button=function(label,fn,bold,icon,green){var tb=this.toolbar_area;if(this.buttons[label])return;var btn=$btn(tb,label,fn,{marginRight:'4px'},(green?'btn-primary':''));if(bold)$y(btn,{fontWeight:'bold'});this.buttons[label]=btn;$ds(this.toolbar_area);return btn;}
+var def_ph_style={wrapper:{marginBottom:'16px',backgroundColor:'#EEE'},main_heading:{},sub_heading:{marginBottom:'8px',color:'#555',display:'none'},separator:{borderTop:'1px solid #ddd'},toolbar_area:{padding:'3px 0px',display:'none',borderBottom:'1px solid #ddd'}}
+function PageHeader(parent,main_text,sub_text){this.wrapper=$a(parent,'div','page_header');this.close_btn=$a(this.wrapper,'a','close',{},'×');this.close_btn.onclick=function(){window.history.back();};this.breadcrumbs=$a(this.wrapper,'div');this.main_head=$a(this.wrapper,'h1','',def_ph_style.main_heading);this.sub_head=$a(this.wrapper,'h4','',def_ph_style.sub_heading);this.separator=$a(this.wrapper,'div','',def_ph_style.separator);this.toolbar_area=$a(this.wrapper,'div','',def_ph_style.toolbar_area);this.padding_area=$a(this.wrapper,'div','',{padding:'3px'});if(main_text)this.main_head.innerHTML=main_text;if(sub_text)this.sub_head.innerHTML=sub_text;this.buttons={};this.buttons2={};}
+PageHeader.prototype.add_button=function(label,fn,bold,icon,green){var tb=this.toolbar_area;if(this.buttons[label])return;iconhtml=icon?('<i class="'+icon+'"></i> '):'';var $button=$('<button class="btn btn-small">'+iconhtml+label+'</button>').click(fn).appendTo(tb);if(green){$button.addClass('btn-info');$button.find('i').addClass('icon-white');}
+if(bold)$button.css('font-weight','bold');this.buttons[label]=$button.get(0);$ds(this.toolbar_area);return this.buttons[label];}
PageHeader.prototype.clear_toolbar=function(){this.toolbar_area.innerHTML='';this.buttons={};}
PageHeader.prototype.make_buttonset=function(){$(this.toolbar_area).buttonset();}
/*
- * lib/js/legacy/widgets/select.js
- */
-function SelectWidget(parent,options,width,editable,bg_color){var me=this;this.inp=$a(parent,'select');if(options)add_sel_options(this.inp,options);if(width)$y(this.inp,{width:width});this.set_width=function(w){$y(this.inp,{width:w})};this.set_options=function(o){add_sel_options(this.inp,o);}
-this.inp.onchange=function(){if(me.onchange)me.onchange(this);}
-return;}
-/*
- * lib/js/legacy/webpage/history.js
- */
-var nav_obj={}
-nav_obj.observers=[];nav_obj.add_observer=function(o){nav_obj.observers.push(o);}
-nav_obj.ol=[];nav_obj.open_notify=function(t,dt,dn,no_history){if(nav_obj.ol.length){var tmp=nav_obj.ol[nav_obj.ol.length-1];if(tmp&&tmp[0]==t&&tmp[1]==dt&&tmp[2]==dn)return;}
-if(!no_history){var tmp=[];for(var i in nav_obj.ol)
-if(!(nav_obj.ol[i][0]==t&&nav_obj.ol[i][1]==dt&&nav_obj.ol[i][2]==dn))tmp.push(nav_obj.ol[i]);nav_obj.ol=tmp;nav_obj.ol.push([t,dt,dn])
-en_t=encodeURIComponent(t);en_dt=encodeURIComponent(dt);en_dn=dn?encodeURIComponent(dn):'';if(en_t=='Page'){var id=en_dt+(dn?('/'+en_dn):'')}else{var id=en_t+'/'+en_dt+(dn?('/'+en_dn):'')}
-if(nav_obj.on_open)
-nav_obj.on_open(id);if(window.location.hash!='!'+id){window.location.hash='!'+id;}}
-nav_obj.notify_observers(t,dt,dn);if(wn.boot.analytics_code){try{eval(wn.boot.analytics_code);}catch(e){console.log(e);}}}
-nav_obj.notify_observers=function(t,dt,dn){for(var i=0;i<nav_obj.observers.length;i++){var o=nav_obj.observers[i];if(o&&o.notify)o.notify(t,dt,dn);}}
-nav_obj.rename_notify=function(dt,oldn,newn){for(var i=0;i<nav_obj.ol.length;i++){var o=nav_obj.ol[i];if(o[1]==dt&&o[2]==oldn)o[2]=newn;}}
-nav_obj.show_last_open=function(){var l=nav_obj.ol[nav_obj.ol.length-2];delete nav_obj.ol[nav_obj.ol.length-1];if(!l)loadpage('_home');else if(l[0]=='Page'){loadpage(l[1]);}else if(l[0]=='Report'){loadreport(l[1],l[2]);}else if(l[0]=='Form'){loaddoc(l[1],l[2]);}else if(l[0]=='DocBrowser'||l[0]=='List'){loaddocbrowser(l[1]);}}
-var _history_current;function history_get_name(t){var parts=[];if(t.length>=3){for(var i=2;i<t.length;i++){parts.push(t[i]);}}
-return parts.join('/')}
-nav_obj.get_page=function(loc){if(!loc)loc=window.location.hash;if(loc.substr(0,1)=='#'){loc=loc.substr(1);}
-if(loc.substr(0,1)=='!'){loc=loc.substr(1);}
-if(!in_list(['Page/','Form/','Repor','DocBr','List/'],loc.substr(0,5))){loc='Page/'+loc;}
-return loc.split('/');}
-function historyChange(newLocation){var t=nav_obj.get_page(newLocation)
-for(var i=0;i<t.length;i++)
-t[i]=decodeURIComponent(t[i]);if(nav_obj.ol.length){var c=nav_obj.ol[nav_obj.ol.length-1];if(t.length==2){if(c[0]==t[0]&&c[1]==t[1])return;}else{if(c[0]==t[0]&&c[1]==t[1]&&c[2]==t[2])return;}}
-if(t[2])
-var docname=history_get_name(t);if(t[0]=='Form'){_history_current=newLocation;if(docname.substr(0,3)=='New'&&!(locals[t[1]]&&locals[t[1]][docname])){newdoc(t[1]);}else{loaddoc(t[1],docname);}}else if(t[0]=='Report'){_history_current=newLocation;loadreport(t[1],docname);}else if(t[0]=='Page'){_history_current=newLocation;loadpage(t[1]);}else if(t[0]=='Application'){_history_current=newLocation;loadapp(t[1]);}else if(t[0]=='DocBrowser'||t[0]=='List'){_history_current=newLocation;loaddocbrowser(t[1]);}};$(window).bind('hashchange',function(){historyChange(location.hash);});
-/*
* lib/js/legacy/webpage/search.js
*/
-search_fields={};function setlinkvalue(name){selector.input.set_input(name);selector.hide();}
+search_fields={};function setlinkvalue(name){selector.input.set_input_value(name);selector.hide();}
function makeselector(){var d=new Dialog(540,440,'Search');d.make_body([['Data','Beginning With','Tip: You can use wildcard "%"'],['Select','Search By'],['Button','Search'],['HTML','Help'],['HTML','Result']]);var inp=d.widgets['Beginning With'];var field_sel=d.widgets['Search By'];var btn=d.widgets['Search'];d.sel_type='';d.values_len=0;d.set=function(input,type,label){d.sel_type=type;d.input=input;if(d.style!='Link'){d.rows['Result'].innerHTML='';d.values_len=0;}
d.style='Link';d.set_query_description()
if(!d.sel_type)d.sel_type='Value';d.set_title('Select a "'+d.sel_type+'" for field "'+label+'"');}
@@ -797,8 +1034,7 @@
try{inp.focus();}catch(e){}
if(d.input)d.input.set_get_query();var get_sf_list=function(dt){var l=[];var lf=search_fields[dt];for(var i=0;i<lf.length;i++)l.push(lf[i][1]);return l;}
$ds(d.rows['Search By']);if(search_fields[d.sel_type]){empty_select(field_sel);add_sel_options(field_sel,get_sf_list(d.sel_type),'ID');}else{empty_select(field_sel);add_sel_options(field_sel,['ID'],'ID');$c('webnotes.widgets.search.getsearchfields',{'doctype':d.sel_type},function(r,rt){search_fields[d.sel_type]=r.searchfields;empty_select(field_sel);add_sel_options(field_sel,get_sf_list(d.sel_type));field_sel.selectedIndex=0;});}}
-d.onhide=function(){if(d.input&&d.input.txt)
-d.input.txt.onchange()}
+d.onhide=function(){}
btn.onclick=function(){if(this.disabled)return;this.args.is_ajax=true;this.set_working();d.set_doctype=d.sel_type;var q='';args={};if(d.input&&d.input.get_query){var doc={};args.is_simple=1;if(cur_frm)doc=locals[cur_frm.doctype][cur_frm.docname];var q=d.input.get_query(doc,d.input.doctype,d.input.docname);if(!q){return'';}}
var get_sf_fieldname=function(v){var lf=search_fields[d.sel_type];if(!lf)
return'name'
@@ -816,92 +1052,58 @@
/*
* lib/js/legacy/webpage/spinner.js
*/
-function set_loading(){pending_req++;$('#spinner').css('visibility','visible');$('body').css('cursor','progress');}
+var pending_req=0;var fcount=0;var dialog_back;function set_loading(){pending_req++;$('#spinner').css('visibility','visible');$('body').css('cursor','progress');}
function hide_loading(){pending_req--;if(!pending_req){$('body').css('cursor','default');$('#spinner').css('visibility','hidden');}}
-/*
- * lib/js/legacy/webpage/freeze_page.js
- */
-var fcount=0;var frozen=0;var dialog_message;var dialog_back;function freeze(msg,do_freeze){if(!dialog_back){dialog_back=$a($i('body_div'),'div','dialog_back');$(dialog_back).css('opacity',0.6);}
-$ds(dialog_back);fcount++;frozen=1;}
-function unfreeze(){if(dialog_message)
-$dh(dialog_message);if(!fcount)return;fcount--;if(!fcount){$dh(dialog_back);frozen=0;}}
+function freeze(){if(!dialog_back){dialog_back=$a($i('body_div'),'div','dialog_back');$(dialog_back).css('opacity',0.6);}
+$ds(dialog_back);fcount++;}
+function unfreeze(){if(!fcount)return;fcount--;if(!fcount){$dh(dialog_back);}}
/*
* lib/js/legacy/webpage/error_console.js
*/
var err_console;var err_list=[];function errprint(t){if(!err_list)err_list=[];err_list.push('<pre style="font-family: Courier, Fixed; font-size: 11px; \
border-bottom: 1px solid #AAA; overflow: auto; width: 90%;">'+t+'</pre>');}
-function setup_err_console(){err_console=new Dialog(640,480,'Error Console')
+$(document).bind('startup',function(){err_console=new Dialog(640,480,'Error Console')
err_console.make_body([['HTML','Error List'],['Button','Clear'],['HTML','Error Report']]);var span=$a(err_console.widgets['Error Report'],'span','link_type');span.innerHTML='Send Error Report';span.onclick=function(){msg=prompt('How / where did you get the error [optional]')
var call_back=function(r,rt){err_console.hide();msgprint("Error Report Sent")}
$c('webnotes.utils.send_error_report',{'err_msg':err_console.rows['Error List'].innerHTML,'msg':msg},call_back);}
err_console.widgets['Clear'].onclick=function(){err_list=[];err_console.rows['Error List'].innerHTML='';err_console.hide();}
err_console.onshow=function(){err_console.rows['Error List'].innerHTML='<div style="padding: 16px; height: 360px; width: 90%; overflow: auto;">'
-+err_list.join('<div style="height: 10px; margin-bottom: 10px; border-bottom: 1px solid #AAA"></div>')+'</div>';}}
-startup_list.push(setup_err_console);
++err_list.join('<div style="height: 10px; margin-bottom: 10px; border-bottom: 1px solid #AAA"></div>')+'</div>';}});
/*
* lib/js/legacy/webpage/loaders.js
*/
-function loadreport(dt,rep_name,onload,menuitem,reset_report){wn.require('lib/js/legacy/report.compressed.js');dt=get_label_doctype(dt);var show_report_builder=function(){if(!_r.rb_con){_r.rb_con=new _r.ReportContainer();}
-_r.rb_con.set_dt(dt,function(rb){if(rep_name){var t=rb.current_loaded;rb.load_criteria(rep_name);if(onload)
-onload(rb);if((rb.dt)&&(!rb.dt.has_data()||rb.current_loaded!=t))
-rb.dt.run();}else{if(reset_report){rb.reset_report();}}
-if(!rb.forbidden){page_body.change_to('Report Builder');nav_obj.open_notify('Report',dt,rep_name);}});}
-show_report_builder();}
-var load_doc=loaddoc;function loaddoc(doctype,name,onload,menuitem,from_archive){doctype=get_label_doctype(doctype);if(frms['DocType']&&frms['DocType'].opendocs[doctype]){msgprint("Cannot open an instance of \""+doctype+"\" when the DocType is open.");return;}
-if(doctype=='DocType'&&frms[name]){msgprint("Cannot open DocType \""+name+"\" when its instance is open.");return;}
-var show_form=function(f){if(!_f.frm_con){_f.frm_con=new _f.FrmContainer();}
-if(!frms[doctype]){_f.add_frm(doctype,show_doc,name,from_archive);}else if(LocalDB.is_doc_loaded(doctype,name)){show_doc();}else{$c('webnotes.widgets.form.load.getdoc',{'name':name,'doctype':doctype,'user':user,'from_archive':(from_archive?1:0)},show_doc,null,null);}}
-var show_doc=function(r,rt){if(locals[doctype]&&locals[doctype][name]){var frm=frms[doctype];frm.refresh(name);if(!frm.in_dialog)
-nav_obj.open_notify('Form',doctype,name);if(onload)onload();}else{if(r.exc){msgprint('There were errors while loading '+doctype+' '+name);}
-loadpage('_home');}}
-show_form();}
-function new_doc(doctype,onload,in_dialog,on_save_callback,cdt,cdn,cnic){doctype=get_label_doctype(doctype);if(!doctype){if(cur_frm)doctype=cur_frm.doctype;else return;}
-var show_doc=function(){frm=frms[doctype];if(frm.perm[0][CREATE]==1){if(frm.meta.issingle){var dn=doctype;LocalDB.set_default_values(locals[doctype][doctype]);}else
-var dn=LocalDB.create(doctype);if(onload)onload(dn);if(frm.in_dialog){var fd=_f.frm_dialog;fd.cdt=cdt;fd.cdn=cdn;fd.cnic=cnic;fd.on_save_callback=on_save_callback;}else{nav_obj.open_notify('Form',doctype,dn);}
-frm.refresh(dn);}else{msgprint('error:Not Allowed To Create '+doctype+'\nContact your Admin for help');}}
-var show_form=function(){if(!_f.frm_con){_f.frm_con=new _f.FrmContainer();}
-if(!frms[doctype])
-_f.add_frm(doctype,show_doc);else
-show_doc(frms[doctype]);}
-show_form();}
-var newdoc=new_doc;var pscript={};var cur_page;function loadpage(page_name,call_back,no_history){if(!page_name)return;if(page_name=='_home')
-page_name=home_page;var fn=function(r,rt){if(wn.pages[page_name]){var p=wn.pages[page_name]
-page_body.change_to(page_name);}else{var p=render_page(page_name);if(!p)return;}
-cur_page=page_name;if(call_back)call_back();scroll(0,0);pscript.update_page_history(page_name,no_history)
-try{if(pscript['refresh_'+page_name])pscript['refresh_'+page_name]();}catch(e){console.log(e);}}
-if(get_local('Page',page_name)||wn.pages[page_name])
-fn();else{args=get_url_dict();args.name=page_name;$c('webnotes.widgets.page.getpage',args,fn);}}
-pscript.update_page_history=function(page_name,no_history){var arg=null;var t=null;if(window.location.hash){var t=nav_obj.get_page(window.location.hash)}else if(get_url_arg('page')){var t=nav_obj.get_page(get_url_arg('page'))}
-if(t&&t[1]==page_name)arg=t[2];nav_obj.open_notify('Page',page_name,arg,no_history);}
-function loadscript(src,call_back){set_loading();var script=$a('head','script');script.type='text/javascript';script.src=src;script.onload=function(){if(call_back)call_back();hide_loading();}
-script.onreadystatechange=function(){if(this.readyState=='complete'||this.readyState=='loaded'){hide_loading();call_back();}}}
-var doc_browser_page;function loaddocbrowser(dt,label,fields){wn.require('lib/js/legacy/webpage/docbrowser.js');dt=get_label_doctype(dt);if(!doc_browser_page)
-doc_browser_page=new ItemBrowserPage();doc_browser_page.show(dt,label,fields);nav_obj.open_notify('List',dt,'');}
+function loadreport(dt,rep_name,onload){if(rep_name)
+wn.set_route('Report',dt,rep_name);else
+wn.set_route('Report',dt);}
+function loaddoc(doctype,name,onload){doctype=get_label_doctype(doctype);wn.model.with_doctype(doctype,function(){if(locals.DocType[doctype].in_dialog){console.log(1)
+_f.edit_record(doctype,name);}else{wn.set_route('Form',doctype,name);}})}
+var load_doc=loaddoc;function new_doc(doctype,onload,in_dialog,on_save_callback,cdt,cdn,cnic){doctype=get_label_doctype(doctype);wn.model.with_doctype(doctype,function(){if(locals.DocType[doctype].in_dialog){_f.edit_record(doctype,'New '+doctype);}else{wn.set_route('Form',doctype,'New '+doctype);}})}
+var newdoc=new_doc;var pscript={};function loadpage(page_name,call_back,no_history){wn.set_route(page_name);}
+function loaddocbrowser(dt){wn.set_route('List',dt);}
/*
* lib/js/legacy/webpage/uploader.js
*/
var uploaders={};var upload_frame_count=0;Uploader=function(parent,args,callback){var id='frame'+upload_frame_count;upload_frame_count++;this.callback=callback;var div=$a(parent,'div');div.innerHTML='<iframe id="'+id+'" name="'+id+'" src="blank.html" \
- style="width:0px; height:0px; border:0px"></iframe>';var div=$a(parent,'div');div.innerHTML='<form method="POST" enctype="multipart/form-data" action="'+outUrl+'" target="'+id+'"></form>';var ul_form=div.childNodes[0];var f_list=[];var inp_fdata=$a_input($a(ul_form,'span'),'file',{name:'filedata'},{marginLeft:'7px'});if(!('cmd'in args)){var inp=$a_input($a(ul_form,'span'),'hidden',{name:'cmd'});inp.value='uploadfile';}
+ style="width:0px; height:0px; border:0px"></iframe>';var div=$a(parent,'div');div.innerHTML='<form method="POST" enctype="multipart/form-data" action="'+wn.request.url+'" target="'+id+'"></form>';var ul_form=div.childNodes[0];var f_list=[];var inp_fdata=$a_input($a(ul_form,'span'),'file',{name:'filedata'},{marginLeft:'7px'});if(!('cmd'in args)){var inp=$a_input($a(ul_form,'span'),'hidden',{name:'cmd'});inp.value='uploadfile';}
var inp=$a_input($a(ul_form,'span'),'hidden',{name:'uploader_id'});inp.value=id;var inp=$a_input($a(ul_form,'span'),'submit',null,{marginLeft:'7px'});inp.value='Upload';$y(inp,{width:'80px'});for(var key in args){var inp=$a_input($a(ul_form,'span'),'hidden',{name:key});inp.value=args[key];}
uploaders[id]=this;}
function upload_callback(id,fid){uploaders[id].callback(fid);}
/*
* lib/js/legacy/webpage/page.js
*/
-var stylesheets=[];function Page(page_name,content){var me=this;this.name=page_name;this.trigger=function(event){try{if(pscript[event+'_'+this.name])
+function Page(page_name,content){var me=this;this.name=page_name;this.trigger=function(event){try{if(pscript[event+'_'+this.name])
pscript[event+'_'+this.name](me.wrapper);if(me.wrapper[event]){me.wrapper[event](me.wrapper);}}catch(e){console.log(e);}}
this.page_show=function(){set_title(me.doc.title?me.doc.title:me.name);if(!me.onload_complete){me.trigger('onload');me.onload_complete=true;}
me.trigger('onshow');cur_frm=null;}
-this.wrapper=page_body.add_page(page_name,this.page_show);this.cont=this.wrapper
+this.wrapper=wn.container.add_page(page_name,this.page_show);this.cont=this.wrapper
if(content)
this.wrapper.innerHTML=content;return this;}
function render_page(page_name,menuitem){if(!page_name)return;if((!locals['Page'])||(!locals['Page'][page_name])){loadpage('_home');return;}
var pdoc=locals['Page'][page_name];if(pdoc.style)set_style(pdoc.style)
-if(pdoc.stylesheet){set_style(locals.Stylesheet[pdoc.stylesheet].stylesheet);stylesheets.push(pdoc.stylesheet);}
var p=new Page(page_name,pdoc._Page__content?pdoc._Page__content:pdoc.content);var script=pdoc.__script?pdoc.__script:pdoc.script;p.doc=pdoc;if(script){eval(script);}
-page_body.change_to(page_name);return p;}
+wn.container.change_to(page_name);return p;}
function refresh_page(page_name){var fn=function(r,rt){render_page(page_name)}
-$c('webnotes.widgets.page.getpage',{'name':page_name,stylesheets:JSON.stringify(stylesheets)},fn);}
+$c('webnotes.widgets.page.getpage',{'name':page_name},fn);}
/*
* lib/js/legacy/wn/page_layout.js
*/
@@ -927,14 +1129,11 @@
d.name=LocalDB.get_localname(d.doctype);LocalDB.add(d.doctype,d.name);locals[d.doctype][d.name]=d;if(d.doctype=='DocType'){fields_list[d.name]=[];}else if(d.doctype=='DocField'){if(!d.parent){alert('Error: No parent specified for field "'+d.label+'"');}
if(!fields_list[d.parent])fields_list[d.parent]=[];fields_list[d.parent][fields_list[d.parent].length]=d;if(!fields[d.parent])
fields[d.parent]={};if(d.fieldname){fields[d.parent][d.fieldname]=d;}else if(d.label){fields[d.parent][d.label]=d;}}
-if(d.localname)
-notify_rename_observers(d.doctype,d.localname,d.name);}}
+if(d.localname){wn.model.new_names[d.localname]=d.name;$(document).trigger('rename',[d.doctype,d.localname,d.name]);delete locals[d.doctype][d.localname];}}}
local_name_idx={};LocalDB.get_localname=function(doctype){if(!local_name_idx[doctype])local_name_idx[doctype]=1;var n='New '+get_doctype_label(doctype)+' '+local_name_idx[doctype];local_name_idx[doctype]++;return n;}
LocalDB.set_default_values=function(doc){var doctype=doc.doctype;var docfields=fields_list[doctype];if(!docfields){return;}
var fields_to_refresh=[];for(var fid=0;fid<docfields.length;fid++){var f=docfields[fid];if(!in_list(no_value_fields,f.fieldtype)&&doc[f.fieldname]==null){var v=LocalDB.get_default_value(f.fieldname,f.fieldtype,f['default']);if(v){doc[f.fieldname]=v;fields_to_refresh.push(f.fieldname);}}}
return fields_to_refresh;}
-LocalDB.is_doc_loaded=function(dt,dn){var exists=false;if(locals[dt]&&locals[dt][dn])exists=true;if(exists&&dt=='DocType'&&!locals[dt][dn].__islocal&&!frms[dt])
-exists=false;return exists;}
function check_perm_match(p,dt,dn){if(!dn)return true;var out=false;if(p.match){if(user_defaults[p.match]){for(var i=0;i<user_defaults[p.match].length;i++){if(user_defaults[p.match][i]==locals[dt][dn][p.match]){return true;}}
return false;}else if(!locals[dt][dn][p.match]){return true;}else{return false;}}else{return true;}}
function get_perm(doctype,dn,ignore_submit){var perm=[[0,0],];if(in_list(user_roles,'Administrator'))perm[0][READ]=1;var plist=getchildren('DocPerm',doctype,'permissions','DocType');for(var pidx in plist){var p=plist[pidx];var pl=cint(p.permlevel?p.permlevel:0);if(in_list(user_roles,p.role)){if(check_perm_match(p,doctype,dn)){if(!perm[pl])perm[pl]=[];if(!perm[pl][READ]){if(cint(p.read))perm[pl][READ]=1;else perm[pl][READ]=0;}
@@ -963,9 +1162,6 @@
return locals[dt][newdoc];}
function make_doclist(dt,dn,deleted){var dl=[];dl[0]=locals[dt][dn];for(var ndt in locals){if(locals[ndt]){for(var ndn in locals[ndt]){var doc=locals[ndt][ndn];if(doc&&doc.parenttype==dt&&(doc.parent==dn||(deleted&&doc.__oldparent==dn))){dl[dl.length]=doc;}}}}
return dl;}
-var rename_observers=[];function notify_rename_observers(dt,old_name,new_name){try{delete locals[dt][old_name];}catch(e){alert("[rename_from_local] No Document for: "+old_name);}
-for(var i=0;i<rename_observers.length;i++){if(rename_observers[i])
-rename_observers[i].rename_notify(dt,old_name,new_name);}}
var Meta={};var local_dt={};Meta.make_local_dt=function(dt,dn){var dl=make_doclist('DocType',dt);if(!local_dt[dt])local_dt[dt]={};if(!local_dt[dt][dn])local_dt[dt][dn]={};for(var i=0;i<dl.length;i++){var d=dl[i];if(d.doctype=='DocField'){var key=d.fieldname?d.fieldname:d.label;local_dt[dt][dn][key]=copy_dict(d);}}}
Meta.get_field=function(dt,fn,dn){if(dn&&local_dt[dt]&&local_dt[dt][dn]){return local_dt[dt][dn][fn];}else{if(fields[dt])var d=fields[dt][fn];if(d)return d;}
return{};}
@@ -993,7 +1189,6 @@
return obj;}
function save_doclist(dt,dn,save_action,onsave,onerr){var doc=locals[dt][dn];var doctype=locals['DocType'][dt];var tmplist=[];var doclist=make_doclist(dt,dn,1);var all_clear=true;if(save_action!='Cancel'){for(var n in doclist){var tmp=check_required(doclist[n].doctype,doclist[n].name,doclist[0].doctype);if(doclist[n].docstatus+''!='2'&&all_clear)
all_clear=tmp;}}
-var f=frms[dt];if(f&&!all_clear){if(f)f.savingflag=false;return'Error';}
var _save=function(){$c('webnotes.widgets.form.save.savedocs',{'docs':compress_doclist(doclist),'docname':dn,'action':save_action,'user':user},function(r,rtxt){if(f){f.savingflag=false;}
if(r.saved){if(onsave)onsave(r);}else{if(onerr)onerr(r);}},function(){if(f){f.savingflag=false;}},0,(f?'Saving...':''));}
if(doc.__islocal&&(doctype&&doctype.autoname&&doctype.autoname.toLowerCase()=='prompt')){var newname=prompt('Enter the name of the new '+dt,'');if(newname){doc.__newname=strip(newname);_save();}else{msgprint('Not Saved');onerr();}}else{_save();}}
@@ -1002,34 +1197,18 @@
if(errfld.length)msgprint('<b>Mandatory fields required in '+
(doc.parenttype?(fields[doc.parenttype][doc.parentfield].label+' (Table)'):get_doctype_label(doc.doctype))+':</b>\n'+errfld.join('\n'));return all_clear;}
/*
- * lib/js/legacy/webpage/body.js
- */
-wn.provide('wn.pages');function Body(){this.left_sidebar=null;this.right_sidebar=null;this.status_area=null;var me=this;page_body=this;this.ready=function(){$dh('startup_div');$ds('body_div');}
-this.setup_page_areas=function(){this.center=this.body;this.center.header=$a(this.center,'div');this.center.body=$a(this.center,'div');this.center.loading=$a(this.center,'div','',{margin:'200px 0px',fontSize:'14px',color:'#999',textAlign:'center'});this.center.loading.innerHTML='Loading...'}
-this.run_startup_code=function(){$(document).trigger('startup');try{if(this.cp.custom_startup_code)
-eval(this.cp.custom_startup_code);}catch(e){errprint(e);}}
-this.setup=function(){this.cp=wn.control_panel;this.wrapper=$a($i('body_div'),'div');this.body=$a(this.wrapper,'div');this.setup_page_areas();if(user=='Guest')user_defaults.hide_webnotes_toolbar=1;if(!cint(user_defaults.hide_webnotes_toolbar)||user=='Administrator'){this.wntoolbar=new wn.ui.toolbar.Toolbar();}
-if(this.cp.page_width)
-$y(this.wrapper,{width:cint(this.cp.page_width)+'px'});}
-this.cur_page=null;this.add_page=function(label,onshow,onhide){var c=$a(this.center.body,'div');if(onshow)
-c.page_show=onshow;if(onhide)
-c.page_hide=onhide;wn.pages[label]=c;$dh(c);return c;}
-this.change_to=function(label){$dh(this.center.loading);if(me.cur_page&&wn.pages[label]!=me.cur_page){if(me.cur_page.page_hide)
-me.cur_page.page_hide();$dh(me.cur_page);}
-me.cur_page=wn.pages[label];me.cur_page_label=label;$(me.cur_page).fadeIn();if(me.cur_page.page_show)
-me.cur_page.page_show(me.cur_page);}
-this.set_session_changed=function(){if(this.session_message_set)return;var div=$a($i('body_div').parentNode,'div','',{textAlign:'center',fontSize:'14px',margin:'150px auto'});$dh('body_div');div.innerHTML='This session has been changed. Please <span class="link_type" onclick="window.location.reload()">refresh</span> to continue';this.session_message_set=1;}
-this.setup();}
-/*
* lib/js/legacy/app.js
*/
-var popup_cont;var session={};var start_sid=null;if(!wn)var wn={};function startup(){start_sid=get_cookie('sid');popup_cont=$a(document.getElementsByTagName('body')[0],'div');var setup_globals=function(r){wn.boot=r;profile=r.profile;user=r.profile.name;user_fullname=wn.user_info(user).fullname;user_defaults=profile.defaults;user_roles=profile.roles;user_email=profile.email;home_page=r.home_page;_p.letter_heads=r.letter_heads;sys_defaults=r.sysdefaults;session.rt=profile.can_read;if(r.ipinfo)session.ipinfo=r.ipinfo;session.dt_labels=r.dt_labels;session.rev_dt_labels={}
+var popup_cont;var session={};if(!wn)var wn={};function startup(){popup_cont=$a(document.getElementsByTagName('body')[0],'div');var setup_globals=function(r){wn.boot=r;profile=r.profile;user=r.profile.name;user_fullname=wn.user_info(user).fullname;user_defaults=profile.defaults;user_roles=profile.roles;user_email=profile.email;home_page=r.home_page;_p.letter_heads=r.letter_heads;sys_defaults=r.sysdefaults;session.rt=profile.can_read;if(r.ipinfo)session.ipinfo=r.ipinfo;session.dt_labels=r.dt_labels;session.rev_dt_labels={}
if(r.dt_labels){for(key in r.dt_labels)session.rev_dt_labels[r.dt_labels[key]]=key;}
wn.control_panel=r.control_panel;}
-var setup_history=function(r){rename_observers.push(nav_obj);}
-var callback=function(r,rt){if(r.exc)console.log(r.exc);setup_globals(r);setup_history();var a=new Body();page_body.run_startup_code();for(var i=0;i<startup_list.length;i++){startup_list[i]();}
-var t=to_open();if(t){historyChange(t);}else if(home_page){loadpage(home_page);}
-page_body.ready();}
+var setup_viewport=function(){wn.container=new wn.views.Container();if(user=='Guest')
+user_defaults.hide_webnotes_toolbar=1;if(!cint(user_defaults.hide_webnotes_toolbar)||user=='Administrator'){wn.container.wntoolbar=new wn.ui.toolbar.Toolbar();}
+$(document).trigger('startup');try{if(wn.control_panel.custom_startup_code)
+eval(wn.control_panel.custom_startup_code);}catch(e){errprint(e);}
+var t=to_open();if(t){window.location.hash=t;}else if(home_page){loadpage(home_page);}
+wn.route();$dh('startup_div');$ds('body_div');}
+var callback=function(r,rt){if(r.exc)console.log(r.exc);setup_globals(r);setup_viewport();}
if(wn.boot){LocalDB.sync(wn.boot.docs);callback(wn.boot,'');if(wn.boot.error_messages)
console.log(wn.boot.error_messages)
if(wn.boot.server_messages)
@@ -1066,19 +1245,19 @@
var current_module;var is_system_manager=0;wn.provide('erpnext.startup');erpnext.modules={'Selling':'selling-home','Accounts':'accounts-home','Stock':'stock-home','Buying':'buying-home','Support':'support-home','Projects':'projects-home','Production':'production-home','Website':'website-home','HR':'hr-home','Setup':'Setup','Activity':'activity','To Do':'todo','Calendar':'calendar','Messages':'messages','Knowledge Base':'questions','Dashboard':'dashboard'}
erpnext.startup.set_globals=function(){pscript.is_erpnext_saas=cint(wn.control_panel.sync_with_gateway)
if(inList(user_roles,'System Manager'))is_system_manager=1;}
-erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.custom_css){set_style(wn.boot.custom_css);}
-if(wn.boot.user_background){erpnext.set_user_background(wn.boot.user_background);}
-if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity','Messages'])
-erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('<div class="web-footer erpnext-footer">\
- <a href="#!attributions">ERPNext | Attributions and License</a></div>');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup();}}
+erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.user_background){erpnext.set_user_background(wn.boot.user_background);}
+if(user=='Guest'){if(wn.boot.custom_css){set_style(wn.boot.custom_css);}
+if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity','Messages'])
+if(user_roles.indexOf('Accounts Manager')!=-1){wn.boot.profile.allow_modules.push('Dashboard');}
+erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup();}}
$('#startup_div').toggle(false);}
show_chart_browser=function(nm,chart_type){var call_back=function(){if(nm=='Sales Browser'){var sb_obj=new SalesBrowser();sb_obj.set_val(chart_type);}
else if(nm=='Accounts Browser')
pscript.make_chart(chart_type);}
loadpage(nm,call_back);}
-var update_messages=function(reset){if(inList(['Guest'],user)){return;}
-if(!reset){$c_page('home','event_updates','get_global_status_messages',null,function(r,rt){if(!r.exc){page_body.wntoolbar.set_new_comments(r.message.unread_messages);var show_in_circle=function(parent_id,msg){var parent=$('#'+parent_id);if(parent){if(msg){parent.find('span:first').text(msg);parent.toggle(true);}else{parent.toggle(false);}}}
-show_in_circle('unread_messages',r.message.unread_messages.length);show_in_circle('open_support_tickets',r.message.open_support_tickets);show_in_circle('things_todo',r.message.things_todo);show_in_circle('todays_events',r.message.todays_events);}else{clearInterval(wn.updates.id);}});}else{page_body.wntoolbar.set_new_comments(0);$('#unread_messages').toggle(false);}}
+var update_messages=function(reset){if(inList(['Guest'],user)||!wn.session_alive){return;}
+if(!reset){$c_page('home','event_updates','get_global_status_messages',null,function(r,rt){if(!r.exc){wn.container.wntoolbar.set_new_comments(r.message.unread_messages);var show_in_circle=function(parent_id,msg){var parent=$('#'+parent_id);if(parent){if(msg){parent.find('span:first').text(msg);parent.toggle(true);}else{parent.toggle(false);}}}
+show_in_circle('unread_messages',r.message.unread_messages.length);show_in_circle('open_support_tickets',r.message.open_support_tickets);show_in_circle('things_todo',r.message.things_todo);show_in_circle('todays_events',r.message.todays_events);}else{clearInterval(wn.updates.id);}});}else{wn.container.wntoolbar.set_new_comments(0);$('#unread_messages').toggle(false);}}
erpnext.startup.set_periodic_updates=function(){wn.updates={};if(wn.updates.id){clearInterval(wn.updates.id);}
wn.updates.id=setInterval(update_messages,60000);}
erpnext.set_user_background=function(src){set_style(repl('body { background: url("files/%(src)s") repeat;}',{src:src}))}
@@ -1086,7 +1265,7 @@
/*
* erpnext/website/js/topbar.js
*/
-wn.provide('erpnext.navbar');erpnext.navbar.navbar=Class.extend({init:function(){this.make();$('.brand').html(wn.boot.website_settings.brand_html);this.make_items();$('.dropdown-toggle').dropdown();},make:function(){$('header').append('<div class="navbar navbar-fixed-top">\
+wn.provide('erpnext.navbar');erpnext.navbar.Navbar=Class.extend({init:function(){this.make();$('.brand').html(wn.boot.website_settings.brand_html);this.make_items();$('.dropdown-toggle').dropdown();},make:function(){$('header').append('<div class="navbar navbar-fixed-top">\
<div class="navbar-inner">\
<div class="container">\
<a class="brand">[brand]</a>\
@@ -1110,4 +1289,4 @@
<a href="https://erpnext.com">erpnext.com</a></div>\
</div>',wn.boot.website_settings));this.make_items();},make_items:function(){var items=wn.boot.website_menus
for(var i=0;i<items.length;i++){var item=items[i];if(!item.parent_label&&item.parentfield=='footer_items'){item.route=item.url||item.custom_page;$('.web-footer-menu ul').append(repl('<li><a href="#!%(route)s" \
- data-label="%(label)s">%(label)s</a></li>',item))}}}});$(document).bind('startup',function(){erpnext.footer=new erpnext.Footer();erpnext.navbar.navbar=new erpnext.navbar.navbar();})
\ No newline at end of file
+ data-label="%(label)s">%(label)s</a></li>',item))}}}});$(document).bind('startup',function(){erpnext.footer=new erpnext.Footer();erpnext.navbar.navbar=new erpnext.navbar.Navbar();})
diff --git a/version.num b/version.num
index 3f986b9..2800f1b 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-842
\ No newline at end of file
+1460
diff --git a/wnf.py b/wnf.py
index 4c6c012..49146a2 100755
--- a/wnf.py
+++ b/wnf.py
@@ -100,9 +100,7 @@
# install
parser.add_option('--install', nargs=3, metavar = "rootpassword dbname source",
help="install fresh db")
- parser.add_option('--sync_with_gateway', nargs=1, metavar = "1/0", \
- help="Set or Unset Sync with Gateway")
-
+
# diff
parser.add_option('--diff_ref_file', nargs=0, \
help="Get missing database records and mismatch properties, with file as reference")
@@ -120,9 +118,14 @@
metavar = "search replace_by extension",
help="file search-replace")
- parser.add_option("--cci", nargs=1, metavar="CacheItem Key",
+ parser.add_option("--cci", nargs=1, metavar="CacheItem Key or all",
help="Clear Cache Item")
+ parser.add_option("--sync_all", help="Synchronize all DocTypes using txt files",
+ nargs=0)
+
+ parser.add_option("--sync", help="Synchronize given DocType using txt file",
+ nargs=2, metavar="module doctype (use their folder names)")
return parser.parse_args()
@@ -207,17 +210,6 @@
inst.import_from_db(options.install[1], source_path=options.install[2], \
password='admin', verbose = 1)
- elif options.sync_with_gateway:
- if int(options.sync_with_gateway[0]) in [0, 1]:
- webnotes.conn.begin()
- webnotes.conn.sql("""\
- UPDATE `tabSingles` SET value=%s
- WHERE field='sync_with_gateway' AND doctype='Control Panel'""", int(options.sync_with_gateway[0]))
- webnotes.conn.commit()
- webnotes.message_log.append("sync_with_gateway set to %s" % options.sync_with_gateway[0])
- else:
- webnotes.message_log.append("ERROR: sync_with_gateway can be either 0 or 1")
-
elif options.diff_ref_file is not None:
import webnotes.modules.diff
webnotes.modules.diff.diff_ref_file()
@@ -240,6 +232,14 @@
else:
from webnotes.utils.cache import CacheItem
CacheItem(options.cci).clear()
+
+ elif options.sync_all is not None:
+ import webnotes.model.sync
+ webnotes.model.sync.sync_all()
+
+ elif options.sync is not None:
+ import webnotes.model.sync
+ webnotes.model.sync.sync(options.sync[0], options.sync[1])
# print messages
if webnotes.message_log:
