Merge branch 'add/13.0/box_base' into 13.0-test

# Conflicts: # .gitmodules
2025-01-20 12:37:31 +02:00 · 2020-12-09 12:00:12 -08:00
parent e3962e4f2e df379f4bee
commit 755e28a3c7
7 changed files with 8 additions and 5 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,10 +16,10 @@
 [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
+[submodule "external/hiboubox"]
+	path = external/hiboubox
+	url = https://gitlab.com/hibou-io/hibou-odoo/hiboubox.git

--- a/1
+++ b/1
@@ -0,0 +1 @@
+./external/hiboubox/box_base
--- a/1
+++ b/1
@@ -0,0 +1 @@
+./external/hiboubox/box_printbox
--- a/1
+++ b/1
@@ -0,0 +1 @@
+./external/hiboubox/box_shipbox
--- a/external/hibou-shipbox
+++ b/external/hibou-shipbox
--- a/external/hiboubox
+++ b/external/hiboubox
--- a/2
+++ b/2
@@ -1 +1 @@
-./external/hibou-shipbox/shipbox
+./external/hiboubox/shipbox