Skip to content

Commit

Permalink
Add intrastat module & pending merge
Browse files Browse the repository at this point in the history
  • Loading branch information
leemannd committed Mar 29, 2017
1 parent af567db commit b4278e0
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,7 @@
[submodule "odoo/external-src/sale-workflow"]
path = odoo/external-src/sale-workflow
url = [email protected]:camptocamp/sale-workflow.git
[submodule "odoo/external-src/intrastat"]
path = odoo/external-src/intrastat
url = https://github.com/camptocamp/intrastat.git
branch = 10.0
1 change: 1 addition & 0 deletions odoo/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions odoo/external-src/intrastat
Submodule intrastat added at debffc
10 changes: 10 additions & 0 deletions odoo/pending-merges.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,13 @@
# hr_employee_seniority
# - oca refs/pull/319/head
target: *default_target
./external-src/intrastat:
remotes:
oca: [email protected]:OCA/intrastat.git
camptocamp: [email protected]: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

0 comments on commit b4278e0

Please sign in to comment.