Compare commits

...

36 commits

Author SHA1 Message Date
Frederik Jaeckel
a8541f73bd dont except if no 'modegross' on invoice.line 2025-07-02 13:51:57 +02:00
Frederik Jaeckel
f3375d3d39 allow any vat-type to be exported as 'SpecifiedTaxRegistration' 2025-06-11 15:57:35 +02:00
Frederik Jaeckel
437f047e44 test: fix tax-code 2025-06-11 12:14:05 +02:00
Frederik Jaeckel
2dab5b1b43 SpecifiedTradeProduct: export 'description' as 'name' if no product was used in invoice-line 2025-06-11 11:57:16 +02:00
Frederik Jaeckel
4c2565e15e add xml-validator 2025-06-11 11:48:55 +02:00
Frederik Jaeckel
81f6a3e4a8 ApplicableTradeTax: disable ExemptionReason if CategoryCode exist 2025-06-11 11:48:35 +02:00
Frederik Jaeckel
d065f74482 add legal id of seller 2025-06-11 11:46:53 +02:00
Frederik Jaeckel
214cbb086f get amount on line as net-value (even if invoice is gross-mode) 2025-06-10 13:45:07 +02:00
Frederik Jaeckel
a5bf930e55 update license 2025-05-02 14:16:47 +02:00
Frederik Jaeckel
ea5a83d7c1 use product.round_price() to round unit_price of invoice-line 2025-01-29 09:33:40 +01:00
Frederik Jaeckel
02221601e7 round unit_price of invoice-line by price_digits 2025-01-28 12:50:55 +01:00
Frederik Jaeckel
ceb2a72fed tests: drop usage of Mock, generate invoice in db 2025-01-09 11:50:52 +01:00
Frederik Jaeckel
e47380f930 formatting 2025-01-09 11:50:09 +01:00
Frederik Jaeckel
9a13bc325d calculation of the tax adjusted 2025-01-09 11:50:00 +01:00
e291608373 Merge pull request 'handle tax childs' (#6) from jangras/edocument_xrechnung:wip_jan into main
Reviewed-on: m-ds/edocument_xrechnung#6
2025-01-09 08:33:34 +00:00
dba1965894 fix typo 2025-01-04 21:08:43 +01:00
f3b4849e0c handle tax childs 2025-01-03 22:28:58 +01:00
Frederik Jaeckel
6c47581745 Merge branch 'various_fixes' 2024-12-19 11:35:33 +01:00
Frederik Jaeckel
7ddb94f47e add docs 2024-12-19 11:34:36 +01:00
Mathias Behrle
8eb9c284fb Improve the help text of xrechnung_routeid. 2024-12-19 10:42:41 +01:00
Mathias Behrle
df46388967 Lookup parent taxes for unece tax codes.
In the same way as for categories the unece tax codes must be searched
on parents.
2024-12-19 10:22:12 +01:00
Mathias Behrle
659e78a686 Correct a translation. 2024-12-19 10:20:57 +01:00
Frederik Jaeckel
4177265713 Version 7.0.10 2024-12-12 11:56:33 +01:00
Frederik Jaeckel
d6b5893a8b add folder 'view' to setup.py 2024-12-12 11:52:50 +01:00
Mathias Behrle
79c2227131 Remove arguments in super() calls.
They are no more needed in Python3 and usually result in unexpected
behavior when wrongly used (like e.g. the one introduced in
764cacc091 and solved meanwhile by
refactorization).
2024-12-12 09:53:03 +01:00
Frederik Jaeckel
87f7593340 Version 7.0.9 2024-12-11 17:03:29 +01:00
Frederik Jaeckel
a9bbaebbd9 Merge branch 'main' into 7.0 2024-12-11 17:02:28 +01:00
Frederik Jaeckel
b28ce594d8 fix name of party in error message 2024-12-11 14:34:10 +01:00
Frederik Jaeckel
5a0af0be7c Version 7.0.7 2024-12-10 13:54:56 +01:00
Frederik Jaeckel
d442390154 Merge branch 'main' into 7.0 2024-12-10 13:54:02 +01:00
Frederik Jaeckel
ab064c43ef fix code 2024-12-10 13:16:04 +01:00
Frederik Jaeckel
9f2be4e593 add bank account number to xml-export 2024-12-10 12:59:09 +01:00
Frederik Jaeckel
813f5a4bcf fix typo 2024-12-10 12:58:45 +01:00
Frederik Jaeckel
81ea9d6ab1 configuration: add setting for used bank nuumbers 2024-12-10 12:25:51 +01:00
Frederik Jaeckel
f04d8c907b bank accont number: add field 'company_owned' 2024-12-10 12:24:45 +01:00
Frederik Jaeckel
bff0f296c3 doks 2024-12-10 12:22:33 +01:00
17 changed files with 752 additions and 173 deletions

View file

@ -1,6 +1,5 @@
Copyright (C) 2015-2023 Cédric Krier. Copyright (C) 2021-2025 martin-data services.
Copyright (C) 2015-2023 B2CK SPRL. Copyright (C) 2024-2025 Mathias Behrle
Copyright (C) 2021-2023 martin-data services.
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 General Public License as published by it under the terms of the GNU General Public License as published by

View file

@ -14,6 +14,19 @@ Requires
Changes Changes
======= =======
*7.0.10 - 12.12.2024*
- fix missing views
- Remove arguments in super() calls. (Mathias Behrle)
*7.0.9 - 11.12.2024*
- fix name of party in exceptions
*7.0.7 - 10.12.2024*
- add iban to xml-export
*7.0.6 - 09.12.2024* *7.0.6 - 09.12.2024*
- add: check for valid data to generate xml - add: check for valid data to generate xml

View file

@ -5,12 +5,17 @@
from trytond.pool import Pool from trytond.pool import Pool
from .edocument import XRechnung, FacturX from .edocument import XRechnung, FacturX
from .bank import AccountNumber
from .party import PartyConfiguration, Party from .party import PartyConfiguration, Party
from .configuration import Configuration, BankEdocumentRel
def register(): def register():
Pool.register( Pool.register(
AccountNumber,
XRechnung, XRechnung,
Configuration,
BankEdocumentRel,
FacturX, FacturX,
Party, Party,
PartyConfiguration, PartyConfiguration,

97
bank.py Normal file
View file

@ -0,0 +1,97 @@
# -*- coding: utf-8 -*-
# This file is part of the edocument-module for Tryton from m-ds.de.
# The COPYRIGHT file at the top level of this repository contains the
# full copyright notices and license terms.
from sql.conditionals import Case
from trytond.pool import PoolMeta, Pool
from trytond.model import fields
from trytond.transaction import Transaction
DEF_NONE = None
class AccountNumber(metaclass=PoolMeta):
__name__ = 'bank.account.number'
company_owned = fields.Function(fields.Boolean(
string='Number belongs to Company',
readonly=True),
'get_company_owned',
searcher='searcher_company_owned')
@classmethod
def get_company_owned_sql(cls):
""" get sql to search for bank acconts owned by company-party
"""
pool = Pool()
Account = pool.get('bank.account')
Number = pool.get('bank.account.number')
Owners = pool.get('bank.account-party.party')
Company = pool.get('company.company')
context = Transaction().context
tab_acc = Account.__table__()
tab_owner = Owners.__table__()
tab_num = Number.__table__()
company_id = context.get('company', -1)
party_id = -1
if company_id and company_id > 0:
party_id = Company(company_id).party.id
query = tab_num.join(
tab_acc,
condition=tab_num.account == tab_acc.id,
).join(
tab_owner,
condition=tab_owner.account == tab_acc.id,
).select(
tab_num.id.as_('number'),
Case(
(tab_owner.owner == party_id, True),
else_=False,
).as_('owned'))
return (tab_num, query)
@classmethod
def searcher_company_owned(cls, name, clause):
""" search in owned by party
Args:
name (str): field name
clause (list): search domain
Returns:
list: updated search domain
"""
Operator = fields.SQL_OPERATORS[clause[1]]
(tab_num, query) = cls.get_company_owned_sql()
query = query.select(
query.number,
where=Operator(query.owned, clause[2]))
return [('id', 'in', query)]
@classmethod
def get_company_owned(cls, records, names):
""" get list of bank account numbers owned by company
"""
cursor = Transaction().connection.cursor()
result = {x: {y.id: False for y in records} for x in names}
(tab_num, query) = cls.get_company_owned_sql()
query.where = tab_num.id.in_([x.id for x in records])
cursor.execute(*query)
lines = cursor.fetchall()
for line in lines:
values = {'company_owned': line[1]}
for name in names:
result[name][line[0]] = values.get(name)
return result
# end AccountNumber

35
configuration.py Normal file
View file

@ -0,0 +1,35 @@
# -*- coding: utf-8 -*-
# This file is part of the edocument-module for Tryton from m-ds.de.
# The COPYRIGHT file at the top level of this repository contains the
# full copyright notices and license terms.
from trytond.pool import PoolMeta
from trytond.model import ModelSQL, fields
class Configuration(metaclass=PoolMeta):
__name__ = 'account.configuration'
edocument_bank = fields.Many2Many(
string='Bank accounts',
relation_name='edocument_xrechnung.bank_rel',
origin='config', target='bankaccount',
filter=[('company_owned', '=', True)],
help='The bank accounts listed here are output in the invoice XML.')
# end Configuration
class BankEdocumentRel(ModelSQL):
'Bank - eDocument - Relation'
__name__ = 'edocument_xrechnung.bank_rel'
bankaccount = fields.Many2One(
string='Account', model_name='bank.account.number',
required=True, ondelete='CASCADE')
config = fields.Many2One(
string='Configuration', model_name='account.configuration',
required=True, ondelete='CASCADE')
# end BankEdocumentRel

15
configuration.xml Normal file
View file

@ -0,0 +1,15 @@
<?xml version="1.0"?>
<!-- This file is part of the edocument-module for Tryton from m-ds.de.
The COPYRIGHT file at the top level of this repository contains the
full copyright notices and license terms. -->
<tryton>
<data>
<record model="ir.ui.view" id="configuration_view_form">
<field name="model">account.configuration</field>
<field name="inherit" ref="account.configuration_view_form"/>
<field name="name">configuration_form</field>
</record>
</data>
</tryton>

View file

@ -6,3 +6,11 @@ https://github.com/itplr-kosit
validator: validator:
- https://erechnungsvalidator.service-bw.de/ - https://erechnungsvalidator.service-bw.de/
überweisungsdaten
https://portal3.gefeg.com/projectdata/invoice/deliverables/installed/publishingproject/zugferd%202.0.1%20-%20facturx%201.03/en%2016931%20%E2%80%93%20facturx%201.03%20%E2%80%93%20zugferd%202.0.1%20-%20basic.scm/html/de/021.htm?https://portal3.gefeg.com/projectdata/invoice/deliverables/installed/publishingproject/zugferd%202.0.1%20-%20facturx%201.03/en%2016931%20%E2%80%93%20facturx%201.03%20%E2%80%93%20zugferd%202.0.1%20-%20basic.scm/html/de/02134.htm
https://erechnungsvalidator.service-bw.de/
https://ecosio.com/de/peppol-und-xml-dokumente-online-validieren/
https://www.e-rechnungs-checker.de/

View file

@ -70,7 +70,7 @@ class XRechnung(EdocumentMixin, Invoice):
else: else:
raise ValueError('invalid type-code "%s"' % self.type_code) raise ValueError('invalid type-code "%s"' % self.type_code)
else: else:
return super(XRechnung, self)._get_template(version) return super()._get_template(version)
# end XRechnung # end XRechnung
@ -92,6 +92,6 @@ class FacturX(EdocumentMixin, Invoice):
else: else:
raise ValueError('invalid type-code "%s"' % self.type_code) raise ValueError('invalid type-code "%s"' % self.type_code)
else: else:
return super(FacturX, self)._get_template(version) return super()._get_template(version)
# end FacturX # end FacturX

View file

@ -16,7 +16,7 @@ msgstr "Für die Steuer '%(taxname)s' ist die UNECE-Steuerkategorie nicht konfig
msgctxt "model:ir.message,text:msg_tax_code_missing" msgctxt "model:ir.message,text:msg_tax_code_missing"
msgid "The UNECE tax code is not configured for tax '%(taxname)s'." msgid "The UNECE tax code is not configured for tax '%(taxname)s'."
msgstr "Für die Steuer '%(taxname)s' ist der UNECE-Einheitencode nicht konfiguriert." msgstr "Für die Steuer '%(taxname)s' ist der UNECE Steuercode nicht konfiguriert."
msgctxt "model:ir.message,text:msg_uom_code_missing" msgctxt "model:ir.message,text:msg_uom_code_missing"
msgid "The UNECE uom code is not configured for unit '%(uomname)s'." msgid "The UNECE uom code is not configured for unit '%(uomname)s'."
@ -63,9 +63,12 @@ msgid "X-Rechnung Route-ID"
msgstr "X-Rechnung Leitweg-ID" msgstr "X-Rechnung Leitweg-ID"
msgctxt "help:party.party,xrechnung_routeid:" msgctxt "help:party.party,xrechnung_routeid:"
msgid "Enables the need for an XRechnung route ID at the party for exporting the XRechnung." msgid ""
msgstr "Aktiviert die Notwendigkeit einer XRechnung-Leitweg-ID an der Partei für den Export der XRechnung." "When activated an XRechnung route ID must be used for this party for X-Rechnung exports.\n"
"The route ID must be defined as identifier of type \"X-Rechnung Route-ID\"."
msgstr ""
"Bei Aktivierung muss eine XRechnung-Leitweg-ID bei Rechnungsexporten für diese Partei benutzt werden.\n"
"Die Leitweg-ID muss als Identifikator mit Typ \"X-Rechnung Route-ID\" angelegt werden."
############### ###############
# account.tax # # account.tax #
@ -113,3 +116,31 @@ msgstr "Allgemeine indirekte Steuer der kanarischen Inseln"
msgctxt "selection:account.tax,xrtax_category:" msgctxt "selection:account.tax,xrtax_category:"
msgid "Tax on production; services and imports in Ceuta and Melilla" msgid "Tax on production; services and imports in Ceuta and Melilla"
msgstr "Steuer für Produktion; Dienstleistungen und Einfuhr in Ceuta und Melilla" msgstr "Steuer für Produktion; Dienstleistungen und Einfuhr in Ceuta und Melilla"
#########################
# account.configuration #
#########################
msgctxt "field:account.configuration,edocument_bank:"
msgid "Bank accounts"
msgstr "Bankkonten"
msgctxt "help:account.configuration,edocument_bank:"
msgid "The bank accounts listed here are output in the invoice XML."
msgstr "Die hier aufgeführten Bankkonten werden in der Rechnungs-XML ausgegeben."
################################
# edocument_xrechnung.bank_rel #
################################
msgctxt "model:edocument_xrechnung.bank_rel,name:"
msgid "Bank - eDocument - Relation"
msgstr "Bank - eDocument - Verknüpfung"
msgctxt "field:edocument_xrechnung.bank_rel,bankaccount:"
msgid "Account"
msgstr "Konto"
msgctxt "field:edocument_xrechnung.bank_rel,config:"
msgid "Configuration"
msgstr "Konfiguration"

View file

@ -98,3 +98,23 @@ msgctxt "selection:account.tax,xrtax_category:"
msgid "Tax on production; services and imports in Ceuta and Melilla" msgid "Tax on production; services and imports in Ceuta and Melilla"
msgstr "Tax on production; services and imports in Ceuta and Melilla" msgstr "Tax on production; services and imports in Ceuta and Melilla"
msgctxt "field:account.configuration,edocument_bank:"
msgid "Bank accounts"
msgstr "Bank accounts"
msgctxt "help:account.configuration,edocument_bank:"
msgid "The bank accounts listed here are output in the invoice XML."
msgstr "The bank accounts listed here are output in the invoice XML."
msgctxt "model:edocument_xrechnung.bank_rel,name:"
msgid "Bank - eDocument - Relation"
msgstr "Bank - eDocument - Relation"
msgctxt "field:edocument_xrechnung.bank_rel,bankaccount:"
msgid "Account"
msgstr "Account"
msgctxt "field:edocument_xrechnung.bank_rel,config:"
msgid "Configuration"
msgstr "Configuration"

137
mixin.py
View file

@ -9,6 +9,9 @@ import html
from trytond.exceptions import UserError from trytond.exceptions import UserError
from trytond.i18n import gettext from trytond.i18n import gettext
from trytond.tools import cached_property from trytond.tools import cached_property
from trytond.pool import Pool
from trytond.transaction import Transaction
from trytond.modules.product import round_price
class EdocumentMixin(object): class EdocumentMixin(object):
@ -16,6 +19,25 @@ class EdocumentMixin(object):
""" """
__slots__ = () __slots__ = ()
def company_bank_accounts(self):
""" get leist of bank account numbers, defined in config
Returns:
list: records of model bank.account.number
"""
Configuration = Pool().get('account.configuration')
result = []
cfg1 = Configuration.get_singleton()
if cfg1 and cfg1.edocument_bank:
result.extend(list(cfg1.edocument_bank))
else:
result.extend([
y
for x in self.invoice.company.party.bank_accounts
for y in x.numbers])
return result
@cached_property @cached_property
def seller_trade_address(self): def seller_trade_address(self):
""" get address of seller, throw exception if incomplete """ get address of seller, throw exception if incomplete
@ -27,7 +49,7 @@ class EdocumentMixin(object):
Returns: Returns:
record : model party.address record : model party.address
""" """
result = super(EdocumentMixin, self).seller_trade_address result = super().seller_trade_address
if not result: if not result:
raise UserError(gettext( raise UserError(gettext(
'edocument_xrechnung.msg_no_seller_address', 'edocument_xrechnung.msg_no_seller_address',
@ -37,7 +59,7 @@ class EdocumentMixin(object):
if not result.country: if not result.country:
raise UserError(gettext( raise UserError(gettext(
'edocument_xrechnung.msg_no_address_country', 'edocument_xrechnung.msg_no_address_country',
party=result.party)) party=result.party.rec_name if result.party else '-'))
return result return result
@cached_property @cached_property
@ -55,11 +77,11 @@ class EdocumentMixin(object):
if self.invoice and self.invoice.party if self.invoice and self.invoice.party
else '-')) else '-'))
result = super(EdocumentMixin, self).buyer_trade_address result = super().buyer_trade_address
if result and not result.country: if result and not result.country:
raise UserError(gettext( raise UserError(gettext(
'edocument_xrechnung.msg_no_address_country', 'edocument_xrechnung.msg_no_address_country',
party=result.party)) party=result.party.rec_name if result.party else '-'))
return result return result
def get_list_of_comments(self): def get_list_of_comments(self):
@ -80,21 +102,29 @@ class EdocumentMixin(object):
""" get tax of invoice-line, """ get tax of invoice-line,
fire exception if no/multiple taxes exists fire exception if no/multiple taxes exists
""" """
if len(line.invoice_taxes) != 1: Tax = Pool().get('account.tax')
if len(line.taxes) != 1:
raise UserError(gettext( raise UserError(gettext(
'edocument_xrechnung.msg_linetax_invalid_number', 'edocument_xrechnung.msg_linetax_invalid_number',
linename=line.rec_name, linename=line.rec_name,
numtax=len(line.invoice_taxes))) numtax=len(line.taxes)))
taxlines = Tax.compute(
line.taxes, Decimal('1'), 1.0,
line.invoice.accounting_date or line.invoice.invoice_date)
assert len(taxlines) == 1
tax = taxlines[0]['tax']
allowed_cat = ['AE', 'L', 'M', 'E', 'S', 'Z', 'G', 'O', 'K', 'B'] allowed_cat = ['AE', 'L', 'M', 'E', 'S', 'Z', 'G', 'O', 'K', 'B']
unece_category_code = self.get_category_code(line.invoice_taxes[0].tax) unece_category_code = self.get_category_code(tax)
if unece_category_code not in allowed_cat: if unece_category_code not in allowed_cat:
raise UserError(gettext( raise UserError(gettext(
'edocument_xrechnung.msg_linetax_invalid_catcode', 'edocument_xrechnung.msg_linetax_invalid_catcode',
taxname=line.invoice_taxes[0].tax.rec_name, taxname=tax.rec_name,
allowed=', '.join(allowed_cat))) allowed=', '.join(allowed_cat)))
return line.invoice_taxes[0].tax return tax
def taxident_data(self, tax_identifier): def taxident_data(self, tax_identifier):
""" get tax-scheme-id and codes """ get tax-scheme-id and codes
@ -124,12 +154,58 @@ class EdocumentMixin(object):
def tax_unece_code(self, tax): def tax_unece_code(self, tax):
""" 'tax': invoice.line """ 'tax': invoice.line
""" """
if not (tax.unece_code or ''): unece_code = self.get_tax_unece_code(tax)
if not unece_code:
raise UserError(gettext( raise UserError(gettext(
'edocument_xrechnung.msg_tax_code_missing', 'edocument_xrechnung.msg_tax_code_missing',
taxname=tax.rec_name)) taxname=tax.rec_name))
return tax.unece_code return tax.unece_code
def get_line_amount(self, line):
""" get amount of current invoice-line,
depends on modegross of invoice, set used-modegross to 'net'
Args:
line (record): model account.invoice.line
"""
if not hasattr(line, 'modegross'):
return line.amount
if line.modegross == 'net':
return line.amount
elif line.modegross == 'gross':
# get net-amount
# copy from account_invoice/invoice.py:2416-2434
currency = (
line.invoice.currency
if line.invoice else line.currency)
amount = (Decimal(str(line.quantity or 0)) * (
line.unit_price or Decimal(0)))
invoice_type = (
line.invoice.type
if line.invoice else line.invoice_type)
if (invoice_type == 'in'
and line.taxes_deductible_rate is not None
and line.taxes_deductible_rate != 1):
with Transaction().set_context(_deductible_rate=1):
tax_amount = sum(
t['amount'] for t in line._get_taxes().values())
non_deductible_amount = (
tax_amount * (1 - line.taxes_deductible_rate))
amount += non_deductible_amount
if currency:
return currency.round(amount)
return amount
def get_tax_unece_code(self, tax):
while tax:
if tax.unece_code:
return tax.unece_code
break
tax = tax.parent
def get_category_code(self, tax): def get_category_code(self, tax):
while tax: while tax:
if tax.unece_category_code: if tax.unece_category_code:
@ -147,10 +223,49 @@ class EdocumentMixin(object):
taxname=tax.rec_name)) taxname=tax.rec_name))
return unece_category_code return unece_category_code
def round_unitprice(self, value):
""" round value by digits in unit_price of account.invoice.line
Args:
value (Decimal): unit-price
Returns:
Decimal: rounded value
"""
if value is not None:
return round_price(value)
return value
def quote_text(self, text): def quote_text(self, text):
""" replace critical chars """ replace critical chars
""" """
if text: if text:
return html.quote(text) return html.escape(text)
def _party_legal_types(self):
""" get list of identifier-types to be used as
legal-ids
"""
return ['de_handelsregisternummer']
def party_legal_ids(self, party, address):
""" get list of legal-ids of party
Args:
party (record): model party.party
address (record): model party.address
"""
result = super().party_legal_ids(party, address)
legal_types = self._party_legal_types()
if party and party.identifiers:
for x in party.identifiers:
if x.type in legal_types:
if x.address:
if x.address == address:
result.append((x.rec_name, {'schemeID': '0002'}))
else:
result.append((x.rec_name, {'schemeID': '0002'}))
return result
# end EdocumentMixin # end EdocumentMixin

