diff --git a/.dev/official_modules.txt b/.dev/official_modules.txt index f97f1bc..e2f3bac 100644 --- a/.dev/official_modules.txt +++ b/.dev/official_modules.txt @@ -1,4 +1,7 @@ country company account_stock_continental -sale_point +account_statement +sale_invoice_grouping +purchase +sale_price_list diff --git a/.gitmodules b/.gitmodules index 0364d7d..a083b61 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,3 +9,31 @@ [submodule "naliia"] path = modules/naliia url = ssh://git@gitea.onecluster.org:6666/Aserrador/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 + branch = 7.6 +[submodule "modules/sale_shop"] + path = modules/sale_shop + url = ssh://git@gitea.onecluster.org:6666/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 + branch = 7.6 +[submodule "modules/sale_payment"] + path = modules/sale_payment + url = ssh://git@gitea.onecluster.org:6666/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 + 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 + 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 + branch = 7.6 diff --git a/Rakefile b/Rakefile index 7f1ede0..523a97c 100644 --- a/Rakefile +++ b/Rakefile @@ -90,7 +90,7 @@ namespace :live do compose('exec', '-it', '--user', 'postgres', 'db', "bash -c 'dropdb -U tryton #{args.database}'") compose('exec', '-it', '--user', 'postgres', 'db', "bash -c 'createdb -U tryton #{args.database}'") compose('restart', "live", compose: "compose.live.yml") - sleep(30) + sleep(40) compose('exec', 'live', "bash -c 'python3 demo/populate_scripts/__main__.py -c .dev/trytond.cfg -d #{args.database}'") compose('restart', 'live', compose: "compose.live.yml") else diff --git a/demo/data/config.json b/demo/data/config.json index 26fa0a9..6de9bf7 100644 --- a/demo/data/config.json +++ b/demo/data/config.json @@ -17,14 +17,16 @@ }, "company_currency": "COP", "modules": [ + "account", "company", "country", "currency", "party", "party_co", "product", - "sale_point", - "naliia" + "naliia", + "naliia_shop", + "sale_pos_extras" ] } diff --git a/modules/purchase_one_click b/modules/purchase_one_click new file mode 160000 index 0000000..823ec91 --- /dev/null +++ b/modules/purchase_one_click @@ -0,0 +1 @@ +Subproject commit 823ec91563d6694b6819a8b38962f3708f15a523 diff --git a/modules/sale_one_click b/modules/sale_one_click new file mode 160000 index 0000000..dddb2b9 --- /dev/null +++ b/modules/sale_one_click @@ -0,0 +1 @@ +Subproject commit dddb2b955bd8884e84e0a9bb3499b2b993bbc0f5 diff --git a/modules/sale_payment b/modules/sale_payment new file mode 160000 index 0000000..ccda3c7 --- /dev/null +++ b/modules/sale_payment @@ -0,0 +1 @@ +Subproject commit ccda3c7734945bf99d8af3e666df93d4bb5ab788 diff --git a/modules/sale_pos b/modules/sale_pos new file mode 160000 index 0000000..3252948 --- /dev/null +++ b/modules/sale_pos @@ -0,0 +1 @@ +Subproject commit 325294846d368e79f03b58c3b1e627e914f6b925 diff --git a/modules/sale_pos_extras b/modules/sale_pos_extras new file mode 160000 index 0000000..3831eff --- /dev/null +++ b/modules/sale_pos_extras @@ -0,0 +1 @@ +Subproject commit 3831effee2e09f1029b157a87e587f26329e4ea5 diff --git a/modules/sale_shop b/modules/sale_shop new file mode 160000 index 0000000..e8aa215 --- /dev/null +++ b/modules/sale_shop @@ -0,0 +1 @@ +Subproject commit e8aa2154bc6f94041122a2cb91f0102425f12810 diff --git a/modules/sale_w_tax b/modules/sale_w_tax new file mode 160000 index 0000000..8ddb605 --- /dev/null +++ b/modules/sale_w_tax @@ -0,0 +1 @@ +Subproject commit 8ddb605c33dc99db5044ba16170e0498db24b2c5