From 82ef874d42039708632f67a0e88b6859d630fe74 Mon Sep 17 00:00:00 2001
From: red <redick@newlogic.com>
Date: Thu, 6 Jul 2023 10:09:11 +0800
Subject: [PATCH 1/6] changed repo of .pre-commit-config.yaml

---
 .pre-commit-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3612cee..7bf5531 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -38,12 +38,12 @@ repos:
       # update the NOT INSTALLABLE ADDONS section above
       - id: oca-update-pre-commit-excluded-addons
       - id: oca-fix-manifest-website
-        args: ["https://github.com/openspp/openspp-registry"]
+        args: ["https://github.com/openspp/openspp-base"]
       - id: oca-gen-addon-readme
         args:
           - --addons-dir=.
           - --org-name=openspp
-          - --repo-name=openspp-registry
+          - --repo-name=openspp-base
           - --branch=15.0
         stages: [manual]
       - id: oca-gen-addons-table

From 249ba97cc6275578a852507715c4c7af28d20451 Mon Sep 17 00:00:00 2001
From: red <redick@newlogic.com>
Date: Thu, 6 Jul 2023 10:13:02 +0800
Subject: [PATCH 2/6] added spp_country_office module

---
 .../odoo/addons/spp_country_office            |   1 +
 setup/spp_country_office/setup.py             |   6 +
 spp_country_office/README.rst                 |   0
 spp_country_office/__init__.py                |   1 +
 spp_country_office/__manifest__.py            |  25 ++++
 spp_country_office/models/__init__.py         |   0
 spp_country_office/tests/__init__.py          |   0
 .../views/country_office_views.xml            | 118 ++++++++++++++++++
 8 files changed, 151 insertions(+)
 create mode 120000 setup/spp_country_office/odoo/addons/spp_country_office
 create mode 100644 setup/spp_country_office/setup.py
 create mode 100644 spp_country_office/README.rst
 create mode 100644 spp_country_office/__init__.py
 create mode 100644 spp_country_office/__manifest__.py
 create mode 100644 spp_country_office/models/__init__.py
 create mode 100644 spp_country_office/tests/__init__.py
 create mode 100644 spp_country_office/views/country_office_views.xml

