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

Camadeus -> datenpol für die wichtigsten Module

develop
Christian Hattemer 2016-09-09 14:36:49 +02:00
parent 5db603678a
commit 5fe7633b00
10 changed files with 592 additions and 596 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ext/custom-addons/cam_custom/__init__.py
View File

@ -2,7 +2,7 @@
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 20014-2016 Camadeus GmbH (<http://www.camadeus.at>). # Copyright (C) 20014-2016 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 cam_custom import cam_custom
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

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

@ -2,7 +2,7 @@
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 20014-2016 Camadeus GmbH (<http://www.camadeus.at>). # Copyright (C) 20014-2016 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
@ -21,12 +21,12 @@
{ {
'name': 'Camadeus Anpassungen', 'name': 'datenpol-Anpassungen',
'category': 'Custom', 'category': 'Custom',
'version': '1.0', 'version': '1.0',
'description': """Individuelle Anpassungen""", 'description': """Individuelle Anpassungen""",
'author': 'camadeus GmbH', 'author': 'datenpol gmbh',
'website': 'http://www.camadeus.at', 'website': 'http://www.datenpol.at/',
'depends': ['sale','mail','product','account','knowledge'], 'depends': ['sale','mail','product','account','knowledge'],
'data': [ 'data': [
'cam_custom_view.xml', 'cam_custom_view.xml',

4
ext/custom-addons/cam_custom/cam_custom.py
View File

@ -2,7 +2,7 @@
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 20014-2016 Camadeus GmbH (<http://www.camadeus.at>). # Copyright (C) 20014-2016 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
@ -24,7 +24,6 @@ from openerp import api
from openerp.tools.translate import _ from openerp.tools.translate import _
from openerp import SUPERUSER_ID from openerp import SUPERUSER_ID
from openerp import tools from openerp import tools
from lxml import etree
DISABLED_MENUS = [ DISABLED_MENUS = [
] ]
@ -61,7 +60,6 @@ class res_partner(models.Model):
""" verhindert das Überschreiben von address_format """ """ verhindert das Überschreiben von address_format """
return arch return arch
class mail_notification(models.Model): class mail_notification(models.Model):
_inherit = 'mail.notification' _inherit = 'mail.notification'

4
ext/custom-addons/cam_reports/__init__.py
View File

@ -2,7 +2,7 @@
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 20014-2016 Camadeus GmbH (<http://www.camadeus.at>). # Copyright (C) 20014-2016 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
@ -20,5 +20,5 @@
############################################################################## ##############################################################################
import cam_reports import cam_reports
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

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

@ -2,7 +2,7 @@
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 20014-2016 Camadeus GmbH (<http://www.camadeus.at>). # Copyright (C) 20014-2016 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
@ -21,12 +21,12 @@
{ {
'name': 'Camadeus Reports', 'name': 'Datenpol-Reports',
'category': 'Custom', 'category': 'Custom',
'version': '1.0', 'version': '1.0',
'description': """Individuelle Dokumentenvorlagen""", 'description': """Individuelle Dokumentenvorlagen""",
'author': 'camadeus GmbH', 'author': 'datenpol gmbh',
'website': 'http://www.camadeus.at', 'website': 'http://www.datenpol.at/',
'depends': ['purchase','sale','account','stock'], 'depends': ['purchase','sale','account','stock'],
'data': ['reports_data.xml', 'data': ['reports_data.xml',
], ],

7
ext/custom-addons/cam_reports/cam_reports.py
View File

@ -2,7 +2,7 @@
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 20014-2016 Camadeus GmbH (<http://www.camadeus.at>). # Copyright (C) 20014-2016 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
@ -28,7 +28,6 @@ class res_company(osv.osv):
_inherit = 'res.company' _inherit = 'res.company'
def get_image(self, img): def get_image(self, img):
def _get_dir(): def _get_dir():
styles_dir = 'cam_reports/static/src/img' styles_dir = 'cam_reports/static/src/img'
adps = addons.module.ad_paths adps = addons.module.ad_paths
@ -88,6 +87,6 @@ class res_company(osv.osv):
return result return result
_columns = { _columns = {
'rml_header': fields.function(_get_rml_header, type='text', string='Briefkopf',readonly=True), 'rml_header': fields.function(_get_rml_header, type='text', string='Briefkopf', readonly=True),
'rml_header2': fields.function(_get_rml_header2, type='text', string='RML Header',readonly=True), 'rml_header2': fields.function(_get_rml_header2, type='text', string='RML Header', readonly=True),
} }

358
ext/custom-addons/cam_reports/report/account.invoice.rml
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<document filename="Rechnung.pdf"> <document filename="Rechnung.pdf">
<template pageSize="(595.0,842.0)" title="Sale Order" author="Camadeus Consulting" allowSplitting="20"> <template pageSize="(595.0,842.0)" title="Sale Order" author="datenpol gmbh" allowSplitting="20">
<pageTemplate id="first"> <pageTemplate id="first">
<frame id="first" x1="15.0" y1="42.0" width="539" height="758"/> <frame id="first" x1="15.0" y1="42.0" width="539" height="758"/>
</pageTemplate> </pageTemplate>
@ -13,66 +13,66 @@
</para> </para>
<para>[[repeatIn(objects,'o')]] [[ setLang(o.partner_id.commercial_partner_id.lang)]]</para> <para>[[repeatIn(objects,'o')]] [[ setLang(o.partner_id.commercial_partner_id.lang)]]</para>
<blockTable colWidths="270,85,145" style="Struktur"> <blockTable colWidths="270,85,145" style="Struktur">
<tr> <tr>
<td> <td>
<section> <section>
<para style="fett">[[ o.partner_id.commercial_partner_id.name ]]</para> <para style="fett">[[ o.partner_id.commercial_partner_id.name ]]</para>
<para style="normal">[[ (o.partner_id.commercial_partner_id.id != o.partner_id.id and o.partner_id.name) or '' ]] </para> <para style="normal">[[ (o.partner_id.commercial_partner_id.id != o.partner_id.id and o.partner_id.name) or '' ]] </para>
<para style="normal">[[ (o.partner_id.street ) or '']]</para> <para style="normal">[[ (o.partner_id.street ) or '']]</para>
<para style="normal">[[ (o.partner_id.street2) or removeParentNode('para') ]]</para> <para style="normal">[[ (o.partner_id.street2) or removeParentNode('para') ]]</para>
<para style="normal">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id and o.partner_id.city) or '' ]]</para> <para style="normal">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id and o.partner_id.city) or '' ]]</para>
<para style="normal">[[ (o.partner_id.state_id and o.partner_id.state_id.name) or removeParentNode('para')]]</para> <para style="normal">[[ (o.partner_id.state_id and o.partner_id.state_id.name) or removeParentNode('para')]]</para>
<para style="normal">[[ (o.partner_id.country_id and o.partner_id.country_id.name) or '' ]]</para> <para style="normal">[[ (o.partner_id.country_id and o.partner_id.country_id.name) or '' ]]</para>
<!-- Für Sichtfenster --> <!-- Für Sichtfenster -->
<section>[[ not (o.partner_id.commercial_partner_id and o.partner_id.commercial_partner_id.ref) or removeParentNode('section') ]] <section>[[ not (o.partner_id.commercial_partner_id and o.partner_id.commercial_partner_id.ref) or removeParentNode('section') ]]
<para style="normal">&#160;</para> <para style="normal">&#160;</para>
</section> </section>
</section> </section>
<para></para> <para></para>
</td> </td>
<td> <td>
<para style="normal">Datum:</para> <para style="normal">Datum:</para>
<para style="normal">Quelldokument:</para> <para style="normal">Quelldokument:</para>
<para style="normal">Kundenreferenz:</para> <para style="normal">Kundenreferenz:</para>
<!--<para style="normal">Kundennummer:</para>--> <!--<para style="normal">Kundennummer:</para>-->
<para style="normal">Kunde UID Nr.:</para> <para style="normal">Kunde UID Nr.:</para>
<para style="normal">Ansprechpartner:</para> <para style="normal">Ansprechpartner:</para>
</td> </td>
<td> <td>
<para style="normal">[[ formatLang(o.date_invoice,date = True) ]]&#160;</para> <para style="normal">[[ formatLang(o.date_invoice,date = True) ]]&#160;</para>
<para style="normal">[[ o.origin ]]&#160;</para> <para style="normal">[[ o.origin ]]&#160;</para>
<para style="normal">[[ o.name ]]&#160;</para> <para style="normal">[[ o.name ]]&#160;</para>
<!--<para style="normal">[[ o.partner_id.commercial_partner_id.ref ]]&#160;</para>--> <!--<para style="normal">[[ o.partner_id.commercial_partner_id.ref ]]&#160;</para>-->
<para style="normal">[[ o.partner_id.commercial_partner_id and o.partner_id.commercial_partner_id.vat or '' ]]&#160;</para> <para style="normal">[[ o.partner_id.commercial_partner_id and o.partner_id.commercial_partner_id.vat or '' ]]&#160;</para>
<para style="normal">[[ (o.user_id and o.user_id.name) or '' ]]&#160;</para> <para style="normal">[[ (o.user_id and o.user_id.name) or '' ]]&#160;</para>
</td> </td>
</tr> </tr>
<!-- <!--
<tr> <tr>
<td> <td>
<section>[[ (o.partner_shipping_id and o.partner_shipping_id.id != o.partner_id.id) or removeParentNode('section')]] <section>[[ (o.partner_shipping_id and o.partner_shipping_id.id != o.partner_id.id) or removeParentNode('section')]]
<spacer length="0.5cm"/> <spacer length="0.5cm"/>
<para style="normal">Lieferadresse:</para> <para style="normal">Lieferadresse:</para>
<para style="normal">[[ o.partner_shipping_id.commercial_partner_id.name ]]</para> <para style="normal">[[ o.partner_shipping_id.commercial_partner_id.name ]]</para>
<para style="normal">[[ (o.partner_shipping_id.commercial_partner_id.id != o.partner_shipping_id.id and o.partner_shipping_id.name) or '' ]] </para> <para style="normal">[[ (o.partner_shipping_id.commercial_partner_id.id != o.partner_shipping_id.id and o.partner_shipping_id.name) or '' ]] </para>
<para style="normal">[[ (o.partner_shipping_id.street ) or '']]</para> <para style="normal">[[ (o.partner_shipping_id.street ) or '']]</para>
<para style="normal">[[ (o.partner_shipping_id.street2) or removeParentNode('para') ]]</para> <para style="normal">[[ (o.partner_shipping_id.street2) or removeParentNode('para') ]]</para>
<para style="normal">[[ (o.partner_shipping_id.zip) or '' ]] [[ (o.partner_shipping_id and o.partner_shipping_id.city) or '' ]]</para> <para style="normal">[[ (o.partner_shipping_id.zip) or '' ]] [[ (o.partner_shipping_id and o.partner_shipping_id.city) or '' ]]</para>
<para style="normal">[[ (o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name) or removeParentNode('para')]]</para> <para style="normal">[[ (o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name) or removeParentNode('para')]]</para>
<para style="normal">[[ (o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name) or '' ]]</para> <para style="normal">[[ (o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name) or '' ]]</para>
</section> </section>
<para style="normal">&#160;</para> <para style="normal">&#160;</para>
</td> </td>
<td> <td>
<para style="normal">&#160;</para> <para style="normal">&#160;</para>
</td> </td>
<td> <td>
<para style="normal">&#160;</para> <para style="normal">&#160;</para>
</td> </td>
</tr> </tr>
--> -->
</blockTable> </blockTable>
<spacer length="1.0cm"/> <spacer length="1.0cm"/>
@ -84,131 +84,131 @@
<para style="ueberschrift2"><b>Stornorechnung [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</b></para> <para style="ueberschrift2"><b>Stornorechnung [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</b></para>
<para style="ueberschrift2"><b>Rechnung [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]</b></para> <para style="ueberschrift2"><b>Rechnung [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]</b></para>
<spacer length="0.5cm"/> <spacer length="0.5cm"/>
<blockTable colWidths="30,57,170,75,63,40,75" repeatRows="1" style="TabelleHaupt" hAlign="LEFT"> <blockTable colWidths="30,57,170,75,63,40,75" repeatRows="1" style="TabelleHaupt" hAlign="LEFT">
<tr> <tr>
<td> <td>
<para style="tabelle_header">Pos</para> <para style="tabelle_header">Pos</para>
</td> </td>
<td> <td>
<para style="tabelle_header">Art.nr.</para> <para style="tabelle_header">Art.nr.</para>
</td> </td>
<td> <td>
<para style="tabelle_header_links">Bezeichnung</para> <para style="tabelle_header_links">Bezeichnung</para>
</td> </td>
<td> <td>
<para style="tabelle_header_links">Menge</para> <para style="tabelle_header_links">Menge</para>
</td> </td>
<td> <td>
<para style="tabelle_header_rechts">Einzelpreis</para> <para style="tabelle_header_rechts">Einzelpreis</para>
</td> </td>
<td> <td>
<para style="tabelle_header"></para> <para style="tabelle_header"></para>
</td> </td>
<td> <td>
<para style="tabelle_header_rechts">Gesamtpreis</para> <para style="tabelle_header_rechts">Gesamtpreis</para>
</td> </td>
</tr> </tr>
<tr>[[repeatIn(o.invoice_line,'line')]] <tr>[[repeatIn(o.invoice_line,'line')]]
<td> <td>
<para style="tabelle_daten_center" leftIndent="0" bulletIndent="0" size="8.0"> <para style="tabelle_daten_center" leftIndent="0" bulletIndent="0" size="8.0">
<seq id="L1"/> <seq id="L1"/>
</para> </para>
</td> </td>
<td> <td>
<para style="tabelle_daten_center">[[ line.product_id and line.product_id.default_code or '']]</para> <para style="tabelle_daten_center">[[ line.product_id and line.product_id.default_code or '']]</para>
</td> </td>
<td> <td>
<para style="tabelle_daten_links">[[ (line.name or '').split('\n\n')[0] ]]</para> <para style="tabelle_daten_links">[[ (line.name or '').split('\n\n')[0] ]]</para>
<section>[[ repeatIn((line.name or '').split('\n\n')[1:],'paragraphs') ]] <section>[[ repeatIn((line.name or '').split('\n\n')[1:],'paragraphs') ]]
<spacer length="0.4cm"/> <spacer length="0.4cm"/>
<para style="tabelle_daten_links">[[ paragraphs ]]</para> <para style="tabelle_daten_links">[[ paragraphs ]]</para>
</section> </section>
</td> </td>
<td> <td>
<para style="tabelle_daten_links">[[formatLang(line.quantity, digits=2)[-2:]=='00' and formatLang(line.quantity, digits=0) or formatLang(line.quantity, digits=2)]] [[ line.uos_id.name ]]</para> <para style="tabelle_daten_links">[[formatLang(line.quantity, digits=2)[-2:]=='00' and formatLang(line.quantity, digits=0) or formatLang(line.quantity, digits=2)]] [[ line.uos_id.name ]]</para>
</td> </td>
<td> <td>
<para style="tabelle_daten_rechts">[[ formatLang(line.price_unit,digits=2) ]]</para> <para style="tabelle_daten_rechts">[[ formatLang(line.price_unit,digits=2) ]]</para>
</td> </td>
<td> <td>
<para style="tabelle_daten_rechts">[[ line.discount &lt;&gt; 0 and (formatLang(line.discount) + '%') or '' ]]</para> <para style="tabelle_daten_rechts">[[ line.discount &lt;&gt; 0 and (formatLang(line.discount) + '%') or '' ]]</para>
</td> </td>
<td> <td>
<para style="tabelle_daten_rechts">[[ formatLang(line.price_subtotal,digits=2 ) ]]</para> <para style="tabelle_daten_rechts">[[ formatLang(line.price_subtotal,digits=2 ) ]]</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
<blockTable colWidths="210,200,100" style="TabelleSchlussrechnung"> <blockTable colWidths="210,200,100" style="TabelleSchlussrechnung">
<tr> <tr>
<td> <td>
<para></para> <para></para>
</td> </td>
<td> <td>
<para style="schlussrechnung">Zwischensumme in €</para> <para style="schlussrechnung">Zwischensumme in €</para>
</td> </td>
<td> <td>
<para style="schlussrechnung">[[ formatLang(o.amount_untaxed,digits=2 )]]</para> <para style="schlussrechnung">[[ formatLang(o.amount_untaxed,digits=2 )]]</para>
</td> </td>
</tr> </tr>
<tr>[[ repeatIn(o.tax_line,'tax') ]] <tr>[[ repeatIn(o.tax_line,'tax') ]]
<td> <td>
<para style="schlussrechnung"></para> <para style="schlussrechnung"></para>
</td> </td>
<td> <td>
<para style="schlussrechnung">MwSt. [[tax.name.split(" ")[0] or ""]] in €</para> <para style="schlussrechnung">MwSt. [[tax.name.split(" ")[0] or ""]] in €</para>
</td> </td>
<td> <td>
<para style="schlussrechnung">[[ formatLang(tax.tax_amount) ]]</para> <para style="schlussrechnung">[[ formatLang(tax.tax_amount) ]]</para>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<para></para> <para></para>
</td> </td>
<td> <td>
<para style="schlussrechnung_fett">Rechnungsbetrag in €</para> <para style="schlussrechnung_fett">Rechnungsbetrag in €</para>
</td> </td>
<td> <td>
<para style="schlussrechnung_fett">[[ formatLang(o.amount_total,digits=2 ) ]]</para> <para style="schlussrechnung_fett">[[ formatLang(o.amount_total,digits=2 ) ]]</para>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<para></para> <para></para>
</td> </td>
<td> <td>
<para style="schlussrechnung">Rechnungsbetrag inkl. Skonto in €</para> <para style="schlussrechnung">Rechnungsbetrag inkl. Skonto in €</para>
</td> </td>
<td> <td>
<para style="schlussrechnung">[[ (o.skonto_betrag_inkl and formatLang(o.skonto_betrag_inkl,digits=2)) or removeParentNode('tr') ]]</para> <para style="schlussrechnung">[[ (o.skonto_betrag_inkl and formatLang(o.skonto_betrag_inkl,digits=2)) or removeParentNode('tr') ]]</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
<spacer length="0.5cm"/> <spacer length="0.5cm"/>
<para style="normal">[[ (o.comment or '').split('\n\n')[0] ]]</para> <para style="normal">[[ (o.comment or '').split('\n\n')[0] ]]</para>
<section>[[ repeatIn((o.comment or '').split('\n\n')[1:],'paragraphs') ]] <section>[[ repeatIn((o.comment or '').split('\n\n')[1:],'paragraphs') ]]
<spacer length="0.4cm"/> <spacer length="0.4cm"/>
<para style="normal">[[ paragraphs ]]</para> <para style="normal">[[ paragraphs ]]</para>
</section> </section>
<spacer length="0.5cm"/> <spacer length="0.5cm"/>
<blockTable colWidths="110,390" style="Struktur" hAlign="LEFT"> <blockTable colWidths="110,390" style="Struktur" hAlign="LEFT">
<tr> <tr>
<td> <td>
<para style="normal">Zahlungsbedingungen:</para> <para style="normal">Zahlungsbedingungen:</para>
</td> </td>
<td> <td>
<para style="normal">[[ (o.payment_term and o.payment_term.note) or removeParentNode('blockTable') ]]</para> <para style="normal">[[ (o.payment_term and o.payment_term.note) or removeParentNode('blockTable') ]]</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
<!-- <!--
<spacer length="0.5cm"/> <spacer length="0.5cm"/>

68
ext/custom-addons/cam_reports/report/mrp.production.rml
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<document filename="Picking_Auftrag.pdf"> <document filename="Picking_Auftrag.pdf">
<template pageSize="(595.0,842.0)" title="Picking Auftrag" author="www.camadeus.at" allowSplitting="20"> <template pageSize="(595.0,842.0)" title="Picking Auftrag" author="datenpol gmbh" allowSplitting="20">
<pageTemplate id="first"> <pageTemplate id="first">
<frame id="first" x1="15.0" y1="42.0" width="539" height="758"/> <frame id="first" x1="15.0" y1="42.0" width="539" height="758"/>
</pageTemplate> </pageTemplate>
@ -17,10 +17,10 @@
<blockTable colWidths="260,260" style="Struktur" hAlign="RIGHT"> <blockTable colWidths="260,260" style="Struktur" hAlign="RIGHT">
<tr> <tr>
<td> <td>
<para style="normal">AUFTRAGSNUMMER: [[ o.origin or '' ]]</para> <para style="normal">AUFTRAGSNUMMER: [[ o.origin or '' ]]</para>
</td> </td>
<td> <td>
<para style="normal_rechts"></para> <para style="normal_rechts"></para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
@ -28,49 +28,49 @@
<blockTable colWidths="292,100,126" style="Struktur" hAlign="RIGHT"> <blockTable colWidths="292,100,126" style="Struktur" hAlign="RIGHT">
<tr> <tr>
<td> <td>
<para style="fett"></para> <para style="fett"></para>
<!-- <!--
<spacer length="0.5cm"/> <spacer length="0.5cm"/>
<para style="fett">Fertigung für:</para> <para style="fett">Fertigung für:</para>
<para style="normal">KEINE partner_id in mrp.production!</para> <para style="normal">KEINE partner_id in mrp.production!</para>
<spacer length="0.5cm"/> <spacer length="0.5cm"/>
<spacer length="0.2cm"/> <spacer length="0.2cm"/>
<para style="normal">[[ o.partner_id.commercial_partner_id.name ]]</para> <para style="normal">[[ o.partner_id.commercial_partner_id.name ]]</para>
<spacer length="0.1cm"/> <spacer length="0.1cm"/>
<para style="normal">[[ (o.partner_id.commercial_partner_id.id != o.partner_id.id and o.partner_id.name) or '' ]] </para> <para style="normal">[[ (o.partner_id.commercial_partner_id.id != o.partner_id.id and o.partner_id.name) or '' ]] </para>
<spacer length="0.1cm"/> <spacer length="0.1cm"/>
<para style="normal">[[ (o.partner_id.street ) or '']]</para> <para style="normal">[[ (o.partner_id.street ) or '']]</para>
<spacer length="0.1cm"/> <spacer length="0.1cm"/>
<para style="normal">[[ (o.partner_id.street2) or removeParentNode('para') ]]</para> <para style="normal">[[ (o.partner_id.street2) or removeParentNode('para') ]]</para>
<spacer length="0.1cm"/> <spacer length="0.1cm"/>
<para style="normal">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id and o.partner_id.city) or '' ]]</para> <para style="normal">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id and o.partner_id.city) or '' ]]</para>
<spacer length="0.1cm"/> <spacer length="0.1cm"/>
<para style="normal">[[ (o.partner_id.state_id and o.partner_id.state_id.name) or removeParentNode('para')]]</para> <para style="normal">[[ (o.partner_id.state_id and o.partner_id.state_id.name) or removeParentNode('para')]]</para>
<spacer length="0.1cm"/> <spacer length="0.1cm"/>
<para style="normal">[[ (o.partner_id.country_id and o.partner_id.country_id.name) or '' ]]</para> <para style="normal">[[ (o.partner_id.country_id and o.partner_id.country_id.name) or '' ]]</para>
<spacer length="0.5cm"/> <spacer length="0.5cm"/>
--> -->
</td> </td>
<td> <td>
<spacer length="1.0cm"/> <spacer length="1.0cm"/>
<para style="normal_center"></para> <para style="normal_center"></para>
</td> </td>
<td> <td>
<spacer length="1.0cm"/> <spacer length="1.0cm"/>
<para style="normal_rechts"></para> <para style="normal_rechts"></para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
<blockTable colWidths="292,226" style="Struktur" hAlign="RIGHT"> <blockTable colWidths="292,226" style="Struktur" hAlign="RIGHT">
<tr> <tr>
<td> <td>
<para style="normal_big"><b>FERTIGUNG: [[ o.name ]]</b></para> <para style="normal_big"><b>FERTIGUNG: [[ o.name ]]</b></para>
<spacer length="0.2cm"/> <spacer length="0.2cm"/>
</td> </td>
<td> <td>
<para style="normal_rechts_big">DATUM: [[ formatLang(o.date_planned,date=True) or formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para> <para style="normal_rechts_big">DATUM: [[ formatLang(o.date_planned,date=True) or formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
<spacer length="0.2cm"/> <spacer length="0.2cm"/>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
@ -83,10 +83,10 @@
<para style="tabelle_daten_links"></para> <para style="tabelle_daten_links"></para>
</td> </td>
<td> <td>
<para style="tabelle_daten_links"><b>Fertigungsartikel: [[ (o.product_id.default_code and '['+o.product_id.default_code+']') or '']] [[ o.product_id.name ]]</b></para> <para style="tabelle_daten_links"><b>Fertigungsartikel: [[ (o.product_id.default_code and '['+o.product_id.default_code+']') or '']] [[ o.product_id.name ]]</b></para>
</td> </td>
<td> <td>
<para style="tabelle_daten_links"><b>Zu fertigende Menge: [[ o.product_qty ]]</b></para> <para style="tabelle_daten_links"><b>Zu fertigende Menge: [[ o.product_qty ]]</b></para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>

204
ext/custom-addons/cam_reports/report/sale.order.rml
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<document filename="Auftrag.pdf"> <document filename="Auftrag.pdf">
<template pageSize="(595.0,842.0)" title="Sale Order" author="Camadeus Consulting" allowSplitting="20"> <template pageSize="(595.0,842.0)" title="Sale Order" author="datenpol gmbh" allowSplitting="20">
<pageTemplate id="first"> <pageTemplate id="first">
<frame id="first" x1="15.0" y1="42.0" width="539" height="758"/> <frame id="first" x1="15.0" y1="42.0" width="539" height="758"/>
</pageTemplate> </pageTemplate>
@ -13,108 +13,108 @@
</para> </para>
<para>[[repeatIn(objects,'o')]] [[ setLang(o.partner_id.commercial_partner_id.lang)]]</para> <para>[[repeatIn(objects,'o')]] [[ setLang(o.partner_id.commercial_partner_id.lang)]]</para>
<blockTable colWidths="270,230" style="Struktur"> <blockTable colWidths="270,230" style="Struktur">
<tr> <tr>
<td> <td>
<section> <section>
<para style="fett">[[ o.partner_id.commercial_partner_id.name ]]</para> <para style="fett">[[ o.partner_id.commercial_partner_id.name ]]</para>
<para style="normal">[[ (o.partner_id.commercial_partner_id.id != o.partner_id.id and o.partner_id.name) or '' ]] </para> <para style="normal">[[ (o.partner_id.commercial_partner_id.id != o.partner_id.id and o.partner_id.name) or '' ]] </para>
<para style="normal">[[ (o.partner_id.street ) or '']]</para> <para style="normal">[[ (o.partner_id.street ) or '']]</para>
<para style="normal">[[ (o.partner_id.street2) or removeParentNode('para') ]]</para> <para style="normal">[[ (o.partner_id.street2) or removeParentNode('para') ]]</para>
<para style="normal">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id and o.partner_id.city) or '' ]]</para> <para style="normal">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id and o.partner_id.city) or '' ]]</para>
<para style="normal">[[ (o.partner_id.state_id and o.partner_id.state_id.name) or removeParentNode('para')]]</para> <para style="normal">[[ (o.partner_id.state_id and o.partner_id.state_id.name) or removeParentNode('para')]]</para>
<para style="normal">[[ (o.partner_id.country_id and o.partner_id.country_id.name) or '' ]]</para> <para style="normal">[[ (o.partner_id.country_id and o.partner_id.country_id.name) or '' ]]</para>
<!-- Für Sichtfenster --> <!-- Für Sichtfenster -->
<section>[[ not (o.partner_id.commercial_partner_id and o.partner_id.commercial_partner_id.ref) or removeParentNode('section') ]] <section>[[ not (o.partner_id.commercial_partner_id and o.partner_id.commercial_partner_id.ref) or removeParentNode('section') ]]
<para style="normal">&#160;</para> <para style="normal">&#160;</para>
</section> </section>
<section>[[ (o.partner_shipping_id and o.partner_shipping_id.id != o.partner_id.id) or removeParentNode('section')]] <section>[[ (o.partner_shipping_id and o.partner_shipping_id.id != o.partner_id.id) or removeParentNode('section')]]
<spacer length="1.5cm"/> <spacer length="1.5cm"/>
<para style="normal">Lieferadresse:</para> <para style="normal">Lieferadresse:</para>
<para style="normal">[[ o.partner_shipping_id.commercial_partner_id.name ]]</para> <para style="normal">[[ o.partner_shipping_id.commercial_partner_id.name ]]</para>
<para style="normal">[[ (o.partner_shipping_id.commercial_partner_id.id != o.partner_shipping_id.id and o.partner_shipping_id.name) or '' ]] </para> <para style="normal">[[ (o.partner_shipping_id.commercial_partner_id.id != o.partner_shipping_id.id and o.partner_shipping_id.name) or '' ]] </para>
<para style="normal">[[ (o.partner_shipping_id.street ) or '']]</para> <para style="normal">[[ (o.partner_shipping_id.street ) or '']]</para>
<para style="normal">[[ (o.partner_shipping_id.street2) or removeParentNode('para') ]]</para> <para style="normal">[[ (o.partner_shipping_id.street2) or removeParentNode('para') ]]</para>
<para style="normal">[[ (o.partner_shipping_id.zip) or '' ]] [[ (o.partner_shipping_id and o.partner_shipping_id.city) or '' ]]</para> <para style="normal">[[ (o.partner_shipping_id.zip) or '' ]] [[ (o.partner_shipping_id and o.partner_shipping_id.city) or '' ]]</para>
<para style="normal">[[ (o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name) or removeParentNode('para')]]</para> <para style="normal">[[ (o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name) or removeParentNode('para')]]</para>
<para style="normal">[[ (o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name) or '' ]]</para> <para style="normal">[[ (o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name) or '' ]]</para>
</section> </section>
</section> </section>
<para></para> <para></para>
</td> </td>
<td> <td>
<blockTable colWidths="85,145" style="Struktur"> <blockTable colWidths="85,145" style="Struktur">
<tr> <tr>
<td> <td>
<para style="normal">Angebotsdatum:[[ o.state not in ['draft','sent'] and removeParentNode('para') ]]</para> <para style="normal">Angebotsdatum:[[ o.state not in ['draft','sent'] and removeParentNode('para') ]]</para>
<para style="normal">Bestelldatum:[[ o.state in ['draft','sent'] and removeParentNode('para') ]]</para> <para style="normal">Bestelldatum:[[ o.state in ['draft','sent'] and removeParentNode('para') ]]</para>
</td> </td>
<td> <td>
<para style="normal">[[ formatLang(o.date_order,date = True) ]]</para> <para style="normal">[[ formatLang(o.date_order,date = True) ]]</para>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<para style="normal">Quelldokument:[[ o.state not in ['draft','sent'] and removeParentNode('tr') ]]</para> <para style="normal">Quelldokument:[[ o.state not in ['draft','sent'] and removeParentNode('tr') ]]</para>
</td> </td>
<td> <td>
<para style="normal">[[ o.origin ]]</para> <para style="normal">[[ o.origin ]]</para>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<para style="normal">Kundennummer:</para> <para style="normal">Kundennummer:</para>
</td> </td>
<td> <td>
<para style="normal">[[ o.client_order_ref ]]</para> <para style="normal">[[ o.client_order_ref ]]</para>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<para style="normal">Kunde UID Nr.:</para> <para style="normal">Kunde UID Nr.:</para>
</td> </td>
<td> <td>
<para style="normal">[[ o.partner_id.commercial_partner_id and o.partner_id.commercial_partner_id.vat or '' ]]</para> <para style="normal">[[ o.partner_id.commercial_partner_id and o.partner_id.commercial_partner_id.vat or '' ]]</para>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<para style="normal">Ansprechpartner:</para> <para style="normal">Ansprechpartner:</para>
</td> </td>
<td> <td>
<para style="normal">[[ (o.user_id and o.user_id.name) or '' ]]</para> <para style="normal">[[ (o.user_id and o.user_id.name) or '' ]]</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
</td> </td>
</tr> </tr>
<!-- <!--
<tr> <tr>
<td> <td>
<section>[[ (o.partner_shipping_id and o.partner_shipping_id.id != o.partner_id.id) or removeParentNode('section')]] <section>[[ (o.partner_shipping_id and o.partner_shipping_id.id != o.partner_id.id) or removeParentNode('section')]]
<spacer length="0.5cm"/> <spacer length="0.5cm"/>
<para style="normal">Lieferadresse:</para> <para style="normal">Lieferadresse:</para>
<para style="normal">[[ o.partner_shipping_id.commercial_partner_id.name ]]</para> <para style="normal">[[ o.partner_shipping_id.commercial_partner_id.name ]]</para>
<para style="normal">[[ (o.partner_shipping_id.commercial_partner_id.id != o.partner_shipping_id.id and o.partner_shipping_id.name) or '' ]] </para> <para style="normal">[[ (o.partner_shipping_id.commercial_partner_id.id != o.partner_shipping_id.id and o.partner_shipping_id.name) or '' ]] </para>
<para style="normal">[[ (o.partner_shipping_id.street ) or '']]</para> <para style="normal">[[ (o.partner_shipping_id.street ) or '']]</para>
<para style="normal">[[ (o.partner_shipping_id.street2) or removeParentNode('para') ]]</para> <para style="normal">[[ (o.partner_shipping_id.street2) or removeParentNode('para') ]]</para>
<para style="normal">[[ (o.partner_shipping_id.zip) or '' ]] [[ (o.partner_shipping_id and o.partner_shipping_id.city) or '' ]]</para> <para style="normal">[[ (o.partner_shipping_id.zip) or '' ]] [[ (o.partner_shipping_id and o.partner_shipping_id.city) or '' ]]</para>
<para style="normal">[[ (o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name) or removeParentNode('para')]]</para> <para style="normal">[[ (o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name) or removeParentNode('para')]]</para>
<para style="normal">[[ (o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name) or '' ]]</para> <para style="normal">[[ (o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name) or '' ]]</para>
</section> </section>
<para style="normal">&#160;</para> <para style="normal">&#160;</para>
</td> </td>
<td> <td>
<para style="normal">&#160;</para> <para style="normal">&#160;</para>
</td> </td>
<td> <td>
<para style="normal">&#160;</para> <para style="normal">&#160;</para>
</td> </td>
</tr> </tr>
--> -->
</blockTable> </blockTable>
<spacer length="1.0cm"/> <spacer length="1.0cm"/>
@ -238,7 +238,7 @@
<spacer length="0.5cm"/> <spacer length="0.5cm"/>
<blockTable colWidths="110,390" style="Struktur" hAlign="LEFT"> <blockTable colWidths="110,390" style="Struktur" hAlign="LEFT">
<tr> <tr>
<td> <td>
<para style="normal">Zahlungsbedingungen:</para> <para style="normal">Zahlungsbedingungen:</para>

