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

Fälle 4576, 4574: Dokumentenvorlagen

develop
Roman Widmann 2018-02-07 13:35:57 +01:00
parent 2a3ecaf478
commit ca600b756c
5 changed files with 68 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ext/custom-addons/dp_reports/models/report_helper.py
View File

@ -14,11 +14,14 @@ class ReportHelper(models.AbstractModel):
temp = line.__getattribute__(field) temp = line.__getattribute__(field)
elif not temp and idx != 0: elif not temp and idx != 0:
return False return False
else:
if len(temp) > 1:
temp = temp[0].__getattribute__(field)
else: else:
temp = temp.__getattribute__(field) temp = temp.__getattribute__(field)
if not temp: if temp:
return False
return True return True
return False
@api.model @api.model
def _formatLang(self, value, currency=True): def _formatLang(self, value, currency=True):

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

@ -56,7 +56,7 @@
<span t-field="o.quote_name"/> <span t-field="o.quote_name"/>
</p> </p>
</div> </div>
<div class="col-xs-2"> <div class="col-xs-2 header-logo">
<img t-if="company.logo" t-att-src="'data:image/png;base64,%s' % company.logo.decode()" <img t-if="company.logo" t-att-src="'data:image/png;base64,%s' % company.logo.decode()"
style="max-height: 85px;"/> style="max-height: 85px;"/>
</div> </div>
@ -153,7 +153,7 @@
<div class="partner-data"> <div class="partner-data">
<span t-esc="o.partner_id.name"/><br/> <span t-esc="o.partner_id.name"/><br/>
<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/>
<span t-esc="o.partner_id.email"/><br/> <span t-esc="o.partner_id.email"/><br/>
<span t-esc="o.partner_id.phone"/> <span t-esc="o.partner_id.phone"/>

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

