diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js index c0b8c35388c..62d8247590b 100644 --- a/erpnext/accounts/page/pos/pos.js +++ b/erpnext/accounts/page/pos/pos.js @@ -464,7 +464,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ toggle_totals_area: function(show) { - if(!show) { + if(show === undefined) { show = this.is_totals_area_collapsed; } diff --git a/erpnext/public/css/erpnext.css b/erpnext/public/css/erpnext.css index d92559e233e..f59883d407d 100644 --- a/erpnext/public/css/erpnext.css +++ b/erpnext/public/css/erpnext.css @@ -275,7 +275,7 @@ body[data-route="pos"] .modal-dialog { vertical-align: middle; } .pos-list-row .subject { - width: 50%; + width: 40%; } .pos-list-row .list-row-checkbox, .pos-list-row .list-select-all { @@ -307,7 +307,7 @@ body[data-route="pos"] .modal-dialog { justify-content: center; height: 100%; } -.pos .items .pos-list-row:last-child { +.pos .pos-list-row:last-child { border-bottom: none; } .pos .form-section-heading { diff --git a/erpnext/public/js/pos/pos.html b/erpnext/public/js/pos/pos.html index 54abf7e037a..e8a394c950d 100644 --- a/erpnext/public/js/pos/pos.html +++ b/erpnext/public/js/pos/pos.html @@ -90,9 +90,9 @@
{{ __("Customers in Queue") }}
-
{{ __("Customer") }}
+
{{ __("Customer") }}
{{ __("Status") }}
-
{{ __("Paid Amount") }}
+
{{ __("Amount") }}
{{ __("Grand Total") }}
diff --git a/erpnext/public/js/pos/pos_invoice_list.html b/erpnext/public/js/pos/pos_invoice_list.html index fb15c869b97..9680cd59fa8 100644 --- a/erpnext/public/js/pos/pos_invoice_list.html +++ b/erpnext/public/js/pos/pos_invoice_list.html @@ -1,5 +1,8 @@
-
{%= customer %}
+
{{ data.status }}
{%= paid_amount %}
{%= grand_total %}
diff --git a/erpnext/public/less/erpnext.less b/erpnext/public/less/erpnext.less index 5c4622d97ec..214130bfea7 100644 --- a/erpnext/public/less/erpnext.less +++ b/erpnext/public/less/erpnext.less @@ -330,7 +330,7 @@ body[data-route="pos"] .modal-dialog { } .subject { - width: 50% + width: 40% } .list-row-checkbox, .list-select-all { @@ -369,7 +369,7 @@ body[data-route="pos"] .modal-dialog { height: 100%; } -.pos .items .pos-list-row:last-child { +.pos .pos-list-row:last-child { border-bottom: none; }