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

View File

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

View File

@ -2,7 +2,7 @@
##############################################################################
#
# 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
# it under the terms of the GNU Affero General Public License as
@ -26,8 +26,10 @@
'version': '1.0',
'description': """Individuelle Anpassungen""",
'author': 'datenpol gmbh',
'website': 'http://www.datenpol.at',
'depends': ['base'],
'website': 'http://www.datenpol.at/',
'depends': [
'base',
],
'data': [
'data/dp_custom_data.xml',
'views/dp_custom_view.xml',

View File

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="0">
<data noupdate="0">
<!-- UNITS -->
<!-- Einheit in Stück umbenennen -->
@ -120,8 +118,5 @@
'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>
</data>
</openerp>

View File

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

View File

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

View File

@ -1,5 +1,5 @@
<openerp>
<data>
<data>
<!-- Delivery Body -->
<template id="report_delivery_document" inherit_id="delivery.report_delivery_document2">
<h2 position="replace">
@ -49,6 +49,7 @@
</xpath>
<xpath expr="//table[@t-if='o.pack_operation_ids']/tbody/tr/td[2]" position="replace"/>
</template>
<!-- Render Report with Header -->
<template id="stock.report_deliveryslip">
<t t-set="header" t-value="1"/>
@ -56,6 +57,7 @@
<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"/>
@ -63,6 +65,7 @@
<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"
@ -70,6 +73,5 @@
report_type="qweb-pdf"
name="dp_report.report_deliveryslip_blank"
file="dp_report.report_deliveryslip_blank"/>
</data>
</data>
</openerp>

View File

@ -1,5 +1,5 @@
<openerp>
<data>
<data>
<!-- Invoice Body -->
<template id="report_invoice_document" inherit_id="account.report_invoice_document">
<th t-if="display_discount" position="replace">
@ -33,26 +33,27 @@
</p>
</p>
</template>
<!-- Render Report with Header -->
<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-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 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"
@ -60,6 +61,5 @@
report_type="qweb-pdf"
name="dp_report.report_invoice_blank"
file="dp_report.report_invoice_blank"/>
</data>
</data>
</openerp>

View File

@ -1,24 +1,24 @@
<openerp>
<data>
<data>
<template id="report.external_layout">
<!-- Multicompany -->
<t t-if="not o and doc">
<t t-set="o" t-value="doc"/>
</t>
<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-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-if="header == 1">
<t t-call="dp_report.external_layout_header" />
<t t-call="dp_report.external_layout_header"/>
</t>
<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-raw="0" />
<t t-call="report.external_layout_footer" />
<t t-raw="0"/>
<t t-call="report.external_layout_footer"/>
<t t-esc="header"/>
</template>
@ -54,5 +54,5 @@
</div>
</div>
</template>
</data>
</data>
</openerp>

View File

@ -1,5 +1,5 @@
<openerp>
<data>
<data>
<!-- Sale Order Body -->
<template id="report_saleorder_document" inherit_id="sale.report_saleorder_document">
<th t-if="display_discount" position="replace">
@ -53,26 +53,27 @@
</div>
</div>
</template>
<!-- Render Report with Header -->
<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-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 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"
@ -80,6 +81,5 @@
report_type="qweb-pdf"
name="dp_report.report_saleorder_blank"
file="dp_report.report_saleorder_blank"/>
</data>
</data>
</openerp>