@ -14,8 +14,27 @@ body.container {
.header { .header {
font-size:10pt; font-size:10pt;
font-family: 'Raleway'; font-family: 'Raleway';
position: relative;
} }
/*
.header-logo {
position: absolute;
top: 0;
left: 80%;
}
.header-label {
font-size:20pt;
font-weight: bold;
color: #A72523;
vertical-align: bottom;
position: absolute;
bottom: 0;
left: 0;
}
*/
.header-label { .header-label {
font-size:20pt; font-size:20pt;
font-weight: bold; font-weight: bold;

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

@ -15,7 +15,7 @@
<div class="partner-data"> <div class="partner-data">
<span t-esc="o.partner_shipping_id.name"/> <span t-esc="o.partner_shipping_id.name"/>
<span t-esc="o.partner_shipping_id.street"/><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.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> </div>
@ -24,10 +24,11 @@
<div class="partner-data"> <div class="partner-data">
<span t-esc="o.partner_id.name"/><br/> <span t-esc="o.partner_id.name"/><br/>
<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/> <t t-if="o.partner_id.country_id"><span t-esc="o.partner_id.country_id.name"/><br/></t>
<span t-esc="o.partner_id.email"/><br/> <t t-if="o.partner_id.email"><span t-esc="o.partner_id.email"/><br/></t>
<span t-esc="o.partner_id.phone"/> <t t-if="o.partner_id.phone"><span t-esc="o.partner_id.phone"/><br/></t>
<t t-if="o.partner_id.vat">UID-Nr.: <span t-esc="o.partner_id.vat"/></t>
</div> </div>
</div> </div>
<div class="col-xs-3"> <div class="col-xs-3">
@ -44,8 +45,8 @@
<span class="col-xs-2" t-field="o.positions"/> <span class="col-xs-2" t-field="o.positions"/>
</div> </div>
<div class="row height-20"> <div class="row height-20">
<strong><span class="col-xs-2">Angebotsdatum:</span></strong> <strong><span class="col-xs-2">Rechnungsdatum:</span></strong>
<span class="col-xs-2">?????????</span> <span class="col-xs-2" t-field="o.date_invoice"/>
<strong><span class="col-xs-2">Email:</span></strong> <strong><span class="col-xs-2">Email:</span></strong>
<span class="col-xs-2" t-field="o.user_id.email"/> <span class="col-xs-2" t-field="o.user_id.email"/>
<strong><span class="col-xs-2">Artikel:</span></strong> <strong><span class="col-xs-2">Artikel:</span></strong>
@ -57,7 +58,7 @@
<strong><span class="col-xs-2">Telefon:</span></strong> <strong><span class="col-xs-2">Telefon:</span></strong>
<span class="col-xs-2" t-field="o.user_id.phone"/> <span class="col-xs-2" t-field="o.user_id.phone"/>
<strong><span class="col-xs-2">Bezeichnung:</span></strong> <strong><span class="col-xs-2">Bezeichnung:</span></strong>
<span class="col-xs-2">?????????</span> <span class="col-xs-2" t-field="o.number"/>
</div> </div>
<div class="row mt32"/> <div class="row mt32"/>
<table class="table table-condensed"> <table class="table table-condensed">
@ -178,6 +179,11 @@
<span t-esc="o.payment_term_id.name"/> <span t-esc="o.payment_term_id.name"/>
<br/> <br/>
</p> </p>
<p class="col-xs-12">
EORI-Nr.:
<span t-esc="o.user_id.company_id.eori_nr"/>
<br/>
</p>
</div> </div>
</div> </div>
</t> </t>

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

@ -14,7 +14,7 @@
<div class="partner-data"> <div class="partner-data">
<span t-esc="o.partner_shipping_id.name"/> <span t-esc="o.partner_shipping_id.name"/>
<span t-esc="o.partner_shipping_id.street"/><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.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> </div>
@ -23,10 +23,11 @@
<div class="partner-data"> <div class="partner-data">
<span t-esc="o.partner_invoice_id.name"/><br/> <span t-esc="o.partner_invoice_id.name"/><br/>
<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/> <t t-if="o.partner_invoice_id.country_id"><span t-esc="o.partner_invoice_id.country_id.name"/><br/></t>
<span t-esc="o.partner_invoice_id.email"/><br/> <t t-if="o.partner_invoice_id.email"><span t-esc="o.partner_invoice_id.email"/><br/></t>
<span t-esc="o.partner_invoice_id.phone"/> <t t-if="o.partner_invoice_id.phone"><span t-esc="o.partner_invoice_id.phone"/><br/></t>
<t t-if="o.partner_invoice_id.vat">UID-Nr.: <span t-esc="o.partner_invoice_id.vat"/></t>
</div> </div>
</div> </div>
<div class="col-xs-3"> <div class="col-xs-3">
@ -44,7 +45,7 @@
</div> </div>
<div class="row height-20"> <div class="row height-20">
<strong><span class="col-xs-2">Angebotsdatum:</span></strong> <strong><span class="col-xs-2">Angebotsdatum:</span></strong>
<span class="col-xs-2" t-field="o.date_order"/> <span class="col-xs-2" t-field="o.date_order" t-options='{"widget": "date"}'/>
<strong><span class="col-xs-2">Email:</span></strong> <strong><span class="col-xs-2">Email:</span></strong>
<span class="col-xs-2" t-field="o.user_id.email"/> <span class="col-xs-2" t-field="o.user_id.email"/>
<strong><span class="col-xs-2">Artikel:</span></strong> <strong><span class="col-xs-2">Artikel:</span></strong>
@ -52,11 +53,11 @@
</div> </div>
<div class="row height-20"> <div class="row height-20">
<strong><span class="col-xs-2">Lieferdatum:</span></strong> <strong><span class="col-xs-2">Lieferdatum:</span></strong>
<span class="col-xs-2" t-field="o.earliest_scheduled_date"/> <span class="col-xs-2" t-field="o.earliest_scheduled_date" t-options='{"widget": "date"}'/>
<strong><span class="col-xs-2">Telefon:</span></strong> <strong><span class="col-xs-2">Telefon:</span></strong>
<span class="col-xs-2" t-field="o.user_id.phone"/> <span class="col-xs-2" t-field="o.user_id.phone"/>
<strong><span class="col-xs-2">Bezeichnung:</span></strong> <strong><span class="col-xs-2">Bezeichnung:</span></strong>
<span class="col-xs-2">?????????</span> <span class="col-xs-2" t-field="o.quote_name"/>
</div> </div>
<div class="row mt32"/> <div class="row mt32"/>
<table class="table table-condensed"> <table class="table table-condensed">
@ -84,12 +85,10 @@
<span t-field="order_line.product_uom_qty"/> <span t-field="order_line.product_uom_qty"/>
</td> </td>
<td t-if="not order_line.lot_id.weight" class="text-right"> <td t-if="not order_line.lot_id.weight" class="text-right">
<span t-field="order_line.product_id.weight"/> <span t-field="order_line.product_id.weight"/> kg
<span t-field="order_line.product_uom"/>
</td> </td>
<td t-if="order_line.lot_id.weight" class="text-right"> <td t-if="order_line.lot_id.weight" class="text-right">
<span t-field="order_line.lot_id.weight"/> <span t-field="order_line.lot_id.weight"/> kg
<span t-field="order_line.product_uom"/>
</td> </td>
<td class="text-right"> <td class="text-right">
<span t-field="order_line.price_unit"/> <span t-field="order_line.price_unit"/>
@ -188,6 +187,21 @@
<span t-esc="o.payment_term_id.name"/> <span t-esc="o.payment_term_id.name"/>
<br/> <br/>
</p> </p>
<p class="col-xs-12" t-if="o.state not in ['draft','sent']">
Bitte prüfen Sie bei Anlieferung sofort die Verkackung bzw. Ware auf Beschädigung!<br/>
Falls die beschädigte Ware angenommen wird, besteht kein Anspruch auf Kostenerstattung bzw. Austausch.
</p>
<t t-if="o.state in ['draft','sent']">
<p class="col-xs-12">
Gültigkeit: 14 Tage ab Ausstellungsdatum
</p>
<p class="col-xs-12">
Auftrag erteilt am: ____________________
</p>
<p class="col-xs-12">
Unterschrift: ____________________
</p>
</t>
</div> </div>
</div> </div>
</t> </t>