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

Redesign Sales TreeView (add 'origin') 

Special printout for own dealer logo (DLV,OC)
develop
Andreas Osim 2019-11-18 15:56:52 +01:00
parent d895483158
commit 1d085e9746
3 changed files with 187 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,11 +44,16 @@ class SaleOrder(models.Model):
('delivered', 'Geliefert'), ('delivered', 'Geliefert'),
('completed', 'Abgeschlossen')] ('completed', 'Abgeschlossen')]
# ORDER_TYPES = [
# ('M', 'Manuell'),
# ('D', 'DesignBox'),
# ('I', 'Industrie'),
# ('T', 'TZBox')
ORDER_TYPES = [ ORDER_TYPES = [
('M', 'Manuell'), ('M', 'M'),
('D', 'DesignBox'), ('D', 'D'),
('I', 'Industrie'), ('I', 'I'),
('T', 'TZBox') ('T', 'T')
] ]
assembled = fields.Boolean(string='Zusammengebaut') assembled = fields.Boolean(string='Zusammengebaut')

6
ext/custom-addons/dp_custom/views/sale_views.xml
View File

@ -180,8 +180,9 @@
<field name="partner_shipping_id" invisible="1"/> <field name="partner_shipping_id" invisible="1"/>
</field> </field>
<field name="name" position="after"> <field name="name" position="after">
<field name="order_type"/> <field name="order_type" string="Art"/>
<!-- <field name="team_id"/> --> <!-- <field name="team_id"/> -->
<field name="origin"/>
<field name="confirmation_nr"/> <field name="confirmation_nr"/>
<field name="client_order_ref"/> <field name="client_order_ref"/>
</field> </field>
@ -198,8 +199,9 @@
<field name="partner_shipping_id" invisible="1"/> <field name="partner_shipping_id" invisible="1"/>
</field> </field>
<field name="name" position="after"> <field name="name" position="after">
<field name="order_type"/> <field name="order_type" string="Art"/>
<!-- <field name="team_id"/> --> <!-- <field name="team_id"/> -->
<field name="origin"/>
<field name="confirmation_nr"/> <field name="confirmation_nr"/>
<field name="client_order_ref"/> <field name="client_order_ref"/>
</field> </field>

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

