diff --git a/partner_noncommercial/README.rst b/partner_noncommercial/README.rst
new file mode 100644
index 00000000000..a2e59baae9c
--- /dev/null
+++ b/partner_noncommercial/README.rst
@@ -0,0 +1,92 @@
+======================
+Partner Non Commercial
+======================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:1ecd98ebd59a21140434e6e67b495c737d3f8d5ef691e6ea25837b19d312fa62
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fpartner--contact-lightgray.png?logo=github
+    :target: https://github.com/OCA/partner-contact/tree/18.0/partner_noncommercial
+    :alt: OCA/partner-contact
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/partner-contact-18-0/partner-contact-18-0-partner_noncommercial
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/partner-contact&target_branch=18.0
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+This module changes menu and view descriptions to make partner
+management suitable for use in non commercial organizations.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Configuration
+=============
+
+This module requires no special configuration.
+
+Usage
+=====
+
+This module changes some strings for partners to make them more
+appropiate for non-commercial context, especially renaming companies to
+organizations. It also adds some filters that are often used in
+non-commercial settings, although they can be useful within companies
+too.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/partner-contact/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/partner-contact/issues/new?body=module:%20partner_noncommercial%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+-------
+
+* Therp BV
+* Camptocamp
+
+Contributors
+------------
+
+-  Ronald Portier <ronald@therp.nl>
+
+Maintainers
+-----------
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+This module is part of the `OCA/partner-contact <https://github.com/OCA/partner-contact/tree/18.0/partner_noncommercial>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/partner_noncommercial/__init__.py b/partner_noncommercial/__init__.py
new file mode 100644
index 00000000000..c32fd62b78d
--- /dev/null
+++ b/partner_noncommercial/__init__.py
@@ -0,0 +1,2 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+from . import models
diff --git a/partner_noncommercial/__manifest__.py b/partner_noncommercial/__manifest__.py
new file mode 100644
index 00000000000..497d26c3802
--- /dev/null
+++ b/partner_noncommercial/__manifest__.py
@@ -0,0 +1,19 @@
+# Copyright 2015-2018 Therp BV (https://therp.nl).
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+{
+    "name": "Partner Non Commercial",
+    "version": "18.0.1.0.0",
+    "author": "Therp BV,Camptocamp,Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/partner-contact",
+    "category": "Customer Relationship Management",
+    "license": "AGPL-3",
+    "depends": [
+        "contacts",
+        "base_view_inheritance_extension",
+    ],
+    "data": [
+        "views/menu.xml",
+        "views/res_partner.xml",
+    ],
+    "installable": True,
+}
diff --git a/partner_noncommercial/i18n/nl.po b/partner_noncommercial/i18n/nl.po
new file mode 100644
index 00000000000..cc8b1bb9481
--- /dev/null
+++ b/partner_noncommercial/i18n/nl.po
@@ -0,0 +1,119 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* partner_noncommercial
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2026-03-01 15:51+0000\n"
+"PO-Revision-Date: 2026-03-01 15:51+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_partner_form
+msgid "<span>Other address for the organization</span>"
+msgstr "<span>Ander adres voor organisatie</span>"
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_partner_form
+msgid ""
+"<span>Preferred address for all deliveries. Selected by default when you "
+"deliver an order that belongs to this organization.</span>"
+msgstr ""
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_partner_form
+msgid ""
+"<span>Preferred address for all invoices. Selected by default when you "
+"invoice an order that belongs to this organization.</span>"
+msgstr ""
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_partner_form
+msgid ""
+"<span>Use this to organize the contact details of members of a given "
+"organization</span>"
+msgstr ""
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_res_partner_filter
+msgid "City"
+msgstr "Plaats"
+
+#. module: partner_noncommercial
+#: model:ir.model.fields,field_description:partner_noncommercial.field_res_partner__company_type
+#: model:ir.model.fields,field_description:partner_noncommercial.field_res_users__company_type
+msgid "Organization Type"
+msgstr "Soort Organisatie"
+
+#. module: partner_noncommercial
+#: model:ir.model,name:partner_noncommercial.model_res_partner
+msgid "Contact"
+msgstr "Contact"
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_partner_form
+msgid "Details"
+msgstr "Details"
+
+#. module: partner_noncommercial
+#: model:ir.model.fields.selection,name:partner_noncommercial.selection__res_partner__company_type__company
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_res_partner_filter
+msgid "Organization"
+msgstr "Organisatie"
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_partner_form
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_partner_simple_form
+msgid "Organization Name..."
+msgstr "Naam Organisatie..."
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_res_partner_filter
+msgid "Organizations"
+msgstr "Organisaties"
+
+#. module: partner_noncommercial
+#: model:ir.model.fields,field_description:partner_noncommercial.field_res_partner__parent_id
+#: model:ir.model.fields,field_description:partner_noncommercial.field_res_users__parent_id
+msgid "Related organization"
+msgstr "Gerelateerd bedrijf"
+
+#. module: partner_noncommercial
+#: model:ir.model.fields,field_description:partner_noncommercial.field_res_partner__user_id
+#: model:ir.model.fields,field_description:partner_noncommercial.field_res_users__user_id
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_res_partner_filter
+msgid "Responsible"
+msgstr "Verantwoordelijke"
+
+#. module: partner_noncommercial
+#: model:ir.model.fields,help:partner_noncommercial.field_res_partner__user_id
+#: model:ir.model.fields,help:partner_noncommercial.field_res_users__user_id
+msgid "The internal user in charge of this contact."
+msgstr "De interne gebruiker verantwoordelijk voor dit contact."
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_res_partner_filter
+msgid "With address"
+msgstr "Met adres"
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_res_partner_filter
+msgid "With email"
+msgstr "Met email"
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_partner_form
+msgid "e.g. Board Member"
+msgstr "bv. Bestuurslid"
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_partner_form
+msgid "e.g. Unicef"
+msgstr "bv. Unicef"
diff --git a/partner_noncommercial/i18n/partner_noncommercial.pot b/partner_noncommercial/i18n/partner_noncommercial.pot
new file mode 100644
index 00000000000..478ff8a6710
--- /dev/null
+++ b/partner_noncommercial/i18n/partner_noncommercial.pot
@@ -0,0 +1,119 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* partner_noncommercial
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2026-03-01 15:49+0000\n"
+"PO-Revision-Date: 2026-03-01 15:49+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_partner_form
+msgid "<span>Other address for the organization</span>"
+msgstr ""
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_partner_form
+msgid ""
+"<span>Preferred address for all deliveries. Selected by default when you "
+"deliver an order that belongs to this organization.</span>"
+msgstr ""
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_partner_form
+msgid ""
+"<span>Preferred address for all invoices. Selected by default when you "
+"invoice an order that belongs to this organization.</span>"
+msgstr ""
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_partner_form
+msgid ""
+"<span>Use this to organize the contact details of members of a given "
+"organization</span>"
+msgstr ""
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_res_partner_filter
+msgid "City"
+msgstr ""
+
+#. module: partner_noncommercial
+#: model:ir.model.fields,field_description:partner_noncommercial.field_res_partner__company_type
+#: model:ir.model.fields,field_description:partner_noncommercial.field_res_users__company_type
+msgid "Organization Type"
+msgstr ""
+
+#. module: partner_noncommercial
+#: model:ir.model,name:partner_noncommercial.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_partner_form
+msgid "Details"
+msgstr ""
+
+#. module: partner_noncommercial
+#: model:ir.model.fields.selection,name:partner_noncommercial.selection__res_partner__company_type__company
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_res_partner_filter
+msgid "Organization"
+msgstr ""
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_partner_form
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_partner_simple_form
+msgid "Organization Name..."
+msgstr ""
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_res_partner_filter
+msgid "Organizations"
+msgstr ""
+
+#. module: partner_noncommercial
+#: model:ir.model.fields,field_description:partner_noncommercial.field_res_partner__parent_id
+#: model:ir.model.fields,field_description:partner_noncommercial.field_res_users__parent_id
+msgid "Related organization"
+msgstr ""
+
+#. module: partner_noncommercial
+#: model:ir.model.fields,field_description:partner_noncommercial.field_res_partner__user_id
+#: model:ir.model.fields,field_description:partner_noncommercial.field_res_users__user_id
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_res_partner_filter
+msgid "Responsible"
+msgstr ""
+
+#. module: partner_noncommercial
+#: model:ir.model.fields,help:partner_noncommercial.field_res_partner__user_id
+#: model:ir.model.fields,help:partner_noncommercial.field_res_users__user_id
+msgid "The internal user in charge of this contact."
+msgstr ""
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_res_partner_filter
+msgid "With address"
+msgstr ""
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_res_partner_filter
+msgid "With email"
+msgstr ""
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_partner_form
+msgid "e.g. Board Member"
+msgstr ""
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_partner_form
+msgid "e.g. Unicef"
+msgstr ""
diff --git a/partner_noncommercial/i18n/sl.po b/partner_noncommercial/i18n/sl.po
new file mode 100644
index 00000000000..0c92d6e6e13
--- /dev/null
+++ b/partner_noncommercial/i18n/sl.po
@@ -0,0 +1,45 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * partner_noncommercial
+#
+# Translators:
+# Matjaž Mozetič <m.mozetic@matmoz.si>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-06-13 03:19+0000\n"
+"PO-Revision-Date: 2017-06-13 03:19+0000\n"
+"Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>, 2017\n"
+"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n"
+"Language: sl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_res_partner_filter
+msgid "City"
+msgstr ""
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_res_partner_filter
+msgid "Organization"
+msgstr ""
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_res_partner_filter
+msgid "Organizations"
+msgstr "Organizacije"
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_res_partner_filter
+msgid "With address"
+msgstr ""
+
+#. module: partner_noncommercial
+#: model_terms:ir.ui.view,arch_db:partner_noncommercial.view_res_partner_filter
+msgid "With email"
+msgstr ""
diff --git a/partner_noncommercial/models/__init__.py b/partner_noncommercial/models/__init__.py
new file mode 100644
index 00000000000..73a41f174f0
--- /dev/null
+++ b/partner_noncommercial/models/__init__.py
@@ -0,0 +1,2 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+from . import res_partner
diff --git a/partner_noncommercial/models/res_partner.py b/partner_noncommercial/models/res_partner.py
new file mode 100644
index 00000000000..ff405887481
--- /dev/null
+++ b/partner_noncommercial/models/res_partner.py
@@ -0,0 +1,12 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+from odoo import fields, models
+
+
+class ResPartner(models.Model):
+    _inherit = "res.partner"
+
+    parent_id = fields.Many2one(string="Related organization")
+    user_id = fields.Many2one(string="Responsible")
+    company_type = fields.Selection(
+        selection_add=[("company", "Organization")], string="Organization Type"
+    )
diff --git a/partner_noncommercial/pyproject.toml b/partner_noncommercial/pyproject.toml
new file mode 100644
index 00000000000..4231d0cccb3
--- /dev/null
+++ b/partner_noncommercial/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"
diff --git a/partner_noncommercial/readme/CONFIGURE.md b/partner_noncommercial/readme/CONFIGURE.md
new file mode 100644
index 00000000000..783e4447aea
--- /dev/null
+++ b/partner_noncommercial/readme/CONFIGURE.md
@@ -0,0 +1 @@
+This module requires no special configuration.
diff --git a/partner_noncommercial/readme/CONTRIBUTORS.md b/partner_noncommercial/readme/CONTRIBUTORS.md
new file mode 100644
index 00000000000..c2a6ea2ebcf
--- /dev/null
+++ b/partner_noncommercial/readme/CONTRIBUTORS.md
@@ -0,0 +1 @@
+- Ronald Portier \<<ronald@therp.nl>\>
diff --git a/partner_noncommercial/readme/DESCRIPTION.md b/partner_noncommercial/readme/DESCRIPTION.md
new file mode 100644
index 00000000000..3b27010ae29
--- /dev/null
+++ b/partner_noncommercial/readme/DESCRIPTION.md
@@ -0,0 +1,2 @@
+This module changes menu and view descriptions to make partner
+management suitable for use in non commercial organizations.
diff --git a/partner_noncommercial/readme/USAGE.md b/partner_noncommercial/readme/USAGE.md
new file mode 100644
index 00000000000..9242ce79471
--- /dev/null
+++ b/partner_noncommercial/readme/USAGE.md
@@ -0,0 +1,5 @@
+This module changes some strings for partners to make them more
+appropiate for non-commercial context, especially renaming companies to
+organizations. It also adds some filters that are often used in
+non-commercial settings, although they can be useful within companies
+too.
diff --git a/partner_noncommercial/static/description/icon.png b/partner_noncommercial/static/description/icon.png
new file mode 100644
index 00000000000..3a0328b516c
Binary files /dev/null and b/partner_noncommercial/static/description/icon.png differ
diff --git a/partner_noncommercial/static/description/index.html b/partner_noncommercial/static/description/index.html
new file mode 100644
index 00000000000..a9e8324ee7b
--- /dev/null
+++ b/partner_noncommercial/static/description/index.html
@@ -0,0 +1,439 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
+<title>Partner Non Commercial</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: gray; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic, pre.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="partner-non-commercial">
+<h1 class="title">Partner Non Commercial</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:1ecd98ebd59a21140434e6e67b495c737d3f8d5ef691e6ea25837b19d312fa62
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/partner-contact/tree/18.0/partner_noncommercial"><img alt="OCA/partner-contact" src="https://img.shields.io/badge/github-OCA%2Fpartner--contact-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/partner-contact-18-0/partner-contact-18-0-partner_noncommercial"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/partner-contact&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p>This module changes menu and view descriptions to make partner
+management suitable for use in non commercial organizations.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#configuration" id="toc-entry-1">Configuration</a></li>
+<li><a class="reference internal" href="#usage" id="toc-entry-2">Usage</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-6">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-7">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="configuration">
+<h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
+<p>This module requires no special configuration.</p>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
+<p>This module changes some strings for partners to make them more
+appropiate for non-commercial context, especially renaming companies to
+organizations. It also adds some filters that are often used in
+non-commercial settings, although they can be useful within companies
+too.</p>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/partner-contact/issues">GitHub Issues</a>.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/partner-contact/issues/new?body=module:%20partner_noncommercial%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<p>Do not contact contributors directly about support or help with technical issues.</p>
+</div>
+<div class="section" id="credits">
+<h1><a class="toc-backref" href="#toc-entry-4">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
+<ul class="simple">
+<li>Therp BV</li>
+<li>Camptocamp</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
+<ul class="simple">
+<li>Ronald Portier &lt;<a class="reference external" href="mailto:ronald&#64;therp.nl">ronald&#64;therp.nl</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
+<p>This module is maintained by the OCA.</p>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
+<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/partner-contact/tree/18.0/partner_noncommercial">OCA/partner-contact</a> project on GitHub.</p>
+<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/partner_noncommercial/views/menu.xml b/partner_noncommercial/views/menu.xml
new file mode 100644
index 00000000000..4b2a3185251
--- /dev/null
+++ b/partner_noncommercial/views/menu.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <!-- Make sure configuration menu is shown as last item. -->
+    <record id="contacts.res_partner_menu_config" model="ir.ui.menu">
+        <field name="sequence">990</field>
+    </record>
+</odoo>
diff --git a/partner_noncommercial/views/res_partner.xml b/partner_noncommercial/views/res_partner.xml
new file mode 100644
index 00000000000..dbcfd25c690
--- /dev/null
+++ b/partner_noncommercial/views/res_partner.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_res_partner_filter" model="ir.ui.view">
+        <field name="inherit_id" ref="base.view_res_partner_filter" />
+        <field name="model">res.partner</field>
+        <field name="mode">extension</field>
+        <field type="xml" name="arch">
+            <!-- Default type_person also contains invoice and delivery
+                 addresses for companies (and persons). -->
+            <filter name="type_person" position="attributes">
+                <attribute
+                    name="domain"
+                    operation="domain_add"
+                >[('type', '=', 'contact')]</attribute>
+            </filter>
+
+            <!-- Change string of Company filter to Organizations. -->
+            <filter name="type_company" position="attributes">
+                <attribute name="string">Organizations</attribute>
+            </filter>
+
+            <filter name="group_company" position="attributes">
+                <attribute name="string">Organization</attribute>
+            </filter>
+
+            <!-- Rename salesperson to responsible -->
+            <filter name="salesperson" position="attributes">
+                <attribute name="string">Responsible</attribute>
+            </filter>
+
+            <!-- Add extra filters. -->
+            <filter name="inactive" position="after">
+                <separator />
+                <filter
+                    string="With email"
+                    name="filter_email"
+                    domain="[('email', '!=', False)]"
+                />
+                <filter
+                    string="With address"
+                    name="filter_address"
+                    domain="[('street', '!=', False), ('street', '!=', ''),
+                             ('city', '!=', False), ('city', '!=', '')]"
+                />
+            </filter>
+
+            <!-- Add extra groupings. -->
+            <filter name="group_country" position="after">
+                <filter
+                    name="group_city"
+                    string="City"
+                    context="{'group_by': 'city'}"
+                />
+            </filter>
+        </field>
+    </record>
+    <record id="view_partner_simple_form" model="ir.ui.view">
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="base.view_partner_simple_form" />
+        <field name="arch" type="xml">
+            <!-- Change placeholders -->
+            <field name="parent_id" position="attributes">
+                <attribute name="placeholder">Organization Name...</attribute>
+            </field>
+        </field>
+    </record>
+    <record id="view_partner_form" model="ir.ui.view">
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="base.view_partner_form" />
+        <field name="priority">99</field>
+        <field name="arch" type="xml">
+            <!-- Change placeholders -->
+            <xpath expr="//field[@id='company']" position="attributes">
+                <attribute name="placeholder">e.g. Unicef</attribute>
+            </xpath>
+            <field name="parent_id" position="attributes">
+                <attribute name="placeholder">Organization Name...</attribute>
+            </field>
+            <field name="function" position="attributes">
+                <attribute name="placeholder">e.g. Board Member</attribute>
+            </field>
+            <!-- Change tab titles -->
+            <page name="sales_purchases" position="attributes">
+                <attribute name="string">Details</attribute>
+            </page>
+            <!-- Change help texts of company types -->
+            <xpath
+                expr="//field[@name='child_ids']/form//field[@name='type']/following-sibling::div[hasclass('oe_edit_only')]/p[@invisible=&quot;type != 'contact'&quot;]/span"
+                position="replace"
+            >
+                <span
+                >Use this to organize the contact details of members of a given organization</span>
+            </xpath>
+            <xpath
+                expr="//field[@name='child_ids']/form//field[@name='type']/following-sibling::div[hasclass('oe_edit_only')]/p[@invisible=&quot;type != 'invoice'&quot;]/span"
+                position="replace"
+            >
+                <span
+                >Preferred address for all invoices. Selected by default when you invoice an order that belongs to this organization.</span>
+            </xpath>
+            <xpath
+                expr="//field[@name='child_ids']/form//field[@name='type']/following-sibling::div[hasclass('oe_edit_only')]/p[@invisible=&quot;type != 'delivery'&quot;]/span"
+                position="replace"
+            >
+                <span
+                >Preferred address for all deliveries. Selected by default when you deliver an order that belongs to this organization.</span>
+            </xpath>
+            <xpath
+                expr="//field[@name='child_ids']/form//field[@name='type']/following-sibling::div[hasclass('oe_edit_only')]/p[@invisible=&quot;type != 'other'&quot;]/span"
+                position="replace"
+            >
+                <span>Other address for the organization</span>
+            </xpath>
+        </field>
+    </record>
+</odoo>