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

Merge remote-tracking branch 'origin/develop' into develop

develop
Andreas Osim 2018-05-02 14:33:56 +02:00
parent 499d26e870 d37e02e9a3
commit 4c20f803ff
6 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/custom-addons/dp_reports_account/__manifest__.py
View File

@ -2,11 +2,11 @@
# noinspection PyStatementEffect # noinspection PyStatementEffect
{ {
'name': 'datepol Report-Anpassungen', 'name': 'DP Finanzen Report-Anpassungen',
'category': 'Custom', 'category': 'Custom',
'version': '11.0.1.0.0', 'version': '11.0.1.0.0',
'summary': """Individuelle Report Anpassungen""", 'summary': """Individuelle Report Anpassungen im Bereich Finanzen""",
'description': """Individuelle Report Anpassungen""", 'description': """Individuelle Report Anpassungen im Bereich Finanzen""",
'author': 'datenpol gmbh', 'author': 'datenpol gmbh',
'website': 'http://www.datenpol.at/', 'website': 'http://www.datenpol.at/',
'depends': [ 'depends': [

2
ext/custom-addons/dp_reports_account/reports/invoice.xml
View File

@ -172,7 +172,7 @@
t-field="invoice_line.price_unit"/> 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-if="not invoice_line.hide_discount" <span t-if="not invoice_line.hide_discount and invoice_line.discount"
t-field="invoice_line.discount"/> t-field="invoice_line.discount"/>
</td> </td>
<td class="text-right"> <td class="text-right">

8
ext/custom-addons/dp_reports_sale/__manifest__.py
View File

@ -2,16 +2,16 @@
# noinspection PyStatementEffect # noinspection PyStatementEffect
{ {
'name': 'datepol Report-Anpassungen', 'name': 'DP Verkauf Report-Anpassungen',
'category': 'Custom', 'category': 'Custom',
'version': '11.0.1.0.0', 'version': '11.0.1.0.0',
'summary': """Individuelle Report Anpassungen""", 'summary': """Individuelle Report Anpassungen im Bereich Verkauf""",
'description': """Individuelle Report Anpassungen""", 'description': """Individuelle Report Anpassungen im Bereich Verkauf""",
'author': 'datenpol gmbh', 'author': 'datenpol gmbh',
'website': 'http://www.datenpol.at/', 'website': 'http://www.datenpol.at/',
'depends': [ 'depends': [
'dp_reports', 'dp_reports',
'sale', 'sale_management',
'dp_sale_delivery_date', 'dp_sale_delivery_date',
'dp_sale_hide_discount', 'dp_sale_hide_discount',
], ],

2
ext/custom-addons/dp_reports_sale/reports/sale.xml
View File

@ -167,7 +167,7 @@
t-field="order_line.price_unit"/> 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-if="not order_line.hide_discount" t-field="order_line.discount"/> <span t-if="not order_line.hide_discount and order_line.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"/>

8
ext/custom-addons/dp_reports_stock/__manifest__.py
View File

@ -2,11 +2,11 @@
# noinspection PyStatementEffect # noinspection PyStatementEffect
{ {
'name': 'datepol Report-Anpassungen', 'name': 'DP Lager Report-Anpassungen',
'category': 'Custom', 'category': 'Custom',
'version': '1.0', 'version': '11.0.1.0.0',
'summary': """Individuelle Report Anpassungen""", 'summary': """Individuelle Report Anpassungen im Bereich Lager""",
'description': """Individuelle Report Anpassungen""", 'description': """Individuelle Report Anpassungen im Bereich Lager""",
'author': 'datenpol gmbh', 'author': 'datenpol gmbh',
'website': 'http://www.datenpol.at/', 'website': 'http://www.datenpol.at/',
'depends': [ 'depends': [

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

@ -78,6 +78,7 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<t t-set="total_ordered_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>
@ -95,7 +96,9 @@
<span t-field="move.product_id"/> <span t-field="move.product_id"/>
</td> </td>
<td> <td>
<span t-esc="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"/>
<span t-esc="ordered_qty"/>
<span t-field="move.product_uom"/> <span t-field="move.product_uom"/>
</td> </td>
</tr> </tr>
@ -159,7 +162,9 @@
<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>
<span t-esc="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"/>
<span t-esc="ordered_qty"/>
<span t-field="move_line.product_uom_id"/> <span t-field="move_line.product_uom_id"/>
</td> </td>
<td class="text-right" t-if="move_line.state == 'done'"> <td class="text-right" t-if="move_line.state == 'done'">
@ -183,7 +188,7 @@
<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-field="o.number_of_packages"/> <span t-esc="total_ordered_qty"/>
</span> </span>
</div> </div>
</div> </div>