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

bug fix dp_reports/dp_reports_template; add street2 to partner-address

develop
Andreas Osim 2018-11-16 09:20:26 +01:00
parent 3ecb2ec251
commit 1b68641269
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,9 +47,9 @@
<t t-if="not (env.context.get('proforma', False) or is_pro_forma)"> <t t-if="not (env.context.get('proforma', False) or is_pro_forma)">
<!-- <!--
--> -->
<span t-if="not data.get('tz_report_production', False) and o.state not in ['draft','sent']">Auftragsbestätigung</span> <span t-if="not (data or {}).get('tz_report_production', False) and o.state not in ['draft','sent']">Auftragsbestätigung</span>
<span t-if="not data.get('tz_report_production', False) and o.state in ['draft','sent']">Angebot</span> <span t-if="not (data or {}).get('tz_report_production', False) and o.state in ['draft','sent']">Angebot</span>
<span t-if="data.get('tz_report_production',False)">Produktionsschein</span> <span t-if="(data or {}).get('tz_report_production',False)">Produktionsschein</span>
</t> </t>
<t t-if="env.context.get('proforma', False) or is_pro_forma"> <t t-if="env.context.get('proforma', False) or is_pro_forma">
<span>Proformarechnung</span> <span>Proformarechnung</span>
@ -187,6 +187,10 @@
</t> </t>
<span t-esc="o.partner_id.street"/> <span t-esc="o.partner_id.street"/>
<br/> <br/>
<t t-if="o.partner_id.street2">
<span t-esc="o.partner_id.street2"/>
<br/>
</t>
<span t-esc="o.partner_id.zip"/> <span t-esc="o.partner_id.zip"/>
<span t-esc="o.partner_id.city"/> <span t-esc="o.partner_id.city"/>
<br/> <br/>

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

@ -17,6 +17,10 @@
</t> </t>
<span t-esc="o.partner_id.street"/> <span t-esc="o.partner_id.street"/>
<br/> <br/>
<t t-if="o.partner_id.street2">
<span t-esc="o.partner_id.street2"/>
<br/>
</t>
<span t-esc="o.partner_id.zip"/> <span t-esc="o.partner_id.zip"/>
<span t-esc="o.partner_id.city"/> <span t-esc="o.partner_id.city"/>
<br/> <br/>