[change] Delivery address by SchrodingersGat · Pull Request #12056 · inventree/InvenTree

SchrodingersGat · 2026-05-31T05:11:26Z

This PR expands the functionality of the "Address" model, allowing it to be used to represent internal addresses (not just addresses associated with external companies).

This is an alternative approach to the one suggested in #9768

Relates Issues

Closes [FR] Delivery Address on Purchase Orders #9303
Replaces feat: Add Delivery Address field to Purchase Orders #9768
Update demo dataset - Add internal addresses demo-dataset#117

Breaking Change

This is a "slightly" breaking change - in that the Address model no longer is definitely linked to a Company instance. Any external code which expects an Address to always link to a Company model will need to be updated

Changes

Address.company is now nullable; addresses with no linked company are "internal addresses" representing your own sites
Internal addresses are managed from the Admin Center (staff only) under a new Addresses panel
Purchase Orders, Return Orders, and Transfer Orders now use an internal address for their address field; the picker is filtered to internal addresses only
Sales Orders are unchanged — they continue to use a customer-linked address
If no explicit address is set on a PO/RO/TO, the primary internal address is used as the fallback (mirrors the existing company primary-address fallback on Sales Orders)
New ?internal=true/false filter on the address list API endpoint
order_address property updated for all order types to reflect the internal/external split
Unit tests added for address field validation on all four order types (PO, SO, RO, TO) via the API, and for the order_address fallback behaviour
Documentation updated: new Internal Addresses section in the company concepts page, including fallback address behaviour for both internal and external orders

netlify · 2026-05-31T05:11:31Z

✅ Deploy Preview for inventree-web-pui-preview ready!

Name	Link
🔨 Latest commit	`2c8d511`
🔍 Latest deploy log	https://app.netlify.com/projects/inventree-web-pui-preview/deploys/6a1d733fb737b200080b5025
😎 Deploy Preview	https://deploy-preview-12056--inventree-web-pui-preview.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.
Lighthouse	1 paths audited Performance: 93 (🟢 up 2 from production) Accessibility: 82 (no change from production) Best Practices: 100 (no change from production) SEO: 78 (no change from production) PWA: - View the detailed breakdown and full score reports
🤖 Make changes	Run an agent on this branch

To edit notification comments on pull requests, go to your Netlify project configuration.

Copilot

Pull request overview

This PR extends the company address model to support internal organization addresses and updates order address behavior so PO/RO/TO use internal addresses while SO remains customer-address based.

Changes:

Allows Address.company to be nullable and adds internal-address filtering.
Updates order validation/fallback behavior and frontend address pickers for PO/RO/TO.
Adds tests, migrations, changelog entries, and documentation for internal addresses.

Reviewed changes

Copilot reviewed 16 out of 16 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
`src/backend/InvenTree/company/models.py`	Makes address company optional for internal addresses.
`src/backend/InvenTree/company/api.py`	Adds the `internal` address list filter.
`src/backend/InvenTree/company/migrations/0080_alter_address_company.py`	Migrates address company FK to nullable.
`src/backend/InvenTree/order/models.py`	Adds internal/external order address validation and fallback behavior.
`src/backend/InvenTree/order/migrations/0120_alter_purchaseorder_address_and_more.py`	Updates order address field help text.
`src/backend/InvenTree/order/tests.py`	Tests internal address fallback behavior.
`src/backend/InvenTree/order/test_sales_order.py`	Extends Sales Order address validation tests.
`src/backend/InvenTree/order/test_api.py`	Adds API validation tests for order address fields.
`src/frontend/src/tables/company/AddressTable.tsx`	Supports internal address table mode.
`src/frontend/src/pages/Index/Settings/AdminCenter/Index.tsx`	Adds Admin Center address management panel.
`src/frontend/src/pages/company/CompanyDetail.tsx`	Updates the company address panel icon.
`src/frontend/src/forms/PurchaseOrderForms.tsx`	Filters purchase order address choices to internal addresses.
`src/frontend/src/forms/ReturnOrderForms.tsx`	Filters return order address choices to internal addresses.
`src/frontend/src/forms/TransferOrderForms.tsx`	Adds transfer order address field filtered to internal addresses.
`docs/docs/concepts/company.md`	Documents internal addresses and order address fallback behavior.
`CHANGELOG.md`	Records the internal address feature and breaking behavior change.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

codecov · 2026-05-31T06:13:31Z

Codecov Report

❌ Patch coverage is 95.97990% with 8 lines in your changes missing coverage. Please review.
✅ Project coverage is 91.45%. Comparing base (d38af61) to head (2c8d511).

Additional details and impacted files

@@            Coverage Diff             @@
##           master   #12056      +/-   ##
==========================================
+ Coverage   91.43%   91.45%   +0.02%     
==========================================
  Files         975      977       +2     
  Lines       52154    52346     +192     
==========================================
+ Hits        47685    47873     +188     
- Misses       4469     4473       +4