@ -18,6 +18,17 @@
</template> </template>
<template id="external_layout_custom"> <template id="external_layout_custom">
<t t-set="DlvLogo" t-value="False"/>
<t t-set="OcLogo" t-value="False"/>
<t t-foreach="o.partner_id.retail_partner_id.category_id" t-as="cat">
<t t-if="cat.name == 'OcLogo'">
<t t-set="OcLogo" t-value="True"/>
</t>
<t t-if="cat.name == 'DlvLogo'">
<t t-set="DlvLogo" t-value="True"/>
</t>
</t>
<t t-call="dp_reports.external_layout_header"/> <t t-call="dp_reports.external_layout_header"/>
<div class="article o_dp_report_layout"> <div class="article o_dp_report_layout">
@ -42,11 +53,10 @@
<span t-if="o.type == 'in_refund'">LIEFERANTENSTORNO</span> <span t-if="o.type == 'in_refund'">LIEFERANTENSTORNO</span>
<span t-if="o.type == 'in_invoice'">EINGANGSRECHNUNG</span> <span t-if="o.type == 'in_invoice'">EINGANGSRECHNUNG</span>
<span t-field="o.number"/> <span t-field="o.number"/>
<span t-field="o.partner_id.retail_partner_id.category_id.name"/>
</p> </p>
<p t-if="o._name == 'sale.order'"> <p t-if="o._name == 'sale.order'">
<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 or {}).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 or {}).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 or {}).get('tz_report_production',False)">Produktionsschein</span> <span t-if="(data or {}).get('tz_report_production',False)">Produktionsschein</span>
@ -62,8 +72,18 @@
</p> </p>
</div> </div>
<div class="col-xs-4 header-logo"> <div class="col-xs-4 header-logo">
<img t-if="company.logo" t-att-src="'data:image/png;base64,%s' % company.logo.decode()" <t t-if="DlvLogo and o._name == 'stock.picking' and is_picking">
style="max-height: 85px;"/> <img t-if="o.partner_id.retail_partner_id.image" t-att-src="'data:image/png;base64,%s' % o.partner_id.retail_partner_id.image.decode()"
style="max-height: 85px;"/>
</t>
<t t-elif="OcLogo and not (data or {}).get('tz_report_production', False) and o.state not in ['draft','sent']">
<img t-if="o.partner_id.retail_partner_id.image" t-att-src="'data:image/png;base64,%s' % o.partner_id.retail_partner_id.image.decode()"
style="max-height: 85px;"/>
</t>
<t t-else="">
<img t-if="company.logo" t-att-src="'data:image/png;base64,%s' % company.logo.decode()"
style="max-height: 85px;"/>
</t>
</div> </div>
</div> </div>
<div class="row mt16"> <div class="row mt16">
@ -77,64 +97,88 @@
<div class="row"> <div class="row">
<hr class="red-line-1"/> <hr class="red-line-1"/>
</div> </div>
<div class="row" style="padding-left:0;"> <t t-if="(DlvLogo and o._name == 'stock.picking' and is_picking) or (OcLogo and not (data or {}).get('tz_report_production', False) and o.state not in ['draft','sent'])">
<div class="col-xs-12 text-center"> <div class="row" style="padding-left:0;">
<strong> <div class="col-xs-12 text-center">
<span t-esc="company.name"/> <strong>
&#183; <span t-esc="o.partner_id.retail_partner_id.name"/>
<span t-esc="company.street"/> &#183;
&#183; <span t-esc="o.partner_id.retail_partner_id.street"/>
<span t-esc="company.zip"/> &#183;
<span t-esc="company.city"/> <span t-esc="o.partner_id.retail_partner_id.zip"/>
&#183; <span t-esc="o.partner_id.retail_partner_id.city"/>
<span t-esc="company.phone"/> &#183;
&#183; <span t-esc="o.partner_id.retail_partner_id.phone"/>
<span t-esc="company.email"/> &#183;
&#183; <span t-esc="o.partner_id.retail_partner_id.email"/>
<span t-esc="company.website.replace('http://', '').replace('https://', '')"/> <t t-if ="o.partner_id.retail_partner_id.website">
</strong> &#183;
<span t-esc="o.partner_id.retail_partner_id.website.replace('http://', '').replace('https://', '')"/>
</t>
</strong>
</div>
</div> </div>
</div> </t>
<div class="row"> <t t-else="">
<div class="col-xs-12 text-center"> <div class="row" style="padding-left:0;">
<!-- <span>AT 46 3250 1000 0200 9306</span> --> <div class="col-xs-12 text-center">
<!-- <span>RLN WAT WW MIB</span> --> <strong>
<!-- <span>Raiffeisenbank Spannberg</span> --> <span t-esc="company.name"/>
<strong> &#183;
IBAN: <span t-esc="company.street"/>
<span t-if="company.partner_id.bank_ids" t-esc="company.partner_id.bank_ids[0].acc_number"/> &#183;
&#183; <span t-esc="company.zip"/>
BIC: <span t-esc="company.city"/>
<span t-if="company.partner_id.bank_ids" t-esc="company.partner_id.bank_ids[0].bank_id.bic"/> &#183;
&#183; <span t-esc="company.phone"/>
<span t-if="company.partner_id.bank_ids" t-esc="company.partner_id.bank_ids[0].bank_id.name"/> &#183;
</strong> <span t-esc="company.email"/>
&#183;
<span t-esc="company.website.replace('http://', '').replace('https://', '')"/>
</strong>
</div>
</div> </div>
</div> <div class="row">
<div class="row"> <div class="col-xs-12 text-center">
<div class="col-xs-12 text-center"> <!-- <span>AT 46 3250 1000 0200 9306</span> -->
<!-- <span>AT 46 3250 1000 0200 9306</span> --> <!-- <span>RLN WAT WW MIB</span> -->
<!-- <span>RLN WAT WW MIB</span> --> <!-- <span>Raiffeisenbank Spannberg</span> -->
<!-- <span>Raiffeisenbank Spannberg</span> --> <strong>
<strong> IBAN:
UID-Nr.: <span t-if="company.partner_id.bank_ids" t-esc="company.partner_id.bank_ids[0].acc_number"/>
<span t-esc="company.vat"/> &#183;
&#183; BIC:
EORI-Nr. <span t-if="company.partner_id.bank_ids" t-esc="company.partner_id.bank_ids[0].bank_id.bic"/>
<span t-esc="company.eori_nr"/> &#183;
&#183; <span t-if="company.partner_id.bank_ids" t-esc="company.partner_id.bank_ids[0].bank_id.name"/>
Firmenbuch Nr.: </strong>
<span t-esc="company.company_registry"/> </div>
</strong>
</div> </div>
</div> <div class="row">
<div class="row" style="padding-left:0;"> <div class="col-xs-12 text-center">
<div class="col-xs-12 text-center"> <!-- <span>AT 46 3250 1000 0200 9306</span> -->
<strong> <!-- <span>RLN WAT WW MIB</span> -->
Die AGBs finden Sie auf unserer Website. <!-- <span>Raiffeisenbank Spannberg</span> -->
</strong> <strong>
UID-Nr.:
<span t-esc="company.vat"/>
&#183;
EORI-Nr.
<span t-esc="company.eori_nr"/>
&#183;
Firmenbuch Nr.:
<span t-esc="company.company_registry"/>
</strong>
</div>
</div> </div>
</div> <div class="row" style="padding-left:0;">
<div class="col-xs-12 text-center">
<strong>
Die AGBs finden Sie auf unserer Website.
</strong>
</div>
</div>
</t>
<div class="row"> <div class="row">
<div class="col-xs-12 text-right"> <div class="col-xs-12 text-right">
<ul class="list-inline"> <ul class="list-inline">
@ -153,36 +197,81 @@
</template> </template>
<template id="company_data"> <template id="company_data">
<t t-set="company" t-value="res_company"/> <t t-set="DlvLogo" t-value="False"/>
<strong> <t t-set="OcLogo" t-value="False"/>
<span t-esc="company.partner_id.name"/> <t t-foreach="o.partner_id.retail_partner_id.category_id" t-as="cat">
</strong> <t t-if="cat.name == 'OcLogo'">
<div class="company-data"> <t t-set="OcLogo" t-value="True"/>
<span t-esc="company.partner_id.street"/>
<br/>
<span t-esc="company.partner_id.zip"/>
<span t-esc="company.partner_id.city"/>
<br/>
<span t-esc="company.partner_id.country_id.name"/>
<br/>
<br/>
Phone:
<span t-esc="company.partner_id.phone"/>
<t t-if="company.partner_id.fax">
<br/>
Fax:
<span t-esc="company.partner_id.fax"/>
</t> </t>
<br/> <t t-if="cat.name == 'DlvLogo'">
E-Mail: <t t-set="DlvLogo" t-value="True"/>
<span t-esc="company.partner_id.email"/> </t>
<br/> </t>
</div> <t t-if="(DlvLogo and o._name == 'stock.picking' and is_picking) or (OcLogo and not (data or {}).get('tz_report_production', False) and o.state not in ['draft','sent'])">
<div>
<strong> <strong>
<span t-esc="company.partner_id.website.replace('http://', '').replace('https://', '')"/> <span t-esc="o.partner_id.retail_partner_id.name"/>
</strong> </strong>
</div> <div class="company-data">
<span t-esc="o.partner_id.retail_partner_id.street"/>
<br/>
<span t-esc="o.partner_id.retail_partner_id.zip"/>
<span t-esc="o.partner_id.retail_partner_id.city"/>
<br/>
<span t-esc="o.partner_id.retail_partner_id.country_id.name"/>
<br/>
<br/>
Phone:
<span t-esc="o.partner_id.retail_partner_id.phone"/>
<t t-if="o.partner_id.retail_partner_id.fax">
<br/>
Fax:
<span t-esc="o.partner_id.retail_partner_id.fax"/>
</t>
<br/>
E-Mail:
<span t-esc="o.partner_id.retail_partner_id.email"/>
<br/>
</div>
<div>
<strong>
<t t-if ="o.partner_id.retail_partner_id.website">
<span t-esc="o.partner_id.retail_partner_id.website.replace('http://', '').replace('https://', '')"/>
</t>
</strong>
</div>
</t>
<t t-else="">
<t t-set="company" t-value="res_company"/>
<strong>
<span t-esc="company.partner_id.name"/>
</strong>
<div class="company-data">
<span t-esc="company.partner_id.street"/>
<br/>
<span t-esc="company.partner_id.zip"/>
<span t-esc="company.partner_id.city"/>
<br/>
<span t-esc="company.partner_id.country_id.name"/>
<br/>
<br/>
Phone:
<span t-esc="company.partner_id.phone"/>
<t t-if="company.partner_id.fax">
<br/>
Fax:
<span t-esc="company.partner_id.fax"/>
</t>
<br/>
E-Mail:
<span t-esc="company.partner_id.email"/>
<br/>
</div>
<div>
<strong>
<span t-esc="company.partner_id.website.replace('http://', '').replace('https://', '')"/>
</strong>
</div>
</t>
</template> </template>
<template id="partner_data"> <template id="partner_data">