View file

@ -14,8 +14,10 @@ class Party(metaclass=PoolMeta):
xrechnung_routeid = fields.Boolean( xrechnung_routeid = fields.Boolean(
string='X-Rechnung Route-ID', string='X-Rechnung Route-ID',
help='Enables the need for an XRechnung route ID at the party ' + help='When activated an XRechnung route ID must be used '
'for exporting the XRechnung.') 'for this party for X-Rechnung exports.\n'
'The route ID must be defined as identifier of type '
'"X-Rechnung Route-ID".')
def get_xrechnung_route_id(self): def get_xrechnung_route_id(self):
""" search for route-id at party, fire-exception if missing """ search for route-id at party, fire-exception if missing
@ -45,7 +47,7 @@ class Party(metaclass=PoolMeta):
Args: Args:
records (list): records of party.party records (list): records of party.party
""" """
super(Party, cls).validate(records) super().validate(records)
for record in records: for record in records:
record.get_xrechnung_route_id() record.get_xrechnung_route_id()
@ -57,7 +59,7 @@ class PartyConfiguration(metaclass=PoolMeta):
@classmethod @classmethod
def __setup__(cls): def __setup__(cls):
super(PartyConfiguration, cls).__setup__() super().__setup__()
cls.identifier_types.selection.append( cls.identifier_types.selection.append(
('edoc_route_id', 'X-Rechnung Route-ID')) ('edoc_route_id', 'X-Rechnung Route-ID'))

