nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-21 05:59:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
ljain112
2025-06-24 16:14:24 +05:30
parent 0790db79fd
commit 2627fb10ce
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
View File

@@ -3287,7 +3287,7 @@ class TestSalesInvoice(FrappeTestCase):
si.posting_date = getdate() si.posting_date = getdate()
si.submit() si.submit()
@IntegrationTestCase.change_settings("Accounts Settings", {"over_billing_allowance": 0}) @change_settings("Accounts Settings", {"over_billing_allowance": 0})
def test_over_billing_case_against_delivery_note(self): def test_over_billing_case_against_delivery_note(self):
""" """
Test a case where duplicating the item with qty = 1 in the invoice Test a case where duplicating the item with qty = 1 in the invoice
@@ -3295,12 +3295,6 @@ class TestSalesInvoice(FrappeTestCase):
""" """
from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
<<<<<<< HEAD
over_billing_allowance = frappe.db.get_single_value("Accounts Settings", "over_billing_allowance")
frappe.db.set_value("Accounts Settings", None, "over_billing_allowance", 0)
=======
>>>>>>> 47c3c4808e (fix: get already billed amount from current doc instead of database (#48079))
dn = create_delivery_note() dn = create_delivery_note()
dn.submit() dn.submit()
@@ -3317,12 +3311,7 @@ class TestSalesInvoice(FrappeTestCase):
si.save() si.save()
self.assertTrue("cannot overbill" in str(err.exception).lower()) self.assertTrue("cannot overbill" in str(err.exception).lower())
<<<<<<< HEAD
frappe.db.set_value("Accounts Settings", None, "over_billing_allowance", over_billing_allowance)
=======
dn.cancel() dn.cancel()
>>>>>>> 47c3c4808e (fix: get already billed amount from current doc instead of database (#48079))
@change_settings( @change_settings(
"Accounts Settings", "Accounts Settings",

4
erpnext/controllers/accounts_controller.py
View File

@@ -1752,7 +1752,9 @@ class AccountsController(TransactionBase):
precision = self.precision(based_on, "items") precision = self.precision(based_on, "items")
precision_allowance = 1 / (10**precision) precision_allowance = 1 / (10**precision)
role_allowed_to_overbill = frappe.get_single_value("Accounts Settings", "role_allowed_to_over_bill") role_allowed_to_overbill = frappe.get_cached_value(
"Accounts Settings", None, "role_allowed_to_over_bill"
)
is_overbilling_allowed = role_allowed_to_overbill in frappe.get_roles() is_overbilling_allowed = role_allowed_to_overbill in frappe.get_roles()
for row in ref_wise_billed_amount.values(): for row in ref_wise_billed_amount.values():