diff --git a/setup/spp_country_office/odoo/addons/spp_country_office b/setup/spp_country_office/odoo/addons/spp_country_office
new file mode 120000
index 0000000..194b115
--- /dev/null
+++ b/setup/spp_country_office/odoo/addons/spp_country_office
@@ -0,0 +1 @@
+../../../../spp_country_office
\ No newline at end of file
diff --git a/setup/spp_country_office/setup.py b/setup/spp_country_office/setup.py
new file mode 100644
index 0000000..28c57bb
--- /dev/null
+++ b/setup/spp_country_office/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/spp_country_office/README.rst b/spp_country_office/README.rst
new file mode 100644
index 0000000..e69de29
diff --git a/spp_country_office/__init__.py b/spp_country_office/__init__.py
new file mode 100644
index 0000000..0650744
--- /dev/null
+++ b/spp_country_office/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/spp_country_office/__manifest__.py b/spp_country_office/__manifest__.py
new file mode 100644
index 0000000..1392f88
--- /dev/null
+++ b/spp_country_office/__manifest__.py
@@ -0,0 +1,25 @@
+# Part of OpenSPP. See LICENSE file for full copyright and licensing details.
+{
+    "name": "OpenSPP Country Office",
+    "category": "OpenSPP",
+    "version": "15.0.0.0.0",
+    "sequence": 1,
+    "author": "OpenSPP.org",
+    "website": "https://github.com/openspp/openspp-base",
+    "license": "LGPL-3",
+    "development_status": "Alpha",
+    "maintainers": ["jeremi", "gonzalesedwin1123"],
+    "depends": [
+        "base",
+        "g2p_registry_base",
+    ],
+    "data": [
+        "views/country_office_views.xml",
+    ],
+    "assets": {},
+    "demo": [],
+    "images": [],
+    "application": True,
+    "installable": True,
+    "auto_install": False,
+}
diff --git a/spp_country_office/models/__init__.py b/spp_country_office/models/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/spp_country_office/tests/__init__.py b/spp_country_office/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/spp_country_office/views/country_office_views.xml b/spp_country_office/views/country_office_views.xml
new file mode 100644
index 0000000..a80cfff
--- /dev/null
+++ b/spp_country_office/views/country_office_views.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="view_country_office_form" model="ir.ui.view">
+        <field name="name">view_country_office_form</field>
+        <field name="model">res.company</field>
+        <field name="arch" type="xml">
+            <form string="Country Office">
+                <sheet>
+                    <field name="logo" widget="image" class="oe_avatar" />
+                    <div class="oe_title">
+                        <label for="name" string="Country Office Name" />
+                        <h1>
+                            <field name="name" placeholder="" />
+                        </h1>
+                    </div>
+                    <notebook colspan="4">
+                        <page string="General Information" name="general_info">
+                            <group>
+                                <group>
+                                    <label for="street" string="Address" />
+                                    <div class="o_address_format">
+                                        <field
+                                            name="street"
+                                            placeholder="Street..."
+                                            class="o_address_street"
+                                        />
+                                        <field
+                                            name="street2"
+                                            placeholder="Street 2..."
+                                            class="o_address_street"
+                                        />
+                                        <field name="city" placeholder="City" class="o_address_city" />
+                                        <field
+                                            name="state_id"
+                                            class="o_address_state"
+                                            placeholder="State"
+                                            options='{"no_open": True}'
+                                        />
+                                        <field name="zip" placeholder="ZIP" class="o_address_zip" />
+                                        <field
+                                            name="country_id"
+                                            placeholder="Country"
+                                            class="o_address_country"
+                                            options='{"no_open": True, "no_create": True}'
+                                        />
+                                    </div>
+                                    <field name="vat" />
+                                    <field
+                                        name="currency_id"
+                                        options="{'no_create': True, 'no_open': True}"
+                                        id="company_currency"
+                                        context="{'active_test': False}"
+                                    />
+                                </group>
+                                <group>
+                                    <field name="phone" class="o_force_ltr" />
+                                    <field name="mobile" class="o_force_ltr" />
+                                    <field name="email" />
+                                    <field
+                                        name="website"
+                                        string="Website"
+                                        widget="url"
+                                        placeholder="e.g. https://www.odoo.com"
+                                    />
+                                </group>
+                                <group name="social_media" />
+                            </group>
+                        </page>
+                    </notebook>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_country_office_tree" model="ir.ui.view">
+        <field name="name">view_country_office_tree</field>
+        <field name="model">res.company</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name" string="Country Office" />
+                <field name="country_id" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="action_res_country_office" model="ir.actions.act_window">
+        <field name="name">Country Office</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">res.company</field>
+        <field name="view_mode">tree,form</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+            Create a new Country Office
+            </p>
+        </field>
+    </record>
+
+    <record id="action_res_country_office_tree_view" model="ir.actions.act_window.view">
+        <field name="sequence" eval="1" />
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="view_country_office_tree" />
+        <field name="act_window_id" ref="action_res_country_office" />
+    </record>
+
+    <record id="action_res_country_office_form_view" model="ir.actions.act_window.view">
+        <field name="sequence" eval="1" />
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_country_office_form" />
+        <field name="act_window_id" ref="action_res_country_office" />
+    </record>
+
+    <menuitem
+        action="action_res_country_office"
+        id="menu_action_res_country_office"
+        parent="g2p_registry_base.g2p_configuration_menu_root"
+        sequence="11"
+    />
+</odoo>

From c1049175594046fc638508ad3604850de3ccd468 Mon Sep 17 00:00:00 2001
From: red <redick@newlogic.com>
Date: Thu, 6 Jul 2023 10:15:38 +0800
Subject: [PATCH 3/6] packages that is auto-removed by pre-commit

---
 requirements.txt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 441e9d9..9cd1629 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1 @@
 # generated from manifests external_dependencies
-apispec
-pyjwt>=2.4.0
-pyOpenSSL==22.0.0
-python-magic
-xlrd