View file

@ -13,11 +13,9 @@ here = path.abspath(path.dirname(__file__))
MODULE = 'edocument_xrechnung' MODULE = 'edocument_xrechnung'
PREFIX = 'mds' PREFIX = 'mds'
# Get the long description from the README file
with open(path.join(here, 'README.rst'), encoding='utf-8') as f: with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
long_description = f.read() long_description = f.read()
# tryton.cfg einlesen
config = ConfigParser() config = ConfigParser()
config.readfp(open('tryton.cfg')) config.readfp(open('tryton.cfg'))
info = dict(config.items('tryton')) info = dict(config.items('tryton'))
@ -87,6 +85,8 @@ setup(
'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
], ],
keywords='tryton xrechnung edcoument', keywords='tryton xrechnung edcoument',
@ -99,7 +99,7 @@ setup(
info.get('xml', []) info.get('xml', [])
+ ['tryton.cfg', 'locale/*.po', 'tests/*.py', + ['tryton.cfg', 'locale/*.po', 'tests/*.py',
'template/*/*.xml', 'versiondep.txt', 'README.rst', 'template/*/*.xml', 'versiondep.txt', 'README.rst',
'tests/*/*/*/*.xsd', 'tests/*/*/*/*.xsd', 'view/*.xml',
'tests/*/*.xsd', 'tests/*/*.sch', 'tests/*/*.xml', 'tests/*/*.xsd', 'tests/*/*.sch', 'tests/*/*.xml',
'tests/*/*/*.xslt', 'tests/*/*/*.xml']), 'tests/*/*/*.xslt', 'tests/*/*/*.xml']),
}, },

