Merge pull request #40878 from ruthra-kumar/merge_taxes_from_DN_to_sales_invoice
refactor: merge taxes from delivery note to Sales Invoice
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index 1ff1cb7..faba0be 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -1316,6 +1316,18 @@
):
self.add_advance_gl_for_reference(gl_entries, ref)
+ def get_dr_and_account_for_advances(self, reference):
+ if reference.reference_doctype == "Sales Invoice":
+ return "credit", reference.account
+
+ if reference.reference_doctype == "Payment Entry":
+ if reference.account_type == "Receivable" and reference.payment_type == "Pay":
+ return "credit", self.party_account
+ else:
+ return "debit", self.party_account
+
+ return "debit", reference.account
+
def add_advance_gl_for_reference(self, gl_entries, invoice):
args_dict = {
"party_type": self.party_type,
@@ -1335,8 +1347,8 @@
if getdate(posting_date) < getdate(self.posting_date):
posting_date = self.posting_date
- dr_or_cr = "credit" if invoice.reference_doctype in ["Sales Invoice", "Payment Entry"] else "debit"
- args_dict["account"] = invoice.account
+ dr_or_cr, account = self.get_dr_and_account_for_advances(invoice)
+ args_dict["account"] = account
args_dict[dr_or_cr] = invoice.allocated_amount
args_dict[dr_or_cr + "_in_account_currency"] = invoice.allocated_amount
args_dict.update(
@@ -2194,6 +2206,10 @@
ref_doc = frappe.get_doc(reference_doctype, reference_name)
company_currency = ref_doc.get("company_currency") or erpnext.get_company_currency(ref_doc.company)
+ # Only applies for Reverse Payment Entries
+ account_type = None
+ payment_type = None
+
if reference_doctype == "Dunning":
total_amount = outstanding_amount = ref_doc.get("dunning_amount")
exchange_rate = 1
@@ -2206,6 +2222,18 @@
exchange_rate = 1
outstanding_amount = get_outstanding_on_journal_entry(reference_name)
+ elif reference_doctype == "Payment Entry":
+ if reverse_payment_details := frappe.db.get_all(
+ "Payment Entry",
+ filters={"name": reference_name},
+ fields=["payment_type", "party_type"],
+ )[0]:
+ payment_type = reverse_payment_details.payment_type
+ account_type = frappe.db.get_value(
+ "Party Type", reverse_payment_details.party_type, "account_type"
+ )
+ exchange_rate = 1
+
elif reference_doctype != "Journal Entry":
if not total_amount:
if party_account_currency == company_currency:
@@ -2250,6 +2278,8 @@
"outstanding_amount": flt(outstanding_amount),
"exchange_rate": flt(exchange_rate),
"bill_no": ref_doc.get("bill_no"),
+ "account_type": account_type,
+ "payment_type": payment_type,
}
)
if account:
diff --git a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
index 0b3037a..03bd21f 100644
--- a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
@@ -1077,6 +1077,8 @@
ref_details = get_reference_details(so.doctype, so.name, pe.paid_from_account_currency)
expected_response = {
"account": get_party_account("Customer", so.customer, so.company),
+ "account_type": None, # only applies for Reverse Payment Entry
+ "payment_type": None, # only applies for Reverse Payment Entry
"total_amount": 5000.0,
"outstanding_amount": 5000.0,
"exchange_rate": 1.0,
@@ -1543,7 +1545,7 @@
company = "_Test Company"
customer = create_customer(frappe.generate_hash(length=10), "INR")
advance_account = create_account(
- parent_account="Current Assets - _TC",
+ parent_account="Current Liabilities - _TC",
account_name="Advances Received",
company=company,
account_type="Receivable",
@@ -1599,9 +1601,9 @@
# assert General and Payment Ledger entries post partial reconciliation
self.expected_gle = [
- {"account": "Debtors - _TC", "debit": 0.0, "credit": 400.0},
{"account": advance_account, "debit": 400.0, "credit": 0.0},
{"account": advance_account, "debit": 0.0, "credit": 1000.0},
+ {"account": advance_account, "debit": 0.0, "credit": 400.0},
{"account": "_Test Cash - _TC", "debit": 1000.0, "credit": 0.0},
]
self.expected_ple = [
@@ -1612,7 +1614,7 @@
"amount": -1000.0,
},
{
- "account": "Debtors - _TC",
+ "account": advance_account,
"voucher_no": pe.name,
"against_voucher_no": reverse_pe.name,
"amount": -400.0,
diff --git a/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json b/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
index e518009b..352ece2 100644
--- a/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
+++ b/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
@@ -10,6 +10,8 @@
"due_date",
"bill_no",
"payment_term",
+ "account_type",
+ "payment_type",
"column_break_4",
"total_amount",
"outstanding_amount",
@@ -108,12 +110,22 @@
"fieldtype": "Link",
"label": "Account",
"options": "Account"
+ },
+ {
+ "fieldname": "account_type",
+ "fieldtype": "Data",
+ "label": "Account Type"
+ },
+ {
+ "fieldname": "payment_type",
+ "fieldtype": "Data",
+ "label": "Payment Type"
}
],
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2024-03-27 13:10:09.578312",
+ "modified": "2024-04-05 09:44:08.310593",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Payment Entry Reference",
diff --git a/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.py b/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.py
index 13707e5..4a027b4 100644
--- a/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.py
+++ b/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.py
@@ -15,6 +15,7 @@
from frappe.types import DF
account: DF.Link | None
+ account_type: DF.Data | None
allocated_amount: DF.Float
bill_no: DF.Data | None
due_date: DF.Date | None
@@ -25,6 +26,7 @@
parentfield: DF.Data
parenttype: DF.Data
payment_term: DF.Link | None
+ payment_type: DF.Data | None
reference_doctype: DF.Link
reference_name: DF.DynamicLink
total_amount: DF.Float
diff --git a/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py
index 8b55c11..0a3a067 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py
@@ -101,6 +101,14 @@
"account_currency": "USD",
"account_type": "Payable",
},
+ # 'Payable' account for capturing advance paid, under 'Assets' group
+ {
+ "attribute": "advance_payable_account",
+ "account_name": "Advance Paid",
+ "parent_account": "Current Assets - _PR",
+ "account_currency": "INR",
+ "account_type": "Payable",
+ },
]
for x in accounts:
@@ -1335,6 +1343,188 @@
# Should not raise frappe.exceptions.ValidationError: Payment Entry has been modified after you pulled it. Please pull it again.
pr.reconcile()
+ def test_reverse_payment_against_payment_for_supplier(self):
+ """
+ Reconcile a payment against a reverse payment, for a supplier.
+ """
+ self.supplier = "_Test Supplier"
+ amount = 4000
+
+ pe = self.create_payment_entry(amount=amount)
+ pe.party_type = "Supplier"
+ pe.party = self.supplier
+ pe.payment_type = "Pay"
+ pe.paid_from = self.cash
+ pe.paid_to = self.creditors
+ pe.save().submit()
+
+ reverse_pe = self.create_payment_entry(amount=amount)
+ reverse_pe.party_type = "Supplier"
+ reverse_pe.party = self.supplier
+ reverse_pe.payment_type = "Receive"
+ reverse_pe.paid_from = self.creditors
+ reverse_pe.paid_to = self.cash
+ reverse_pe.save().submit()
+
+ pr = self.create_payment_reconciliation(party_is_customer=False)
+ pr.get_unreconciled_entries()
+ self.assertEqual(len(pr.invoices), 1)
+ self.assertEqual(len(pr.payments), 1)
+ self.assertEqual(pr.invoices[0].invoice_number, reverse_pe.name)
+ self.assertEqual(pr.payments[0].reference_name, pe.name)
+
+ invoices = [invoice.as_dict() for invoice in pr.invoices]
+ payments = [payment.as_dict() for payment in pr.payments]
+ pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments}))
+ pr.reconcile()
+
+ pe.reload()
+ self.assertEqual(len(pe.references), 1)
+ self.assertEqual(pe.references[0].exchange_rate, 1)
+ # There should not be any Exc Gain/Loss
+ self.assertEqual(pe.references[0].exchange_gain_loss, 0)
+ self.assertEqual(pe.references[0].reference_name, reverse_pe.name)
+
+ journals = frappe.db.get_all(
+ "Journal Entry",
+ filters={
+ "voucher_type": "Exchange Gain Or Loss",
+ "reference_type": "Payment Entry",
+ "reference_name": ("in", [pe.name, reverse_pe.name]),
+ },
+ )
+ # There should be no Exchange Gain/Loss created
+ self.assertEqual(journals, [])
+
+ def test_advance_reverse_payment_against_payment_for_supplier(self):
+ """
+ Reconcile an Advance payment against reverse payment, for a supplier.
+ """
+ frappe.db.set_value(
+ "Company",
+ self.company,
+ {
+ "book_advance_payments_in_separate_party_account": 1,
+ "default_advance_paid_account": self.advance_payable_account,
+ },
+ )
+
+ self.supplier = "_Test Supplier"
+ amount = 4000
+
+ pe = self.create_payment_entry(amount=amount)
+ pe.party_type = "Supplier"
+ pe.party = self.supplier
+ pe.payment_type = "Pay"
+ pe.paid_from = self.cash
+ pe.paid_to = self.advance_payable_account
+ pe.save().submit()
+
+ reverse_pe = self.create_payment_entry(amount=amount)
+ reverse_pe.party_type = "Supplier"
+ reverse_pe.party = self.supplier
+ reverse_pe.payment_type = "Receive"
+ reverse_pe.paid_from = self.advance_payable_account
+ reverse_pe.paid_to = self.cash
+ reverse_pe.save().submit()
+
+ pr = self.create_payment_reconciliation(party_is_customer=False)
+ pr.default_advance_account = self.advance_payable_account
+ pr.get_unreconciled_entries()
+ self.assertEqual(len(pr.invoices), 1)
+ self.assertEqual(len(pr.payments), 1)
+ self.assertEqual(pr.invoices[0].invoice_number, reverse_pe.name)
+ self.assertEqual(pr.payments[0].reference_name, pe.name)
+
+ invoices = [invoice.as_dict() for invoice in pr.invoices]
+ payments = [payment.as_dict() for payment in pr.payments]
+ pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments}))
+ pr.reconcile()
+
+ pe.reload()
+ self.assertEqual(len(pe.references), 1)
+ self.assertEqual(pe.references[0].exchange_rate, 1)
+ # There should not be any Exc Gain/Loss
+ self.assertEqual(pe.references[0].exchange_gain_loss, 0)
+ self.assertEqual(pe.references[0].reference_name, reverse_pe.name)
+
+ journals = frappe.db.get_all(
+ "Journal Entry",
+ filters={
+ "voucher_type": "Exchange Gain Or Loss",
+ "reference_type": "Payment Entry",
+ "reference_name": ("in", [pe.name, reverse_pe.name]),
+ },
+ )
+ # There should be no Exchange Gain/Loss created
+ self.assertEqual(journals, [])
+
+ # Assert Ledger Entries
+ gl_entries = frappe.db.get_all(
+ "GL Entry",
+ filters={"voucher_no": pe.name},
+ fields=["account", "voucher_no", "against_voucher", "debit", "credit"],
+ order_by="account, against_voucher, debit",
+ )
+ expected_gle = [
+ {
+ "account": self.advance_payable_account,
+ "voucher_no": pe.name,
+ "against_voucher": pe.name,
+ "debit": 0.0,
+ "credit": amount,
+ },
+ {
+ "account": self.advance_payable_account,
+ "voucher_no": pe.name,
+ "against_voucher": pe.name,
+ "debit": amount,
+ "credit": 0.0,
+ },
+ {
+ "account": self.advance_payable_account,
+ "voucher_no": pe.name,
+ "against_voucher": reverse_pe.name,
+ "debit": amount,
+ "credit": 0.0,
+ },
+ {
+ "account": "Cash - _PR",
+ "voucher_no": pe.name,
+ "against_voucher": None,
+ "debit": 0.0,
+ "credit": amount,
+ },
+ ]
+ self.assertEqual(gl_entries, expected_gle)
+ pl_entries = frappe.db.get_all(
+ "Payment Ledger Entry",
+ filters={"voucher_no": pe.name},
+ fields=["account", "voucher_no", "against_voucher_no", "amount"],
+ order_by="account, against_voucher_no, amount",
+ )
+ expected_ple = [
+ {
+ "account": self.advance_payable_account,
+ "voucher_no": pe.name,
+ "against_voucher_no": pe.name,
+ "amount": -amount,
+ },
+ {
+ "account": self.advance_payable_account,
+ "voucher_no": pe.name,
+ "against_voucher_no": pe.name,
+ "amount": amount,
+ },
+ {
+ "account": self.advance_payable_account,
+ "voucher_no": pe.name,
+ "against_voucher_no": reverse_pe.name,
+ "amount": -amount,
+ },
+ ]
+ self.assertEqual(pl_entries, expected_ple)
+
def make_customer(customer_name, currency=None):
if not frappe.db.exists("Customer", customer_name):
diff --git a/erpnext/assets/doctype/asset/test_asset.py b/erpnext/assets/doctype/asset/test_asset.py
index 088641a..1b3951e 100644
--- a/erpnext/assets/doctype/asset/test_asset.py
+++ b/erpnext/assets/doctype/asset/test_asset.py
@@ -232,7 +232,11 @@
asset.precision("gross_purchase_amount"),
)
pro_rata_amount, _, _ = _get_pro_rata_amt(
- asset.finance_books[0], 9000, get_last_day(add_months(purchase_date, 1)), date
+ asset.finance_books[0],
+ 9000,
+ get_last_day(add_months(purchase_date, 1)),
+ date,
+ original_schedule_date=get_last_day(nowdate()),
)
pro_rata_amount = flt(pro_rata_amount, asset.precision("gross_purchase_amount"))
self.assertEqual(
@@ -314,7 +318,11 @@
self.assertEqual(first_asset_depr_schedule.status, "Cancelled")
pro_rata_amount, _, _ = _get_pro_rata_amt(
- asset.finance_books[0], 9000, get_last_day(add_months(purchase_date, 1)), date
+ asset.finance_books[0],
+ 9000,
+ get_last_day(add_months(purchase_date, 1)),
+ date,
+ original_schedule_date=get_last_day(nowdate()),
)
pro_rata_amount = flt(pro_rata_amount, asset.precision("gross_purchase_amount"))
@@ -332,7 +340,6 @@
),
("Debtors - _TC", 25000.0, 0.0),
)
-
gle = get_gl_entries("Sales Invoice", si.name)
self.assertSequenceEqual(gle, expected_gle)
@@ -378,7 +385,7 @@
self.assertEqual(frappe.db.get_value("Asset", asset.name, "status"), "Sold")
- expected_values = [["2023-03-31", 12000, 36000], ["2023-05-23", 1742.47, 37742.47]]
+ expected_values = [["2023-03-31", 12000, 36000], ["2023-05-23", 1737.7, 37737.7]]
second_asset_depr_schedule = get_depr_schedule(asset.name, "Active")
@@ -391,7 +398,7 @@
expected_gle = (
(
"_Test Accumulated Depreciations - _TC",
- 37742.47,
+ 37737.7,
0.0,
),
(
@@ -402,7 +409,7 @@
(
"_Test Gain/Loss on Asset Disposal - _TC",
0.0,
- 17742.47,
+ 17737.7,
),
("Debtors - _TC", 40000.0, 0.0),
)
@@ -707,25 +714,24 @@
)
expected_schedules = [
- ["2023-01-31", 1021.98, 1021.98],
- ["2023-02-28", 923.08, 1945.06],
- ["2023-03-31", 1021.98, 2967.04],
- ["2023-04-30", 989.01, 3956.05],
- ["2023-05-31", 1021.98, 4978.03],
- ["2023-06-30", 989.01, 5967.04],
- ["2023-07-31", 1021.98, 6989.02],
- ["2023-08-31", 1021.98, 8011.0],
- ["2023-09-30", 989.01, 9000.01],
- ["2023-10-31", 1021.98, 10021.99],
- ["2023-11-30", 989.01, 11011.0],
- ["2023-12-31", 989.0, 12000.0],
+ ["2023-01-31", 1019.18, 1019.18],
+ ["2023-02-28", 920.55, 1939.73],
+ ["2023-03-31", 1019.18, 2958.91],
+ ["2023-04-30", 986.3, 3945.21],
+ ["2023-05-31", 1019.18, 4964.39],
+ ["2023-06-30", 986.3, 5950.69],
+ ["2023-07-31", 1019.18, 6969.87],
+ ["2023-08-31", 1019.18, 7989.05],
+ ["2023-09-30", 986.3, 8975.35],
+ ["2023-10-31", 1019.18, 9994.53],
+ ["2023-11-30", 986.3, 10980.83],
+ ["2023-12-31", 1019.17, 12000.0],
]
schedules = [
[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
for d in get_depr_schedule(asset.name, "Draft")
]
-
self.assertEqual(schedules, expected_schedules)
def test_schedule_for_straight_line_method_for_existing_asset(self):
diff --git a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
index d22377d..c71d1d0 100644
--- a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
+++ b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
@@ -313,7 +313,6 @@
has_wdv_or_dd_non_yearly_pro_rata,
number_of_pending_depreciations,
)
-
if not has_pro_rata or (
n < (cint(final_number_of_depreciations) - 1) or final_number_of_depreciations == 2
):
@@ -338,6 +337,7 @@
depreciation_amount,
from_date,
date_of_disposal,
+ original_schedule_date=schedule_date,
)
if depreciation_amount > 0:
@@ -565,23 +565,27 @@
)
-def _get_pro_rata_amt(row, depreciation_amount, from_date, to_date, has_wdv_or_dd_non_yearly_pro_rata=False):
+def _get_pro_rata_amt(
+ row,
+ depreciation_amount,
+ from_date,
+ to_date,
+ has_wdv_or_dd_non_yearly_pro_rata=False,
+ original_schedule_date=None,
+):
days = date_diff(to_date, from_date)
months = month_diff(to_date, from_date)
if has_wdv_or_dd_non_yearly_pro_rata:
- total_days = get_total_days(to_date, 12)
+ total_days = get_total_days(original_schedule_date or to_date, 12)
else:
- total_days = get_total_days(to_date, row.frequency_of_depreciation)
-
+ total_days = get_total_days(original_schedule_date or to_date, row.frequency_of_depreciation)
return (depreciation_amount * flt(days)) / flt(total_days), days, months
def get_total_days(date, frequency):
period_start_date = add_months(date, cint(frequency) * -1)
-
if is_last_day_of_the_month(date):
period_start_date = get_last_day(period_start_date)
-
return date_diff(date, period_start_date)
@@ -632,33 +636,37 @@
# if the Depreciation Schedule is being modified after Asset Value Adjustment due to decrease in asset value
elif asset.flags.decrease_in_asset_value_due_to_value_adjustment:
if row.daily_prorata_based:
- daily_depr_amount = (
- flt(row.value_after_depreciation) - flt(row.expected_value_after_useful_life)
- ) / date_diff(
- get_last_day(
- add_months(
- row.depreciation_start_date,
- flt(row.total_number_of_depreciations - asset.number_of_depreciations_booked - 1)
- * row.frequency_of_depreciation,
- )
- ),
- add_days(
+ amount = flt(row.value_after_depreciation) - flt(row.expected_value_after_useful_life)
+ total_days = (
+ date_diff(
get_last_day(
add_months(
row.depreciation_start_date,
- flt(
- row.total_number_of_depreciations
- - asset.number_of_depreciations_booked
- - number_of_pending_depreciations
- - 1
- )
+ flt(row.total_number_of_depreciations - asset.number_of_depreciations_booked - 1)
* row.frequency_of_depreciation,
)
),
- 1,
- ),
+ add_days(
+ get_last_day(
+ add_months(
+ row.depreciation_start_date,
+ flt(
+ row.total_number_of_depreciations
+ - asset.number_of_depreciations_booked
+ - number_of_pending_depreciations
+ - 1
+ )
+ * row.frequency_of_depreciation,
+ )
+ ),
+ 1,
+ ),
+ )
+ + 1
)
+ daily_depr_amount = amount / total_days
+
to_date = get_last_day(
add_months(row.depreciation_start_date, schedule_idx * row.frequency_of_depreciation)
)
@@ -679,24 +687,33 @@
# if the Depreciation Schedule is being prepared for the first time
else:
if row.daily_prorata_based:
- daily_depr_amount = (
+ amount = (
flt(asset.gross_purchase_amount)
- flt(asset.opening_accumulated_depreciation)
- flt(row.expected_value_after_useful_life)
- ) / date_diff(
- get_last_day(
- add_months(
- row.depreciation_start_date,
- flt(row.total_number_of_depreciations - asset.number_of_depreciations_booked - 1)
- * row.frequency_of_depreciation,
- )
- ),
- add_days(
- get_last_day(add_months(row.depreciation_start_date, -1 * row.frequency_of_depreciation)),
- 1,
- ),
)
+ total_days = (
+ date_diff(
+ get_last_day(
+ add_months(
+ row.depreciation_start_date,
+ flt(row.total_number_of_depreciations - asset.number_of_depreciations_booked - 1)
+ * row.frequency_of_depreciation,
+ )
+ ),
+ add_days(
+ get_last_day(
+ add_months(row.depreciation_start_date, -1 * row.frequency_of_depreciation)
+ ),
+ 1,
+ ),
+ )
+ + 1
+ )
+
+ daily_depr_amount = amount / total_days
+
to_date = get_last_day(
add_months(row.depreciation_start_date, schedule_idx * row.frequency_of_depreciation)
)
@@ -708,7 +725,6 @@
),
1,
)
-
return daily_depr_amount * (date_diff(to_date, from_date) + 1)
else:
return (
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
index abb5702..de37ec2 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
@@ -22,9 +22,13 @@
this.frm.set_value("valid_till", frappe.datetime.add_months(this.frm.doc.transaction_date, 1));
}
if (this.frm.doc.docstatus === 1) {
- this.frm.add_custom_button(__("Purchase Order"), this.make_purchase_order, __("Create"));
+ this.frm.add_custom_button(
+ __("Purchase Order"),
+ this.make_purchase_order.bind(this),
+ __("Create")
+ );
this.frm.page.set_inner_btn_group_as_primary(__("Create"));
- this.frm.add_custom_button(__("Quotation"), this.make_quotation, __("Create"));
+ this.frm.add_custom_button(__("Quotation"), this.make_quotation.bind(this), __("Create"));
} else if (this.frm.doc.docstatus === 0) {
this.frm.add_custom_button(
__("Material Request"),
diff --git a/erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.py b/erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.py
index 1cb6305..8aa49f7 100644
--- a/erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.py
+++ b/erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.py
@@ -65,7 +65,7 @@
& (
(table.from_date.between(self.from_date, self.to_date))
| (table.to_date.between(self.from_date, self.to_date))
- | (table.from_date >= self.from_date and table.to_date >= self.to_date)
+ | ((table.from_date >= self.from_date) & (table.to_date >= self.to_date))
)
)
)
diff --git a/erpnext/stock/report/item_prices/item_prices.js b/erpnext/stock/report/item_prices/item_prices.js
index 868b503..6724c1a 100644
--- a/erpnext/stock/report/item_prices/item_prices.js
+++ b/erpnext/stock/report/item_prices/item_prices.js
@@ -9,9 +9,6 @@
fieldtype: "Select",
options: "Enabled Items only\nDisabled Items only\nAll Items",
default: "Enabled Items only",
- on_change: function (query_report) {
- query_report.trigger_refresh();
- },
},
],
};