Skip to content

Commit

Permalink
add OCA/sale-workflow repo + merge PR 396 sale_order_revision
Browse files Browse the repository at this point in the history
  • Loading branch information
damdam-s committed Feb 15, 2017
1 parent b7cc221 commit f321d95
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@
path = odoo/external-src/odoo-cloud-platform
url = [email protected]:camptocamp/odoo-cloud-platform.git
branch = 10.0
[submodule "odoo/external-src/sale-workflow"]
path = odoo/external-src/sale-workflow
url = [email protected]:oca/sale-workflow.git
branch = 10.0
1 change: 1 addition & 0 deletions odoo/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ ENV ADDONS_PATH="/opt/odoo/external-src/enterprise, \
/opt/odoo/external-src/server-tools, \
/opt/odoo/external-src/odoo-cloud-platform, \
/opt/odoo/external-src/hr, \
/opt/odoo/external-src/sale-workflow, \
/opt/odoo/external-src/hr-timesheet, \
/opt/odoo/local-src," \
LIMIT_TIME_CPU=86400 \
Expand Down
1 change: 1 addition & 0 deletions odoo/external-src/sale-workflow
Submodule sale-workflow added at 81b126
16 changes: 8 additions & 8 deletions odoo/pending-merges.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
# add module account_invoice_bank_selection
- oca refs/pull/595/head
target: &default_target camptocamp merge-branch-1900-master
# ./external-src/bank-statement-reconcile:
# remotes:
# oca: [email protected]:OCA/bank-statement-reconcile.git
# camptocamp: [email protected]:camptocamp/bank-statement-reconcile.git
# merges:
# - oca 10.0
./external-src/sale-workflow:
remotes:
oca: [email protected]:OCA/sale-workflow.git
camptocamp: [email protected]:camptocamp/sale-workflow.git
merges:
- oca 10.0
# # port account_mass_reconcile
# - oca refs/pull/136/head
- oca refs/pull/396/head
# # port of account_statement_base_import
# - oca refs/pull/137/head
# target: *default_target
target: *default_target

0 comments on commit f321d95

Please sign in to comment.