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

fix: resolve conflicts

Browse Source
This commit is contained in:
Sudharsanan11
2026-09-22 21:34:57 +05:30
parent 004633a97e
commit 32c8a9507d
3 changed files with 4 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/party.py
View File

@@ -417,16 +417,10 @@ def set_price_list(party_details, party, party_type, given_price_list, pos=None,
else:
price_list = get_default_price_list(party) or given_price_list
<<<<<<< HEAD
=======
# don't set a price list the user has no permission for, the transaction can't be saved with it
if price_list and permitted_price_lists and price_list not in permitted_price_lists:
price_list = get_usable_price_list(permitted_price_lists, party.doctype)
if price_list and not is_price_list_enabled(price_list):
price_list = None
>>>>>>> e814d13 (fix(accounts): keep price list within user permissions (#59231))
if price_list:
party_details.price_list_currency = frappe.db.get_value(
"Price List", price_list, "currency", cache=True

26
erpnext/accounts/test_party.py
View File

@@ -1,13 +1,8 @@
import frappe
from frappe.tests.utils import FrappeTestCase
<<<<<<< HEAD
from erpnext.accounts.party import get_default_price_list
=======
from erpnext.accounts.doctype.pos_profile.test_pos_profile import make_pos_profile
from erpnext.accounts.party import get_default_price_list, set_price_list
from erpnext.tests.utils import ERPNextTestSuite
>>>>>>> e814d13 (fix(accounts): keep price list within user permissions (#59231))
class PartyTestCase(FrappeTestCase):
@@ -18,25 +13,6 @@ class PartyTestCase(FrappeTestCase):
customer.save()
price_list = get_default_price_list(customer)
assert price_list is None
<<<<<<< HEAD
=======
def test_disabled_party_default_should_fall_back_to_given_price_list(self):
customer = self.create_customer(default_price_list=self.create_price_list(enabled=0))
given_price_list = self.create_price_list(enabled=1)
party_details = frappe._dict()
set_price_list(party_details, customer, "Customer", given_price_list)
self.assertEqual(party_details.selling_price_list, given_price_list)
def test_disabled_given_price_list_should_not_be_set(self):
customer = self.create_customer()
party_details = frappe._dict()
set_price_list(party_details, customer, "Customer", self.create_price_list(enabled=0))
self.assertIsNone(party_details.selling_price_list)
def test_fallback_should_not_pick_an_unpermitted_price_list(self):
permitted_default = self.create_price_list(enabled=1)
@@ -196,6 +172,7 @@ class PartyTestCase(FrappeTestCase):
{
"doctype": "Customer",
"customer_name": frappe.generate_hash(length=10),
"customer_group": "Individual",
**values,
}
).insert(ignore_permissions=True, ignore_mandatory=True)
@@ -203,4 +180,3 @@ class PartyTestCase(FrappeTestCase):
customer.save()
return customer
>>>>>>> e814d13 (fix(accounts): keep price list within user permissions (#59231))

6
erpnext/controllers/tests/test_price_list_validation.py
View File

@@ -1,11 +1,11 @@
import frappe
from frappe.tests.utils import FrappeTestCase
from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
from erpnext.tests.utils import ERPNextTestSuite
class TestPriceListValidation(ERPNextTestSuite):
class TestPriceListValidation(FrappeTestCase):
def create_price_list(self, selling=0, buying=0, enabled=1):
return (
frappe.get_doc(
@@ -55,7 +55,7 @@ class TestPriceListValidation(ERPNextTestSuite):
def test_internal_transfer_should_keep_the_outward_price_list(self):
"""The inward document of an internal transfer takes the price list of the outward one, which
is flagged for the opposite side."""
from erpnext.stock.doctype.delivery_note.mapper import make_inter_company_purchase_receipt
from erpnext.stock.doctype.delivery_note.delivery_note import make_inter_company_purchase_receipt
from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import (
prepare_data_for_internal_transfer,