156
ext/custom-addons/cam_reports/report/stock.picking.rml
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<document filename="Lieferschein.pdf"> <document filename="Lieferschein.pdf">
<template pageSize="(595.0,842.0)" title="Sale Order" author="Camadeus Consulting" allowSplitting="20"> <template pageSize="(595.0,842.0)" title="Sale Order" author="datenpol gmbh" allowSplitting="20">
<pageTemplate id="first"> <pageTemplate id="first">
<frame id="first" x1="15.0" y1="42.0" width="539" height="758"/> <frame id="first" x1="15.0" y1="42.0" width="539" height="758"/>
</pageTemplate> </pageTemplate>
@ -13,89 +13,89 @@
</para> </para>
<para>[[ repeatIn(objects,'picking') ]] [[ picking.partner_id and setLang(picking.partner_id.lang) ]]</para> <para>[[ repeatIn(objects,'picking') ]] [[ picking.partner_id and setLang(picking.partner_id.lang) ]]</para>
<blockTable colWidths="270,85,145" style="Struktur"> <blockTable colWidths="270,85,145" style="Struktur">
<tr> <tr>
<td> <td>
<section> <section>
<para style="fett">[[ picking.partner_id.commercial_partner_id.name ]]</para> <para style="fett">[[ picking.partner_id.commercial_partner_id.name ]]</para>
<para style="normal">[[ (picking.partner_id.commercial_partner_id.id != picking.partner_id.id and picking.partner_id.name) or '' ]] </para> <para style="normal">[[ (picking.partner_id.commercial_partner_id.id != picking.partner_id.id and picking.partner_id.name) or '' ]] </para>
<para style="normal">[[ (picking.partner_id.street ) or '']]</para> <para style="normal">[[ (picking.partner_id.street ) or '']]</para>
<para style="normal">[[ (picking.partner_id.street2) or removeParentNode('para') ]]</para> <para style="normal">[[ (picking.partner_id.street2) or removeParentNode('para') ]]</para>
<para style="normal">[[ (picking.partner_id.zip) or '' ]] [[ (picking.partner_id and picking.partner_id.city) or '' ]]</para> <para style="normal">[[ (picking.partner_id.zip) or '' ]] [[ (picking.partner_id and picking.partner_id.city) or '' ]]</para>
<para style="normal">[[ (picking.partner_id.state_id and picking.partner_id.state_id.name) or removeParentNode('para')]]</para> <para style="normal">[[ (picking.partner_id.state_id and picking.partner_id.state_id.name) or removeParentNode('para')]]</para>
<para style="normal">[[ (picking.partner_id.country_id and picking.partner_id.country_id.name) or '' ]]</para> <para style="normal">[[ (picking.partner_id.country_id and picking.partner_id.country_id.name) or '' ]]</para>
<!-- Für Sichtfenster --> <!-- Für Sichtfenster -->
<section>[[ not (picking.partner_id.commercial_partner_id and picking.partner_id.commercial_partner_id.ref) or removeParentNode('section') ]] <section>[[ not (picking.partner_id.commercial_partner_id and picking.partner_id.commercial_partner_id.ref) or removeParentNode('section') ]]
<para style="normal">&#160;</para> <para style="normal">&#160;</para>
</section> </section>
</section> </section>
<para></para> <para></para>
</td> </td>
<td> <td>
<para style="normal">Datum:</para> <para style="normal">Datum:</para>
<para style="normal">Bestellung:</para> <para style="normal">Bestellung:</para>
<para style="normal">Kundenreferenz:</para> <para style="normal">Kundenreferenz:</para>
<para style="normal">Kundennr.:</para> <para style="normal">Kundennr.:</para>
</td> </td>
<td> <td>
<para style="normal">[[ formatLang(picking.date_done, date=True) or formatLang(time.strftime('%Y-%m-%d'),date=True) ]]&#160;</para> <para style="normal">[[ formatLang(picking.date_done, date=True) or formatLang(time.strftime('%Y-%m-%d'),date=True) ]]&#160;</para>
<para style="normal">[[ picking.origin ]]&#160;</para> <para style="normal">[[ picking.origin ]]&#160;</para>
<para style="normal">[[ picking.sale_id and picking.sale_id.client_order_ref or '' ]]&#160;</para> <para style="normal">[[ picking.sale_id and picking.sale_id.client_order_ref or '' ]]&#160;</para>
<para style="normal">[[ picking.partner_id and picking.partner_id.commercial_partner_id and picking.partner_id.commercial_partner_id.ref or '' ]]&#160;</para> <para style="normal">[[ picking.partner_id and picking.partner_id.commercial_partner_id and picking.partner_id.commercial_partner_id.ref or '' ]]&#160;</para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
<spacer length="1.0cm"/> <spacer length="1.0cm"/>
<para style="ueberschrift">Lieferschein [[ picking.name ]]</para> <para style="ueberschrift">Lieferschein [[ picking.name ]]</para>
<spacer length="0.5cm"/> <spacer length="0.5cm"/>
<blockTable colWidths="30,80,304,80" repeatRows="1" style="TabelleHaupt" hAlign="LEFT"> <blockTable colWidths="30,80,304,80" repeatRows="1" style="TabelleHaupt" hAlign="LEFT">
<tr> <tr>
<td> <td>
<para style="tabelle_header">Pos</para> <para style="tabelle_header">Pos</para>
</td> </td>
<td> <td>
<para style="tabelle_header">Art.nr.</para> <para style="tabelle_header">Art.nr.</para>
</td> </td>
<td> <td>
<para style="tabelle_header_links">Bezeichnung</para> <para style="tabelle_header_links">Bezeichnung</para>
</td> </td>
<td> <td>
<para style="tabelle_header">Menge</para> <para style="tabelle_header">Menge</para>
</td> </td>
</tr> </tr>
<tr>[[ repeatIn([line for line in picking.move_lines if line.state &lt;&gt; 'cancel'],'move_lines') ]] <tr>[[ repeatIn([line for line in picking.move_lines if line.state &lt;&gt; 'cancel'],'move_lines') ]]
<td> <td>
<para style="tabelle_daten_center" leftIndent="0" bulletIndent="0" size="8.0"> <para style="tabelle_daten_center" leftIndent="0" bulletIndent="0" size="8.0">
<seq id="L1"/> <seq id="L1"/>
</para> </para>
</td> </td>
<td> <td>
<para style="tabelle_daten_center">[[ move_lines.product_id.default_code ]]</para> <para style="tabelle_daten_center">[[ move_lines.product_id.default_code ]]</para>
</td> </td>
<td> <td>
<para style="tabelle_daten_links">[[ (move_lines.name or '').split('\n\n')[0] ]]</para> <para style="tabelle_daten_links">[[ (move_lines.name or '').split('\n\n')[0] ]]</para>
<section>[[ repeatIn((move_lines.name or '').split('\n\n')[1:],'paragraphs') ]] <section>[[ repeatIn((move_lines.name or '').split('\n\n')[1:],'paragraphs') ]]
<spacer length="0.4cm"/> <spacer length="0.4cm"/>
<para style="tabelle_daten_links">[[ paragraphs ]]</para> <para style="tabelle_daten_links">[[ paragraphs ]]</para>
</section> </section>
</td> </td>
<td> <td>
<para style="tabelle_daten_center">[[ formatLang(move_lines.product_qty, digits=0) ]] </para> <para style="tabelle_daten_center">[[ formatLang(move_lines.product_qty, digits=0) ]] </para>
</td> </td>
</tr> </tr>
</blockTable> </blockTable>
<spacer length="0.5cm"/> <spacer length="0.5cm"/>
<para style="normal">[[ (picking.note or '').split('\n\n')[0] ]]</para> <para style="normal">[[ (picking.note or '').split('\n\n')[0] ]]</para>
<section>[[ repeatIn((picking.note or '').split('\n\n')[1:],'paragraphs') ]] <section>[[ repeatIn((picking.note or '').split('\n\n')[1:],'paragraphs') ]]
<spacer length="0.4cm"/> <spacer length="0.4cm"/>
<para style="normal">[[ paragraphs ]]</para> <para style="normal">[[ paragraphs ]]</para>
</section> </section>
</story> </story>
</document> </document>