View file

@ -12,33 +12,33 @@ this repository contains the full copyright notices and license terms. -->
<udt:DateTimeString format="102">${value.strftime('%Y%m%d')}</udt:DateTimeString> <udt:DateTimeString format="102">${value.strftime('%Y%m%d')}</udt:DateTimeString>
</py:def> </py:def>
<py:def function="TradeParty(party, address=None, tax_identifier=None)"> <py:def function="TradeParty(party, address=None, tax_identifier=None)">
<ram:Name>${party.name}</ram:Name> <ram:Name>${this.quote_text(party.name)}</ram:Name>
<ram:SpecifiedLegalOrganization> <ram:SpecifiedLegalOrganization>
<py:for each="id, attrs in this.party_legal_ids(party, address)"> <py:for each="id, attrs in this.party_legal_ids(party, address)">
<ram:ID py:attrs="attrs">${id}</ram:ID> <ram:ID py:attrs="attrs">${id}</ram:ID>
</py:for> </py:for>
</ram:SpecifiedLegalOrganization> </ram:SpecifiedLegalOrganization>
<ram:PostalTradeAddress py:if="address">${TradeAddress(address)}</ram:PostalTradeAddress> <ram:PostalTradeAddress py:if="address">${TradeAddress(address)}</ram:PostalTradeAddress>
<ram:SpecifiedTaxRegistration py:if="tax_identifier and tax_identifier.type == 'eu_vat'"> <ram:SpecifiedTaxRegistration py:if="tax_identifier and tax_identifier.type.endswith('_vat')">
<ram:ID schemeID='VA'>${tax_identifier.code}</ram:ID> <ram:ID schemeID='VA'>${tax_identifier.code}</ram:ID>
</ram:SpecifiedTaxRegistration> </ram:SpecifiedTaxRegistration>
</py:def> </py:def>
<py:def function="TradeAddress(address)"> <py:def function="TradeAddress(address)">
<ram:PostcodeCode py:if="address.postal_code">${address.postal_code}</ram:PostcodeCode> <ram:PostcodeCode py:if="address.postal_code">${address.postal_code}</ram:PostcodeCode>
<py:with vars="lines = (address.street or '').splitlines()"> <py:with vars="lines = (address.street or '').splitlines()">
<ram:LineOne py:if="len(lines) > 0">${lines[0]}</ram:LineOne> <ram:LineOne py:if="len(lines) > 0">${this.quote_text(lines[0])}</ram:LineOne>
<ram:LineTwo py:if="len(lines) > 1">${lines[1]}</ram:LineTwo> <ram:LineTwo py:if="len(lines) > 1">${this.quote_text(lines[1])}</ram:LineTwo>
<ram:LineThree py:if="len(lines) > 2">${lines[2]}</ram:LineThree> <ram:LineThree py:if="len(lines) > 2">${(lines[2])}</ram:LineThree>
</py:with> </py:with>
<ram:CityName py:if="address.city">${address.city}</ram:CityName> <ram:CityName py:if="address.city">${(address.city)}</ram:CityName>
<ram:CountryID py:if="address.country">${address.country.code}</ram:CountryID> <ram:CountryID py:if="address.country">${address.country.code}</ram:CountryID>
<ram:CountrySubDivisionName py:if="address.subdivision">${address.subdivision.name}</ram:CountrySubDivisionName> <ram:CountrySubDivisionName py:if="address.subdivision">${this.quote_text(address.subdivision.name)}</ram:CountrySubDivisionName>
</py:def> </py:def>
<py:def function="TradeTax(tax, amount=None, base=None)"> <py:def function="TradeTax(tax, amount=None, base=None)">
<ram:ApplicableTradeTax> <ram:ApplicableTradeTax>
<ram:CalculatedAmount py:if="amount" py:attrs="{'currencyID': this.invoice.currency.code}">${amount * this.type_sign}</ram:CalculatedAmount> <ram:CalculatedAmount py:if="amount" py:attrs="{'currencyID': this.invoice.currency.code}">${amount * this.type_sign}</ram:CalculatedAmount>
<ram:TypeCode>${this.tax_unece_code(tax)}</ram:TypeCode> <ram:TypeCode>${this.tax_unece_code(tax)}</ram:TypeCode>
<ram:ExemptionReason py:if="tax.legal_notice">${tax.legal_notice}</ram:ExemptionReason> <ram:ExemptionReason py:if="tax.legal_notice and not this.tax_category_code(tax)">${tax.legal_notice}</ram:ExemptionReason>
<ram:BasisAmount py:if="base">${base * this.type_sign}</ram:BasisAmount> <ram:BasisAmount py:if="base">${base * this.type_sign}</ram:BasisAmount>
<ram:CategoryCode>${this.tax_category_code(tax)}</ram:CategoryCode> <ram:CategoryCode>${this.tax_category_code(tax)}</ram:CategoryCode>
<ram:RateApplicablePercent py:if="tax.type == 'percentage'">${tax.rate * 100}</ram:RateApplicablePercent> <ram:RateApplicablePercent py:if="tax.type == 'percentage'">${tax.rate * 100}</ram:RateApplicablePercent>
@ -50,8 +50,8 @@ this repository contains the full copyright notices and license terms. -->
</ram:GuidelineSpecifiedDocumentContextParameter> </ram:GuidelineSpecifiedDocumentContextParameter>
</rsm:ExchangedDocumentContext> </rsm:ExchangedDocumentContext>
<rsm:ExchangedDocument> <rsm:ExchangedDocument>
<ram:ID>${this.invoice.number}</ram:ID> <ram:ID>${this.quote_text(this.invoice.number)}</ram:ID>
<ram:Name py:if="this.invoice.description">${this.invoice.description}</ram:Name> <ram:Name py:if="this.invoice.description">${this.quote_text(this.invoice.description)}</ram:Name>
<ram:TypeCode>${this.type_code}</ram:TypeCode> <ram:TypeCode>${this.type_code}</ram:TypeCode>
<ram:IssueDateTime> <ram:IssueDateTime>
${DateTime(this.invoice.invoice_date)} ${DateTime(this.invoice.invoice_date)}
@ -71,23 +71,21 @@ this repository contains the full copyright notices and license terms. -->
</ram:AssociatedDocumentLineDocument> </ram:AssociatedDocumentLineDocument>
<ram:SpecifiedTradeProduct> <ram:SpecifiedTradeProduct>
<ram:ID py:if="line.product and line.product.code">${line.product.code}</ram:ID> <ram:ID py:if="line.product and line.product.code">${line.product.code}</ram:ID>
<ram:Name>${line.product.name if line.product else ''}</ram:Name> <ram:Name>${this.quote_text(line.product.name if line.product else line.description if line.description else 'name not set')}</ram:Name>
<ram:Description py:if="line.description">${line.description}</ram:Description> <ram:Description py:if="line.description">${this.quote_text(line.description if line.product else '')}</ram:Description>
</ram:SpecifiedTradeProduct> </ram:SpecifiedTradeProduct>
<ram:SpecifiedLineTradeAgreement> <ram:SpecifiedLineTradeAgreement>
<ram:NetPriceProductTradePrice> <ram:NetPriceProductTradePrice>
<ram:ChargeAmount py:attrs="{'currencyID': this.invoice.currency.code}">${this.invoice.currency.round(line.unit_price)}</ram:ChargeAmount> <ram:ChargeAmount py:attrs="{'currencyID': this.invoice.currency.code}">${this.round_unitprice(line.unit_price)}</ram:ChargeAmount>
</ram:NetPriceProductTradePrice> </ram:NetPriceProductTradePrice>
</ram:SpecifiedLineTradeAgreement> </ram:SpecifiedLineTradeAgreement>
<ram:SpecifiedLineTradeDelivery> <ram:SpecifiedLineTradeDelivery>
<ram:BilledQuantity py:attrs="{'unitCode': line.unit.unece_code} if line.unit and line.unit.unece_code else {}">${line.quantity * this.type_sign}</ram:BilledQuantity> <ram:BilledQuantity py:attrs="{'unitCode': line.unit.unece_code} if line.unit and line.unit.unece_code else {}">${line.quantity * this.type_sign}</ram:BilledQuantity>
</ram:SpecifiedLineTradeDelivery> </ram:SpecifiedLineTradeDelivery>
<ram:SpecifiedLineTradeSettlement> <ram:SpecifiedLineTradeSettlement>
<py:for each="tax in line.invoice_taxes"> ${TradeTax(this.invoice_line_tax(line))}
${TradeTax(tax.tax)}
</py:for>
<ram:SpecifiedTradeSettlementLineMonetarySummation> <ram:SpecifiedTradeSettlementLineMonetarySummation>
<ram:LineTotalAmount py:attrs="{'currencyID': this.invoice.currency.code}">${line.amount}</ram:LineTotalAmount> <ram:LineTotalAmount py:attrs="{'currencyID': this.invoice.currency.code}">${this.get_line_amount(line)}</ram:LineTotalAmount>
</ram:SpecifiedTradeSettlementLineMonetarySummation> </ram:SpecifiedTradeSettlementLineMonetarySummation>
</ram:SpecifiedLineTradeSettlement> </ram:SpecifiedLineTradeSettlement>
</ram:IncludedSupplyChainTradeLineItem> </ram:IncludedSupplyChainTradeLineItem>
@ -99,10 +97,10 @@ this repository contains the full copyright notices and license terms. -->
${TradeParty(this.buyer_trade_party, this.buyer_trade_address, this.buyer_trade_tax_identifier)} ${TradeParty(this.buyer_trade_party, this.buyer_trade_address, this.buyer_trade_tax_identifier)}
</ram:BuyerTradeParty> </ram:BuyerTradeParty>
<ram:SellerOrderReferencedDocument py:if="this.invoice.type == 'in'"> <ram:SellerOrderReferencedDocument py:if="this.invoice.type == 'in'">
<ram:IssuerAssignedID>${this.invoice.reference}</ram:IssuerAssignedID> <ram:IssuerAssignedID>${this.quote_text(this.invoice.reference)}</ram:IssuerAssignedID>
</ram:SellerOrderReferencedDocument> </ram:SellerOrderReferencedDocument>
<ram:BuyerOrderReferencedDocument py:if="this.invoice.type == 'out'"> <ram:BuyerOrderReferencedDocument py:if="this.invoice.type == 'out'">
<ram:IssuerAssignedID>${this.invoice.reference}</ram:IssuerAssignedID> <ram:IssuerAssignedID>${this.quote_text(this.invoice.reference)}</ram:IssuerAssignedID>
</ram:BuyerOrderReferencedDocument> </ram:BuyerOrderReferencedDocument>
</ram:ApplicableHeaderTradeAgreement> </ram:ApplicableHeaderTradeAgreement>
<ram:ApplicableHeaderTradeDelivery> <ram:ApplicableHeaderTradeDelivery>
@ -114,11 +112,26 @@ this repository contains the full copyright notices and license terms. -->
</ram:ShipFromTradeParty> </ram:ShipFromTradeParty>
</ram:ApplicableHeaderTradeDelivery> </ram:ApplicableHeaderTradeDelivery>
<ram:ApplicableHeaderTradeSettlement> <ram:ApplicableHeaderTradeSettlement>
<ram:PaymentReference>${this.payment_reference}</ram:PaymentReference> <ram:PaymentReference>${this.quote_text(this.payment_reference)}</ram:PaymentReference>
<ram:InvoiceCurrencyCode>${this.invoice.currency.code}</ram:InvoiceCurrencyCode> <ram:InvoiceCurrencyCode>${this.invoice.currency.code}</ram:InvoiceCurrencyCode>
<ram:SpecifiedTradeSettlementPaymentMeans> <py:if test="len(this.company_bank_accounts()) == 0">
<ram:TypeCode>1</ram:TypeCode> <!-- Instrument not defined --> <ram:SpecifiedTradeSettlementPaymentMeans>
</ram:SpecifiedTradeSettlementPaymentMeans> <ram:TypeCode>1</ram:TypeCode>
</ram:SpecifiedTradeSettlementPaymentMeans>
</py:if>
<py:for each="banknumber in this.company_bank_accounts()">
<ram:SpecifiedTradeSettlementPaymentMeans>
<ram:TypeCode>30</ram:TypeCode>
<ram:Information>Wire transfer</ram:Information>
<ram:PayeePartyCreditorFinancialAccount>
<ram:IBANID>${banknumber.number_compact}</ram:IBANID>
<ram:AccountName>${this.quote_text(banknumber.account.bank.party.rec_name)}</ram:AccountName>
</ram:PayeePartyCreditorFinancialAccount>
<ram:PayeeSpecifiedCreditorFinancialInstitution>
<ram:BICID>${banknumber.account.bank.bic}</ram:BICID>
</ram:PayeeSpecifiedCreditorFinancialInstitution>
</ram:SpecifiedTradeSettlementPaymentMeans>
</py:for>
<py:for each="tax in this.invoice.taxes"> <py:for each="tax in this.invoice.taxes">
${TradeTax(tax.tax, tax.amount, tax.base)} ${TradeTax(tax.tax, tax.amount, tax.base)}
</py:for> </py:for>

