Merge pull request #30324 from nextchamp-saqib/fix-pos-issues-again
fix: multiple pos issues
diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction.json b/erpnext/accounts/doctype/bank_transaction/bank_transaction.json
index 88aa7ef..2bdaa10 100644
--- a/erpnext/accounts/doctype/bank_transaction/bank_transaction.json
+++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction.json
@@ -134,7 +134,8 @@
{
"fieldname": "allocated_amount",
"fieldtype": "Currency",
- "label": "Allocated Amount"
+ "label": "Allocated Amount",
+ "options": "currency"
},
{
"fieldname": "amended_from",
@@ -152,7 +153,8 @@
{
"fieldname": "unallocated_amount",
"fieldtype": "Currency",
- "label": "Unallocated Amount"
+ "label": "Unallocated Amount",
+ "options": "currency"
},
{
"fieldname": "party_section",
@@ -192,10 +194,11 @@
],
"is_submittable": 1,
"links": [],
- "modified": "2021-04-14 17:31:58.963529",
+ "modified": "2022-03-21 19:05:04.208222",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Bank Transaction",
+ "naming_rule": "By \"Naming Series\" field",
"owner": "Administrator",
"permissions": [
{
@@ -242,6 +245,7 @@
],
"sort_field": "date",
"sort_order": "DESC",
+ "states": [],
"title_field": "bank_account",
"track_changes": 1
}
\ No newline at end of file
diff --git a/erpnext/controllers/sales_and_purchase_return.py b/erpnext/controllers/sales_and_purchase_return.py
index 2166633..d6296eb 100644
--- a/erpnext/controllers/sales_and_purchase_return.py
+++ b/erpnext/controllers/sales_and_purchase_return.py
@@ -399,6 +399,8 @@
}
}, target_doc, set_missing_values)
+ doclist.set_onload('ignore_price_list', True)
+
return doclist
def get_rate_for_return(voucher_type, voucher_no, item_code, return_against=None,
diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index 19acc10..29da5f1 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -114,20 +114,16 @@
for item in self.doc.get("items"):
self.doc.round_floats_in(item)
- if not item.rate:
- item.rate = item.price_list_rate
-
if item.discount_percentage == 100:
item.rate = 0.0
elif item.price_list_rate:
- if item.pricing_rules or abs(item.discount_percentage) > 0:
+ if not item.rate or (item.pricing_rules and item.discount_percentage > 0):
item.rate = flt(item.price_list_rate *
(1.0 - (item.discount_percentage / 100.0)), item.precision("rate"))
- if abs(item.discount_percentage) > 0:
- item.discount_amount = item.price_list_rate * (item.discount_percentage / 100.0)
+ item.discount_amount = item.price_list_rate * (item.discount_percentage / 100.0)
- elif item.discount_amount or item.pricing_rules:
+ elif item.discount_amount and item.pricing_rules:
item.rate = item.price_list_rate - item.discount_amount
if item.doctype in ['Quotation Item', 'Sales Order Item', 'Delivery Note Item', 'Sales Invoice Item',
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index ddb524c..dc1d692 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -1,7 +1,7 @@
[pre_model_sync]
erpnext.patches.v12_0.update_is_cancelled_field
-erpnext.patches.v13_0.add_bin_unique_constraint
erpnext.patches.v11_0.rename_production_order_to_work_order
+erpnext.patches.v13_0.add_bin_unique_constraint
erpnext.patches.v11_0.refactor_naming_series
erpnext.patches.v11_0.refactor_autoname_naming
execute:frappe.reload_doc("accounts", "doctype", "POS Payment Method") #2020-05-28
diff --git a/erpnext/patches/v13_0/rename_issue_doctype_fields.py b/erpnext/patches/v13_0/rename_issue_doctype_fields.py
index bf5438c..80d5165 100644
--- a/erpnext/patches/v13_0/rename_issue_doctype_fields.py
+++ b/erpnext/patches/v13_0/rename_issue_doctype_fields.py
@@ -60,7 +60,7 @@
def convert_to_seconds(value, unit):
seconds = 0
- if value == 0:
+ if not value:
return seconds
if unit == 'Hours':
seconds = value * 3600
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 43ee5b3..19e12e3 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -1042,9 +1042,9 @@
var me = this;
this.set_dynamic_labels();
var company_currency = this.get_company_currency();
- // Added `ignore_pricing_rule` to determine if document is loading after mapping from another doc
+ // Added `ignore_price_list` to determine if document is loading after mapping from another doc
if(this.frm.doc.currency && this.frm.doc.currency !== company_currency
- && !this.frm.doc.ignore_pricing_rule) {
+ && !this.frm.doc.__onload.ignore_price_list) {
this.get_exchange_rate(transaction_date, this.frm.doc.currency, company_currency,
function(exchange_rate) {
@@ -1144,8 +1144,8 @@
this.set_dynamic_labels();
var company_currency = this.get_company_currency();
- // Added `ignore_pricing_rule` to determine if document is loading after mapping from another doc
- if(this.frm.doc.price_list_currency !== company_currency && !this.frm.doc.ignore_pricing_rule) {
+ // Added `ignore_price_list` to determine if document is loading after mapping from another doc
+ if(this.frm.doc.price_list_currency !== company_currency && !this.frm.doc.__onload.ignore_price_list) {
this.get_exchange_rate(this.frm.doc.posting_date, this.frm.doc.price_list_currency, company_currency,
function(exchange_rate) {
me.frm.set_value("plc_conversion_rate", exchange_rate);