Date: Sun, 23 Jul 2023 19:50:14 +0530
Subject: [PATCH 097/107] refactor: refresh table once after loop ends
---
erpnext/accounts/doctype/sales_invoice/sales_invoice.js | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index 4ec103c9f2..3a0a2cf8ce 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -897,6 +897,8 @@ frappe.ui.form.on('Sales Invoice', {
frm.events.append_time_log(frm, timesheet, 1.0);
}
});
+ frm.refresh_field("timesheets");
+ frm.trigger("calculate_timesheet_totals");
},
async get_exchange_rate(frm, from_currency, to_currency) {
@@ -936,9 +938,6 @@ frappe.ui.form.on('Sales Invoice', {
row.billing_amount = flt(time_log.billing_amount) * flt(exchange_rate);
row.timesheet_detail = time_log.name;
row.project_name = time_log.project_name;
-
- frm.refresh_field("timesheets");
- frm.trigger("calculate_timesheet_totals");
},
calculate_timesheet_totals: function(frm) {
From 8d3d9493f05ce4e1db22cb20c2dcb6d262d7a110 Mon Sep 17 00:00:00 2001
From: Deepesh Garg
Date: Sun, 23 Jul 2023 20:06:41 +0530
Subject: [PATCH 098/107] chore: linting issues
---
.../stock/doctype/item_variant_settings/item_variant_settings.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/erpnext/stock/doctype/item_variant_settings/item_variant_settings.py b/erpnext/stock/doctype/item_variant_settings/item_variant_settings.py
index cec5e218cc..c3edba321c 100644
--- a/erpnext/stock/doctype/item_variant_settings/item_variant_settings.py
+++ b/erpnext/stock/doctype/item_variant_settings/item_variant_settings.py
@@ -24,7 +24,6 @@ class ItemVariantSettings(Document):
"description",
"variant_of",
"valuation_rate",
- "description",
"barcodes",
"has_variants",
"attributes",
From cdc9b62688c803dc208a8e6ef7c70dcfca46cc08 Mon Sep 17 00:00:00 2001
From: Deepesh Garg
Date: Sun, 23 Jul 2023 22:44:18 +0530
Subject: [PATCH 099/107] chore: Remove cur_frm from sales_invoice.js
---
.../accounts/doctype/sales_invoice/regional/italy.js | 2 +-
erpnext/crm/doctype/opportunity/opportunity.js | 5 ++---
erpnext/public/js/controllers/buying.js | 3 +--
erpnext/public/js/utils/sales_common.js | 11 +++++------
4 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/erpnext/accounts/doctype/sales_invoice/regional/italy.js b/erpnext/accounts/doctype/sales_invoice/regional/italy.js
index 0c20f364a4..2f305b914e 100644
--- a/erpnext/accounts/doctype/sales_invoice/regional/italy.js
+++ b/erpnext/accounts/doctype/sales_invoice/regional/italy.js
@@ -1,7 +1,7 @@
frappe.ui.form.on("Sales Invoice", {
refresh: (frm) => {
if(frm.doc.docstatus == 1) {
- frm.add_custom_button('Generate E-Invoice', () => {
+ frm.add_custom_button(__('Generate E-Invoice'), () => {
frm.call({
method: "erpnext.regional.italy.utils.generate_single_invoice",
args: {
diff --git a/erpnext/crm/doctype/opportunity/opportunity.js b/erpnext/crm/doctype/opportunity/opportunity.js
index 149b32df12..6ef82971f5 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.js
+++ b/erpnext/crm/doctype/opportunity/opportunity.js
@@ -1,9 +1,6 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
frappe.provide("erpnext.crm");
-
-cur_frm.email_field = "contact_email";
-
erpnext.pre_sales.set_as_lost("Quotation");
erpnext.sales_common.setup_selling_controller();
@@ -22,6 +19,8 @@ frappe.ui.form.on("Opportunity", {
}
}
});
+
+ frm.email_field = "contact_email";
},
validate: function(frm) {
diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js
index 7dbe485d29..54f0aadb1d 100644
--- a/erpnext/public/js/controllers/buying.js
+++ b/erpnext/public/js/controllers/buying.js
@@ -2,8 +2,6 @@
// License: GNU General Public License v3. See license.txt
frappe.provide("erpnext.buying");
-
-// cur_frm.email_field = "contact_email";
// cur_frm.add_fetch('project', 'cost_center', 'cost_center');
erpnext.buying = {
@@ -11,6 +9,7 @@ erpnext.buying = {
erpnext.buying.BuyingController = class BuyingController extends erpnext.TransactionController {
setup() {
super.setup();
+ this.frm.email_field = "contact_email";
}
onload(doc, cdt, cdn) {
diff --git a/erpnext/public/js/utils/sales_common.js b/erpnext/public/js/utils/sales_common.js
index 430d9968e8..517d87127a 100644
--- a/erpnext/public/js/utils/sales_common.js
+++ b/erpnext/public/js/utils/sales_common.js
@@ -1,8 +1,6 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-// cur_frm.email_field = "contact_email";
-
frappe.provide("erpnext.selling");
erpnext.sales_common = {
@@ -10,6 +8,7 @@ erpnext.sales_common = {
erpnext.selling.SellingController = class SellingController extends erpnext.TransactionController {
setup() {
super.setup();
+ this.frm.email_field = "contact_email";
}
onload() {
@@ -61,7 +60,7 @@ erpnext.sales_common = {
this.frm.set_query("item_code", "items", function() {
return {
query: "erpnext.controllers.queries.item_query",
- filters: {'is_sales_item': 1, 'customer': cur_frm.doc.customer, 'has_variants': 0}
+ filters: {'is_sales_item': 1, 'customer': me.frm.doc.customer, 'has_variants': 0}
}
});
}
@@ -260,9 +259,9 @@ erpnext.sales_common = {
}
set_product_bundle_help(doc) {
- if(!cur_frm.fields_dict.packing_list) return;
+ if(!this.frm.fields_dict.packing_list) return;
if ((doc.packed_items || []).length) {
- $(cur_frm.fields_dict.packing_list.row.wrapper).toggle(true);
+ $(this.frm.fields_dict.packing_list.row.wrapper).toggle(true);
if (in_list(['Delivery Note', 'Sales Invoice'], doc.doctype)) {
var help_msg = "" +
@@ -271,7 +270,7 @@ erpnext.sales_common = {
frappe.meta.get_docfield(doc.doctype, 'product_bundle_help', doc.name).options = help_msg;
}
} else {
- $(cur_frm.fields_dict.packing_list.row.wrapper).toggle(false);
+ $(this.frm.fields_dict.packing_list.row.wrapper).toggle(false);
if (in_list(['Delivery Note', 'Sales Invoice'], doc.doctype)) {
frappe.meta.get_docfield(doc.doctype, 'product_bundle_help', doc.name).options = '';
}
From efb51526a92158af34e43e5d4f62f2bca6e6ba6b Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure
Date: Mon, 24 Jul 2023 14:00:20 +0530
Subject: [PATCH 100/107] fix: no default email account causing reposting issue
---
.../doctype/repost_item_valuation/repost_item_valuation.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
index 27066b825c..f128c8e206 100644
--- a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
+++ b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
@@ -271,7 +271,11 @@ def repost(doc):
message += "
" + "Traceback:
" + traceback
frappe.db.set_value(doc.doctype, doc.name, "error_log", message)
- if not isinstance(e, RecoverableErrors):
+ outgoing_email_account = frappe.get_cached_value(
+ "Email Account", {"default_outgoing": 1, "enable_outgoing": 1}, "name"
+ )
+
+ if outgoing_email_account and not isinstance(e, RecoverableErrors):
notify_error_to_stock_managers(doc, message)
doc.set_status("Failed")
finally:
From 3dd119eeea77313955d23a474b7321e1c5d83676 Mon Sep 17 00:00:00 2001
From: ruthra kumar
Date: Mon, 24 Jul 2023 14:50:11 +0530
Subject: [PATCH 101/107] refactor: apply terms based validation only on
sales/purchase doctyp
---
erpnext/accounts/doctype/payment_entry/payment_entry.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index c175e2475d..596881a4e0 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -210,7 +210,11 @@ class PaymentEntry(AccountsController):
def term_based_allocation_enabled_for_reference(
self, reference_doctype: str, reference_name: str
) -> bool:
- if reference_doctype and reference_name:
+ if (
+ reference_doctype
+ and reference_doctype in ["Sales Invoice", "Sales Order", "Purchase Order", "Purchase Invoice"]
+ and reference_name
+ ):
if template := frappe.db.get_value(reference_doctype, reference_name, "payment_terms_template"):
return frappe.db.get_value(
"Payment Terms Template", template, "allocate_payment_based_on_payment_terms"
From 1436040d4c2fd5bf374a95addd6dc7b64548015d Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 24 Jul 2023 15:51:24 +0530
Subject: [PATCH 102/107] fix: allow both custodian and location while creating
asset (copy #36263) (#36264)
fix: allow both custodian and location while creating asset
(cherry picked from commit bff00bc8b2c8911f1513a25f066077e2b0c0adf0)
Co-authored-by: anandbaburajan
---
.../doctype/asset_movement/asset_movement.py | 23 ++++++++++---------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/erpnext/assets/doctype/asset_movement/asset_movement.py b/erpnext/assets/doctype/asset_movement/asset_movement.py
index 22055dcb73..b85f7194f9 100644
--- a/erpnext/assets/doctype/asset_movement/asset_movement.py
+++ b/erpnext/assets/doctype/asset_movement/asset_movement.py
@@ -62,20 +62,21 @@ class AssetMovement(Document):
frappe.throw(_("Source and Target Location cannot be same"))
if self.purpose == "Receipt":
- if not (d.source_location or d.from_employee) and not (d.target_location or d.to_employee):
+ if not (d.source_location) and not (d.target_location or d.to_employee):
frappe.throw(
_("Target Location or To Employee is required while receiving Asset {0}").format(d.asset)
)
- elif d.from_employee and not d.target_location:
- frappe.throw(
- _("Target Location is required while receiving Asset {0} from an employee").format(d.asset)
- )
- elif d.to_employee and d.target_location:
- frappe.throw(
- _(
- "Asset {0} cannot be received at a location and given to an employee in a single movement"
- ).format(d.asset)
- )
+ elif d.source_location:
+ if d.from_employee and not d.target_location:
+ frappe.throw(
+ _("Target Location is required while receiving Asset {0} from an employee").format(d.asset)
+ )
+ elif d.to_employee and d.target_location:
+ frappe.throw(
+ _(
+ "Asset {0} cannot be received at a location and given to an employee in a single movement"
+ ).format(d.asset)
+ )
def validate_employee(self):
for d in self.assets:
From 34d7fb388d2743732dab7e56869f6006cdd1c8ea Mon Sep 17 00:00:00 2001
From: Gursheen Anand
Date: Mon, 24 Jul 2023 16:47:06 +0530
Subject: [PATCH 103/107] fix: customer filter in process soa
---
.../process_statement_of_accounts.py | 2 +-
...ss_statement_of_accounts_accounts_receivable.html | 12 ++++--------
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
index 08f4cf45d6..6193c849b5 100644
--- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
+++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
@@ -140,7 +140,7 @@ def get_gl_filters(doc, entry, tax_id, presentation_currency):
def get_ar_filters(doc, entry):
return {
"report_date": doc.posting_date if doc.posting_date else None,
- "customer_name": entry.customer,
+ "customer": entry.customer,
"payment_terms_template": doc.payment_terms_template if doc.payment_terms_template else None,
"sales_partner": doc.sales_partner if doc.sales_partner else None,
"sales_person": doc.sales_person if doc.sales_person else None,
diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html
index 07e1896292..259526f8c4 100644
--- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html
+++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html
@@ -10,16 +10,12 @@
{{ _(report.report_name) }}
- {% if (filters.customer_name) %}
- {{ filters.customer_name }}
- {% else %}
- {{ filters.customer ~ filters.supplier }}
- {% endif %}
+ {{ filters.customer }}
- {% if (filters.tax_id) %}
- {{ _("Tax Id: ") }}{{ filters.tax_id }}
- {% endif %}
+ {% if (filters.tax_id) %}
+ {{ _("Tax Id: ") }}{{ filters.tax_id }}
+ {% endif %}
{{ _(filters.ageing_based_on) }}
From 6f376cf103cfeca06b37e4523f78b0ced32143f4 Mon Sep 17 00:00:00 2001
From: DaizyModi
Date: Mon, 24 Jul 2023 18:02:42 +0530
Subject: [PATCH 104/107] fix: remove unused params
---
erpnext/controllers/taxes_and_totals.py | 28 +++++++++++--------------
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index 04d5e1c69a..fac713de3e 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -957,7 +957,7 @@ def get_itemised_tax_breakup_html(doc):
# get tax breakup data
itemised_tax_data = get_itemised_tax_breakup_data(doc)
- get_rounded_tax_amount(itemised_tax_data, doc.precision("tax_amount", "taxes"), tax_accounts)
+ get_rounded_tax_amount(itemised_tax_data, doc.precision("tax_amount", "taxes"))
update_itemised_tax_data(doc)
frappe.flags.company = None
@@ -1000,21 +1000,17 @@ def get_itemised_tax_breakup_header(item_doctype, tax_accounts):
@erpnext.allow_regional
def get_itemised_tax_breakup_data(doc):
- return _get_itemised_tax_breakup_data(doc)
-
-
-def _get_itemised_tax_breakup_data(doc, with_tax_account=False):
- itemised_tax = get_itemised_tax(doc.taxes, with_tax_account=with_tax_account)
+ itemised_tax = get_itemised_tax(doc.taxes)
itemised_taxable_amount = get_itemised_taxable_amount(doc.items)
itemised_tax_data = []
for item_code, taxes in itemised_tax.items():
- for _item_code, taxable_amount in itemised_taxable_amount.items():
- if item_code == _item_code:
- itemised_tax_data.append(
- frappe._dict({"item": item_code, "taxable_amount": taxable_amount, **taxes})
- )
+ itemised_tax_data.append(
+ frappe._dict(
+ {"item": item_code, "taxable_amount": itemised_taxable_amount.get(item_code), **taxes}
+ )
+ )
return itemised_tax_data
@@ -1059,12 +1055,12 @@ def get_itemised_taxable_amount(items):
return itemised_taxable_amount
-def get_rounded_tax_amount(itemised_tax, precision, tax_accounts):
+def get_rounded_tax_amount(itemised_tax, precision):
# Rounding based on tax_amount precision
- for _itemised_tax in itemised_tax:
- for key, value in _itemised_tax.items():
- if key in tax_accounts:
- value["tax_amount"] = flt(value["tax_amount"], precision)
+ for taxes in itemised_tax:
+ for row in taxes.values():
+ if isinstance(row, dict) and isinstance(row["tax_amount"], float):
+ row["tax_amount"] = flt(row["tax_amount"], precision)
class init_landed_taxes_and_totals(object):
From 4205f564a06e8b074f1b0a2f4dda38bcef3967f2 Mon Sep 17 00:00:00 2001
From: Sagar Vora
Date: Mon, 24 Jul 2023 18:37:36 +0530
Subject: [PATCH 105/107] fix(regional): set `frappe.flags.company`
temporarily, where required
---
erpnext/accounts/party.py | 6 +++---
erpnext/controllers/accounts_controller.py | 5 ++++-
erpnext/controllers/taxes_and_totals.py | 22 ++++++++--------------
erpnext/utilities/regional.py | 13 +++++++++++++
4 files changed, 28 insertions(+), 18 deletions(-)
create mode 100644 erpnext/utilities/regional.py
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index 03cf82a2b0..4996203635 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -33,6 +33,7 @@ import erpnext
from erpnext import get_company_currency
from erpnext.accounts.utils import get_fiscal_year
from erpnext.exceptions import InvalidAccountCurrency, PartyDisabled, PartyFrozen
+from erpnext.utilities.regional import temporary_flag
PURCHASE_TRANSACTION_TYPES = {"Purchase Order", "Purchase Receipt", "Purchase Invoice"}
SALES_TRANSACTION_TYPES = {
@@ -261,9 +262,8 @@ def set_address_details(
)
if doctype in TRANSACTION_TYPES:
- # required to set correct region
- frappe.flags.company = company
- get_regional_address_details(party_details, doctype, company)
+ with temporary_flag("company", company):
+ get_regional_address_details(party_details, doctype, company)
return party_address, shipping_address
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 4193b5327d..79404894cd 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -56,6 +56,7 @@ from erpnext.stock.get_item_details import (
get_item_tax_map,
get_item_warehouse,
)
+from erpnext.utilities.regional import temporary_flag
from erpnext.utilities.transaction_base import TransactionBase
@@ -760,7 +761,9 @@ class AccountsController(TransactionBase):
}
)
- update_gl_dict_with_regional_fields(self, gl_dict)
+ with temporary_flag("company", self.company):
+ update_gl_dict_with_regional_fields(self, gl_dict)
+
accounting_dimensions = get_accounting_dimensions()
dimension_dict = frappe._dict()
diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index 4661c5ca7e..77006b905c 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -18,6 +18,7 @@ from erpnext.controllers.accounts_controller import (
validate_taxes_and_charges,
)
from erpnext.stock.get_item_details import _get_item_tax_template
+from erpnext.utilities.regional import temporary_flag
class calculate_taxes_and_totals(object):
@@ -942,7 +943,6 @@ class calculate_taxes_and_totals(object):
def get_itemised_tax_breakup_html(doc):
if not doc.taxes:
return
- frappe.flags.company = doc.company
# get headers
tax_accounts = []
@@ -952,15 +952,11 @@ def get_itemised_tax_breakup_html(doc):
if tax.description not in tax_accounts:
tax_accounts.append(tax.description)
- headers = get_itemised_tax_breakup_header(doc.doctype + " Item", tax_accounts)
-
- # get tax breakup data
- itemised_tax, itemised_taxable_amount = get_itemised_tax_breakup_data(doc)
-
- get_rounded_tax_amount(itemised_tax, doc.precision("tax_amount", "taxes"))
-
- update_itemised_tax_data(doc)
- frappe.flags.company = None
+ with temporary_flag("company", doc.company):
+ headers = get_itemised_tax_breakup_header(doc.doctype + " Item", tax_accounts)
+ itemised_tax, itemised_taxable_amount = get_itemised_tax_breakup_data(doc)
+ get_rounded_tax_amount(itemised_tax, doc.precision("tax_amount", "taxes"))
+ update_itemised_tax_data(doc)
return frappe.render_template(
"templates/includes/itemised_tax_breakup.html",
@@ -977,10 +973,8 @@ def get_itemised_tax_breakup_html(doc):
@frappe.whitelist()
def get_round_off_applicable_accounts(company, account_list):
# required to set correct region
- frappe.flags.company = company
- account_list = get_regional_round_off_accounts(company, account_list)
-
- return account_list
+ with temporary_flag("company", company):
+ return get_regional_round_off_accounts(company, account_list)
@erpnext.allow_regional
diff --git a/erpnext/utilities/regional.py b/erpnext/utilities/regional.py
new file mode 100644
index 0000000000..858976f855
--- /dev/null
+++ b/erpnext/utilities/regional.py
@@ -0,0 +1,13 @@
+from contextlib import contextmanager
+
+import frappe
+
+
+@contextmanager
+def temporary_flag(flag_name, value):
+ flags = frappe.local.flags
+ flags[flag_name] = value
+ try:
+ yield
+ finally:
+ flags.pop(flag_name, None)
From 1bc87a970a9951d7c12586066e318440edac076e Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 24 Jul 2023 19:37:07 +0530
Subject: [PATCH 106/107] fix: set new purchase_receipt_amount on asset split
(copy #36272) (#36280)
fix: set new purchase_receipt_amount on asset split
(cherry picked from commit 7fd9b489eed33a81f29ecb3802d8a07d232c4c9c)
Co-authored-by: anandbaburajan
---
erpnext/assets/doctype/asset/asset.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py
index 42f531189a..7dc438e08f 100644
--- a/erpnext/assets/doctype/asset/asset.py
+++ b/erpnext/assets/doctype/asset/asset.py
@@ -933,6 +933,8 @@ def create_new_asset_after_split(asset, split_qty):
)
new_asset.gross_purchase_amount = new_gross_purchase_amount
+ if asset.purchase_receipt_amount:
+ new_asset.purchase_receipt_amount = new_gross_purchase_amount
new_asset.opening_accumulated_depreciation = opening_accumulated_depreciation
new_asset.asset_quantity = split_qty
new_asset.split_from = asset.name
From 62ca89b10f0cefeb0a4fc0d22b5d4e7b0bcdbc57 Mon Sep 17 00:00:00 2001
From: RitvikSardana <65544983+RitvikSardana@users.noreply.github.com>
Date: Tue, 25 Jul 2023 13:01:10 +0530
Subject: [PATCH 107/107] fix: POS background color optimized in dark mode
(#36287)
fix: POS dark theme compatability
Co-authored-by: Ritvik Sardana
---
erpnext/public/scss/point-of-sale.scss | 30 +++++++++++---------------
1 file changed, 13 insertions(+), 17 deletions(-)
diff --git a/erpnext/public/scss/point-of-sale.scss b/erpnext/public/scss/point-of-sale.scss
index 7b7530b150..c9d001c127 100644
--- a/erpnext/public/scss/point-of-sale.scss
+++ b/erpnext/public/scss/point-of-sale.scss
@@ -34,7 +34,7 @@
}
.abbr {
- background-color: var(--gray-50);
+ background-color: var(--control-bg);
font-size: var(--text-3xl);
}
@@ -72,7 +72,7 @@
.highlighted-numpad-btn {
box-shadow: inset 0 0px 4px 0px rgba(0, 0, 0, 0.15) !important;
font-weight: 700;
- background-color: var(--gray-50);
+ background-color: var(--control-bg);
}
> .items-selector {
@@ -152,7 +152,6 @@
margin-bottom: 0px;
min-height: 8rem;
height: 8rem;
- color: var(--gray-500);
> img {
@extend .image;
@@ -242,7 +241,7 @@
width: 3rem;
height: 3rem;
border-radius: 50%;
- color: var(--gray-500);
+ color: var(--text-light);
margin-right: var(--margin-md);
> img {
@@ -268,7 +267,6 @@
}
>.customer-desc {
- color: var(--gray-600);
font-weight: 500;
font-size: var(--text-sm);
}
@@ -363,7 +361,7 @@
display: flex;
align-items: center;
justify-content: center;
- background-color: var(--gray-50);
+ background-color: var(--control-bg);
border-radius: var(--border-radius-md);
font-size: var(--text-md);
font-weight: 500;
@@ -385,7 +383,7 @@
border-radius: var(--border-radius-md);
&:hover {
- background-color: var(--gray-50);
+ background-color: var(--control-bg);
}
> .item-image {
@@ -395,7 +393,7 @@
width: 2rem;
height: 2rem;
border-radius: var(--border-radius-md);
- color: var(--gray-500);
+ color: var(--text-light);
margin-right: var(--margin-md);
> img {
@@ -537,13 +535,13 @@
> .edit-cart-btn {
@extend .primary-action;
display: none;
- background-color: var(--gray-300);
+ background-color: var(--control-bg);
font-weight: 500;
transition: all 0.15s ease-in-out;
&:hover {
- background-color: var(--gray-600);
- color: white;
+ background-color: var(--control-bg);
+ color: var(--text-light);
font-weight: 700;
}
}
@@ -832,13 +830,13 @@
> .shortcut {
@extend .pointer-no-select;
border-radius: var(--border-radius-sm);
- background-color: var(--gray-100);
+ background-color: var(--control-bg);
font-weight: 500;
padding: var(--padding-xs) var(--padding-sm);
transition: all 0.15s ease-in-out;
&:hover {
- background-color: var(--gray-300);
+ background-color: var(--control-bg);
}
}
}
@@ -912,7 +910,7 @@
> .totals {
display: flex;
- background-color: var(--gray-100);
+ background-color: var(--control-bg);
justify-content: center;
padding: var(--padding-md);
border-radius: var(--border-radius-md);
@@ -924,7 +922,6 @@
> .total-label {
font-size: var(--text-md);
font-weight: 500;
- color: var(--gray-600);
}
> .value {
@@ -1036,7 +1033,6 @@
> .customer-email {
font-size: var(--text-md);
font-weight: 500;
- color: var(--gray-600);
}
> .cashier {
@@ -1071,7 +1067,7 @@
display: flex;
flex-direction: column;
border-radius: var(--border-radius-md);
- background-color: var(--gray-50);
+ background-color: var(--control-bg);
margin: var(--margin-md) 0px;
> .summary-row-wrapper {