[fix] [minor] pos.js
diff --git a/erpnext/public/css/pos.css b/erpnext/public/css/pos.css
index f66abc8..bc81182 100644
--- a/erpnext/public/css/pos.css
+++ b/erpnext/public/css/pos.css
@@ -34,7 +34,7 @@
margin-left: 15px;
}
.cart-wrapper {
- margin-bottom: 10px;
+ margin-bottom: 12px;
}
.cart-wrapper .list-item__content:not(:first-child) {
justify-content: flex-end;
@@ -121,7 +121,6 @@
border-collapse: collapse;
cursor: pointer;
display: table;
- margin: auto;
}
.num-row {
display: table-row;
diff --git a/erpnext/public/less/pos.less b/erpnext/public/less/pos.less
index 9653a82..0fcb654 100644
--- a/erpnext/public/less/pos.less
+++ b/erpnext/public/less/pos.less
@@ -50,7 +50,7 @@
}
.cart-wrapper {
- margin-bottom: 10px;
+ margin-bottom: 12px;
.list-item__content:not(:first-child) {
justify-content: flex-end;
}
@@ -155,7 +155,6 @@
border-collapse: collapse;
cursor: pointer;
display: table;
- margin: auto;
}
.num-row {
display: table-row;
diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.js b/erpnext/selling/page/point_of_sale/point_of_sale.js
index 4c8ba08..6ac0a5f 100644
--- a/erpnext/selling/page/point_of_sale/point_of_sale.js
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.js
@@ -321,19 +321,17 @@
make_new_invoice() {
return frappe.run_serially([
+ () => this.make_sales_invoice_frm(),
+ () => this.set_pos_profile_data(),
() => {
- this.make_sales_invoice_frm()
- .then(() => this.set_pos_profile_data())
- .then(() => {
- if (this.cart) {
- this.cart.frm = this.frm;
- this.cart.reset();
- } else {
- this.make_items();
- this.make_cart();
- }
- this.toggle_editing(true);
- })
+ if (this.cart) {
+ this.cart.frm = this.frm;
+ this.cart.reset();
+ } else {
+ this.make_items();
+ this.make_cart();
+ }
+ this.toggle_editing(true);
},
]);
}
@@ -376,7 +374,10 @@
this.frm.script_manager.trigger("update_stock");
frappe.model.set_default_values(this.frm.doc);
this.frm.cscript.calculate_taxes_and_totals();
- this.frm.meta.default_print_format = r.message ? r.message.print_format : 'POS Invoice';
+
+ if (r.message) {
+ this.frm.meta.default_print_format = r.message.print_format || 'POS Invoice';
+ }
}
resolve();
@@ -915,7 +916,7 @@
this.search_field = frappe.ui.form.make_control({
df: {
fieldtype: 'Data',
- label: 'Search Item ( Ctrl + i )',
+ label: 'Search Item (Ctrl + i)',
placeholder: 'Search by item code, serial number, batch no or barcode'
},
parent: this.wrapper.find('.search-field'),