From d0d7cd4ac44f71189b30c2837578ae6b6ddda4eb Mon Sep 17 00:00:00 2001
From: red <redick@newlogic.com>
Date: Wed, 26 Jul 2023 08:21:43 +0800
Subject: [PATCH 4/6] fixed error in test with Odoo and test with OCB

---
 test-requirements.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 85db9b9..5a36f94 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,5 +1,5 @@
-git+https://github.com/OpenG2P/openg2p-registry@v15.0-1.0.1#subdirectory=setup/g2p_registry_base
-git+https://github.com/OpenG2P/openg2p-registry@v15.0-1.0.1#subdirectory=setup/g2p_registry_group
-git+https://github.com/OpenG2P/openg2p-registry@v15.0-1.0.1#subdirectory=setup/g2p_registry_individual
-git+https://github.com/OpenG2P/openg2p-registry@v15.0-1.0.1#subdirectory=setup/g2p_registry_membership
+git+https://github.com/OpenG2P/openg2p-registry@15.0-develop#subdirectory=setup/g2p_registry_base
+git+https://github.com/OpenG2P/openg2p-registry@15.0-develop#subdirectory=setup/g2p_registry_group
+git+https://github.com/OpenG2P/openg2p-registry@15.0-develop#subdirectory=setup/g2p_registry_individual
+git+https://github.com/OpenG2P/openg2p-registry@15.0-develop#subdirectory=setup/g2p_registry_membership
 cryptography==38.0.4

From af7457b6d26cac488c69761ae22b5f6e8400ddec Mon Sep 17 00:00:00 2001
From: red <redick@newlogic.com>
Date: Wed, 26 Jul 2023 11:01:18 +0800
Subject: [PATCH 5/6] Revert "fixed error in test with Odoo and test with OCB"

This reverts commit d0d7cd4ac44f71189b30c2837578ae6b6ddda4eb.
---
 test-requirements.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 5a36f94..85db9b9 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,5 +1,5 @@
-git+https://github.com/OpenG2P/openg2p-registry@15.0-develop#subdirectory=setup/g2p_registry_base
-git+https://github.com/OpenG2P/openg2p-registry@15.0-develop#subdirectory=setup/g2p_registry_group
-git+https://github.com/OpenG2P/openg2p-registry@15.0-develop#subdirectory=setup/g2p_registry_individual
-git+https://github.com/OpenG2P/openg2p-registry@15.0-develop#subdirectory=setup/g2p_registry_membership
+git+https://github.com/OpenG2P/openg2p-registry@v15.0-1.0.1#subdirectory=setup/g2p_registry_base
+git+https://github.com/OpenG2P/openg2p-registry@v15.0-1.0.1#subdirectory=setup/g2p_registry_group
+git+https://github.com/OpenG2P/openg2p-registry@v15.0-1.0.1#subdirectory=setup/g2p_registry_individual
+git+https://github.com/OpenG2P/openg2p-registry@v15.0-1.0.1#subdirectory=setup/g2p_registry_membership
 cryptography==38.0.4

From 636daf545b2da63ddd0ecb87cc1c4a0b8ce9100f Mon Sep 17 00:00:00 2001
From: red <redick@newlogic.com>
Date: Mon, 7 Aug 2023 18:42:44 +0800
Subject: [PATCH 6/6] change module name, added users and groups

---
 .../odoo/addons/spp_base_setting                 |  1 +
 .../setup.py                                     |  0
 .../odoo/addons/spp_country_office               |  1 -
 .../README.rst                                   |  0
 .../__init__.py                                  |  0
 .../__manifest__.py                              |  3 ++-
 .../models/__init__.py                           |  0
 .../tests/__init__.py                            |  0
 .../views/country_office_views.xml               |  0
 spp_base_setting/views/res_users_views.xml       | 16 ++++++++++++++++
 10 files changed, 19 insertions(+), 2 deletions(-)
 create mode 120000 setup/spp_base_setting/odoo/addons/spp_base_setting
 rename setup/{spp_country_office => spp_base_setting}/setup.py (100%)
 delete mode 120000 setup/spp_country_office/odoo/addons/spp_country_office
 rename {spp_country_office => spp_base_setting}/README.rst (100%)
 rename {spp_country_office => spp_base_setting}/__init__.py (100%)
 rename {spp_country_office => spp_base_setting}/__manifest__.py (89%)
 rename {spp_country_office => spp_base_setting}/models/__init__.py (100%)
 rename {spp_country_office => spp_base_setting}/tests/__init__.py (100%)
 rename {spp_country_office => spp_base_setting}/views/country_office_views.xml (100%)
 create mode 100644 spp_base_setting/views/res_users_views.xml

