From 2511d6ef7abc5a32dc05082382a84eb2dee52a6b Mon Sep 17 00:00:00 2001 From: aserrador Date: Thu, 6 Nov 2025 22:00:01 -0500 Subject: [PATCH 1/9] feat: add docker-compose.yaml --- docker-compose.yaml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 docker-compose.yaml diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000..01cdda1 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,33 @@ +services: + db: + image: postgres:12 + environment: + - POSTGRES_USER=${POSTGRES_USER} + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + - POSTGRES_DB=${POSTGRES_DB} + live: + build: + context: . + dockerfile: Dockerfile_Live + args: + TRYTOND_VERSION: ${TRYTOND_VERSION} + depends_on: + - db + command: bash .dev/run.sh + environment: + - DB_NAME=${POSTGRES_DB} + - SRC=/app + - TRYTOND_DATABASE_URI=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DB_HOSTNAME}:5432/ + volumes: + - .:/app + - attachments:/attachments + - ./.dev/pudb.cfg:/root/.config/pudb/pudb.cfg + ports: + - "${TRYTOND_PORT_LIVE:-18020}:8000" + - "${PUDB_PORT_LIVE:-8020}:8020" + working_dir: /app + env_file: + - .env +volumes: + app: + attachments: From 558a793d473328e2b5a9e533d27f195ca8584151 Mon Sep 17 00:00:00 2001 From: aserrador Date: Thu, 6 Nov 2025 22:32:45 -0500 Subject: [PATCH 2/9] fix: Update submodules path --- .gitmodules | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitmodules b/.gitmodules index db4bce0..6e3f31d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,46 +1,46 @@ [submodule "modules/party_co"] path = modules/party_co - url = ssh://git@gitea.onecluster.org:6666/OneTeam/trytondo-party_co.git + url = https://gitea.onecluster.org/OneTeam/trytondo-party_co.git branch = main [submodule "web_app"] path = web_app - url = ssh://git@gitea.onecluster.org:6666/OneTeam/Naliia_webapp.git + url = https://gitea.onecluster.org/OneTeam/Naliia_webapp.git branch = main [submodule "naliia"] path = modules/naliia - url = ssh://git@gitea.onecluster.org:6666/OneTeam/trytond-au-naliia.git + url = https://gitea.onecluster.org/OneTeam/trytond-au-naliia.git [submodule "modules/sale_w_tax"] path = modules/sale_w_tax - url = ssh://git@gitea.onecluster.org:6666/OneTeam/trytondo-sale_w_tax.git + url = https://gitea.onecluster.org/OneTeam/trytondo-sale_w_tax.git branch = 7.6 [submodule "modules/sale_shop"] path = modules/sale_shop - url = ssh://git@gitea.onecluster.org:6666/OneTeam/trytondo-sale_shop.git + url = https://gitea.onecluster.org/OneTeam/trytondo-sale_shop.git branch = 7.6 [submodule "modules/sale_pos"] path = modules/sale_pos - url = ssh://git@gitea.onecluster.org:6666/OneTeam/trytondo-sale_pos.git + url = https://gitea.onecluster.org/OneTeam/trytondo-sale_pos.git branch = 7.6 [submodule "modules/sale_payment"] path = modules/sale_payment - url = ssh://git@gitea.onecluster.org:6666/OneTeam/trytondo-sale_payment.git + url = https://gitea.onecluster.org/OneTeam/trytondo-sale_payment.git branch = 7.6 [submodule "modules/sale_pos_extras"] path = modules/sale_pos_extras - url = ssh://git@gitea.onecluster.org:6666/OneTeam/trytondo-sale_pos_extras.git + url = https://gitea.onecluster.org/OneTeam/trytondo-sale_pos_extras.git branch = 7.6 [submodule "modules/sale_one_click"] path = modules/sale_one_click - url = ssh://git@gitea.onecluster.org:6666/OneTeam/trytondo-sale_one_click.git + url = https://gitea.onecluster.org/OneTeam/trytondo-sale_one_click.git branch = 7.6 [submodule "modules/purchase_one_click"] path = modules/purchase_one_click - url = ssh://git@gitea.onecluster.org:6666/OneTeam/trytondo-purchase_one_click.git + url = https://gitea.onecluster.org/OneTeam/trytondo-purchase_one_click.git branch = 7.6 [submodule "modules/naliia_shop"] path = modules/naliia_shop - url = ssh://git@gitea.onecluster.org:6666/OneTeam/trytond-au-naliia_shop.git + url = https://gitea.onecluster.org/OneTeam/trytond-au-naliia_shop.git [submodule "modules/naliia_payment"] path = modules/naliia_payment - url = ssh://git@gitea.onecluster.org:6666/OneTeam/trytond-au-naliia_payment.git + url = https://gitea.onecluster.org/OneTeam/trytond-au-naliia_payment.git branch = main From edae8c39679c5cd23dcc9c84d6e6ea3d26bdc64c Mon Sep 17 00:00:00 2001 From: aserrador Date: Thu, 6 Nov 2025 22:35:34 -0500 Subject: [PATCH 3/9] fix: submodules path --- .gitmodules | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6e3f31d..f8367fa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,43 +4,43 @@ branch = main [submodule "web_app"] path = web_app - url = https://gitea.onecluster.org/OneTeam/Naliia_webapp.git + url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/Naliia_webapp.git branch = main [submodule "naliia"] path = modules/naliia - url = https://gitea.onecluster.org/OneTeam/trytond-au-naliia.git + url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/trytond-au-naliia.git [submodule "modules/sale_w_tax"] path = modules/sale_w_tax - url = https://gitea.onecluster.org/OneTeam/trytondo-sale_w_tax.git + url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/trytondo-sale_w_tax.git branch = 7.6 [submodule "modules/sale_shop"] path = modules/sale_shop - url = https://gitea.onecluster.org/OneTeam/trytondo-sale_shop.git + url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/trytondo-sale_shop.git branch = 7.6 [submodule "modules/sale_pos"] path = modules/sale_pos - url = https://gitea.onecluster.org/OneTeam/trytondo-sale_pos.git + url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/trytondo-sale_pos.git branch = 7.6 [submodule "modules/sale_payment"] path = modules/sale_payment - url = https://gitea.onecluster.org/OneTeam/trytondo-sale_payment.git + url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/trytondo-sale_payment.git branch = 7.6 [submodule "modules/sale_pos_extras"] path = modules/sale_pos_extras - url = https://gitea.onecluster.org/OneTeam/trytondo-sale_pos_extras.git + url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/trytondo-sale_pos_extras.git branch = 7.6 [submodule "modules/sale_one_click"] path = modules/sale_one_click - url = https://gitea.onecluster.org/OneTeam/trytondo-sale_one_click.git + url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/trytondo-sale_one_click.git branch = 7.6 [submodule "modules/purchase_one_click"] path = modules/purchase_one_click - url = https://gitea.onecluster.org/OneTeam/trytondo-purchase_one_click.git + url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/trytondo-purchase_one_click.git branch = 7.6 [submodule "modules/naliia_shop"] path = modules/naliia_shop - url = https://gitea.onecluster.org/OneTeam/trytond-au-naliia_shop.git + url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/trytond-au-naliia_shop.git [submodule "modules/naliia_payment"] path = modules/naliia_payment - url = https://gitea.onecluster.org/OneTeam/trytond-au-naliia_payment.git + url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/trytond-au-naliia_payment.git branch = main From 3740330f869679e9dd2a785e8d191257fd101d6b Mon Sep 17 00:00:00 2001 From: aserrador Date: Thu, 6 Nov 2025 22:37:37 -0500 Subject: [PATCH 4/9] fix: update submodules path --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index f8367fa..16ea6ab 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ [submodule "modules/party_co"] path = modules/party_co - url = https://gitea.onecluster.org/OneTeam/trytondo-party_co.git + url = https://aserrador:3sh0r4d3s3gu1r/OneTeam/trytondo-party_co.git branch = main [submodule "web_app"] path = web_app url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/Naliia_webapp.git branch = main -[submodule "naliia"] +[submodule "modules/naliia"] path = modules/naliia url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/trytond-au-naliia.git [submodule "modules/sale_w_tax"] From a8b99f5aa2b6414742666f3fe7a2761610f8e11d Mon Sep 17 00:00:00 2001 From: aserrador Date: Thu, 6 Nov 2025 22:38:55 -0500 Subject: [PATCH 5/9] fix: path --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 16ea6ab..d9c51fc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "modules/party_co"] path = modules/party_co - url = https://aserrador:3sh0r4d3s3gu1r/OneTeam/trytondo-party_co.git + url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/trytondo-party_co.git branch = main [submodule "web_app"] path = web_app From 2e2c5fea18ee27e21a5beb53a91b8f447c51564a Mon Sep 17 00:00:00 2001 From: aserrador Date: Thu, 6 Nov 2025 22:48:41 -0500 Subject: [PATCH 6/9] fix: .dev/run.sh path --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 01cdda1..8516fda 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -13,7 +13,7 @@ services: TRYTOND_VERSION: ${TRYTOND_VERSION} depends_on: - db - command: bash .dev/run.sh + command: bash /app/.dev/run.sh environment: - DB_NAME=${POSTGRES_DB} - SRC=/app From 40af2316c6ed3cb96cff0271a72dbbf26a80e6b2 Mon Sep 17 00:00:00 2001 From: aserrador Date: Thu, 6 Nov 2025 22:51:27 -0500 Subject: [PATCH 7/9] fix --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 8516fda..4431a57 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -19,7 +19,7 @@ services: - SRC=/app - TRYTOND_DATABASE_URI=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DB_HOSTNAME}:5432/ volumes: - - .:/app + - ./:/app - attachments:/attachments - ./.dev/pudb.cfg:/root/.config/pudb/pudb.cfg ports: From 489128fd4db0f0ceb80b1ad21886640054d89f2a Mon Sep 17 00:00:00 2001 From: Aserrador Date: Sat, 8 Nov 2025 11:07:51 -0500 Subject: [PATCH 8/9] Actualizar docker-compose.yaml --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 4431a57..bd09adc 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -20,7 +20,7 @@ services: - TRYTOND_DATABASE_URI=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DB_HOSTNAME}:5432/ volumes: - ./:/app - - attachments:/attachments + - ./attachments:/attachments - ./.dev/pudb.cfg:/root/.config/pudb/pudb.cfg ports: - "${TRYTOND_PORT_LIVE:-18020}:8000" From 543fc2a4ebe48adcfa41e1d4461c6bed8ac5a37a Mon Sep 17 00:00:00 2001 From: aserrador Date: Mon, 5 Jan 2026 20:12:05 -0500 Subject: [PATCH 9/9] feat: Add account_co_pyme submodule --- .gitmodules | 4 ++++ modules/account_co_pyme | 1 + 2 files changed, 5 insertions(+) create mode 160000 modules/account_co_pyme diff --git a/.gitmodules b/.gitmodules index d9c51fc..eaa6318 100644 --- a/.gitmodules +++ b/.gitmodules @@ -44,3 +44,7 @@ path = modules/naliia_payment url = https://aserrador:3sh0r4d3s3gu1r@gitea.onecluster.org/OneTeam/trytond-au-naliia_payment.git branch = main +[submodule "modules/account_co_pyme"] + path = modules/account_co_pyme + url = ssh://git@gitea.onecluster.org:6666/OneTeam/trytondo-account_co_pyme.git + branch = 7.6 diff --git a/modules/account_co_pyme b/modules/account_co_pyme new file mode 160000 index 0000000..e49d942 --- /dev/null +++ b/modules/account_co_pyme @@ -0,0 +1 @@ +Subproject commit e49d942e466dac6b7b3adf406da43bd82898e50c