View file

@ -5,19 +5,227 @@
from lxml import etree from lxml import etree
import os import os
from unittest.mock import Mock
from decimal import Decimal from decimal import Decimal
from datetime import date from datetime import date
from trytond.tests.test_tryton import ModuleTestCase, with_transaction from trytond.tests.test_tryton import (
ModuleTestCase, with_transaction, activate_module)
from trytond.pool import Pool from trytond.pool import Pool
from trytond.modules.edocument_uncefact.tests.test_module import get_invoice from trytond.modules.company.tests import create_company, set_company
from trytond.modules.account.tests import create_chart, get_fiscalyear
from trytond.exceptions import UserError from trytond.exceptions import UserError
def set_invoice_sequences(fiscalyear):
pool = Pool()
Sequence = pool.get('ir.sequence.strict')
SequenceType = pool.get('ir.sequence.type')
InvoiceSequence = pool.get('account.fiscalyear.invoice_sequence')
ModelData = pool.get('ir.model.data')
sequence = Sequence(
name=fiscalyear.name,
sequence_type=SequenceType(ModelData.get_id(
'account_invoice', 'sequence_type_account_invoice')),
company=fiscalyear.company)
sequence.save()
fiscalyear.invoice_sequences = []
invoice_sequence = InvoiceSequence()
invoice_sequence.fiscalyear = fiscalyear
invoice_sequence.in_invoice_sequence = sequence
invoice_sequence.in_credit_note_sequence = sequence
invoice_sequence.out_invoice_sequence = sequence
invoice_sequence.out_credit_note_sequence = sequence
invoice_sequence.save()
return fiscalyear
class EdocTestCase(ModuleTestCase): class EdocTestCase(ModuleTestCase):
'Test e-rechnung module' 'Test e-rechnung module'
module = 'edocument_xrechnung' module = 'edocument_xrechnung'
@classmethod
def setUpClass(cls):
super().setUpClass()
activate_module([
'edocument_uncefact', 'party', 'bank',
'account_invoice', 'sale_point_invoice',
'product_grossprice'], 'en')
def prep_fiscalyear(self, company1):
""" prepare fiscal year, sequences...
"""
pool = Pool()
FiscalYear = pool.get('account.fiscalyear')
fisc_year = get_fiscalyear(company1, today=date(2024, 1, 15))
set_invoice_sequences(fisc_year)
self.assertEqual(len(fisc_year.invoice_sequences), 1)
FiscalYear.create_period([fisc_year])
def prep_company(self):
""" create company, add country and bank-account
"""
pool = Pool()
Country = pool.get('country.country')
Party = pool.get('party.party')
Bank = pool.get('bank')
BankAccount = pool.get('bank.account')
country_de, = Country.create([{
'name': 'Germany',
'code': 'DE',
'code3': 'DEU'}])
company = create_company('m-ds')
Party.write(*[[company.party], {
'identifiers': [('create', [
# post.de
{'type': 'de_handelsregisternummer', 'code': 'Bonn HRB 6792'},
{'type': 'de_vat', 'code': 'DE 169838187'},
])],
'addresses': [('write', [company.party.addresses[0]], {
'country': country_de.id})]}])
bank_party, = Party.create([{
'name': 'Bank 123',
'addresses': [('create', [{}])]}])
bank, = Bank.create([{'party': bank_party.id}])
BankAccount.create([{
'bank': bank.id,
'owners': [('add', [company.party.id])],
'numbers': [('create', [{
'type': 'iban',
'number': 'DE02300209000106531065'}])]}])
return company
def prep_invoice(self, credit_note=False, modegross='net'):
""" add invoice
"""
pool = Pool()
Invoice = pool.get('account.invoice')
Taxes = pool.get('account.tax')
Account = pool.get('account.account')
Journal = pool.get('account.journal')
Currency = pool.get('currency.currency')
Uom = pool.get('product.uom')
Country = pool.get('country.country')
Party = pool.get('party.party')
country_de, = Country.search([('code', '=', 'DE')])
customer, = Party.create([{
'name': 'Customer',
'identifiers': [('create', [{
'type': 'edoc_route_id', 'code': 'xrechn-route-id-123'}])],
'addresses': [('create', [{
'invoice': True,
'street': 'Customer Street 1',
'postal_code': '12345',
'city': 'Usertown',
'country': country_de.id,
}])],
}])
currency1, = Currency.search([('code', '=', 'usd')])
Currency.write(*[[currency1], {'code': 'USD'}])
tax, = Taxes.search([('name', '=', '20% VAT')])
Taxes.write(*[
[tax],
{'unece_code': 'VAT', 'unece_category_code': 'S',
'legal_notice': 'Legal Notice'}])
account_lst = Account.search([
('name', 'in', ['Main Revenue', 'Main Receivable'])
], order=[('name', 'ASC')])
self.assertEqual(len(account_lst), 2)
self.assertEqual(account_lst[0].name, 'Main Receivable')
journ_lst = Journal.search([('name', '=', 'Revenue')])
self.assertEqual(len(journ_lst), 1)
to_create_invoice = [{
'type': 'out',
'modegross': modegross,
'description': 'description of invoice',
'comment': 'note line 1\nnote line 2',
'invoice_date': date(2024, 7, 1),
'party': customer.id,
'invoice_address': customer.addresses[0].id,
'account': account_lst[0].id,
'journal': journ_lst[0].id,
'currency': currency1.id,
'lines': [('create', [{
'type': 'line',
'quantity': 2.0 if not credit_note else -2.0,
'description': 'Product 1',
'unit': Uom.search([('symbol', '=', 'u')])[0].id,
'unit_price': Decimal('50.0'),
'taxes': [('add', [tax.id])],
'account': account_lst[1].id,
'currency': currency1.id,
}])],
}]
if modegross == 'gross':
to_create_invoice[0]['lines'][0][1][0]['unit_gross_price'] = (
Decimal('50.0') * Decimal('1.2'))
inv_lst, = Invoice.create(to_create_invoice)
inv_lst.on_change_lines()
inv_lst.save()
Invoice.validate_invoice([inv_lst])
Invoice.post([inv_lst])
self.assertEqual(inv_lst.currency.code, 'USD')
self.assertEqual(len(inv_lst.move.lines), 3)
return inv_lst
@with_transaction()
def test_xrechn_bank_account_owned(self):
""" check field 'company_owned' on bank.account.number
"""
pool = Pool()
BankAccount = pool.get('bank.account')
AccountNumber = pool.get('bank.account.number')
Bank = pool.get('bank')
Party = pool.get('party.party')
company = create_company()
with set_company(company):
bank_party, = Party.create([{
'name': 'Bank 123',
'addresses': [('create', [{}])]}])
customer_party, = Party.create([{
'name': 'Someone',
'addresses': [('create', [{}])]}])
bank, = Bank.create([{'party': bank_party.id}])
acc_company, acc_other, = BankAccount.create([
{
'bank': bank.id,
'owners': [('add', [company.party.id])],
'numbers': [('create', [
{'type': 'iban', 'number': 'DE02300209000106531065'}])]
}, {
'bank': bank.id,
'owners': [('add', [customer_party.id])],
'numbers': [('create', [
{'type': 'iban', 'number': 'DE02200505501015871393'}])]
}])
self.assertEqual(len(acc_company.numbers), 1)
self.assertEqual(acc_company.numbers[0].company_owned, True)
self.assertEqual(len(acc_other.numbers), 1)
self.assertEqual(acc_other.numbers[0].company_owned, False)
company_numbers = AccountNumber.search(
[('company_owned', '=', True)])
self.assertEqual(len(company_numbers), 1)
self.assertEqual(company_numbers[0].id, acc_company.numbers[0].id)
other_numbers = AccountNumber.search(
[('company_owned', '=', False)])
self.assertEqual(len(other_numbers), 1)
self.assertEqual(other_numbers[0].id, acc_other.numbers[0].id)
@with_transaction() @with_transaction()
def test_xrechn_check_validator(self): def test_xrechn_check_validator(self):
""" check validation of optional route-id """ check validation of optional route-id
@ -46,51 +254,106 @@ class EdocTestCase(ModuleTestCase):
{'identifiers': [('delete', [party.identifiers[0].id])]}] {'identifiers': [('delete', [party.identifiers[0].id])]}]
) )
@with_transaction()
def test_xrechn_export_facturx_gross(self):
""" run export - factur-x, modegross='gross'
"""
pool = Pool()
Template = pool.get('edocument.facturxext.invoice')
company = self.prep_company()
with set_company(company):
create_chart(company=company, tax=True)
self.prep_fiscalyear(company)
invoice = self.prep_invoice(modegross='gross')
template = Template(invoice)
schema_file = os.path.join(
os.path.dirname(__file__),
'Factur-X_1.07.2_EXTENDED',
'Factur-X_1.07.2_EXTENDED.xsd')
invoice_string = template.render('Factur-X-1.07.2-extended')
with open('gross_invoice_string.xml', 'wb') as fhdl:
fhdl.write(invoice_string)
invoice_xml = etree.fromstring(invoice_string)
# check values in xml
nodes = invoice_xml.xpath(self._readxml_xpath([
'rsm:CrossIndustryInvoice', 'rsm:SupplyChainTradeTransaction',
'ram:ApplicableHeaderTradeAgreement', 'ram:SellerTradeParty',
'ram:SpecifiedLegalOrganization', 'ram:ID']),
namespaces=invoice_xml.nsmap)
self.assertEqual(nodes[0].text, 'Bonn HRB 6792')
nodes = invoice_xml.xpath(self._readxml_xpath([
'rsm:CrossIndustryInvoice', 'rsm:SupplyChainTradeTransaction',
'ram:IncludedSupplyChainTradeLineItem',
'ram:SpecifiedLineTradeSettlement',
'ram:SpecifiedTradeSettlementLineMonetarySummation',
'ram:LineTotalAmount']),
namespaces=invoice_xml.nsmap)
self.assertEqual(nodes[0].text, '100.00')
schema = etree.XMLSchema(etree.parse(schema_file))
schema.assertValid(invoice_xml)
def _readxml_xpath(self, tags):
""" generate xpath
Args:
tags (list): list of string or integer to build path
"""
parts = []
for x in tags:
if isinstance(x, str):
parts.append(x)
elif isinstance(x, int):
if parts[-1].endswith(']'):
raise ValueError('multiple list selector')
parts[-1] += '[%d]' % x
result = '/' + '/'.join(parts)
return result
@with_transaction() @with_transaction()
def test_xrechn_export_facturx(self): def test_xrechn_export_facturx(self):
""" run export - factur-x """ run export - factur-x
""" """
pool = Pool() pool = Pool()
Template = pool.get('edocument.facturxext.invoice') Template = pool.get('edocument.facturxext.invoice')
Identifier = pool.get('party.identifier')
Party = pool.get('party.party')
Bank = pool.get('bank')
BankAccount = pool.get('bank.account')
BankNumber = pool.get('bank.account.number')
invoice = get_invoice() company = self.prep_company()
invoice.payment_term_date = date.today() with set_company(company):
invoice.party.get_xrechnung_route_id = Mock( create_chart(company=company, tax=True)
return_value='xrechn-route-id-123') self.prep_fiscalyear(company)
invoice.company.party.bank_accounts = [ invoice = self.prep_invoice()
Mock(
spec=BankAccount,
currency=invoice.currency,
bank=Mock(spec=Bank, party=Mock(spec=Party, name='Bank')),
owners=[invoice.company.party],
numbers=[Mock(spec=BankNumber, type='other', number='123456')],
)]
invoice.description = 'description of invoice'
invoice.comment = 'note line 1\nnote line 2'
invoice.taxes[0].tax.rate = Decimal('0.1')
invoice.identifiers = [
Mock(
spec=Identifier,
type='edoc_route_id',
code='xrechn-route-id-123')
]
template = Template(invoice) template = Template(invoice)
schema_file = os.path.join( self.assertEqual(
os.path.dirname(__file__), template.party_legal_ids(invoice.company_party, None),
'Factur-X_1.07.2_EXTENDED', [('Bonn HRB 6792', {'schemeID': '0002'})])
'Factur-X_1.07.2_EXTENDED.xsd')
invoice_string = template.render('Factur-X-1.07.2-extended') schema_file = os.path.join(
invoice_xml = etree.fromstring(invoice_string) os.path.dirname(__file__),
schema = etree.XMLSchema(etree.parse(schema_file)) 'Factur-X_1.07.2_EXTENDED',
schema.assertValid(invoice_xml) 'Factur-X_1.07.2_EXTENDED.xsd')
invoice_string = template.render('Factur-X-1.07.2-extended')
invoice_xml = etree.fromstring(invoice_string)
# check values in xml
nodes = invoice_xml.xpath(self._readxml_xpath([
'rsm:CrossIndustryInvoice', 'rsm:SupplyChainTradeTransaction',
'ram:ApplicableHeaderTradeAgreement', 'ram:SellerTradeParty',
'ram:SpecifiedLegalOrganization', 'ram:ID']),
namespaces=invoice_xml.nsmap)
self.assertEqual(nodes[0].text, 'Bonn HRB 6792')
schema = etree.XMLSchema(etree.parse(schema_file))
schema.assertValid(invoice_xml)
@with_transaction() @with_transaction()
def test_xrechn_export_xml_invoice(self): def test_xrechn_export_xml_invoice(self):
@ -98,45 +361,24 @@ class EdocTestCase(ModuleTestCase):
""" """
pool = Pool() pool = Pool()
Template = pool.get('edocument.xrechnung.invoice') Template = pool.get('edocument.xrechnung.invoice')
Identifier = pool.get('party.identifier')
Party = pool.get('party.party')
Bank = pool.get('bank')
BankAccount = pool.get('bank.account')
BankNumber = pool.get('bank.account.number')
invoice = get_invoice() company = self.prep_company()
invoice.payment_term_date = date.today() with set_company(company):
invoice.party.get_xrechnung_route_id = Mock( create_chart(company=company, tax=True)
return_value='xrechn-route-id-123') self.prep_fiscalyear(company)
invoice.company.party.bank_accounts = [ invoice = self.prep_invoice()
Mock(
spec=BankAccount,
currency=invoice.currency,
bank=Mock(spec=Bank, party=Mock(spec=Party, name='Bank')),
owners=[invoice.company.party],
numbers=[Mock(spec=BankNumber, type='other', number='123456')],
)]
invoice.description = 'description of invoice'
invoice.comment = 'note line 1\nnote line 2'
invoice.taxes[0].tax.rate = Decimal('0.1')
invoice.identifiers = [
Mock(
spec=Identifier,
type='edoc_route_id',
code='xrechn-route-id-123')
]
template = Template(invoice) template = Template(invoice)
schema_file = os.path.join( schema_file = os.path.join(
os.path.dirname(__file__), 'os-UBL-2.1', os.path.dirname(__file__), 'os-UBL-2.1',
'xsd', 'maindoc', 'UBL-Invoice-2.1.xsd') 'xsd', 'maindoc', 'UBL-Invoice-2.1.xsd')
for x in ['XRechnung-2.2', 'XRechnung-2.3', 'XRechnung-3.0']: for x in ['XRechnung-2.2', 'XRechnung-2.3', 'XRechnung-3.0']:
invoice_string = template.render(x) invoice_string = template.render(x)
invoice_xml = etree.fromstring(invoice_string) invoice_xml = etree.fromstring(invoice_string)
schema = etree.XMLSchema(etree.parse(schema_file)) schema = etree.XMLSchema(etree.parse(schema_file))
schema.assertValid(invoice_xml) schema.assertValid(invoice_xml)
@with_transaction() @with_transaction()
def test_xrechn_export_xml_creditnote(self): def test_xrechn_export_xml_creditnote(self):
@ -144,59 +386,24 @@ class EdocTestCase(ModuleTestCase):
""" """
pool = Pool() pool = Pool()
Template = pool.get('edocument.xrechnung.invoice') Template = pool.get('edocument.xrechnung.invoice')
Identifier = pool.get('party.identifier')
Party = pool.get('party.party')
Bank = pool.get('bank')
BankAccount = pool.get('bank.account')
BankNumber = pool.get('bank.account.number')
invoice = get_invoice() company = self.prep_company()
with set_company(company):
create_chart(company=company, tax=True)
self.prep_fiscalyear(company)
invoice = self.prep_invoice(credit_note=True)
# credit note template = Template(invoice)
invoice.lines[0].quantity = -1
invoice.lines[0].amount = Decimal('-100.0')
invoice.taxes[0].base = Decimal('-100.0')
invoice.taxes[0].amount = Decimal('-10.0')
invoice.untaxed_amount = Decimal('-100.0')
invoice.tax_amount = Decimal('-10.0')
invoice.total_amount = Decimal('-110.0')
invoice.lines_to_pay[0].debit = Decimal('-110.0')
invoice.party.get_xrechnung_route_id = Mock( schema_file = os.path.join(
return_value='xrechn-route-id-123') os.path.dirname(__file__), 'os-UBL-2.1',
invoice.company.party.bank_accounts = [ 'xsd', 'maindoc', 'UBL-CreditNote-2.1.xsd')
Mock(
spec=BankAccount,
currency=invoice.currency,
bank=Mock(spec=Bank, party=Mock(spec=Party, name='Bank')),
owners=[invoice.company.party],
numbers=[Mock(spec=BankNumber, type='other', number='123456')],
)]
invoice.description = 'description of invoice'
invoice.comment = 'note line 1\nnote line 2'
invoice.taxes[0].tax.rate = Decimal('0.1')
invoice.identifiers = [
Mock(
spec=Identifier,
type='edoc_route_id',
code='xrechn-route-id-123')
]
template = Template(invoice) for x in ['XRechnung-2.2', 'XRechnung-2.3', 'XRechnung-3.0']:
invoice_string = template.render(x)
schema_file = os.path.join( invoice_xml = etree.fromstring(invoice_string)
os.path.dirname(__file__), 'os-UBL-2.1', schema = etree.XMLSchema(etree.parse(schema_file))
'xsd', 'maindoc', 'UBL-CreditNote-2.1.xsd') schema.assertValid(invoice_xml)
for x in ['XRechnung-2.2', 'XRechnung-2.3', 'XRechnung-3.0']:
invoice_string = template.render(x)
invoice_xml = etree.fromstring(invoice_string)
schema = etree.XMLSchema(etree.parse(schema_file))
schema.assertValid(invoice_xml)
# invoice_string = template.render('XRechnung-2.2')
# with open('xrechnung-test-creditnote.xml', 'wt') as fhdl:
# fhdl.write(invoice_string.decode('utf8'))
# end EdocTestCase # end EdocTestCase

View file

@ -1,10 +1,14 @@
[tryton] [tryton]
version=7.0.6 version=7.0.10
depends: depends:
edocument_uncefact edocument_uncefact
party party
bank bank
account_invoice account_invoice
extras_depend:
sale_point_invoice
product_grossprice
xml: xml:
message.xml message.xml
configuration.xml
party.xml party.xml

View file

@ -0,0 +1,15 @@
<?xml version="1.0"?>
<!-- This file is part of the account-datev-module from m-ds for Tryton.
The COPYRIGHT file at the top level of this repository contains the
full copyright notices and license terms. -->
<data>
<xpath expr="/form/separator[@id='currency_exchange']" position="before">
<separator id="edocument" colspan="4" string="eDocument"/>
<field name="edocument_bank" colspan="2" height="200"/>
<newline/>
</xpath>
</data>