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

Fall 5398: CR1 - Anpassungen SST-01 / Neues Feld

develop
Ahmed Aly 2018-04-04 08:46:15 +02:00
parent f2c37357cd
commit 7ec1b4ab8e
4 changed files with 210 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dev/scripts/interfaces/sst11_pg_create_company.py
View File

@ -13,9 +13,10 @@ odoo.login(db, user, pw)
values = { values = {
"name": "Company2", "name": "Company2",
"street": "Elterleinplatz 11", "name2": "Unternehmen 2",
"street": "Matzleinsdorferplatz 5",
"street2": "Teststrasse 30", "street2": "Teststrasse 30",
"zip": 1170, "zip": 1050,
"city": "Wien", "city": "Wien",
"country_id": "AT", "country_id": "AT",
"fax": "+43 55567051", "fax": "+43 55567051",

37
ext/custom-addons/dp_custom/models/res_partner.py
View File

@ -245,7 +245,7 @@ class Partner(models.Model):
elif self.env.context.get('sst_11', False): elif self.env.context.get('sst_11', False):
common_list.extend(['name', 'ref', 'partner_sector_id', 'comment', 'vat', 'property_payment_term_id', common_list.extend(['name', 'ref', 'partner_sector_id', 'comment', 'vat', 'property_payment_term_id',
'property_pricelist_id', 'date_vat_check', 'active', 'property_product_pricelist', 'property_pricelist_id', 'date_vat_check', 'active', 'property_product_pricelist',
'retail_partner_id', 'retailer', 'info_uid']) 'retail_partner_id', 'retailer', 'info_uid', 'name2'])
elif self.env.context.get('sst_14', False): elif self.env.context.get('sst_14', False):
common_list.extend(['firstname', 'lastname', 'midname', 'company_odoo_id', 'portal_id']) common_list.extend(['firstname', 'lastname', 'midname', 'company_odoo_id', 'portal_id'])
return common_list return common_list
@ -296,6 +296,41 @@ class Partner(models.Model):
vals[field] = False vals[field] = False
return super(Partner, self).write(vals) return super(Partner, self).write(vals)
@api.multi
def name_get(self):
res = []
for partner in self:
name = partner.name or ''
if partner.name2:
name += " " + partner.name2
if partner.company_name or partner.parent_id:
if not name and partner.type in ['invoice', 'delivery', 'other']:
name = dict(self.fields_get(['type'])['type']['selection'])[partner.type]
if not partner.is_company:
name = "%s, %s" % (partner.commercial_company_name or partner.parent_id.name, name)
if self._context.get('show_address_only'):
name = partner._display_address(without_company=True)
if self._context.get('show_address'):
name = name + "\n" + partner._display_address(without_company=True)
name = name.replace('\n\n', '\n')
name = name.replace('\n\n', '\n')
if self._context.get('show_email') and partner.email:
name = "%s <%s>" % (name, partner.email)
if self._context.get('html_format'):
name = name.replace('\n', '<br/>')
res.append((partner.id, name))
return res
@api.depends('company_name', 'parent_id.is_company', 'commercial_partner_id.name')
def _compute_commercial_company_name(self):
res = super(Partner, self)._compute_commercial_company_name()
for partner in self:
p = partner.commercial_partner_id
if p.is_company and p.name2:
partner.commercial_company_name += " " + p.name2
return res
class PartnerSector(models.Model): class PartnerSector(models.Model):
_name = 'res.partner.sector' _name = 'res.partner.sector'

4
ext/custom-addons/dp_custom/views/res_partner_views.xml
View File

@ -12,9 +12,9 @@
class="btn-danger" attrs="{'invisible':[('portal_pending','=',False)]}"/> class="btn-danger" attrs="{'invisible':[('portal_pending','=',False)]}"/>
</header> </header>
</xpath> </xpath>
<xpath expr="//h1" position="after"> <xpath expr="//field[@name='parent_id']/.." position="before">
<h3> <h3>
<field name="name2" attrs="{'invisible': [('is_company', '=', False)]}"/> <field name="name2" placeholder="Unternehmen 2"/>
</h3> </h3>
</xpath> </xpath>

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

@ -1,166 +1,188 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<odoo> <odoo>
<data>
<template id="report_assets_common" inherit_id="web.report_assets_common"> <template id="report_assets_common" inherit_id="web.report_assets_common">
<xpath expr="." position="inside"> <xpath expr="." position="inside">
<link rel="stylesheet" type="text/less" href="/dp_reports/static/src/less/report_backend.less"/> <link rel="stylesheet" type="text/less" href="/dp_reports/static/src/less/report_backend.less"/>
<link href="https://fonts.googleapis.com/css?family=Raleway:300,400,700" rel="stylesheet"/> <link href="https://fonts.googleapis.com/css?family=Raleway:300,400,700" rel="stylesheet"/>
</xpath> </xpath>
</template> </template>
<template id="external_layout" inherit_id="web.external_layout"> <template id="external_layout" inherit_id="web.external_layout">
<xpath expr="." position="inside"> <xpath expr="." position="inside">
<t t-if="company.external_report_layout == 'custom'"> <t t-if="company.external_report_layout == 'custom'">
<t t-call="dp_reports.external_layout_custom"> <t t-call="dp_reports.external_layout_custom">
<t t-raw="0"/> <t t-raw="0"/>
</t>
</t> </t>
</xpath> </t>
</template> </xpath>
</template>
<template id="external_layout_custom"> <template id="external_layout_custom">
<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">
<t t-raw="0"/> <t t-raw="0"/>
</div> </div>
<t t-call="dp_reports.external_layout_footer"/> <t t-call="dp_reports.external_layout_footer"/>
</template> </template>
<!-- Report Header Full --> <!-- Report Header Full -->
<template id="external_layout_header"> <template id="external_layout_header">
<div class="header"> <div class="header">
<div class="row"> <div class="row">
<div class="col-xs-10 header-label"> <div class="col-xs-10 header-label">
<p t-if="o._name == 'account.invoice'"> <p t-if="o._name == 'account.invoice'">
<span t-if="o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')"> <span t-if="o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')">
RECHNUNG RECHNUNG
</span> </span>
<span t-if="o.type == 'out_invoice' and o.state == 'draft'">RECHNUNGSENTWURF</span> <span t-if="o.type == 'out_invoice' and o.state == 'draft'">RECHNUNGSENTWURF</span>
<span t-if="o.type == 'out_invoice' and o.state == 'cancel'">STORNIERTE RECHNUNG</span> <span t-if="o.type == 'out_invoice' and o.state == 'cancel'">STORNIERTE RECHNUNG</span>
<span t-if="o.type == 'out_refund'">GUTSCHRIFT</span> <span t-if="o.type == 'out_refund'">GUTSCHRIFT</span>
<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"/>
</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="o.state not in ['draft','sent']">Auftragsbestätigung</span> <span t-if="o.state not in ['draft','sent']">Auftragsbestätigung</span>
<span t-if="o.state in ['draft','sent']">Angebot</span> <span t-if="o.state in ['draft','sent']">Angebot</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>
</t> </t>
<span t-field="o.quote_name"/> <span t-field="o.quote_name"/>
</p> </p>
</div>
<div class="col-xs-2 header-logo">
<img t-if="company.logo" t-att-src="'data:image/png;base64,%s' % company.logo.decode()"
style="max-height: 85px;"/>
</div>
</div> </div>
<div class="row mt16"> <div class="col-xs-2 header-logo">
<hr class="red-line-1"/> <img t-if="company.logo" t-att-src="'data:image/png;base64,%s' % company.logo.decode()"
style="max-height: 85px;"/>
</div> </div>
</div> </div>
</template> <div class="row mt16">
<hr class="red-line-1"/>
</div>
</div>
</template>
<template id="external_layout_footer"> <template id="external_layout_footer">
<div class="footer"> <div class="footer">
<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;"> <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"/>
&#183; &#183;
<span t-esc="company.street"/> <span t-esc="company.street"/>
&#183; &#183;
<span t-esc="company.zip"/> <span t-esc="company.zip"/>
<span t-esc="company.city"/> <span t-esc="company.city"/>
&#183; &#183;
<span t-esc="company.phone"/> <span t-esc="company.phone"/>
&#183; &#183;
<span t-esc="company.email"/> <span t-esc="company.email"/>
&#183; &#183;
<span t-esc="company.website"/> <span t-esc="company.website"/>
</strong> </strong>
</div>
</div>
<div class="row">
<div class="col-xs-12 text-center">
<strong>
IBAN:
<!-- <span t-if="company.bank_ids" t-esc="company.bank_ids[0].acc_number"/> -->
<span>AT463 250 100 002 009 306</span>
&#183;
BIC:
<!-- <span t-if="company.bank_ids" t-esc="company.bank_ids[0].bank_id.bic"/> -->
<span>RLN WAT WW MIB</span>
&#183;
<!-- <span t-if="company.bank_ids" t-esc="company.bank_ids[0].bank_id.name"/> -->
<span>Raiffeisenbank Spannberg</span>
&#183;
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 class="row">
<div class="col-xs-12 text-right">
<ul class="list-inline">
<li>Seite:</li>
<li>
<span class="page"/>
</li>
<li>/</li>
<li>
<span class="topage"/>
</li>
</ul>
</div>
</div> </div>
</div> </div>
</template> <div class="row">
<div class="col-xs-12 text-center">
<strong>
IBAN:
<!-- <span t-if="company.bank_ids" t-esc="company.bank_ids[0].acc_number"/> -->
<span>AT463 250 100 002 009 306</span>
&#183;
BIC:
<!-- <span t-if="company.bank_ids" t-esc="company.bank_ids[0].bank_id.bic"/> -->
<span>RLN WAT WW MIB</span>
&#183;
<!-- <span t-if="company.bank_ids" t-esc="company.bank_ids[0].bank_id.name"/> -->
<span>Raiffeisenbank Spannberg</span>
&#183;
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 class="row">
<div class="col-xs-12 text-right">
<ul class="list-inline">
<li>Seite:</li>
<li>
<span class="page"/>
</li>
<li>/</li>
<li>
<span class="topage"/>
</li>
</ul>
</div>
</div>
</div>
</template>
<template id="company_data"> <template id="company_data">
<t t-set="company" t-value="res_company"/> <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"/>
<br/>
Fax: +43 2538/8628 - 400
<br/>
E-Mail:
<span t-esc="company.partner_id.email"/>
<br/>
</div>
<div>
<strong> <strong>
<span t-esc="company.partner_id.name"/> <span t-esc="company.partner_id.website"/>
</strong> </strong>
<div class="company-data"> </div>
<span t-esc="company.partner_id.street"/><br/> </template>
<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/> <template id="partner_data">
Phone: <span t-esc="company.partner_id.phone"/><br/> <strong>
Fax: +43 2538/8628 - 400<br/> Kundendaten
E-Mail: <span t-esc="company.partner_id.email"/><br/> </strong>
</div> <div class="partner-data">
<div> <span t-esc="o.partner_id.name"/>
<strong><span t-esc="company.partner_id.website"/></strong> <br/>
</div> <t t-if="o.partner_id.name2">
</template> <span t-esc="o.partner_id.name2"/>
<template id="partner_data"> <br/>
<strong> </t>
Kundendaten <span t-esc="o.partner_id.street"/>
</strong> <br/>
<div class="partner-data"> <span t-esc="o.partner_id.zip"/>
<span t-esc="o.partner_id.name"/><br/> <span t-esc="o.partner_id.city"/>
<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.country_id.name"/>
<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.email"/>
<span t-esc="o.partner_id.phone"/> <br/>
</div> <span t-esc="o.partner_id.phone"/>
</template> </div>
</data> </template>
</odoo> </odoo>