diff --git a/setup/spp_base_setting/odoo/addons/spp_base_setting b/setup/spp_base_setting/odoo/addons/spp_base_setting
new file mode 120000
index 0000000..b8ca653
--- /dev/null
+++ b/setup/spp_base_setting/odoo/addons/spp_base_setting
@@ -0,0 +1 @@
+../../../../spp_base_setting
\ No newline at end of file
diff --git a/setup/spp_country_office/setup.py b/setup/spp_base_setting/setup.py
similarity index 100%
rename from setup/spp_country_office/setup.py
rename to setup/spp_base_setting/setup.py
diff --git a/setup/spp_country_office/odoo/addons/spp_country_office b/setup/spp_country_office/odoo/addons/spp_country_office
deleted file mode 120000
index 194b115..0000000
--- a/setup/spp_country_office/odoo/addons/spp_country_office
+++ /dev/null
@@ -1 +0,0 @@
-../../../../spp_country_office
\ No newline at end of file
diff --git a/spp_country_office/README.rst b/spp_base_setting/README.rst
similarity index 100%
rename from spp_country_office/README.rst
rename to spp_base_setting/README.rst
diff --git a/spp_country_office/__init__.py b/spp_base_setting/__init__.py
similarity index 100%
rename from spp_country_office/__init__.py
rename to spp_base_setting/__init__.py
diff --git a/spp_country_office/__manifest__.py b/spp_base_setting/__manifest__.py
similarity index 89%
rename from spp_country_office/__manifest__.py
rename to spp_base_setting/__manifest__.py
index 1392f88..16d2605 100644
--- a/spp_country_office/__manifest__.py
+++ b/spp_base_setting/__manifest__.py
@@ -1,6 +1,6 @@
 # Part of OpenSPP. See LICENSE file for full copyright and licensing details.
 {
-    "name": "OpenSPP Country Office",
+    "name": "OpenSPP Base Settings",
     "category": "OpenSPP",
     "version": "15.0.0.0.0",
     "sequence": 1,
@@ -15,6 +15,7 @@
     ],
     "data": [
         "views/country_office_views.xml",
+        "views/res_users_views.xml",
     ],
     "assets": {},
     "demo": [],
diff --git a/spp_country_office/models/__init__.py b/spp_base_setting/models/__init__.py
similarity index 100%
rename from spp_country_office/models/__init__.py
rename to spp_base_setting/models/__init__.py
diff --git a/spp_country_office/tests/__init__.py b/spp_base_setting/tests/__init__.py
similarity index 100%
rename from spp_country_office/tests/__init__.py
rename to spp_base_setting/tests/__init__.py
diff --git a/spp_country_office/views/country_office_views.xml b/spp_base_setting/views/country_office_views.xml
similarity index 100%
rename from spp_country_office/views/country_office_views.xml
rename to spp_base_setting/views/country_office_views.xml
diff --git a/spp_base_setting/views/res_users_views.xml b/spp_base_setting/views/res_users_views.xml
new file mode 100644
index 0000000..f55ff2e
--- /dev/null
+++ b/spp_base_setting/views/res_users_views.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <menuitem
+        action="base.action_res_users"
+        id="menu_action_res_users"
+        parent="g2p_registry_base.g2p_configuration_menu_root"
+        sequence="0"
+    />
+    <menuitem
+        action="base.action_res_groups"
+        id="menu_action_res_groups"
+        parent="g2p_registry_base.g2p_configuration_menu_root"
+        groups="base.group_no_one"
+        sequence="3"
+    />
+</odoo>