* fix: E-commerce permissions
(cherry picked from commit f4d74990fe)
# Conflicts:
# erpnext/accounts/party.py
# erpnext/controllers/selling_controller.py
* chore: conflicts
---------
Co-authored-by: Ankush Menat <ankush@frappe.io>
This commit is contained in:
@@ -4,11 +4,7 @@
|
|||||||
|
|
||||||
import frappe
|
import frappe
|
||||||
from frappe import _, msgprint, scrub
|
from frappe import _, msgprint, scrub
|
||||||
from frappe.contacts.doctype.address.address import (
|
from frappe.contacts.doctype.address.address import get_company_address, get_default_address
|
||||||
get_address_display,
|
|
||||||
get_company_address,
|
|
||||||
get_default_address,
|
|
||||||
)
|
|
||||||
from frappe.contacts.doctype.contact.contact import get_contact_details
|
from frappe.contacts.doctype.contact.contact import get_contact_details
|
||||||
from frappe.core.doctype.user_permission.user_permission import get_permitted_documents
|
from frappe.core.doctype.user_permission.user_permission import get_permitted_documents
|
||||||
from frappe.model.utils import get_fetch_values
|
from frappe.model.utils import get_fetch_values
|
||||||
@@ -120,6 +116,7 @@ def _get_party_details(
|
|||||||
party_address,
|
party_address,
|
||||||
company_address,
|
company_address,
|
||||||
shipping_address,
|
shipping_address,
|
||||||
|
ignore_permissions=ignore_permissions,
|
||||||
)
|
)
|
||||||
set_contact_details(party_details, party, party_type)
|
set_contact_details(party_details, party, party_type)
|
||||||
set_other_values(party_details, party, party_type)
|
set_other_values(party_details, party, party_type)
|
||||||
@@ -183,6 +180,8 @@ def set_address_details(
|
|||||||
party_address=None,
|
party_address=None,
|
||||||
company_address=None,
|
company_address=None,
|
||||||
shipping_address=None,
|
shipping_address=None,
|
||||||
|
*,
|
||||||
|
ignore_permissions=False
|
||||||
):
|
):
|
||||||
billing_address_field = (
|
billing_address_field = (
|
||||||
"customer_address" if party_type == "Lead" else party_type.lower() + "_address"
|
"customer_address" if party_type == "Lead" else party_type.lower() + "_address"
|
||||||
@@ -195,13 +194,17 @@ def set_address_details(
|
|||||||
get_fetch_values(doctype, billing_address_field, party_details[billing_address_field])
|
get_fetch_values(doctype, billing_address_field, party_details[billing_address_field])
|
||||||
)
|
)
|
||||||
# address display
|
# address display
|
||||||
party_details.address_display = get_address_display(party_details[billing_address_field])
|
party_details.address_display = render_address(
|
||||||
|
party_details[billing_address_field], check_permissions=not ignore_permissions
|
||||||
|
)
|
||||||
# shipping address
|
# shipping address
|
||||||
if party_type in ["Customer", "Lead"]:
|
if party_type in ["Customer", "Lead"]:
|
||||||
party_details.shipping_address_name = shipping_address or get_party_shipping_address(
|
party_details.shipping_address_name = shipping_address or get_party_shipping_address(
|
||||||
party_type, party.name
|
party_type, party.name
|
||||||
)
|
)
|
||||||
party_details.shipping_address = get_address_display(party_details["shipping_address_name"])
|
party_details.shipping_address = render_address(
|
||||||
|
party_details["shipping_address_name"], check_permissions=not ignore_permissions
|
||||||
|
)
|
||||||
if doctype:
|
if doctype:
|
||||||
party_details.update(
|
party_details.update(
|
||||||
get_fetch_values(doctype, "shipping_address_name", party_details.shipping_address_name)
|
get_fetch_values(doctype, "shipping_address_name", party_details.shipping_address_name)
|
||||||
@@ -224,7 +227,7 @@ def set_address_details(
|
|||||||
party_details.update(
|
party_details.update(
|
||||||
{
|
{
|
||||||
"shipping_address": shipping_address,
|
"shipping_address": shipping_address,
|
||||||
"shipping_address_display": get_address_display(shipping_address),
|
"shipping_address_display": render_address(shipping_address),
|
||||||
**get_fetch_values(doctype, "shipping_address", shipping_address),
|
**get_fetch_values(doctype, "shipping_address", shipping_address),
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
@@ -235,7 +238,8 @@ def set_address_details(
|
|||||||
{
|
{
|
||||||
"billing_address": party_details.company_address,
|
"billing_address": party_details.company_address,
|
||||||
"billing_address_display": (
|
"billing_address_display": (
|
||||||
party_details.company_address_display or get_address_display(party_details.company_address)
|
party_details.company_address_display
|
||||||
|
or render_address(party_details.company_address, check_permissions=True)
|
||||||
),
|
),
|
||||||
**get_fetch_values(doctype, "billing_address", party_details.company_address),
|
**get_fetch_values(doctype, "billing_address", party_details.company_address),
|
||||||
}
|
}
|
||||||
@@ -938,3 +942,13 @@ def add_party_account(party_type, party, company, account):
|
|||||||
doc.append("accounts", accounts)
|
doc.append("accounts", accounts)
|
||||||
|
|
||||||
doc.save()
|
doc.save()
|
||||||
|
|
||||||
|
|
||||||
|
def render_address(address, check_permissions=True):
|
||||||
|
try:
|
||||||
|
from frappe.contacts.doctype.address.address import render_address as _render
|
||||||
|
except ImportError:
|
||||||
|
# Older frappe versions where this function is not available
|
||||||
|
from frappe.contacts.doctype.address.address import get_address_display as _render
|
||||||
|
|
||||||
|
return frappe.call(_render, address, check_permissions=check_permissions)
|
||||||
|
|||||||
@@ -4,9 +4,9 @@
|
|||||||
|
|
||||||
import frappe
|
import frappe
|
||||||
from frappe import _, bold, throw
|
from frappe import _, bold, throw
|
||||||
from frappe.contacts.doctype.address.address import get_address_display
|
|
||||||
from frappe.utils import cint, cstr, flt, get_link_to_form, nowtime
|
from frappe.utils import cint, cstr, flt, get_link_to_form, nowtime
|
||||||
|
|
||||||
|
from erpnext.accounts.party import render_address
|
||||||
from erpnext.controllers.accounts_controller import get_taxes_and_charges
|
from erpnext.controllers.accounts_controller import get_taxes_and_charges
|
||||||
from erpnext.controllers.sales_and_purchase_return import get_rate_for_return
|
from erpnext.controllers.sales_and_purchase_return import get_rate_for_return
|
||||||
from erpnext.controllers.stock_controller import StockController
|
from erpnext.controllers.stock_controller import StockController
|
||||||
@@ -583,7 +583,9 @@ class SellingController(StockController):
|
|||||||
|
|
||||||
for address_field, address_display_field in address_dict.items():
|
for address_field, address_display_field in address_dict.items():
|
||||||
if self.get(address_field):
|
if self.get(address_field):
|
||||||
self.set(address_display_field, get_address_display(self.get(address_field)))
|
self.set(
|
||||||
|
address_display_field, render_address(self.get(address_field), check_permissions=False)
|
||||||
|
)
|
||||||
|
|
||||||
def validate_for_duplicate_items(self):
|
def validate_for_duplicate_items(self):
|
||||||
check_list, chk_dupl_itm = [], []
|
check_list, chk_dupl_itm = [], []
|
||||||
|
|||||||
Reference in New Issue
Block a user