From b4278e04490b0ab7ba185cfc45abec33bf31d866 Mon Sep 17 00:00:00 2001 From: Denis Leemann Date: Wed, 29 Mar 2017 14:02:31 +0200 Subject: [PATCH] Add intrastat module & pending merge --- .gitmodules | 4 ++++ odoo/Dockerfile | 1 + odoo/external-src/intrastat | 1 + odoo/pending-merges.yaml | 10 ++++++++++ 4 files changed, 16 insertions(+) create mode 160000 odoo/external-src/intrastat diff --git a/.gitmodules b/.gitmodules index c03e8dbf7bd..63d9d458927 100644 --- a/.gitmodules +++ b/.gitmodules @@ -21,3 +21,7 @@ [submodule "odoo/external-src/sale-workflow"] path = odoo/external-src/sale-workflow url = git@github.com:camptocamp/sale-workflow.git +[submodule "odoo/external-src/intrastat"] + path = odoo/external-src/intrastat + url = https://github.com/camptocamp/intrastat.git + branch = 10.0 diff --git a/odoo/Dockerfile b/odoo/Dockerfile index 13ab009bde2..985def6f238 100644 --- a/odoo/Dockerfile +++ b/odoo/Dockerfile @@ -20,6 +20,7 @@ ENV ADDONS_PATH="/opt/odoo/external-src/enterprise, \ /opt/odoo/external-src/hr, \ /opt/odoo/external-src/sale-workflow, \ /opt/odoo/external-src/hr-timesheet, \ + /opt/odoo/external-src/intrastat, \ /opt/odoo/local-src," \ LIMIT_TIME_CPU=86400 \ LIMIT_TIME_REAL=86400 \ diff --git a/odoo/external-src/intrastat b/odoo/external-src/intrastat new file mode 160000 index 00000000000..debffce130f --- /dev/null +++ b/odoo/external-src/intrastat @@ -0,0 +1 @@ +Subproject commit debffce130f142947c9b6ccebbf4b68bedbe596c diff --git a/odoo/pending-merges.yaml b/odoo/pending-merges.yaml index 6cdf5a807c0..d5337b13b6a 100644 --- a/odoo/pending-merges.yaml +++ b/odoo/pending-merges.yaml @@ -31,3 +31,13 @@ # hr_employee_seniority # - oca refs/pull/319/head target: *default_target +./external-src/intrastat: + remotes: + oca: git@github.com:OCA/intrastat.git + camptocamp: git@github.com:camptocamp/intrastat.git + merges: + - oca 10.0 + # change menu entry for enterprise compatibility. Could be changed in favor + # of pull/10 + - oca refs/pull/11/head + target: *default_target