Flag	Coverage Δ
backend	`90.47% <95.97%> (+0.02%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components	Coverage Δ
Backend Apps	`91.79% <95.95%> (+0.02%)`	⬆️
Backend General	`93.38% <ø> (ø)`
Frontend	`∅ <ø> (∅)`

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

matmair · 2026-05-31T23:23:21Z

this will probably break a few plugins; can we move the change in the company link to 2.0?

matmair · 2026-05-31T23:26:55Z

+def _require_staff_for_internal_address(request, address_company) -> None:
+    """Raise PermissionDenied if the address is internal and the user is not staff."""
+    if address_company is None and not request.user.is_staff:
+        raise PermissionDenied(_('Only staff users can modify internal addresses'))


this forces ppl to use staff accounts - which are well-known sources for security issues; imo this should be a seperate permissions

matmair · 2026-05-31T23:29:57Z

Having looked deeper at it: this is a huge breaking change; I do not really understand why we are breaking every existing PO, RO, TO effectively - the value-add of this feature is blurry to me at best.

SchrodingersGat · 2026-06-01T02:39:50Z

So currently, PO / RO / TO - all specify addresses incorrectly (IMO):

Purchase Order

Must specify an address linked to the supplier - NOT the delivery address of the org using InvenTree

Return Order

Must specify an address linked to the customer - NOT the return address of the org using InvenTree

Transfer Order

Not linked to a company at all
However the "address" field here must be linked to a Company

I think that in each of these cases having an "internal" address (not linked to any Company) would make more sense, right?

wolflu05 · 2026-06-01T09:13:07Z

Sorry I have no real opinion on this, since I am not really using the addresses, but this may be a big breaking change for some other plugin developers. Just an idea, why cant we create an "Internal Company" and add adresses there? Then instead of company name in system settings we can select the internal company?

…-address

…ee into delivery-address

matmair · 2026-06-01T23:05:11Z

I think this solution with an internal flag that fundamentally changes validation and breaking the meaning of existing date entries is not a slight change; it changes how whole integration flows would need to work.

IMO a suggestion to solve the stated problems should not change the meaning of existing data fields without even warning the users.
For POs this would mean adding a new field delivery address and renaming the label and helper text of the current field to supplier adress. The new field could map to a helper property target_field that is exposed by any type of order for keeping a similar python api on all orders.
For ROs the same but names return address(new) and customer address.

For TOs either limit it to addresses that are additionally flagged as internal or add a system setting that enables admins to select if they want non-internal addresses to be allowed for TOs. TOs were not shipped in a stable so changing stuff there does not worry me.

Additionally, I think it would make sense to add a way to have one or more "internal" companies (marked with a flag or setting) - packaging/shipping slips still need company information and this would keep the python API interfaces stable

SchrodingersGat · 2026-06-02T00:20:44Z

Clearly we will need to think carefully about how this is implemented. I'm happy to support "internal" companies (and thus linked addresses) if we all feel that's a cleaner approach

SchrodingersGat added 13 commits May 31, 2026 04:06

Allow 'company' field of Address model to be null

ba32138

Add API filtering

2384a99

Migrate address fields for order models

bb39b19

Adjust UI forms

2b917d0

Refactor address table

cb4113b

Admin table for internal addresses

3b77c41

New unit tests for order addresses

97caa20

Adjust admin interface

a92e2f7

Documentation updates

28ef786

Tweak text

6f4312d

Add fallback for primary address

8afae9d

Update CHANGELOG

801d244

lazy load address table

22f94d3

SchrodingersGat added this to the 1.4.0 milestone May 31, 2026

SchrodingersGat added order Related to purchase orders / sales orders api Relates to the API breaking Indicates a major update or change which breaks compatibility User Interface Related to the frontend / User Interface labels May 31, 2026

SchrodingersGat requested review from Copilot, matmair and wolflu05 and removed request for matmair May 31, 2026 05:15

Copilot started reviewing on behalf of SchrodingersGat May 31, 2026 05:15 View session

SchrodingersGat requested a review from matmair May 31, 2026 05:15

Copilot AI reviewed May 31, 2026

View reviewed changes

Comment thread src/backend/InvenTree/company/api.py

Comment thread src/backend/InvenTree/company/api.py

Comment thread src/backend/InvenTree/company/api.py

Comment thread docs/docs/concepts/company.md Outdated

Comment thread CHANGELOG.md Outdated

Comment thread CHANGELOG.md Outdated

Display address on PurchaseOrderDetail page

10b93d2

SchrodingersGat mentioned this pull request May 31, 2026

Add internal addresses inventree/demo-dataset#117

Open

SchrodingersGat added 6 commits May 31, 2026 05:29

Bump API version

296ee10

only staff users can manipulate internal addresses

e1acec9

Fix CHANGELOG

755a724

Test for new API filter

3b1ba84

docs fix

4a7ba6a

Adjust address fallback

2730775

Merge branch 'master' into delivery-address

27767bb

matmair reviewed May 31, 2026

View reviewed changes

Update migration

90fba96

SchrodingersGat modified the milestones: 1.4.0, 1.5.0 Jun 1, 2026

SchrodingersGat added 2 commits June 1, 2026 11:55

Merge commit 'd38af61ba2fb3c87143da57ddd92bc4845f85a7c' into delivery…

95b8202

…-address

Merge branch 'delivery-address' of github.com:SchrodingersGat/InvenTr…

2c8d511

…ee into delivery-address

SchrodingersGat modified the milestones: 1.5.0, 2.0.0 Jun 3, 2026

Uh oh!

Conversation

SchrodingersGat commented May 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Relates Issues

Breaking Change

Changes

Uh oh!

netlify Bot commented May 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for inventree-web-pui-preview ready!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov Bot commented May 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

matmair commented May 31, 2026

Uh oh!

matmair May 31, 2026

Choose a reason for hiding this comment

Uh oh!

matmair commented May 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

SchrodingersGat commented Jun 1, 2026

Purchase Order

Return Order

Transfer Order

Uh oh!

wolflu05 commented Jun 1, 2026

Uh oh!

matmair commented Jun 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

SchrodingersGat commented Jun 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

SchrodingersGat commented May 31, 2026 •

edited

Loading

netlify Bot commented May 31, 2026 •

edited

Loading

codecov Bot commented May 31, 2026 •

edited

Loading

matmair commented May 31, 2026 •

edited

Loading

matmair commented Jun 1, 2026 •

edited

Loading