From 65f1c709b58b59f409f25c287a3a40ac253c0577 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Wed, 9 Dec 2020 11:42:03 -0800 Subject: [PATCH 1/2] [ADD] box_base, box_printbox, box_shipbox: from submodule `hiboubox` --- .gitmodules | 3 +++ box_base | 1 + box_printbox | 1 + box_shipbox | 1 + external/hiboubox | 1 + 5 files changed, 7 insertions(+) create mode 120000 box_base create mode 120000 box_printbox create mode 120000 box_shipbox create mode 160000 external/hiboubox diff --git a/.gitmodules b/.gitmodules index 73c65265..9bedff84 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,6 @@ [submodule "external/hibou-oca/queue"] path = external/hibou-oca/queue url = https://github.com/hibou-io/oca-queue.git +[submodule "external/hiboubox"] + path = external/hiboubox + url = https://gitlab.com/hibou-io/hibou-odoo/hiboubox.git diff --git a/box_base b/box_base new file mode 120000 index 00000000..927a8be2 --- /dev/null +++ b/box_base @@ -0,0 +1 @@ +./external/hiboubox/box_base \ No newline at end of file diff --git a/box_printbox b/box_printbox new file mode 120000 index 00000000..32a05aa1 --- /dev/null +++ b/box_printbox @@ -0,0 +1 @@ +./external/hiboubox/box_printbox \ No newline at end of file diff --git a/box_shipbox b/box_shipbox new file mode 120000 index 00000000..e6ddf932 --- /dev/null +++ b/box_shipbox @@ -0,0 +1 @@ +./external/hiboubox/box_shipbox \ No newline at end of file diff --git a/external/hiboubox b/external/hiboubox new file mode 160000 index 00000000..024ce743 --- /dev/null +++ b/external/hiboubox @@ -0,0 +1 @@ +Subproject commit 024ce74355a15c480ee91878fefae97039de73d8 From df379f4bee68817d1b35c59d07221d2590d4aa3b Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Wed, 9 Dec 2020 11:56:00 -0800 Subject: [PATCH 2/2] [MOV] shipbox: remove `hibou-shipbox` submodule, use `shipbox` module from `hiboubox` submodule --- .gitmodules | 3 --- external/hibou-shipbox | 1 - shipbox | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) delete mode 160000 external/hibou-shipbox diff --git a/.gitmodules b/.gitmodules index 9bedff84..cc6be510 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,9 +16,6 @@ [submodule "external/camptocamp-cloud-platform"] path = external/camptocamp-cloud-platform url = https://github.com/hibou-io/camptocamp-cloud-platform -[submodule "external/hibou-shipbox"] - path = external/hibou-shipbox - url = https://gitlab.com/hibou-io/hibou-odoo/shipbox.git [submodule "external/hibou-oca/queue"] path = external/hibou-oca/queue url = https://github.com/hibou-io/oca-queue.git diff --git a/external/hibou-shipbox b/external/hibou-shipbox deleted file mode 160000 index e0a0f3e9..00000000 --- a/external/hibou-shipbox +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e0a0f3e9c6664c8e5e46cc77ff9c89dccb514fee diff --git a/shipbox b/shipbox index e077c55d..45ee84a1 120000 --- a/shipbox +++ b/shipbox @@ -1 +1 @@ -./external/hibou-shipbox/shipbox \ No newline at end of file +./external/hiboubox/shipbox \ No newline at end of file