From faf6ab77525395eb412e1714b8874d0b2fefebc2 Mon Sep 17 00:00:00 2001 From: Nicolas JEUDY Date: Thu, 13 Apr 2023 16:35:40 +0200 Subject: [PATCH] [NEW] add pending PR --- odoo/custom/dependencies/pip.txt | 1 + odoo/custom/src/addons.yaml | 2 ++ odoo/custom/src/repos.yaml | 50 +++++++++++++++++++++++++------- 3 files changed, 42 insertions(+), 11 deletions(-) diff --git a/odoo/custom/dependencies/pip.txt b/odoo/custom/dependencies/pip.txt index b1a4b96..7ff1495 100644 --- a/odoo/custom/dependencies/pip.txt +++ b/odoo/custom/dependencies/pip.txt @@ -34,3 +34,4 @@ jsondiff extendable-pydantic pdfplumber ipdb +factur-x diff --git a/odoo/custom/src/addons.yaml b/odoo/custom/src/addons.yaml index 9ff175e..6a79d91 100644 --- a/odoo/custom/src/addons.yaml +++ b/odoo/custom/src/addons.yaml @@ -144,3 +144,5 @@ spreadsheet: - "*" galicea-addons: - "*" +project-reporting: + - "*" diff --git a/odoo/custom/src/repos.yaml b/odoo/custom/src/repos.yaml index ae10fbb..1274a03 100644 --- a/odoo/custom/src/repos.yaml +++ b/odoo/custom/src/repos.yaml @@ -97,12 +97,14 @@ # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner # You may need a bigger depth when merging PRs (use $DEPTH_MERGE # for a sane value of 100 commits) - depth: $DEPTH_DEFAULT + depth: 400 remotes: oca: https://github.com/OCA/l10n-france.git target: oca 16.0 merges: - oca 16.0 + #- oca refs/pull/405/head + - oca refs/pull/430/head ./product-attribute: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -119,12 +121,26 @@ # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner # You may need a bigger depth when merging PRs (use $DEPTH_MERGE # for a sane value of 100 commits) - depth: $DEPTH_DEFAULT + depth: 200 remotes: oca: https://github.com/OCA/project.git target: oca 16.0 merges: - oca 16.0 + - oca refs/pull/1035/head + - oca refs/pull/1093/head +./project-reporting: + defaults: + # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner + # You may need a bigger depth when merging PRs (use $DEPTH_MERGE + # for a sane value of 100 commits) + depth: 200 + remotes: + oca: https://github.com/OCA/project-reporting.git + target: oca 16.0 + merges: + - oca 16.0 + - oca refs/pull/51/head ./website: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -141,12 +157,14 @@ # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner # You may need a bigger depth when merging PRs (use $DEPTH_MERGE # for a sane value of 100 commits) - depth: $DEPTH_DEFAULT + depth: 200 remotes: oca: https://github.com/OCA/web.git target: oca 16.0 merges: - oca 16.0 + - oca refs/pull/2470/head + - oca refs/pull/2328/head ./mis-builder: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -244,10 +262,10 @@ # merges: # - origin 16.0 ./muk-web: -# defaults: -# # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner -# # You may need a bigger depth when merging PRs (use $DEPTH_MERGE -# # for a sane value of 100 commits) + defaults: + # # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner + # # You may need a bigger depth when merging PRs (use $DEPTH_MERGE + # # for a sane value of 100 commits) depth: $DEPTH_DEFAULT remotes: origin: https://github.com/muk-it/muk_web.git @@ -281,12 +299,13 @@ # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner # You may need a bigger depth when merging PRs (use $DEPTH_MERGE # for a sane value of 100 commits) - depth: $DEPTH_DEFAULT + depth: 200 remotes: oca: https://github.com/OCA/server-tools.git target: oca 16.0 merges: - oca 16.0 + - oca refs/pull/2574/head ./wms: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -380,12 +399,17 @@ # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner # You may need a bigger depth when merging PRs (use $DEPTH_MERGE # for a sane value of 100 commits) - depth: $DEPTH_DEFAULT + depth: 200 remotes: oca: https://github.com/OCA/social.git target: oca 16.0 merges: - oca 16.0 + - oca refs/pull/976/head + - oca refs/pull/1059/head + - oca refs/pull/1073/head + - oca refs/pull/1091/head + - oca refs/pull/1099/head ./pos: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -468,12 +492,13 @@ # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner # You may need a bigger depth when merging PRs (use $DEPTH_MERGE # for a sane value of 100 commits) - depth: $DEPTH_DEFAULT + depth: 200 remotes: oca: https://github.com/OCA/multi-company.git target: oca 16.0 merges: - oca 16.0 + - oca refs/pull/451/head ./account-analytic: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -556,12 +581,15 @@ # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner # You may need a bigger depth when merging PRs (use $DEPTH_MERGE # for a sane value of 100 commits) - depth: $DEPTH_DEFAULT + depth: 200 remotes: oca: https://github.com/OCA/edi.git target: oca 16.0 merges: - oca 16.0 + - oca refs/pull/706/head + - oca refs/pull/724/head + - oca refs/pull/742/head ./timesheet: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner