servala/servala-portal
3
0
Fork 0
Code Issues 21 Pull requests 5 Projects 2 Releases Packages 2 Activity Actions

Billing Entity Management #66

Merged
rixx merged 32 commits from 54-billing-entity-management into main 2025-06-22 15:42:14 +00:00
Conversation 8 Commits 32 Files changed 23 +24 -20
1 changed files with 24 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2579aff765 - Show all commits

44
src/servala/core/odoo.py
View file

@ -1,6 +1,7 @@
import xmlrpc.client import xmlrpc.client
from django.conf import settings from django.conf import settings
from django_scopes import scopes_disabled
ADDRESS_FIELDS = [ ADDRESS_FIELDS = [
"id", "id",
@ -116,9 +117,7 @@ def get_odoo_countries():
return COUNTRIES return COUNTRIES
def get_invoice_addresses(user): def get_odoo_access_conditions(user):
"""Used during organization creation: retrieves all invoice
addresses the user owns or is connected to from the Odoo API."""
# We’re building our conditions in order: # We’re building our conditions in order:
# - in exceptions, users may be using a billing account’s email # - in exceptions, users may be using a billing account’s email
# - if the user is an admin or owner of a Servala organization # - if the user is an admin or owner of a Servala organization
@ -134,17 +133,6 @@ def get_invoice_addresses(user):
email = user.email email = user.email
tobru marked this conversation as resolved Outdated
tobru commented 2025-06-05 08:52:57 +00:00
Outdated
Copy link

Enhance the domain to include ('active','=',True) to make sure the user is active in Odoo.

Enhance the domain to include `('active','=',True)` to make sure the user is active in Odoo.
or_conditions = [("email", "ilike", email)] or_conditions = [("email", "ilike", email)]
servala_invoice_ids = list(
OrganizationMembership.objects.filter(
user=user, role__in=[OrganizationRole.ADMIN, OrganizationRole.OWNER]
)
.values_list("organization__billing_entity__odoo_invoice_id", flat=True)
.distinct()
)
servala_invoice_ids = [pk for pk in servala_invoice_ids if pk]
if servala_invoice_ids:
or_conditions.append(("id", "in", servala_invoice_ids))
odoo_users = CLIENT.search_read( odoo_users = CLIENT.search_read(
model="res.users", model="res.users",
domain=[("login", "=", email), ("active", "=", True)], domain=[("login", "=", email), ("active", "=", True)],
tobru marked this conversation as resolved Outdated
tobru commented 2025-06-05 08:56:57 +00:00
Outdated
Copy link

A user in the Servala Portal which matches an internal user in Odoo should be able to see all invoice addresses, like they do when they log in to the Odoo backend. I figured out that the "Internal Users" filter in Odoo uses the domain ('share', '=', False) (L342) so let's use the same to decide if the user can see all invoice addresses. There are also "Portal Users" in Odoo, they should not see all invoice addresses and behave like a normal Servala Portal user.

A user in the Servala Portal which matches an internal user in Odoo should be able to see all invoice addresses, like they do when they log in to the Odoo backend. I figured out that the "Internal Users" filter in Odoo uses the domain `('share', '=', False)` ([L342](https://github.com/odoo/odoo/blob/16.0/odoo/addons/base/views/res_users_views.xml#L342)) so let's use the same to decide if the user can see all invoice addresses. There are also "Portal Users" in Odoo, they should not see all invoice addresses and behave like a normal Servala Portal user.
@ -155,8 +143,9 @@ def get_invoice_addresses(user):
if odoo_users: if odoo_users:
odoo_user = odoo_users[0] odoo_user = odoo_users[0]
if odoo_user.get("share") is False: if odoo_user.get("share") is False:
# An Odoo internal user (share=False) should see all invoice addresses. # An Odoo internal user (share=False) should see all invoice addresses,
or_conditions = [] # so we short-circuit the entire search logic here
return []
elif uid := odoo_user.get("id"): elif uid := odoo_user.get("id"):
# For portal users or users not in Odoo, apply standard filters. # For portal users or users not in Odoo, apply standard filters.
or_conditions.append(("create_uid", "=", uid)) or_conditions.append(("create_uid", "=", uid))
@ -174,13 +163,28 @@ def get_invoice_addresses(user):
for contact in odoo_contacts: for contact in odoo_contacts:
or_conditions.append(("parent_id", "=", contact["parent_id"][0])) or_conditions.append(("parent_id", "=", contact["parent_id"][0]))
with scopes_disabled():
servala_invoice_ids = list(
OrganizationMembership.objects.filter(
user=user, role__in=[OrganizationRole.ADMIN, OrganizationRole.OWNER]
)
.values_list("organization__billing_entity__odoo_invoice_id", flat=True)
.distinct()
)
servala_invoice_ids = [pk for pk in servala_invoice_ids if pk]
if servala_invoice_ids:
or_conditions.append(("id", "in", servala_invoice_ids))
if len(or_conditions) > 1: if len(or_conditions) > 1:
or_conditions = ["|"] * (len(or_conditions) - 1) + or_conditions or_conditions = ["|"] * (len(or_conditions) - 1) + or_conditions
return or_conditions
# The domain requires the partner to be an invoice address, that is:
# Of the company_type=person, and type=invoice. def get_invoice_addresses(user):
# If we were searching for an existing organization, we would also have to """Used during organization creation: retrieves all invoice
# filter for parent_id=odoo_company_id addresses the user owns or is connected to from the Odoo API."""
or_conditions = get_odoo_access_conditions(user)
domain = [ domain = [
("company_type", "=", "person"), ("company_type", "=", "person"),
("type", "=", "invoice"), ("type", "=", "invoice"),