Skip to content

Commit

Permalink
Merge pull request #718 from tafaRU/10.0-issue717-fix
Browse files Browse the repository at this point in the history
[10.0][FIX] issue #717
  • Loading branch information
rafaelbn authored Oct 17, 2018
2 parents 2310dda + fdd80e5 commit 23e21f8
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ env:
matrix:
- LINT_CHECK="1"
- TRANSIFEX="1"
- TESTS="1" ODOO_REPO="odoo/odoo" LINT_CHECK="0" EXCLUDE=sale_stock_picking_blocking_proc_group_by_line,sale_sourced_by_line,sale_procurement_group_by_line
- TESTS="1" ODOO_REPO="OCA/OCB" LINT_CHECK="0" EXCLUDE=sale_stock_picking_blocking_proc_group_by_line,sale_sourced_by_line,sale_procurement_group_by_line
- TESTS="1" ODOO_REPO="odoo/odoo" LINT_CHECK="0" INCLUDE=sale_stock_picking_blocking_proc_group_by_line,sale_sourced_by_line,sale_procurement_group_by_line
- TESTS="1" ODOO_REPO="OCA/OCB" LINT_CHECK="0" INCLUDE=sale_stock_picking_blocking_proc_group_by_line,sale_sourced_by_line,sale_procurement_group_by_line
- TESTS="1" ODOO_REPO="odoo/odoo" LINT_CHECK="0" EXCLUDE=sale_delivery_split_date,sale_stock_picking_blocking_proc_group_by_line,sale_sourced_by_line,sale_procurement_group_by_line
- TESTS="1" ODOO_REPO="OCA/OCB" LINT_CHECK="0" EXCLUDE=sale_delivery_split_date,sale_stock_picking_blocking_proc_group_by_line,sale_sourced_by_line,sale_procurement_group_by_line
- TESTS="1" ODOO_REPO="odoo/odoo" LINT_CHECK="0" INCLUDE=sale_delivery_split_date,sale_stock_picking_blocking_proc_group_by_line,sale_sourced_by_line,sale_procurement_group_by_line
- TESTS="1" ODOO_REPO="OCA/OCB" LINT_CHECK="0" INCLUDE=sale_delivery_split_date,sale_stock_picking_blocking_proc_group_by_line,sale_sourced_by_line,sale_procurement_group_by_line

virtualenv:
system_site_packages: true
Expand Down
1 change: 1 addition & 0 deletions sale_mrp_link/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ The module is incompatible with the following modules:

* `sale_sourced_by_line <https://github.com/OCA/sale-workflow/tree/10.0/sale_sourced_by_line>`_
* `sale_stock_picking_blocking_proc_group_by_line <https://github.com/OCA/sale-workflow/tree/10.0/sale_stock_picking_blocking_proc_group_by_line>`_
* `sale_delivery_split_date <https://github.com/OCA/sale-workflow/tree/10.0/sale_delivery_split_date>`_
* `sale_quotation_sourcing <https://github.com/OCA/sale-workflow/blob/10.0/sale_quotation_sourcing>`_ (please note this latter is not migrated yet).

Please see https://github.com/OCA/sale-workflow/pull/661#discussion_r214031110 for further info.
Expand Down
1 change: 1 addition & 0 deletions sale_mrp_link/readme/ROADMAP.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ The module is incompatible with the following modules:

* `sale_sourced_by_line <https://github.com/OCA/sale-workflow/tree/10.0/sale_sourced_by_line>`_
* `sale_stock_picking_blocking_proc_group_by_line <https://github.com/OCA/sale-workflow/tree/10.0/sale_stock_picking_blocking_proc_group_by_line>`_
* `sale_delivery_split_date <https://github.com/OCA/sale-workflow/tree/10.0/sale_delivery_split_date>`_
* `sale_quotation_sourcing <https://github.com/OCA/sale-workflow/blob/10.0/sale_quotation_sourcing>`_ (please note this latter is not migrated yet).

Please see https://github.com/OCA/sale-workflow/pull/661#discussion_r214031110 for further info.
1 change: 1 addition & 0 deletions sale_mrp_link/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,7 @@ <h1><a class="toc-backref" href="#id1">Known issues / Roadmap</a></h1>
<ul class="simple">
<li><a class="reference external" href="https://github.com/OCA/sale-workflow/tree/10.0/sale_sourced_by_line">sale_sourced_by_line</a></li>
<li><a class="reference external" href="https://github.com/OCA/sale-workflow/tree/10.0/sale_stock_picking_blocking_proc_group_by_line">sale_stock_picking_blocking_proc_group_by_line</a></li>
<li><a class="reference external" href="https://github.com/OCA/sale-workflow/tree/10.0/sale_delivery_split_date">sale_delivery_split_date</a></li>
<li><a class="reference external" href="https://github.com/OCA/sale-workflow/blob/10.0/sale_quotation_sourcing">sale_quotation_sourcing</a> (please note this latter is not migrated yet).</li>
</ul>
<p>Please see <a class="reference external" href="https://github.com/OCA/sale-workflow/pull/661#discussion_r214031110">https://github.com/OCA/sale-workflow/pull/661#discussion_r214031110</a> for further info.</p>
Expand Down

0 comments on commit 23e21f8

Please sign in to comment.