diff options
| author | Arnold Moyaux <arm@odoo.com> | 2018-08-24 14:31:44 +0200 |
|---|---|---|
| committer | Arnold Moyaux <arm@odoo.com> | 2018-09-13 14:16:22 +0200 |
| commit | ecc8ff826083d3c157b268ff03221bbee5e390e4 (patch) | |
| tree | 09bf120f2f54dc8c816b0506044ecad0aa51a99f | |
| parent | f6411136052b4ee8f3a7f463e47068a8d4cf0d06 (diff) | |
[FIX] mrp: fix bom structure report link
complete commit e31048f6a426c94410df70070ed9eb0eee4d447a
scss cursor is not needed since it is already set on btn element that
are activate.
| -rw-r--r-- | addons/mrp/report/mrp_report_bom_structure.xml | 8 | ||||
| -rw-r--r-- | addons/mrp/static/src/js/mrp_bom_report.js | 1 | ||||
| -rw-r--r-- | addons/mrp/static/src/scss/mrp_bom_report.scss | 3 |
3 files changed, 5 insertions, 7 deletions
diff --git a/addons/mrp/report/mrp_report_bom_structure.xml b/addons/mrp/report/mrp_report_bom_structure.xml index f732ceafae6..02e53b95e7e 100644 --- a/addons/mrp/report/mrp_report_bom_structure.xml +++ b/addons/mrp/report/mrp_report_bom_structure.xml @@ -38,7 +38,7 @@ <span><a href="#" t-if="data['report_type'] == 'html'" t-att-data-res-id="data['product'].id" t-att-data-model="'product.product'" class="o_mrp_bom_action"><t t-esc="data['bom_prod_name']"/></a><t t-else="" t-esc="data['bom_prod_name']"/></span> </td> <td> - <span><a t-if="data['report_type'] == 'html'" t-att-data-res-id="data['bom'].id" t-att-data-model="'mrp.bom'" class="o_mrp_bom_action"><t t-esc="data['code']"/></a><t t-else="" t-esc="data['code']"/></span> + <span><a href="#" t-if="data['report_type'] == 'html'" t-att-data-res-id="data['bom'].id" t-att-data-model="'mrp.bom'" class="o_mrp_bom_action"><t t-esc="data['code']"/></a><t t-else="" t-esc="data['code']"/></span> </td> <td class="text-right"><span><t t-esc="data['bom_qty']" t-options='{"widget": "float", "decimal_precision": "Product Unit of Measure"}'/></span></td> <td groups="uom.group_uom"><span><t t-esc="data['bom'].product_uom_id.name"/></span></td> @@ -51,7 +51,7 @@ <td t-if="data['report_type'] == 'html'"> <span> <t t-if="data['attachments']"> - <a role="button" t-att-data-res-id="data['attachments'].ids" t-att-data-model="'mrp.document'" class="o_mrp_show_attachment_action fa fa-fw o_button_icon fa-files-o"/> + <a href="#" role="button" t-att-data-res-id="data['attachments'].ids" t-att-data-model="'mrp.document'" class="o_mrp_show_attachment_action fa fa-fw o_button_icon fa-files-o"/> </t> </span> </td> @@ -103,7 +103,7 @@ </td> <td> <span> - <a t-att-data-res-id="l['child_bom']" t-att-data-model="'mrp.bom'" class="o_mrp_bom_action"><t t-esc="l['code']"/></a> + <a href="#" t-att-data-res-id="l['child_bom']" t-att-data-model="'mrp.bom'" class="o_mrp_bom_action"><t t-esc="l['code']"/></a> </span> </td> <td class="text-right"><span><t t-esc="l['prod_qty']" t-options='{"widget": "float", "decimal_precision": "Product Unit of Measure"}'/></span></td> @@ -117,7 +117,7 @@ <td> <span> <t t-if="l['attachments']"> - <a role="button" t-att-data-res-id="l['attachments'].ids" t-att-data-model="'mrp.document'" class="o_mrp_show_attachment_action fa fa-fw o_button_icon fa-files-o"/> + <a href="#" role="button" t-att-data-res-id="l['attachments'].ids" t-att-data-model="'mrp.document'" class="o_mrp_show_attachment_action fa fa-fw o_button_icon fa-files-o"/> </t> </span> </td> diff --git a/addons/mrp/static/src/js/mrp_bom_report.js b/addons/mrp/static/src/js/mrp_bom_report.js index 49bf44c938b..77d57dcf01e 100644 --- a/addons/mrp/static/src/js/mrp_bom_report.js +++ b/addons/mrp/static/src/js/mrp_bom_report.js @@ -172,6 +172,7 @@ var MrpBomReport = stock_report_generic.extend({ }); }, _onClickShowAttachment: function (ev) { + ev.preventDefault(); var ids = $(ev.currentTarget).data('res-id'); return this.do_action({ name: _t('Attachments'), diff --git a/addons/mrp/static/src/scss/mrp_bom_report.scss b/addons/mrp/static/src/scss/mrp_bom_report.scss index 095d6e05846..221a2847820 100644 --- a/addons/mrp/static/src/scss/mrp_bom_report.scss +++ b/addons/mrp/static/src/scss/mrp_bom_report.scss @@ -2,9 +2,6 @@ background-color: $o-view-background-color; margin: 16px auto; padding: 24px 16px; - .o_mrp_bom_action { - cursor: pointer; - } // Manage expand icon table.o_mrp_bom_expandable { thead tr { |