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

Fall 4574, 4576: Dokumentenvorlagen

develop
Roman Widmann 2018-02-01 16:47:12 +01:00
parent d0a56ed8df
commit 2d5b5dde00
7 changed files with 231 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ext/custom-addons/dp_custom/models/account.py
View File

@ -44,6 +44,15 @@ class AccountInvoice(models.Model):
positions = fields.Integer(string='Positionen', compute='_compute_positions') positions = fields.Integer(string='Positionen', compute='_compute_positions')
num_items = fields.Integer(string='Anzahl der Artikel', compute='_compute_num_items') num_items = fields.Integer(string='Anzahl der Artikel', compute='_compute_num_items')
weight_total = fields.Float(string='Gesamtgewicht', compute='_compute_weight_total')
@api.multi
def _compute_weight_total(self):
for record in self:
sum = 0
for line in record.invoice_line_ids:
sum += line.product_id.weight * line.quantity
record.weight_total = sum
@api.multi @api.multi
def _compute_positions(self): def _compute_positions(self):

9
ext/custom-addons/dp_custom/models/sale.py
View File

@ -49,6 +49,15 @@ class SaleOrder(models.Model):
earliest_scheduled_date = fields.Datetime(compute='_compute_earliest_scheduled_date') earliest_scheduled_date = fields.Datetime(compute='_compute_earliest_scheduled_date')
positions = fields.Integer(string='Positionen', compute='_compute_positions') positions = fields.Integer(string='Positionen', compute='_compute_positions')
num_items = fields.Integer(string='Anzahl der Artikel', compute='_compute_num_items') num_items = fields.Integer(string='Anzahl der Artikel', compute='_compute_num_items')
weight_total = fields.Float(string='Gesamtgewicht', compute='_compute_weight_total')
@api.multi
def _compute_weight_total(self):
for record in self:
sum = 0
for line in record.order_line:
sum += line.product_id.weight * line.product_uom_qty
record.weight_total = sum
@api.multi @api.multi
def _compute_positions(self): def _compute_positions(self):

4
ext/custom-addons/dp_reports/data/paperformat.xml
View File

@ -7,12 +7,12 @@
<field name="page_height">0</field> <field name="page_height">0</field>
<field name="page_width">0</field> <field name="page_width">0</field>
<field name="orientation">Portrait</field> <field name="orientation">Portrait</field>
<field name="margin_top">55</field> <field name="margin_top">40</field>
<field name="margin_bottom">20</field> <field name="margin_bottom">20</field>
<field name="margin_left">10</field> <field name="margin_left">10</field>
<field name="margin_right">10</field> <field name="margin_right">10</field>
<field name="header_line" eval="False"/> <field name="header_line" eval="False"/>
<field name="header_spacing">40</field> <field name="header_spacing">25</field>
<field name="dpi">90</field> <field name="dpi">90</field>
</record> </record>
</odoo> </odoo>

17
ext/custom-addons/dp_reports/reports/report_templates.xml
View File

@ -61,15 +61,18 @@
style="max-height: 85px;"/> style="max-height: 85px;"/>
</div> </div>
</div> </div>
<div class="row"> <div class="row mt16">
<hr class="col-xs-12 red-line-1"/> <hr class="red-line-1"/>
</div> </div>
</div> </div>
</template> </template>
<template id="external_layout_footer"> <template id="external_layout_footer">
<div class="footer" style="font-size:9pt;"> <div class="footer" style="font-size:9pt;">
<div class="row" style="padding-left:0;border-top: 2px solid #A72523;"> <div class="row">
<hr class="red-line-1"/>
</div>
<div class="row" style="padding-left:0;">
<div class="col-xs-12 text-center"> <div class="col-xs-12 text-center">
<strong> <strong>
<span t-esc="company.name"/> <span t-esc="company.name"/>
@ -152,12 +155,8 @@
<span t-esc="o.partner_id.street"/><br/> <span t-esc="o.partner_id.street"/><br/>
<span t-esc="o.partner_id.zip"/><span t-esc="o.partner_id.city"/><br/> <span t-esc="o.partner_id.zip"/><span t-esc="o.partner_id.city"/><br/>
<span t-esc="o.partner_id.country_id.name"/><br/> <span t-esc="o.partner_id.country_id.name"/><br/>
<t t-if="o.partner_id.email"> <span t-esc="o.partner_id.email"/><br/>
Email: <span t-esc="o.partner_id.email"/><br/> <span t-esc="o.partner_id.phone"/>
</t>
<t t-if="o.partner_id.phone">
Telefon: <span t-esc="o.partner_id.phone"/>
</t>
</div> </div>
</template> </template>
</data> </data>

