[ux] added folds, show actual / projected qty in pos
diff --git a/erpnext/public/build.json b/erpnext/public/build.json
index 14a631f..0998c53 100644
--- a/erpnext/public/build.json
+++ b/erpnext/public/build.json
@@ -7,10 +7,9 @@
],
"js/erpnext.min.js": [
"public/js/conf.js",
- "public/js/toolbar.js",
"public/js/feature_setup.js",
"public/js/utils.js",
"public/js/queries.js",
"public/js/utils/party.js"
]
-}
\ No newline at end of file
+}
diff --git a/erpnext/public/css/erpnext.css b/erpnext/public/css/erpnext.css
index 3777f4c..6d3f475 100644
--- a/erpnext/public/css/erpnext.css
+++ b/erpnext/public/css/erpnext.css
@@ -14,8 +14,8 @@
/* toolbar */
.toolbar-splash {
- width: 32px;
- height: 32px;
+ width: 32px;
+ height: 32px;
margin: -10px auto;
}
@@ -32,5 +32,6 @@
margin-left: -30px;
margin-top: -10px;
padding: 20px 10px;
- font-family: Monospace;
-}
\ No newline at end of file
+ border-right: 1px solid #c7c7c7;
+ border-bottom: 1px solid #c7c7c7;
+}
diff --git a/erpnext/public/js/transaction.js b/erpnext/public/js/transaction.js
index 915bbd9..dd11fab 100644
--- a/erpnext/public/js/transaction.js
+++ b/erpnext/public/js/transaction.js
@@ -57,8 +57,9 @@
this.set_dynamic_labels();
// Show POS button only if it is enabled from features setup
- if(cint(sys_defaults.fs_pos_view)===1 && this.frm.doctype!="Material Request")
+ if(cint(sys_defaults.fs_pos_view)===1 && this.frm.doctype!="Material Request") {
this.make_pos_btn();
+ }
},
make_pos_btn: function() {
@@ -77,6 +78,8 @@
erpnext.open_as_pos = false;
}
+ this.$pos_btn && this.$pos_btn.remove();
+
this.$pos_btn = this.frm.appframe.add_primary_action(btn_label, function() {
me.toggle_pos();
}, icon, "btn-default");