diff --git a/.python-version b/.python-version new file mode 100644 index 0000000..a5c4c76 --- /dev/null +++ b/.python-version @@ -0,0 +1 @@ +3.9.0 diff --git a/common.yaml b/common.yaml index fed069b..82b1fb7 100644 --- a/common.yaml +++ b/common.yaml @@ -5,7 +5,7 @@ services: build: context: ./odoo args: - ODOO_VERSION: "14.0" + ODOO_VERSION: "15.0" UID: "${UID:-1000}" GID: "${GID:-1000}" environment: diff --git a/odoo/Dockerfile b/odoo/Dockerfile index 1d9b6dd..f6a69b0 100644 --- a/odoo/Dockerfile +++ b/odoo/Dockerfile @@ -1,2 +1,2 @@ ARG ODOO_VERSION -FROM docker.0k.io/mirror/4c894cb89e98/doodba:14.0-onbuild \ No newline at end of file +FROM ghcr.io/tecnativa/doodba:15.0-onbuild diff --git a/odoo/custom/dependencies/apt.txt b/odoo/custom/dependencies/apt.txt index 3b976da..a15f607 100644 --- a/odoo/custom/dependencies/apt.txt +++ b/odoo/custom/dependencies/apt.txt @@ -1,5 +1,3 @@ -python3-pandas -cups -libcups2-dev python3-dev build-essential +libcups2-dev diff --git a/odoo/custom/src/repos.yaml b/odoo/custom/src/repos.yaml index 88893b5..5040ccc 100644 --- a/odoo/custom/src/repos.yaml +++ b/odoo/custom/src/repos.yaml @@ -9,9 +9,9 @@ ocb: https://github.com/OCA/OCB.git odoo: https://github.com/odoo/odoo.git openupgrade: https://github.com/OCA/OpenUpgrade.git - target: ocb 14.0 + target: ocb 15.0 merges: - - ocb 14.0 + - ocb 15.0 # Example of a merge of the PR with the number # - oca refs/pull//head ./sale-workflow: @@ -22,9 +22,9 @@ depth: $DEPTH_DEFAULT remotes: origin: https://github.com/OCA/sale-workflow.git - target: origin 14.0 + target: origin 15.0 merges: - - origin 14.0 + - origin 15.0 ./partner-contact: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -34,9 +34,9 @@ remotes: oca: https://github.com/OCA/partner-contact.git myc: ssh://git@git.myceliandre.fr:5022/OCA/partner-contact.git - target: myc 14.0_partner_favorite + target: oca 15.0 merges: - - myc 14.0_partner_favorite + - oca 15.0 ./server-ux: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -45,9 +45,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/server-ux.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./bank-payment: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -56,9 +56,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/bank-payment.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./account-financial-tools: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -67,9 +67,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/account-financial-tools.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./community-data-files: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -78,9 +78,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/community-data-files.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./hr: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -89,9 +89,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/hr.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./l10n-france: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -100,9 +100,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/l10n-france.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./product-attribute: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -111,9 +111,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/product-attribute.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./project: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -122,9 +122,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/project.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./website: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -133,9 +133,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/website.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./web: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -144,9 +144,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/web.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./mis-builder: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -155,9 +155,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/mis-builder.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./operating-unit: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -166,9 +166,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/operating-unit.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./connector: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -177,9 +177,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/connector.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./delivery-carrier: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -188,9 +188,9 @@ depth: $DEPTH_DEFAULT remotes: origin: https://github.com/OCA/delivery-carrier.git - target: origin 14.0 + target: origin 15.0 merges: - - origin 14.0 + - origin 15.0 ./purchase-workflow: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -199,9 +199,9 @@ depth: $DEPTH_DEFAULT remotes: origin: https://github.com/OCA/purchase-workflow.git - target: origin 14.0 + target: origin 15.0 merges: - - origin 14.0 + - origin 15.0 ./server-env: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -210,61 +210,53 @@ depth: $DEPTH_DEFAULT remotes: origin: https://github.com/OCA/server-env.git - target: origin 14.0 + target: origin 15.0 merges: - - origin 14.0 -./odoo-theme: - defaults: - depth: $DEPTH_DEFAULT - remotes: - myc: https://git.myceliandre.fr/Myceliandre/odoo_theme.git - target: myc 14.0 - merges: - - myc 14.0 + - origin 15.0 ./report-engine: defaults: depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/reporting-engine.git myc: ssh://git@git.myceliandre.fr:5022/OCA/reporting-engine.git - target: myc myc-14.0-py3o + target: oca 15.0 merges: - - myc myc-14.0-py3o + - oca 15.0 # report_py3o PR #- oca refs/pull/445/head -./formio: - 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/novacode-nl/odoo-formio.git - target: origin 14.0 - merges: - - origin 14.0 -./learning_addons: - 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: ssh://git@git.myceliandre.fr:5022/Myceliandre/odoo_learning_addons.git - target: origin 14.0 - merges: - - origin 14.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) - depth: $DEPTH_DEFAULT - remotes: - origin: https://github.com/muk-it/muk_web.git - target: origin 14.0 - merges: - - origin 14.0 +# ./formio: +# 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/novacode-nl/odoo-formio.git +# target: origin 15.0 +# merges: +# - origin 15.0 +# ./learning_addons: +# 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: ssh://git@git.myceliandre.fr:5022/Myceliandre/odoo_learning_addons.git +# target: origin 15.0 +# merges: +# - origin 15.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) +# depth: $DEPTH_DEFAULT +# remotes: +# origin: https://github.com/muk-it/muk_web.git +# target: origin 15.0 +# merges: +# - origin 15.0 ./rest-framework: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -273,9 +265,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/rest-framework.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./server-auth: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -284,9 +276,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/server-auth.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./server-tools: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -295,9 +287,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/server-tools.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./wms: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -306,9 +298,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/wms.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./stock-logistics-warehouse: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -317,9 +309,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/stock-logistics-warehouse.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./contract: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -328,9 +320,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/contract.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./field-service: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -339,9 +331,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/field-service.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./queue: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -350,9 +342,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/queue.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./commission: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -361,9 +353,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/commission.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./pms: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -372,9 +364,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/pms.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./dms: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -383,9 +375,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/dms.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./social: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -394,9 +386,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/social.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./pos: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -405,9 +397,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/pos.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./product-configurator: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -416,9 +408,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/product-configurator.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./stock-logistics-workflow: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -427,9 +419,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/stock-logistics-workflow.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./account-financial-reporting: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -438,9 +430,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/account-financial-reporting.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./bank-statement-import: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -449,9 +441,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/bank-statement-import.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./account-reconcile: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -460,9 +452,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/account-reconcile.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./manufacture: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -471,9 +463,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/manufacture.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./multi-company: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -482,9 +474,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/multi-company.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./account-analytic: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -493,9 +485,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/account-analytic.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./stock-logistics-reporting: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -504,9 +496,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/stock-logistics-reporting.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./account-invoice-reporting: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -515,9 +507,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/account-invoice-reporting.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./account-invoicing: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -526,9 +518,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/account-invoicing.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./sale-reporting: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -537,9 +529,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/sale-reporting.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./account-closing: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -548,9 +540,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/account-closing.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./account-payment: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -559,9 +551,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/account-payment.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./edi: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -570,9 +562,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/edi.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./timesheet: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -581,9 +573,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/timesheet.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./odoo-pim: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -592,9 +584,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/odoo-pim.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./storage: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -603,9 +595,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/storage.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./product-variant: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -614,9 +606,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/product-variant.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./e-commerce: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -625,9 +617,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/e-commerce.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./hr-expense: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -636,9 +628,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/hr-expense.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./crm: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -647,9 +639,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/crm.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./maintenance: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -658,9 +650,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/maintenance.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./connector-telephony: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -669,9 +661,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/connector-telephony.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./server-backend: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -680,9 +672,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/server-backend.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./intrastat-extrastat: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -691,9 +683,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/intrastat-extrastat.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./brand: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -702,9 +694,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/brand.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./hr-holidays: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -713,9 +705,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/hr-holidays.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./server-brand: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -724,9 +716,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/server-brand.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./report-print-send: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -735,9 +727,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/report-print-send.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./calendar: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -746,9 +738,9 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/calendar.git - target: oca 14.0 + target: oca 15.0 merges: - - oca 14.0 + - oca 15.0 ./credit-control: defaults: # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner @@ -757,30 +749,30 @@ depth: $DEPTH_DEFAULT remotes: oca: https://github.com/OCA/credit-control.git - target: oca 14.0 - merges: - - oca 14.0 -./myc-extra-addons: - defaults: - depth: $DEPTH_DEFAULT - remotes: - myc: ssh://git@git.myceliandre.fr:5022/njeudy/myc-extra-addons.git - target: myc 14.0 - merges: - - myc 14.0 -./sync-addons: - defaults: - depth: $DEPTH_DEFAULT - remotes: - origin: https://github.com/itpp-labs/sync-addons.git - target: origin 14.0 - merges: - - origin 14.0 -./vertical-cooperative: - defaults: - depth: $DEPTH_DEFAULT - remotes: - origin: https://git.myceliandre.fr/njeudy/vertical-cooperative.git - target: origin 14.0-MIG-INITIAL - merges: - - origin 14.0-MIG-INITIAL + target: oca 15.0 + merges: + - oca 15.0 +# ./myc-extra-addons: +# defaults: +# depth: $DEPTH_DEFAULT +# remotes: +# myc: ssh://git@git.myceliandre.fr:5022/njeudy/myc-extra-addons.git +# target: myc 15.0 +# merges: +# - myc 15.0 +# ./sync-addons: +# defaults: +# depth: $DEPTH_DEFAULT +# remotes: +# origin: https://github.com/itpp-labs/sync-addons.git +# target: origin 15.0 +# merges: +# - origin 15.0 +# ./vertical-cooperative: +# defaults: +# depth: $DEPTH_DEFAULT +# remotes: +# origin: https://git.myceliandre.fr/njeudy/vertical-cooperative.git +# target: origin 15.0-MIG-INITIAL +# merges: +# - origin 15.0-MIG-INITIAL