29
ext/custom-addons/dp_reports/static/src/less/report_backend.less
View File

@ -32,8 +32,9 @@ hr.red-line-1 {
height: 1px; height: 1px;
border: 0; border: 0;
border-top: 1px solid #A72523; border-top: 1px solid #A72523;
margin: 1em 0;
padding: 0; padding: 0;
margin-top: 0;
margin-bottom: 0;
} }
hr.red-line-2 { hr.red-line-2 {
@ -41,8 +42,9 @@ hr.red-line-2 {
height: 2px; height: 2px;
border: 0; border: 0;
border-top: 2px solid #A72523; border-top: 2px solid #A72523;
margin: 1em 0;
padding: 0; padding: 0;
margin-top: 0;
margin-bottom: 0;
} }
div.height-20 { div.height-20 {
@ -52,13 +54,30 @@ div.height-20 {
thead.table-header { thead.table-header {
background-color: #9D9D9D; background-color: #9D9D9D;
border-top: 2px solid #A72523;
color: white; color: white;
} }
tbody.sale-tbody { tbody.sale-tbody {
background-color: #E6E7E9; background-color: #E6E7E9;
} margin-top: 0;
margin-bottom: 0;
tr.amount-total {
border-bottom: 2px solid #A72523; border-bottom: 2px solid #A72523;
} }
tbody.totals-tbody {
background-color: #E6E7E9;
margin-top: 0;
margin-bottom: 0;
}
tbody.invoice-tbody {
background-color: #E6E7E9;
margin-top: 0;
margin-bottom: 0;
border-bottom: 2px solid #A72523;
}
.table-condensed > tbody > tr.amount-total {
border-top: 2px solid #A72523 !important;
}

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

@ -6,163 +6,129 @@
<t t-call="web.external_layout"> <t t-call="web.external_layout">
<t t-set="o" t-value="o.with_context({'lang':o.partner_id.lang})"/> <t t-set="o" t-value="o.with_context({'lang':o.partner_id.lang})"/>
<div class="page"> <div class="page">
<div class="row"> <div class="row">
<div name="invoice_address" style="width:32%;padding-left:15px;padding-right:15px;float: left;"> <div class="col-xs-3">
<u style="font-size: large;">Kundendaten</u> <t t-call="dp_reports.partner_data"/>
<br/> </div>
<strong> <div class="col-xs-3">
<span t-esc="o.partner_id.name"/> <strong>Lieferadresse</strong>
</strong> <div class="partner-data">
<br/> <span t-esc="o.partner_shipping_id.name"/>
<span t-esc="o.partner_id.street"/> <span t-esc="o.partner_shipping_id.street"/><br/>
<br/> <span t-esc="o.partner_shipping_id.zip"/><span t-esc="o.partner_shipping_id.city"/><br/>
<span t-esc="o.partner_id.zip"/>
<span t-esc="o.partner_id.city"/>
<br/>
<span t-esc="o.partner_id.country_id.name"/>
<br/>
Email:
<span t-esc="o.partner_id.email"/>
<br/>
Telefon:
<span t-esc="o.partner_id.phone"/>
</div>
<div style="width:30%;padding-left:15px;padding-right:10px;float: left;">
<u style="font-size: large;">Lieferadresse</u>
<br/>
<strong>
<span t-esc="o.partner_shipping_id.name"/>
</strong>
<br/>
<span t-esc="o.partner_shipping_id.street"/>
<br/>
<span t-esc="o.partner_shipping_id.zip"/>
<span t-esc="o.partner_shipping_id.city"/>
<br/>
<span t-esc="o.partner_shipping_id.country_id.name"/> <span t-esc="o.partner_shipping_id.country_id.name"/>
</div> </div>
<div name="invoice_address" style="width:32%;padding-left:15px;padding-right:15px;float: left;"> </div>
<u style="font-size: large;">Rechnungsadresse</u> <div class="col-xs-3">
<br/> <strong>Rechnungsadresse</strong>
<strong> <div class="partner-data">
<span t-esc="o.partner_id.name"/> <span t-esc="o.partner_id.name"/><br/>
</strong> <span t-esc="o.partner_id.street"/><br/>
<br/> <span t-esc="o.partner_id.zip"/><span t-esc="o.partner_id.city"/><br/>
<span t-esc="o.partner_id.street"/> <span t-esc="o.partner_id.country_id.name"/><br/>
<br/> <span t-esc="o.partner_id.email"/><br/>
<span t-esc="o.partner_id.zip"/>
<span t-esc="o.partner_id.city"/>
<br/>
<span t-esc="o.partner_id.country_id.name"/>
<br/>
Email:
<span t-esc="o.partner_id.email"/>
<br/>
Telefon:
<span t-esc="o.partner_id.phone"/> <span t-esc="o.partner_id.phone"/>
</div> </div>
</div> </div>
<div class="row"> <div class="col-xs-3">
<hr class="col-xs-12 red-line-2"/> <t t-call="dp_reports.company_data"/>
</div>
<div class="row height-20">
<span class="col-xs-2">Kundennr.:</span>
<span class="col-xs-2" t-field="o.partner_id.ref"/>
<span class="col-xs-2">Ansprechpartner:</span>
<span class="col-xs-2" t-field="o.user_id"/>
<span class="col-xs-2">Positionen:</span>
<span class="col-xs-2" t-field="o.positions"/>
</div>
<div class="row height-20">
<span class="col-xs-2">Angebotsdatum:</span>
<span class="col-xs-2">?????????</span>
<span class="col-xs-2">Email:</span>
<span class="col-xs-2" t-field="o.user_id.email"/>
<span class="col-xs-2">Artikel:</span>
<span class="col-xs-2" t-field="o.num_items"/>
</div>
<div class="row height-20">
<span class="col-xs-2">Lieferdatum:</span>
<span class="col-xs-2">?????????</span>
<span class="col-xs-2">Telefon:</span>
<span class="col-xs-2" t-field="o.user_id.phone"/>
<span class="col-xs-2">Bezeichnung:</span>
<span class="col-xs-2">?????????</span>
</div> </div>
</div>
<div class="row mt32"/>
<div class="row height-20">
<strong><span class="col-xs-2">Kundennr.:</span></strong>
<span class="col-xs-2" t-field="o.partner_id.ref"/>
<strong><span class="col-xs-2">Ansprechpartner:</span></strong>
<span class="col-xs-2" t-field="o.user_id"/>
<strong><span class="col-xs-2">Positionen:</span></strong>
<span class="col-xs-2" t-field="o.positions"/>
</div>
<div class="row height-20">
<strong><span class="col-xs-2">Angebotsdatum:</span></strong>
<span class="col-xs-2">?????????</span>
<strong><span class="col-xs-2">Email:</span></strong>
<span class="col-xs-2" t-field="o.user_id.email"/>
<strong><span class="col-xs-2">Artikel:</span></strong>
<span class="col-xs-2" t-field="o.num_items"/>
</div>
<div class="row height-20">
<strong><span class="col-xs-2">Lieferdatum:</span></strong>
<span class="col-xs-2">?????????</span>
<strong><span class="col-xs-2">Telefon:</span></strong>
<span class="col-xs-2" t-field="o.user_id.phone"/>
<strong><span class="col-xs-2">Bezeichnung:</span></strong>
<span class="col-xs-2">?????????</span>
</div>
<div class="row mt32"/>
<table class="table table-condensed">
<t t-set="discount_is_set" t-value="field_set_in_lines(o.invoice_line_ids, 'discount')"/>
<thead class="table-header">
<tr>
<th class="text-center">Pos.</th>
<th class="text-center">Anzahl</th>
<th class="text-right">Gewicht</th>
<th class="text-right">EP</th>
<th class="text-left">Artikel</th>
<th class="text-right" t-if="discount_is_set">Rabatt</th>
<th class="text-right">Gesamtpreis</th>
</tr>
</thead>
<table class="mt32 table table-condensed"> <tbody class="invoice-tbody">
<t t-set="discount_is_set" t-value="field_set_in_lines(o.invoice_line_ids, 'discount')"/> <t t-set="pos_nr" t-value="0"/>
<thead> <t t-foreach="o.invoice_line_ids" t-as="invoice_line">
<tr> <tr>
<th class="text-center">Pos.</th> <t t-set="pos_nr" t-value="pos_nr+1"/>
<th class="text-center">Anzahl</th> <td class="text-center">
<th class="text-right">Gewicht</th> <span t-esc="pos_nr"/>
<th class="text-right">EP</th> </td>
<th class="text-left">Artikel</th> <td class="text-right">
<th class="text-right" t-if="discount_is_set">Rabatt</th> <span t-field="invoice_line.quantity"/>
<th class="text-right">Gesamtpreis</th> </td>
</tr> <td class="text-right">
</thead> <span t-field="invoice_line.product_id.weight"/> kg
</td>
<tbody class="invoice_tbody"> <td class="text-right">
<t t-set="pos_nr" t-value="0"/> <span t-field="invoice_line.price_unit"/>
<t t-set="weight_total" t-value="0"/> </td>
<t t-foreach="o.invoice_line_ids" t-as="invoice_line"> <td rowspan="2" class="text-left">
<tr> <t t-if="invoice_line.product_id.default_code">
<t t-set="pos_nr" t-value="pos_nr+1"/> <strong>
<t t-set="weight_total" <span t-field="invoice_line.product_id.default_code"/>
t-value="weight_total+invoice_line.product_id.weight*invoice_line.quantity"/> </strong>
<td class="text-center">
<span t-esc="pos_nr"/>
</td>
<td class="text-right">
<span t-field="invoice_line.quantity"/>
</td>
<td class="text-right">
<span t-field="invoice_line.product_id.weight"/> kg
</td>
<td class="text-right">
<span t-field="invoice_line.price_unit"/>
</td>
<td rowspan="2" class="text-left">
<t t-if="invoice_line.product_id.default_code">
<strong>
<span t-field="invoice_line.product_id.default_code"/>
</strong>
<br/>
</t>
<span>
<strong>Zolltarif Nr.:</strong>
<span t-field="invoice_line.product_id.intrastat_id"/>
</span>
<br/> <br/>
<span t-field="invoice_line.name"/> </t>
</td> <span>
<td rowspan="2" class="text-right" t-if="discount_is_set"> <strong>Zolltarif Nr.:</strong>
<span t-field="invoice_line.discount"/> <span t-field="invoice_line.product_id.intrastat_id"/>
</td> </span>
<td rowspan="2" class="text-right"> <br/>
<span t-field="invoice_line.price_subtotal"/> <span t-field="invoice_line.name"/>
</td> </td>
</tr> <td rowspan="2" class="text-right" t-if="discount_is_set">
<span t-field="invoice_line.discount"/>
</td>
<td rowspan="2" class="text-right">
<span t-field="invoice_line.price_subtotal"/>
</td>
</tr>
<tr>
<td colspan="4" style="border: 0;text-align: center;">
<img t-if="invoice_line.product_id.image_medium"
t-att-src="'data:image/png;base64,%s' % invoice_line.product_id.image_medium.decode()"/>
</td>
</tr>
</t>
</tbody>
</table>
<div class="row">
<div class="col-xs-4 pull-right">
<table class="table table-condensed">
<tbody class="totals-tbody">
<tr> <tr>
<td colspan="4" style="border: 0;text-align: center;">
<img t-if="invoice_line.product_id.image_medium"
t-att-src="'data:image/png;base64,%s' % invoice_line.product_id.image_medium.decode()"/>
</td>
</tr>
</t>
</tbody>
</table>
<div class="row">
<div class="mt32 col-xs-4 pull-right">
<table class="table table-condensed">
<tr class="border-black">
<td> <td>
<strong>Zwischensumme</strong> Zwischensumme
</td> </td>
<td class="text-right"> <td class="text-right">
<span t-field="o.amount_untaxed" <span t-field="o.amount_untaxed"
@ -178,39 +144,42 @@
t-options='{"widget": "monetary", "display_currency": o.currency_id}'/> t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
</td> </td>
</tr> </tr>
<tr class="border-black"> <tr class="amount-total">
<td> <td>
<strong>Rechnungsbetrag</strong> <strong>Rechnungsbetrag</strong>
</td> </td>
<td class="text-right"> <td class="text-right">
<span t-field="o.amount_total" <strong>
t-options='{"widget": "monetary", "display_currency": o.currency_id}'/> <span t-field="o.amount_total"
t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
</strong>
</td> </td>
</tr> </tr>
</table> </tbody>
</div> </table>
</div>
<div class="row">
<p class="col-xs-12">
<span t-field="o.comment"/>
</p>
<p class="col-xs-12">
Gesamtgewicht:
<span t-esc="round(weight_total, 2)"/> kg
<br/>
</p>
<p class="col-xs-12" t-if="o.incoterms_id.name">
Lieferkonditionen:
<span t-esc="o.incoterms_id.name"/>
<br/>
</p>
<p class="col-xs-12" t-if="o.payment_term_id">
Zahlungskonditionen:
<span t-esc="o.payment_term_id.name"/>
<br/>
</p>
</div> </div>
</div> </div>
<div class="row">
<p class="col-xs-12">
<span t-field="o.comment"/>
</p>
<p class="col-xs-12">
Gesamtgewicht:
<span t-esc="round(o.weight_total, 2)"/> kg
<br/>
</p>
<p class="col-xs-12" t-if="o.incoterms_id.name">
Lieferkonditionen:
<span t-esc="o.incoterms_id.name"/>
<br/>
</p>
<p class="col-xs-12" t-if="o.payment_term_id">
Zahlungskonditionen:
<span t-esc="o.payment_term_id.name"/>
<br/>
</p>
</div>
</div>
</t> </t>
</template> </template>

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

@ -25,45 +25,40 @@
<span t-esc="o.partner_invoice_id.street"/><br/> <span t-esc="o.partner_invoice_id.street"/><br/>
<span t-esc="o.partner_invoice_id.zip"/><span t-esc="o.partner_invoice_id.city"/><br/> <span t-esc="o.partner_invoice_id.zip"/><span t-esc="o.partner_invoice_id.city"/><br/>
<span t-esc="o.partner_invoice_id.country_id.name"/><br/> <span t-esc="o.partner_invoice_id.country_id.name"/><br/>
<t t-if="o.partner_invoice_id.email"> <span t-esc="o.partner_invoice_id.email"/><br/>
Email: <span t-esc="o.partner_invoice_id.email"/><br/> <span t-esc="o.partner_invoice_id.phone"/>
</t>
<t t-if="o.partner_invoice_id.phone">
Telefon: <span t-esc="o.partner_invoice_id.phone"/>
</t>
</div> </div>
</div> </div>
<div class="col-xs-3"> <div class="col-xs-3">
<t t-call="dp_reports.company_data"/> <t t-call="dp_reports.company_data"/>
</div> </div>
<div class="row height-20">
<strong><span class="col-xs-2">Kundennr.:</span></strong>
<span class="col-xs-2" t-field="o.partner_id.ref"/>
<strong><span class="col-xs-2">Ansprechpartner:</span></strong>
<span class="col-xs-2" t-field="o.user_id"/>
<strong><span class="col-xs-2">Positionen:</span></strong>
<span class="col-xs-2" t-field="o.positions"/>
</div>
<div class="row height-20">
<strong><span class="col-xs-2">Angebotsdatum:</span></strong>
<span class="col-xs-2" t-field="o.date_order"/>
<strong><span class="col-xs-2">Email:</span></strong>
<span class="col-xs-2" t-field="o.user_id.email"/>
<strong><span class="col-xs-2">Artikel:</span></strong>
<span class="col-xs-2" t-field="o.num_items"/>
</div>
<div class="row height-20">
<strong><span class="col-xs-2">Lieferdatum:</span></strong>
<span class="col-xs-2" t-field="o.earliest_scheduled_date"/>
<strong><span class="col-xs-2">Telefon:</span></strong>
<span class="col-xs-2" t-field="o.user_id.phone"/>
<strong><span class="col-xs-2">Bezeichnung:</span></strong>
<span class="col-xs-2">?????????</span>
</div>
</div> </div>
<div class="row"> <div class="row mt32"/>
<hr class="col-xs-12 red-line-2"/> <div class="row height-20">
<strong><span class="col-xs-2">Kundennr.:</span></strong>
<span class="col-xs-2" t-field="o.partner_id.ref"/>
<strong><span class="col-xs-2">Ansprechpartner:</span></strong>
<span class="col-xs-2" t-field="o.user_id"/>
<strong><span class="col-xs-2">Positionen:</span></strong>
<span class="col-xs-2" t-field="o.positions"/>
</div> </div>
<div class="row height-20">
<strong><span class="col-xs-2">Angebotsdatum:</span></strong>
<span class="col-xs-2" t-field="o.date_order"/>
<strong><span class="col-xs-2">Email:</span></strong>
<span class="col-xs-2" t-field="o.user_id.email"/>
<strong><span class="col-xs-2">Artikel:</span></strong>
<span class="col-xs-2" t-field="o.num_items"/>
</div>
<div class="row height-20">
<strong><span class="col-xs-2">Lieferdatum:</span></strong>
<span class="col-xs-2" t-field="o.earliest_scheduled_date"/>
<strong><span class="col-xs-2">Telefon:</span></strong>
<span class="col-xs-2" t-field="o.user_id.phone"/>
<strong><span class="col-xs-2">Bezeichnung:</span></strong>
<span class="col-xs-2">?????????</span>
</div>
<div class="row mt32"/>
<table class="table table-condensed"> <table class="table table-condensed">
<t t-set="discount_is_set" t-value="field_set_in_lines(o.order_line, 'discount')"/> <t t-set="discount_is_set" t-value="field_set_in_lines(o.order_line, 'discount')"/>
<thead class="table-header"> <thead class="table-header">
@ -131,24 +126,20 @@
</tbody> </tbody>
</table> </table>
<div class="row">
<hr class="col-xs-12 red-line-2"/>
</div>
<div class="row"> <div class="row">
<div class="col-xs-4 pull-right"> <div class="col-xs-4 pull-right">
<table class="table table-condensed"> <table class="table table-condensed">
<tbody class="sale-tbody"> <tbody class="totals-tbody">
<tr> <tr>
<td> <td>
<strong>Zwischensumme</strong> Zwischensumme
</td> </td>
<td class="text-right"> <td class="text-right">
<span t-field="o.amount_untaxed" <span t-field="o.amount_untaxed"
t-options='{"widget": "monetary", "display_currency": o.currency_id}'/> t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
</td> </td>
</tr> </tr>
<tr class="amount-total"> <tr>
<td> <td>
<span>MwSt.</span> <span>MwSt.</span>
</td> </td>
@ -157,13 +148,15 @@
t-options='{"widget": "monetary", "display_currency": o.currency_id}'/> t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
</td> </td>
</tr> </tr>
<tr> <tr class="amount-total">
<td> <td>
<strong>Gesamtsumme</strong> <strong>Gesamtsumme</strong>
</td> </td>
<td class="text-right"> <td class="text-right">
<span t-field="o.amount_total" <strong>
t-options='{"widget": "monetary", "display_currency": o.currency_id}'/> <span t-field="o.amount_total"
t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
</strong>
</td> </td>
</tr> </tr>
</tbody> </tbody>
@ -175,6 +168,11 @@
<p class="col-xs-12"> <p class="col-xs-12">
<span t-field="o.note"/> <span t-field="o.note"/>
</p> </p>
<p class="col-xs-12">
Gesamtgewicht:
<span t-esc="round(o.weight_total, 2)"/> kg
<br/>
</p>
<p class="col-xs-12" t-if="o.incoterm.name"> <p class="col-xs-12" t-if="o.incoterm.name">
Lieferkonditionen: Lieferkonditionen:
<span t-esc="o.incoterm.name"/> <span t-esc="o.incoterm.name"/>