From a74b76c7db2334e8dabea7eac1eb13ddc4ca15ec Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Thu, 29 Oct 2020 13:17:42 -0700 Subject: [PATCH 1/5] [MIG] auditlog, purchase_exception, purchase_minimum_amount: from hibou-oca existing submodules --- auditlog | 1 + purchase_exception | 1 + purchase_minimum_amount | 1 + 3 files changed, 3 insertions(+) create mode 120000 auditlog create mode 120000 purchase_exception create mode 120000 purchase_minimum_amount diff --git a/auditlog b/auditlog new file mode 120000 index 00000000..d456b705 --- /dev/null +++ b/auditlog @@ -0,0 +1 @@ +./external/hibou-oca/server-tools/auditlog \ No newline at end of file diff --git a/purchase_exception b/purchase_exception new file mode 120000 index 00000000..25c41368 --- /dev/null +++ b/purchase_exception @@ -0,0 +1 @@ +./external/hibou-oca/purchase-workflow/purchase_exception \ No newline at end of file diff --git a/purchase_minimum_amount b/purchase_minimum_amount new file mode 120000 index 00000000..72a12fcf --- /dev/null +++ b/purchase_minimum_amount @@ -0,0 +1 @@ +./external/hibou-oca/purchase-workflow/purchase_minimum_amount \ No newline at end of file From 9f2878bc1794360edcb42940ef608e986a82acd0 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Thu, 29 Oct 2020 16:02:38 -0700 Subject: [PATCH 2/5] [ADD] hibou-oca/purchase-workflow submodule --- .gitmodules | 3 +++ external/hibou-oca/purchase-workflow | 1 + 2 files changed, 4 insertions(+) create mode 160000 external/hibou-oca/purchase-workflow diff --git a/.gitmodules b/.gitmodules index 24cb44ff..d6fc7e5f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -39,3 +39,6 @@ [submodule "external/hibou-oca/connector-magento"] path = external/hibou-oca/connector-magento url = https://github.com/hibou-io/oca-connector-magento.git +[submodule "external/hibou-oca/purchase-workflow"] + path = external/hibou-oca/purchase-workflow + url = https://github.com/hibou-io/oca-purchase-workflow.git diff --git a/external/hibou-oca/purchase-workflow b/external/hibou-oca/purchase-workflow new file mode 160000 index 00000000..cafb62ab --- /dev/null +++ b/external/hibou-oca/purchase-workflow @@ -0,0 +1 @@ +Subproject commit cafb62abc97d487a51bd48053ea2c7108384db92 From 157e1219cf0e4c7b78fa62c60de450f89132918e Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Fri, 30 Oct 2020 09:19:24 -0700 Subject: [PATCH 3/5] [ADD] openupgradelib to Dockerfile --- Dockerfile | 4 ++++ Dockerfile-GitLab | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Dockerfile b/Dockerfile index ab5d9837..b16b215c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,9 @@ FROM hibou/hibou-odoo:12.0 +USER 0 +RUN pip install git+git://github.com/OCA/openupgradelib.git + +USER 104 COPY --chown=104 . /opt/odoo/hibou-suite RUN rm /etc/odoo/odoo.conf \ && cp /opt/odoo/hibou-suite/debian/odoo.conf /etc/odoo/odoo.conf \ diff --git a/Dockerfile-GitLab b/Dockerfile-GitLab index 17df09f1..8697e56a 100644 --- a/Dockerfile-GitLab +++ b/Dockerfile-GitLab @@ -1,5 +1,9 @@ FROM registry.gitlab.com/hibou-io/hibou-odoo/odoo:RELEASE +USER 0 +RUN pip install git+git://github.com/OCA/openupgradelib.git + +USER 104 COPY --chown=104 . /opt/odoo/hibou-suite RUN rm /etc/odoo/odoo.conf \ && cp /opt/odoo/hibou-suite/debian/odoo.conf /etc/odoo/odoo.conf \ From f42328fc6f1e3969be0ef691a9008cbe472f694a Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Fri, 30 Oct 2020 10:09:39 -0700 Subject: [PATCH 4/5] [FIX] builds with openupgradelib --- Dockerfile | 13 ++++++++++++- Dockerfile-GitLab | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b16b215c..ef1d55e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,18 @@ FROM hibou/hibou-odoo:12.0 +# All this just for openupgradelib USER 0 -RUN pip install git+git://github.com/OCA/openupgradelib.git +RUN set -x; \ + apt update && apt install -y git \ + && pip install git+git://github.com/OCA/openupgradelib.git \ + # Clean Up + && apt remove -y git \ + && apt autoremove -y \ + && rm -rf /root/.cache \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* \ + && rm -rf /tmp/* \ + ; USER 104 COPY --chown=104 . /opt/odoo/hibou-suite diff --git a/Dockerfile-GitLab b/Dockerfile-GitLab index 8697e56a..4e9a4984 100644 --- a/Dockerfile-GitLab +++ b/Dockerfile-GitLab @@ -1,7 +1,18 @@ FROM registry.gitlab.com/hibou-io/hibou-odoo/odoo:RELEASE +# All this just for openupgradelib USER 0 -RUN pip install git+git://github.com/OCA/openupgradelib.git +RUN set -x; \ + apt update && apt install -y git \ + && pip install git+git://github.com/OCA/openupgradelib.git \ + # Clean Up + && apt remove -y git \ + && apt autoremove -y \ + && rm -rf /root/.cache \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* \ + && rm -rf /tmp/* \ + ; USER 104 COPY --chown=104 . /opt/odoo/hibou-suite From 1d2983484d8f221a19944b8198ca0b0d52b5faa1 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Wed, 4 Nov 2020 12:48:24 -0800 Subject: [PATCH 5/5] [MIG] connector_magento_product_by_sku: to Odoo 12.0 --- external/hibou-oca/connector-magento | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/hibou-oca/connector-magento b/external/hibou-oca/connector-magento index 055dafb0..3433a239 160000 --- a/external/hibou-oca/connector-magento +++ b/external/hibou-oca/connector-magento @@ -1 +1 @@ -Subproject commit 055dafb0d7b572edc2331cbfdf54e76bf9c97f5a +Subproject commit 3433a2395b23414c8e64ccc8930e6b3f0b404ef0