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

Aufräumen

develop
Christian Hattemer 2016-11-08 18:44:44 +01:00
parent ce61bdad8d
commit 83aff9a249
12 changed files with 389 additions and 393 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/config/odoo-server.conf
View File

@ -38,4 +38,4 @@ limit_memory_hard = 10000000000
# Use a new worker for the next request if 400MB is reached # Use a new worker for the next request if 400MB is reached
# The worker will be recycled after the current request # The worker will be recycled after the current request
limit_memory_soft = 400000000 limit_memory_soft = 400000000

5
ext/custom-addons/dp_custom/__init__.py
View File

@ -1,8 +1,8 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # datenpol gmbh
# Copyright (C) 20014-2016 Camadeus GmbH (<http://www.camadeus.at>). # Copyright (C) 2013-TODAY datenpol gmbh (<http://www.datenpol.at/>)
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as # it under the terms of the GNU Affero General Public License as
@ -22,4 +22,3 @@
import models import models
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

10
ext/custom-addons/dp_custom/__openerp__.py
View File

@ -2,7 +2,7 @@
############################################################################## ##############################################################################
# #
# datenpol gmbh # datenpol gmbh
# Copyright (C) 2013-TODAY datenpol gmbh(<http://www.datenpol.at>) # Copyright (C) 2013-TODAY datenpol gmbh (<http://www.datenpol.at/>)
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as # it under the terms of the GNU Affero General Public License as
@ -22,12 +22,14 @@
{ {
'name': 'datenpol Anpassungen', 'name': 'datenpol Anpassungen',
'category': 'Custom', 'category': 'Custom',
'version': '1.0', 'version': '1.0',
'description': """Individuelle Anpassungen""", 'description': """Individuelle Anpassungen""",
'author': 'datenpol gmbh', 'author': 'datenpol gmbh',
'website': 'http://www.datenpol.at', 'website': 'http://www.datenpol.at/',
'depends': ['base'], 'depends': [
'base',
],
'data': [ 'data': [
'data/dp_custom_data.xml', 'data/dp_custom_data.xml',
'views/dp_custom_view.xml', 'views/dp_custom_view.xml',

225
ext/custom-addons/dp_custom/data/dp_custom_data.xml
View File

@ -1,127 +1,122 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data noupdate="0"> <data noupdate="0">
<!-- UNITS -->
<!-- UNITS -->
<!-- Einheit in Stück umbenennen --> <!-- Einheit in Stück umbenennen -->
<record id="product.product_uom_unit" model="product.uom"> <record id="product.product_uom_unit" model="product.uom">
<field name="name">Stück</field> <field name="name">Stück</field>
</record> </record>
<!-- 100 Stk. --> <!-- 100 Stk. -->
<record id="product_uom_unit_100" model="product.uom"> <record id="product_uom_unit_100" model="product.uom">
<field name="category_id" ref="product.product_uom_categ_unit"/> <field name="category_id" ref="product.product_uom_categ_unit"/>
<field name="name">100 Stk.</field> <field name="name">100 Stk.</field>
<field name="factor_inv" eval="100"/> <field name="factor_inv" eval="100"/>
<field name="uom_type">bigger</field> <field name="uom_type">bigger</field>
</record> </record>
<!-- 1000 Stk. --> <!-- 1000 Stk. -->
<record id="product_uom_unit_1000" model="product.uom"> <record id="product_uom_unit_1000" model="product.uom">
<field name="category_id" ref="product.product_uom_categ_unit"/> <field name="category_id" ref="product.product_uom_categ_unit"/>
<field name="name">1000 Stk.</field> <field name="name">1000 Stk.</field>
<field name="factor_inv" eval="1000"/> <field name="factor_inv" eval="1000"/>
<field name="uom_type">bigger</field> <field name="uom_type">bigger</field>
</record> </record>
<!-- Rolle --> <!-- Rolle -->
<record id="product_uom_rolle" model="product.uom"> <record id="product_uom_rolle" model="product.uom">
<field name="category_id" ref="product.product_uom_categ_unit"/> <field name="category_id" ref="product.product_uom_categ_unit"/>
<field name="name">Rolle(n)</field> <field name="name">Rolle(n)</field>
</record> </record>
<!-- Satz --> <!-- Satz -->
<record id="product_uom_satz" model="product.uom"> <record id="product_uom_satz" model="product.uom">
<field name="category_id" ref="product.product_uom_categ_unit"/> <field name="category_id" ref="product.product_uom_categ_unit"/>
<field name="name">Satz</field> <field name="name">Satz</field>
</record> </record>
<!-- Arbeitstag --> <!-- Arbeitstag -->
<record id="product_uom_arbeitstag" model="product.uom"> <record id="product_uom_arbeitstag" model="product.uom">
<field name="category_id" ref="product.uom_categ_wtime"/> <field name="category_id" ref="product.uom_categ_wtime"/>
<field name="name">Arbeitstag</field> <field name="name">Arbeitstag</field>
</record> </record>
<!-- MM -->
<record id="product_uom_mm" model="product.uom">
<field name="category_id" ref="product.uom_categ_length"/>
<field name="name">mm</field>
<field name="factor" eval="0.001"/>
<field name="uom_type">smaller</field>
</record>
<!-- M2 Quadratmeter Category-->
<record id="uom_categ_m2" model="product.uom.categ">
<field name="name">Quadratm.</field>
</record>
<!-- M2, Quadratmeter -->
<record id="product_uom_m2" model="product.uom">
<field name="name">m²</field>
<field name="category_id" ref="uom_categ_m2"/>
<field name="factor" eval="1.0"/>
<field name="rounding" eval="1"/>
</record>
<!-- M3 Quadratmeter Category--> <!-- MM -->
<record id="uom_categ_m3" model="product.uom.categ"> <record id="product_uom_mm" model="product.uom">
<field name="name">Kubikm.</field> <field name="category_id" ref="product.uom_categ_length"/>
</record> <field name="name">mm</field>
<!-- M3, Kubikmeter --> <field name="factor" eval="0.001"/>
<record id="product_uom_m3" model="product.uom"> <field name="uom_type">smaller</field>
<field name="name">Kubikm.</field> </record>
<field name="category_id" ref="uom_categ_m3"/>
<field name="factor" eval="1.0"/>
<field name="rounding" eval="1"/>
</record>
<!-- PKG --> <!-- M2 Quadratmeter Category-->
<record id="product_uom_pkt" model="product.uom"> <record id="uom_categ_m2" model="product.uom.categ">
<field name="name">Paket(e)</field> <field name="name">Quadratm.</field>
<field name="category_id" ref="product.product_uom_categ_unit"/> </record>
<field name="factor" eval="1.0"/> <!-- M2, Quadratmeter -->
<field name="rounding" eval="1"/> <record id="product_uom_m2" model="product.uom">
</record> <field name="name">m²</field>
<field name="category_id" ref="uom_categ_m2"/>
<field name="factor" eval="1.0"/>
<field name="rounding" eval="1"/>
</record>
<!-- Paar --> <!-- M3 Quadratmeter Category-->
<record id="product_uom_paar" model="product.uom"> <record id="uom_categ_m3" model="product.uom.categ">
<field name="name">Paar(e)</field> <field name="name">Kubikm.</field>
<field name="category_id" ref="product.product_uom_categ_unit"/> </record>
<field name="factor" eval="1.0"/> <!-- M3, Kubikmeter -->
<field name="rounding" eval="1"/> <record id="product_uom_m3" model="product.uom">
</record> <field name="name">Kubikm.</field>
<field name="category_id" ref="uom_categ_m3"/>
<field name="factor" eval="1.0"/>
<field name="rounding" eval="1"/>
</record>
<!-- Minuten --> <!-- PKG -->
<record id="product_uom_min" model="product.uom"> <record id="product_uom_pkt" model="product.uom">
<field name="category_id" ref="product.uom_categ_wtime"/> <field name="name">Paket(e)</field>
<field name="name">min</field> <field name="category_id" ref="product.product_uom_categ_unit"/>
</record> <field name="factor" eval="1.0"/>
<field name="rounding" eval="1"/>
</record>
<!-- Variantenattribut Größe -->
<record id="prod_attr_size" model="product.attribute"> <!-- Paar -->
<field name="name">Größe</field> <record id="product_uom_paar" model="product.uom">
<field name="type">radio</field> <field name="name">Paar(e)</field>
<field name="sequence" eval="10"/> <field name="category_id" ref="product.product_uom_categ_unit"/>
</record> <field name="factor" eval="1.0"/>
<field name="rounding" eval="1"/>
</record>
<!-- Verpackungseiheiten -->
<!-- TODO Rolle type in product_ul selection ergänzen --> <!-- Minuten -->
<!-- Ausprägungen hier...? --> <record id="product_uom_min" model="product.uom">
<!-- <record id="product_ul_box" model="product.ul"> <field name="category_id" ref="product.uom_categ_wtime"/>
<field name="name">Box</field> <field name="name">min</field>
<field name="type">box</field> </record>
</record> -->
<!--
'name' : fields.char('Name', select=True, required=True, translate=True), <!-- Variantenattribut Größe -->
'type' : fields.selection([('unit','Unit'),('pack','Pack'),('box', 'Box'), ('pallet', 'Pallet')], 'Type', required=True), <record id="prod_attr_size" model="product.attribute">
'height': fields.float('Height', help='The height of the package'), <field name="name">Größe</field>
'width': fields.float('Width', help='The width of the package'), <field name="type">radio</field>
'length': fields.float('Length', help='The length of the package'), <field name="sequence" eval="10"/>
'weight': fields.float('Empty Package Weight'), --> </record>
<!-- Verpackungseiheiten -->
</data> <!-- TODO Rolle type in product_ul selection ergänzen -->
<!-- Ausprägungen hier...? -->
<!-- <record id="product_ul_box" model="product.ul">
<field name="name">Box</field>
<field name="type">box</field>
</record> -->
<!--
'name' : fields.char('Name', select=True, required=True, translate=True),
'type' : fields.selection([('unit','Unit'),('pack','Pack'),('box', 'Box'), ('pallet', 'Pallet')], 'Type', required=True),
'height': fields.float('Height', help='The height of the package'),
'width': fields.float('Width', help='The width of the package'),
'length': fields.float('Length', help='The length of the package'),
'weight': fields.float('Empty Package Weight'), -->
</data>
</openerp> </openerp>

8
ext/custom-addons/dp_custom/views/dp_custom_view.xml
View File

@ -1,10 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
</data>
</data>
</openerp> </openerp>

2
ext/custom-addons/dp_report/__init__.py
View File

@ -1,3 +1,3 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from . import models from . import models

8
ext/custom-addons/dp_report/__openerp__.py
View File

@ -1,14 +1,16 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
{ {
'name': 'datepol Report Anpassungen', 'name': 'datepol Report-Anpassungen',
'category': 'Custom', 'category': 'Custom',
'version': '1.0', 'version': '1.0',
'summary': """Individuelle Report Anpassungen""", 'summary': """Individuelle Report Anpassungen""",
'description': """Individuelle Report Anpassungen""", 'description': """Individuelle Report Anpassungen""",
'author': 'datenpol gmbh', 'author': 'datenpol gmbh',
'website': 'http://www.datenpol.at', 'website': 'http://www.datenpol.at/',
'depends': ['base'], 'depends': [
'base',
],
'data': [ 'data': [
# 'security/ir.model.access.csv', # 'security/ir.model.access.csv',
'views/layouts.xml', 'views/layouts.xml',

2
ext/custom-addons/dp_report/models/__init__.py
View File

@ -1 +1 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-

144
ext/custom-addons/dp_report/views/delivery.xml
View File

@ -1,75 +1,77 @@
<openerp> <openerp>
<data> <data>
<!-- Delivery Body --> <!-- Delivery Body -->
<template id="report_delivery_document" inherit_id="delivery.report_delivery_document2"> <template id="report_delivery_document" inherit_id="delivery.report_delivery_document2">
<h2 position="replace"> <h2 position="replace">
<h2> <h2>
LIEFERSCHEIN <span t-field="o.name"/> LIEFERSCHEIN <span t-field="o.name"/>
</h2>
</h2> </h2>
<table class="table table-condensed" position="replace"> </h2>
<table class="table table-condensed"> <table class="table table-condensed" position="replace">
<thead> <table class="table table-condensed">
<tr> <thead>
<th name="td_sched_date_h"><strong>Scheduled Date</strong></th> <tr>
<th><strong>Weight</strong></th> <th name="td_sched_date_h"><strong>Scheduled Date</strong></th>
</tr> <th><strong>Weight</strong></th>
</thead> </tr>
<tbody> </thead>
<tr> <tbody>
<td name="td_sched_date"> <tr>
<span t-field="o.min_date"/> <td name="td_sched_date">
</td> <span t-field="o.min_date"/>
<td> </td>
<span t-field="o.weight"/> kg <td>
</td> <span t-field="o.weight"/> kg
</tr> </td>
</tbody> </tr>
</table> </tbody>
</table> </table>
<xpath expr="//table[@t-if='not o.pack_operation_ids']/thead" position="replace"> </table>
<thead> <xpath expr="//table[@t-if='not o.pack_operation_ids']/thead" position="replace">
<tr> <thead>
<th><strong>Product</strong></th> <tr>
<th><strong>Location</strong></th> <th><strong>Product</strong></th>
<th class="text-right"><strong>Quantity</strong></th> <th><strong>Location</strong></th>
</tr> <th class="text-right"><strong>Quantity</strong></th>
</thead> </tr>
</xpath> </thead>
<xpath expr="//table[@t-if='not o.pack_operation_ids']/tbody/tr/td/span[@t-field='move.state']" position="replace"/> </xpath>
<xpath expr="//table[@t-if='o.pack_operation_ids']/thead" position="replace"> <xpath expr="//table[@t-if='not o.pack_operation_ids']/tbody/tr/td/span[@t-field='move.state']" position="replace"/>
<thead> <xpath expr="//table[@t-if='o.pack_operation_ids']/thead" position="replace">
<tr> <thead>
<th><strong>Product</strong></th> <tr>
<th t-if="has_serial_number"><strong>Serial Number</strong></th> <th><strong>Product</strong></th>
<th><strong>Location</strong></th> <th t-if="has_serial_number"><strong>Serial Number</strong></th>
<th class="text-right"><strong>Quantity</strong></th> <th><strong>Location</strong></th>
</tr> <th class="text-right"><strong>Quantity</strong></th>
</thead> </tr>
</xpath> </thead>
<xpath expr="//table[@t-if='o.pack_operation_ids']/tbody/tr/td[2]" position="replace"/> </xpath>
</template> <xpath expr="//table[@t-if='o.pack_operation_ids']/tbody/tr/td[2]" position="replace"/>
<!-- Render Report with Header --> </template>
<template id="stock.report_deliveryslip">
<t t-set="header" t-value="1"/>
<t t-foreach="docs" t-as="o">
<t t-call="dp_report.report_delivery_document" t-lang="o.partner_id.lang"/>
</t>
</template>
<!-- Render Report without Header -->
<template id="report_deliveryslip_blank">
<t t-set="header" t-value="0"/>
<t t-foreach="docs" t-as="o">
<t t-call="dp_report.report_delivery_document" t-lang="o.partner_id.lang"/>
</t>
</template>
<!-- Create new Report -->
<report id="dp_report_deliveryslip_blank"
string="Lieferschein Ohne Logo"
model="stock.picking"
report_type="qweb-pdf"
name="dp_report.report_deliveryslip_blank"
file="dp_report.report_deliveryslip_blank"/>
</data> <!-- Render Report with Header -->
</openerp> <template id="stock.report_deliveryslip">
<t t-set="header" t-value="1"/>
<t t-foreach="docs" t-as="o">
<t t-call="dp_report.report_delivery_document" t-lang="o.partner_id.lang"/>
</t>
</template>
<!-- Render Report without Header -->
<template id="report_deliveryslip_blank">
<t t-set="header" t-value="0"/>
<t t-foreach="docs" t-as="o">
<t t-call="dp_report.report_delivery_document" t-lang="o.partner_id.lang"/>
</t>
</template>
<!-- Create new Report -->
<report id="dp_report_deliveryslip_blank"
string="Lieferschein Ohne Logo"
model="stock.picking"
report_type="qweb-pdf"
name="dp_report.report_deliveryslip_blank"
file="dp_report.report_deliveryslip_blank"/>
</data>
</openerp>

118
ext/custom-addons/dp_report/views/invoice.xml
View File

@ -1,65 +1,65 @@
<openerp> <openerp>
<data> <data>
<!-- Invoice Body --> <!-- Invoice Body -->
<template id="report_invoice_document" inherit_id="account.report_invoice_document"> <template id="report_invoice_document" inherit_id="account.report_invoice_document">
<th t-if="display_discount" position="replace"> <th t-if="display_discount" position="replace">
<th t-if="display_discount and o.sale_order_id.print_discount" class="text-right" groups="sale.group_discount_per_so_line">Disc.(%)</th> <th t-if="display_discount and o.sale_order_id.print_discount" class="text-right" groups="sale.group_discount_per_so_line">Disc.(%)</th>
</th> </th>
<td t-if="display_discount" position="replace"> <td t-if="display_discount" position="replace">
<td t-if="display_discount and o.sale_order_id.print_discount" class="text-right" groups="sale.group_discount_per_so_line"> <td t-if="display_discount and o.sale_order_id.print_discount" class="text-right" groups="sale.group_discount_per_so_line">
<span t-field="l.discount"/> <span t-field="l.discount"/>
</td>
</td> </td>
<div t-if="o.date_invoice" position="replace"> </td>
<div class="col-xs-2" t-if="o.date_invoice"> <div t-if="o.date_invoice" position="replace">
<strong>Invoice Date:</strong> <div class="col-xs-2" t-if="o.date_invoice">
<p t-field="o.date_invoice"/> <strong>Invoice Date:</strong>
</div> <p t-field="o.date_invoice"/>
</div> </div>
<div t-if="o.origin" position="replace"> </div>
<div class="col-xs-2" t-if="o.origin"> <div t-if="o.origin" position="replace">
<strong>Source:</strong> <div class="col-xs-2" t-if="o.origin">
<p t-field="o.origin"/> <strong>Source:</strong>
</div> <p t-field="o.origin"/>
</div> </div>
<div t-if="o.date_due and o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')" position="replace"/> </div>
<xpath expr="//table[@class='table table-condensed']/thead/tr/th" position='replace'> <div t-if="o.date_due and o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')" position="replace"/>
<th>Description</th> <xpath expr="//table[@class='table table-condensed']/thead/tr/th" position='replace'>
</xpath> <th>Description</th>
<div t-if="o.tax_line_ids" position="replace"/> </xpath>
<p t-if="o.payment_term_id" position="replace"> <div t-if="o.tax_line_ids" position="replace"/>
<p t-if="o.payment_term_id"> <p t-if="o.payment_term_id" position="replace">
<strong><span t-field="o.payment_term_id.note"/></strong> <p t-if="o.payment_term_id">
</p> <strong><span t-field="o.payment_term_id.note"/></strong>
</p> </p>
</template> </p>
<!-- Render Report with Header --> </template>
<template id="account.report_invoice">
<t t-call="report.html_container">
<t t-set="header" t-value="1"/>
<t t-foreach="docs" t-as="o">
<t t-call="dp_report.report_invoice_document" t-lang="o.partner_id.lang">
</t>
</t>
</t>
</template>
<!-- Render Report without Header -->
<template id="report_invoice_blank">
<t t-call="report.html_container">
<t t-set="header" t-value="0"/>
<t t-foreach="docs" t-as="o">
<t t-call="dp_report.report_invoice_document" t-lang="o.partner_id.lang">
</t>
</t>
</t>
</template>
<!-- Create new Report -->
<report id="dp_report_invoice_blank"
string="Rechnung Ohne Logo"
model="account.invoice"
report_type="qweb-pdf"
name="dp_report.report_invoice_blank"
file="dp_report.report_invoice_blank"/>
</data> <!-- Render Report with Header -->
</openerp> <template id="account.report_invoice">
<t t-call="report.html_container">
<t t-set="header" t-value="1"/>
<t t-foreach="docs" t-as="o">
<t t-call="dp_report.report_invoice_document" t-lang="o.partner_id.lang"/>
</t>
</t>
</template>
<!-- Render Report without Header -->
<template id="report_invoice_blank">
<t t-call="report.html_container">
<t t-set="header" t-value="0"/>
<t t-foreach="docs" t-as="o">
<t t-call="dp_report.report_invoice_document" t-lang="o.partner_id.lang"/>
</t>
</t>
</template>
<!-- Create new Report -->
<report id="dp_report_invoice_blank"
string="Rechnung Ohne Logo"
model="account.invoice"
report_type="qweb-pdf"
name="dp_report.report_invoice_blank"
file="dp_report.report_invoice_blank"/>
</data>
</openerp>

102
ext/custom-addons/dp_report/views/layouts.xml
View File

@ -1,58 +1,58 @@
<openerp> <openerp>
<data> <data>
<template id="report.external_layout"> <template id="report.external_layout">
<!-- Multicompany --> <!-- Multicompany -->
<t t-if="not o and doc"> <t t-if="not o and doc">
<t t-set="o" t-value="doc"/> <t t-set="o" t-value="doc"/>
</t> </t>
<t t-if="o and 'company_id' in o"> <t t-if="o and 'company_id' in o">
<t t-set="company" t-value="o.company_id"></t> <t t-set="company" t-value="o.company_id"/>
</t> </t>
<t t-if="not o or not 'company_id' in o"> <t t-if="not o or not 'company_id' in o">
<t t-set="company" t-value="res_company"></t> <t t-set="company" t-value="res_company"/>
</t> </t>
<t t-if="header == 1"> <t t-if="header == 1">
<t t-call="dp_report.external_layout_header" /> <t t-call="dp_report.external_layout_header"/>
</t> </t>
<t t-if="header == 0"> <t t-if="header == 0">
<t t-call="dp_report.external_layout_header_blank" /> <t t-call="dp_report.external_layout_header_blank"/>
</t> </t>
<t t-raw="0" /> <t t-raw="0"/>
<t t-call="report.external_layout_footer" /> <t t-call="report.external_layout_footer"/>
<t t-esc="header"/> <t t-esc="header"/>
</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-3" name="company_address"> <div class="col-xs-3" name="company_address">
<div t-field="company.partner_id" <div t-field="company.partner_id"
t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": true}' t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": true}'
style="border-bottom: 1px solid black;"/> style="border-bottom: 1px solid black;"/>
</div> </div>
<div class="col-xs-9 text-right"> <div class="col-xs-9 text-right">
<img t-if="company.logo" t-att-src="'data:image/png;base64,%s' % company.logo" style="max-height: 105px;"/> <img t-if="company.logo" t-att-src="'data:image/png;base64,%s' % company.logo" style="max-height: 105px;"/>
</div>
</div> </div>
</div> </div>
</template> </div>
</template>
<!-- Report Header Blank --> <!-- Report Header Blank -->
<template id="external_layout_header_blank"> <template id="external_layout_header_blank">
<div class="header"> <div class="header">
<div class="row"> <div class="row">
<div class="col-xs-12" style="height: 45px;"> <div class="col-xs-12" style="height: 45px;">
</div>
</div>
<div class="row">
<div class="col-xs-3" name="company_address">
<div t-field="company.partner_id"
t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": true}'
style="border-bottom: 1px solid black;"/>
</div>
</div> </div>
</div> </div>
</template> <div class="row">
</data> <div class="col-xs-3" name="company_address">
</openerp> <div t-field="company.partner_id"
t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": true}'
style="border-bottom: 1px solid black;"/>
</div>
</div>
</div>
</template>
</data>
</openerp>

156
ext/custom-addons/dp_report/views/saleorder.xml
View File

@ -1,85 +1,85 @@
<openerp> <openerp>
<data> <data>
<!-- Sale Order Body --> <!-- Sale Order Body -->
<template id="report_saleorder_document" inherit_id="sale.report_saleorder_document"> <template id="report_saleorder_document" inherit_id="sale.report_saleorder_document">
<th t-if="display_discount" position="replace"> <th t-if="display_discount" position="replace">
<th t-if="display_discount and doc.print_discount" class="text-right" groups="sale.group_discount_per_so_line">Disc.(%)</th> <th t-if="display_discount and doc.print_discount" class="text-right" groups="sale.group_discount_per_so_line">Disc.(%)</th>
</th> </th>
<td t-if="display_discount" position="replace"> <td t-if="display_discount" position="replace">
<td t-if="display_discount and doc.print_discount" class="text-right" groups="sale.group_discount_per_so_line"> <td t-if="display_discount and doc.print_discount" class="text-right" groups="sale.group_discount_per_so_line">
<span t-field="l.discount"/> <span t-field="l.discount"/>
</td>
</td> </td>
</td>
<xpath expr="//div[@class='page']/h2" position='replace'> <xpath expr="//div[@class='page']/h2" position='replace'>
<h2> <h2>
<span t-if="doc.state not in ['draft','sent']">Order # </span> <span t-if="doc.state not in ['draft','sent']">Order # </span>
<span t-if="doc.state in ['draft','sent']">Quotation # </span> <span t-if="doc.state in ['draft','sent']">Quotation # </span>
<span t-field="doc.name"/> <span t-field="doc.name"/>
</h2> </h2>
</xpath> </xpath>
<xpath expr="//div[@t-if='doc.user_id.name']" position='replace'/> <xpath expr="//div[@t-if='doc.user_id.name']" position='replace'/>
<xpath expr="//div[@name='payment_term']" position='attributes'> <xpath expr="//div[@name='payment_term']" position='attributes'>
<attribute name="style">display:none</attribute> <attribute name="style">display:none</attribute>
</xpath> </xpath>
<div name="total" position="replace"> <div name="total" position="replace">
<div class="row" name="total"> <div class="row" name="total">
<div class="col-xs-4 pull-right"> <div class="col-xs-4 pull-right">
<table class="table table-condensed"> <table class="table table-condensed">
<tr class="border-black"> <tr class="border-black">
<td><strong>Total Without Taxes</strong></td> <td><strong>Total Without Taxes</strong></td>
<td class="text-right"> <td class="text-right">
<span t-field="doc.amount_untaxed" <span t-field="doc.amount_untaxed"
t-field-options='{"widget": "monetary", "display_currency": "doc.pricelist_id.currency_id"}'/> t-field-options='{"widget": "monetary", "display_currency": "doc.pricelist_id.currency_id"}'/>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Taxes</td> <td>Taxes</td>
<td class="text-right"> <td class="text-right">
<span t-field="doc.amount_tax" <span t-field="doc.amount_tax"
t-field-options='{"widget": "monetary", "display_currency": "doc.pricelist_id.currency_id"}'/> t-field-options='{"widget": "monetary", "display_currency": "doc.pricelist_id.currency_id"}'/>
</td> </td>
</tr> </tr>
<tr class="border-black"> <tr class="border-black">
<td><strong>Total</strong></td> <td><strong>Total</strong></td>
<td class="text-right"> <td class="text-right">
<span t-field="doc.amount_total" <span t-field="doc.amount_total"
t-field-options='{"widget": "monetary", "display_currency": "doc.pricelist_id.currency_id"}'/> t-field-options='{"widget": "monetary", "display_currency": "doc.pricelist_id.currency_id"}'/>
</td> </td>
</tr> </tr>
</table> </table>
</div>
</div> </div>
</div> </div>
</template> </div>
<!-- Render Report with Header --> </template>
<template id="sale.report_saleorder">
<t t-call="report.html_container">
<t t-set="header" t-value="1"/>
<t t-foreach="docs" t-as="doc">
<t t-call="dp_report.report_saleorder_document" t-lang="doc.partner_id.lang">
</t>
</t>
</t>
</template>
<!-- Render Report without Header -->
<template id="report_saleorder_blank">
<t t-call="report.html_container">
<t t-set="header" t-value="0"/>
<t t-foreach="docs" t-as="doc">
<t t-call="dp_report.report_saleorder_document" t-lang="doc.partner_id.lang">
</t>
</t>
</t>
</template>
<!-- Create new Report -->
<report id="dp_report_saleorder_blank"
string="Angebot / Bestellung Ohne Logo"
model="sale.order"
report_type="qweb-pdf"
name="dp_report.report_saleorder_blank"
file="dp_report.report_saleorder_blank"/>
</data> <!-- Render Report with Header -->
</openerp> <template id="sale.report_saleorder">
<t t-call="report.html_container">
<t t-set="header" t-value="1"/>
<t t-foreach="docs" t-as="doc">
<t t-call="dp_report.report_saleorder_document" t-lang="doc.partner_id.lang"/>
</t>
</t>
</template>
<!-- Render Report without Header -->
<template id="report_saleorder_blank">
<t t-call="report.html_container">
<t t-set="header" t-value="0"/>
<t t-foreach="docs" t-as="doc">
<t t-call="dp_report.report_saleorder_document" t-lang="doc.partner_id.lang"/>
</t>
</t>
</template>
<!-- Create new Report -->
<report id="dp_report_saleorder_blank"
string="Angebot / Bestellung Ohne Logo"
model="sale.order"
report_type="qweb-pdf"
name="dp_report.report_saleorder_blank"
file="dp_report.report_saleorder_blank"/>
</data>
</openerp>