Skip to content

Commit

Permalink
Merge pull request #95 from coopiteasy/12.0-fix-stock_provider_ref_pr…
Browse files Browse the repository at this point in the history
…oduct_weight_on_receipt

[12.0][FIX] stock_[provider_ref|product_weight]_on_receipt: xpath expr
  • Loading branch information
vvrossem authored May 14, 2020
2 parents 456d29a + 82b9e89 commit 35bb0db
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions stock_product_weight_on_receipt/reports/report_deliveryslip.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,28 @@
name="Receipt with weight">

<!-- t-if="o.state!='done'" -->
<xpath expr="//table[2]//th//*[contains(text(),'Product')]" position="after">
<th>
<xpath expr="//table[2]//th[1]" position="after">
<th name="weight">
<strong>Weight</strong>
</th>
</xpath>

<xpath expr="//table[2]//td/span[@t-field='move.product_id']/parent::td" position="after">
<td>
<td name="weight">
<span t-field="move.display_weight"/>
<span t-field="move.display_unit"/>
</td>
</xpath>

<!-- t-if="o.move_line_ids and o.state=='done'" -->
<xpath expr="//table[3]//th//*[contains(text(),'Product')]" position="after">
<th class="text-center">
<xpath expr="//table[3]//th[1]" position="after">
<th name="weight" class="text-center">
<strong>Weight</strong>
</th>
</xpath>

<xpath expr="//table[3]//td/span[@t-field='move_line.product_id']/parent::td" position="after">
<td class="text-center">
<td name="weight" class="text-center">
<span t-field="move_line.display_weight"/>
<span t-field="move_line.display_unit"/>
</td>
Expand Down
12 changes: 6 additions & 6 deletions stock_provider_ref_on_receipt/reports/report_deliveryslip.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,27 @@
name="Receipt with provider reference">

<!-- t-if="o.state!='done'" -->
<xpath expr="//table[2]//th//*[contains(text(),'Product')]" position="after">
<th>
<xpath expr="//table[2]//th[1]" position="after">
<th name="provider_ref">
<strong>Provider ref.</strong>
</th>
</xpath>

<xpath expr="//table[2]//td/span[@t-field='move.product_id']/parent::td" position="after">
<td>
<td name="provider_ref">
<span t-field="move.provider_ref"/>
</td>
</xpath>

<!-- t-if="o.move_line_ids and o.state=='done'" -->
<xpath expr="//table[3]//th//*[contains(text(),'Product')]" position="after">
<th class="text-left">
<xpath expr="//table[3]//th[1]" position="after">
<th name="provider_ref" class="text-left">
<span>Provider ref.</span>
</th>
</xpath>

<xpath expr="//table[3]//td/span[@t-field='move_line.product_id']/parent::td" position="after">
<td class="text-left">
<td name="provider_ref" class="text-left">
<span t-field="move_line.provider_ref"/>
</td>
</xpath>
Expand Down

0 comments on commit 35bb0db

Please sign in to comment.