From cb2bfabb6fb2e9c0656334af9df8104148b291fb Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 25 Jul 2023 14:38:17 +0530 Subject: [PATCH 1/5] fix: validation blocks partial payment for SO and PO --- erpnext/accounts/doctype/payment_entry/payment_entry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index c175e2475d2..bab0e76fef3 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -66,7 +66,7 @@ class PaymentEntry(AccountsController): self.setup_party_account_field() self.set_missing_values() self.set_liability_account() - self.set_missing_ref_details() + self.set_missing_ref_details(force=True) self.validate_payment_type() self.validate_party_details() self.set_exchange_rate() From 539cfd08f0b82337a8ef6e3caa3f83b227ecea77 Mon Sep 17 00:00:00 2001 From: s-aga-r Date: Sat, 12 Aug 2023 22:42:01 +0530 Subject: [PATCH 2/5] fix: fetch `Stock UOM` from Item if not set (#36606) --- erpnext/manufacturing/doctype/work_order/work_order.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/manufacturing/doctype/work_order/work_order.json b/erpnext/manufacturing/doctype/work_order/work_order.json index a236f2a339a..1996e19c37b 100644 --- a/erpnext/manufacturing/doctype/work_order/work_order.json +++ b/erpnext/manufacturing/doctype/work_order/work_order.json @@ -404,6 +404,8 @@ "read_only": 1 }, { + "fetch_from": "production_item.stock_uom", + "fetch_if_empty": 1, "fieldname": "stock_uom", "fieldtype": "Link", "label": "Stock UOM", @@ -590,7 +592,7 @@ "image_field": "image", "is_submittable": 1, "links": [], - "modified": "2023-06-09 13:20:09.154362", + "modified": "2023-08-11 18:35:49.852069", "modified_by": "Administrator", "module": "Manufacturing", "name": "Work Order", @@ -610,7 +612,6 @@ "read": 1, "report": 1, "role": "Manufacturing User", - "set_user_permissions": 1, "share": 1, "submit": 1, "write": 1 From ce25f9e8c9cf165d03b993f8c3e04caa83d5bb1d Mon Sep 17 00:00:00 2001 From: Naufal Afif Date: Sun, 13 Aug 2023 14:56:56 +0700 Subject: [PATCH 3/5] fix: wrong currency on financial-statement based reports (#36524) * add missing field options on financial_statement Total field * format financial statement code --- erpnext/accounts/report/financial_statements.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py index 6b2341cef13..693725d8f50 100644 --- a/erpnext/accounts/report/financial_statements.py +++ b/erpnext/accounts/report/financial_statements.py @@ -637,7 +637,13 @@ def get_columns(periodicity, period_list, accumulated_values=1, company=None): if periodicity != "Yearly": if not accumulated_values: columns.append( - {"fieldname": "total", "label": _("Total"), "fieldtype": "Currency", "width": 150} + { + "fieldname": "total", + "label": _("Total"), + "fieldtype": "Currency", + "width": 150, + "options": "currency", + } ) return columns From ae2c6002236d6667a51e6258275b0773a3742cd2 Mon Sep 17 00:00:00 2001 From: RitvikSardana <65544983+RitvikSardana@users.noreply.github.com> Date: Sun, 13 Aug 2023 13:27:43 +0530 Subject: [PATCH 4/5] fix: POS compatible for mobile view (#36534) * fix: POS compatable for mobile view * fix: variables for margin and font size, and dark mode compatibility while selecting any item from cart --------- Co-authored-by: Ritvik Sardana --- erpnext/public/scss/point-of-sale.scss | 65 +++++++++++++++++-- .../page/point_of_sale/pos_item_cart.js | 2 +- 2 files changed, 62 insertions(+), 5 deletions(-) diff --git a/erpnext/public/scss/point-of-sale.scss b/erpnext/public/scss/point-of-sale.scss index c9d001c127c..ba64b59b46b 100644 --- a/erpnext/public/scss/point-of-sale.scss +++ b/erpnext/public/scss/point-of-sale.scss @@ -53,7 +53,7 @@ .seperator { margin-left: var(--margin-sm); - margin-right: var(--margin-sm); + margin-right: var(--margin-md); border-bottom: 1px solid var(--gray-300); } @@ -381,6 +381,7 @@ align-items: center; padding: var(--padding-sm); border-radius: var(--border-radius-md); + margin-right: var(--margin-sm); &:hover { background-color: var(--control-bg); @@ -858,13 +859,10 @@ > .fields-section { flex: 1; - position: absolute; display: flex; flex-direction: column; width: 50%; height: 100%; - top: 0; - left: 0; padding-bottom: var(--margin-md); .invoice-fields { @@ -1152,3 +1150,62 @@ } } } + +@media screen and (max-width: 620px) { + .point-of-sale-app { + grid-template-columns: repeat(1, minmax(0, 1fr)); + + > .items-selector { + grid-column: span 6 / span 1 !important; + > .items-container { + grid-template-columns: repeat(2, minmax(0, 1fr)) !important; + } + } + + > .item-details-container, .customer-cart-container { + grid-column: span 6 / span 1; + } + + > .payment-container { + overflow: scroll; + > .fields-numpad-container { + flex-direction: column-reverse; + > .number-pad { + display: none; + } + > .fields-section { + width: 100%; + } + } + } + + > .past-order-summary{ + > .invoice-summary-wrapper { + width: 100%; + } + } + + .numpad-totals { + > span { + padding: 0 5px; + font-size: var(--text-sm); + } + } + + .col > * { + font-size: var(--text-sm) !important; + } + + .control-input-wrapper { + padding-left: 0.15rem; + } + + .pay-amount { + margin-left: 0.2rem; + } + + .past-order-list { + grid-column: span 6 / span 1; + } + } +} diff --git a/erpnext/selling/page/point_of_sale/pos_item_cart.js b/erpnext/selling/page/point_of_sale/pos_item_cart.js index 46490c43ae7..193048f6769 100644 --- a/erpnext/selling/page/point_of_sale/pos_item_cart.js +++ b/erpnext/selling/page/point_of_sale/pos_item_cart.js @@ -286,7 +286,7 @@ erpnext.PointOfSale.ItemCart = class { this.item_is_selected = false; this.$cart_container.find('.cart-item-wrapper').css("background-color", ""); } else { - $cart_item.css("background-color", "var(--gray-50)"); + $cart_item.css("background-color", "var(--control-bg)"); this.item_is_selected = true; this.$cart_container.find('.cart-item-wrapper').not(item).css("background-color", ""); } From 39ec11200ea1fd50b399a46b6f0249784020fe09 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Sun, 13 Aug 2023 18:33:09 +0530 Subject: [PATCH 5/5] fix(demo): Item creation with India Compliance app (#36627) --- erpnext/setup/demo_data/item.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/erpnext/setup/demo_data/item.json b/erpnext/setup/demo_data/item.json index ffe41528af5..330e114dd53 100644 --- a/erpnext/setup/demo_data/item.json +++ b/erpnext/setup/demo_data/item.json @@ -4,6 +4,7 @@ "item_group": "Demo Item Group", "item_code": "SKU001", "item_name": "T-shirt", + "gst_hsn_code": "999512", "image": "https://images.pexels.com/photos/1484808/pexels-photo-1484808.jpeg" }, { @@ -11,6 +12,7 @@ "item_group": "Demo Item Group", "item_code": "SKU002", "item_name": "Laptop", + "gst_hsn_code": "999512", "image": "https://images.pexels.com/photos/3999538/pexels-photo-3999538.jpeg" }, { @@ -18,6 +20,7 @@ "item_group": "Demo Item Group", "item_code": "SKU003", "item_name": "Book", + "gst_hsn_code": "999512", "image": "https://images.pexels.com/photos/2422178/pexels-photo-2422178.jpeg" }, { @@ -25,6 +28,7 @@ "item_group": "Demo Item Group", "item_code": "SKU004", "item_name": "Smartphone", + "gst_hsn_code": "999512", "image": "https://images.pexels.com/photos/1647976/pexels-photo-1647976.jpeg" }, { @@ -32,6 +36,7 @@ "item_group": "Demo Item Group", "item_code": "SKU005", "item_name": "Sneakers", + "gst_hsn_code": "999512", "image": "https://images.pexels.com/photos/1598505/pexels-photo-1598505.jpeg" }, { @@ -39,6 +44,7 @@ "item_group": "Demo Item Group", "item_code": "SKU006", "item_name": "Coffee Mug", + "gst_hsn_code": "999512", "image": "https://images.pexels.com/photos/585753/pexels-photo-585753.jpeg" }, { @@ -46,6 +52,7 @@ "item_group": "Demo Item Group", "item_code": "SKU007", "item_name": "Television", + "gst_hsn_code": "999512", "image": "https://images.pexels.com/photos/8059376/pexels-photo-8059376.jpeg" }, { @@ -53,6 +60,7 @@ "item_group": "Demo Item Group", "item_code": "SKU008", "item_name": "Backpack", + "gst_hsn_code": "999512", "image": "https://images.pexels.com/photos/3731256/pexels-photo-3731256.jpeg" }, { @@ -60,6 +68,7 @@ "item_group": "Demo Item Group", "item_code": "SKU009", "item_name": "Headphones", + "gst_hsn_code": "999512", "image": "https://images.pexels.com/photos/3587478/pexels-photo-3587478.jpeg" }, { @@ -67,6 +76,7 @@ "item_group": "Demo Item Group", "item_code": "SKU010", "item_name": "Camera", + "gst_hsn_code": "999512", "image": "https://images.pexels.com/photos/51383/photo-camera-subject-photographer-51383.jpeg" } ]