tzaustria
/
odoo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change sum of 'Gesamt Menge' to actual delivered (qty_done) instead of (ordered_qty)

develop
Andreas Osim 2018-06-20 15:44:16 +02:00
parent e9ec16c6bc
commit b293758827
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ext/custom-addons/dp_reports_stock/reports/stock.xml
View File

@ -121,6 +121,7 @@
</tbody> </tbody>
</table> </table>
<t t-set="total_ordered_qty" t-value="0"/> <t t-set="total_ordered_qty" t-value="0"/>
<t t-set="total_dlv_qty" t-value="0"/>
<table class="table table-condensed mt48" t-if="not o.move_line_ids"> <table class="table table-condensed mt48" t-if="not o.move_line_ids">
<thead class="table-header"> <thead class="table-header">
<tr> <tr>
@ -140,6 +141,8 @@
<td> <td>
<t t-set="ordered_qty" t-value="int(o._formatLang(move_line.ordered_qty).strip('0').strip(',').strip('.'))"/> <t t-set="ordered_qty" t-value="int(o._formatLang(move_line.ordered_qty).strip('0').strip(',').strip('.'))"/>
<t t-set="total_ordered_qty" t-value="total_ordered_qty+ordered_qty"/> <t t-set="total_ordered_qty" t-value="total_ordered_qty+ordered_qty"/>
<t t-set="dlv_qty" t-value="int(move_line.qty_done)"/>
<t t-set="total_dlv_qty" t-value="total_dlv_qty+dlv_qty"/>
<span t-esc="ordered_qty"/> <span t-esc="ordered_qty"/>
<span t-field="move.product_uom"/> <span t-field="move.product_uom"/>
</td> </td>
@ -204,8 +207,14 @@
<td class="text-center"> <td class="text-center">
<span t-field="move_line.package_id"/> <span t-field="move_line.package_id"/>
<span t-if="move_line.package_id">:</span> <span t-if="move_line.package_id">:</span>
<!--
<t t-set="ordered_qty" t-value="int(o._formatLang(move_line.ordered_qty).strip('0').strip(',').strip('.'))"/> <t t-set="ordered_qty" t-value="int(o._formatLang(move_line.ordered_qty).strip('0').strip(',').strip('.'))"/>
<t t-set="total_ordered_qty" t-value="total_ordered_qty+ordered_qty"/> <t t-set="total_ordered_qty" t-value="total_ordered_qty+ordered_qty"/>
-->
<t t-set="ordered_qty" t-value="int(move_line.ordered_qty)"/>
<t t-set="total_ordered_qty" t-value="total_ordered_qty+ordered_qty"/>
<t t-set="dlv_qty" t-value="int(move_line.qty_done)"/>
<t t-set="total_dlv_qty" t-value="total_dlv_qty+dlv_qty"/>
<span t-esc="ordered_qty"/> <span t-esc="ordered_qty"/>
<span t-field="move_line.product_uom_id"/> <span t-field="move_line.product_uom_id"/>
</td> </td>
@ -230,7 +239,12 @@
<div class="col-xs-6"> <div class="col-xs-6">
<span class="pull-right" style="padding-top: 5px; border-top: 1px solid;"> <span class="pull-right" style="padding-top: 5px; border-top: 1px solid;">
<strong>Total Amount:</strong> <strong>Total Amount:</strong>
<span t-esc="total_ordered_qty"/> <!--
<span t-esc="total_ordered_qty" t-if="total_dlv_qty==0"/>
<span t-esc="total_dlv_qty" t-if="total_dlv_qty>0"/>
-->
<span t-esc="total_ordered_qty" t-if="not backorder"/>
<span t-esc="total_dlv_qty" t-if="backorder"/>
</span> </span>
</div> </div>
</div> </div>