Feedback 1597: "Rabatt verstecken" funktioniert nicht

develop
Ahmed Aly 2018-04-10 14:12:13 +02:00
parent 54d27f5069
commit 4533f77cc2
4 changed files with 4 additions and 2 deletions

View File

@ -13,6 +13,7 @@
'account_invoicing', 'account_invoicing',
'report_intrastat', 'report_intrastat',
'dp_reports', 'dp_reports',
'dp_sale_hide_discount',
], ],
'data': [ 'data': [
'reports/invoice.xml', 'reports/invoice.xml',

View File

@ -163,7 +163,7 @@
<span t-field="invoice_line.price_unit"/> <span t-field="invoice_line.price_unit"/>
</td> </td>
<td class="text-right" t-if="discount_is_set"> <td class="text-right" t-if="discount_is_set">
<span t-field="invoice_line.discount"/> <span t-if="not invoice_line.hide_discount" t-field="invoice_line.discount"/>
</td> </td>
<td class="text-right"> <td class="text-right">
<span t-field="invoice_line.price_subtotal"/> <span t-field="invoice_line.price_subtotal"/>

View File

@ -13,6 +13,7 @@
'dp_reports', 'dp_reports',
'sale', 'sale',
'dp_sale_delivery_date', 'dp_sale_delivery_date',
'dp_sale_hide_discount',
], ],
'data': [ 'data': [
'reports/sale.xml', 'reports/sale.xml',

View File

@ -125,7 +125,7 @@
<span t-field="order_line.price_unit"/> <span t-field="order_line.price_unit"/>
</td> </td>
<td rowspan="2" class="text-right" t-if="discount_is_set"> <td rowspan="2" class="text-right" t-if="discount_is_set">
<span t-field="order_line.discount"/> <span t-if="not order_line.hide_discount" t-field="order_line.discount"/>
</td> </td>
<td rowspan="2" class="text-right"> <td rowspan="2" class="text-right">
<span t-field="order_line.price_subtotal"/> <span t-field="order_line.price_subtotal"/>