19.0 vanilla

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/README.md

@@ -1,18 +1,18 @@
 # Testing the Import/Export invoices with UBL/CII
 
 
-    This module tests the module 'account_edi_ubl_cii', it is separated since dependencies to some 
-    localizations were required. Its name begins with 'l10n' to not overload runbot.
-    
-    The test files are separated by sources, they were taken from:
-    
-    * the factur-x doc (form the FNFE)
-    * the peppol-bis-invoice-3 doc (the github repository: https://github.com/OpenPEPPOL/peppol-bis-invoice-3/tree/master/rules/examples contains examples)
-    * odoo, these files pass all validation tests (using ecosio or the FNFE validator)
-    
-    We test that the external examples are correctly imported (currency, total amount and total tax match).
-    We also test that generating xml from odoo with given parameters gives exactly the same xml as the expected, 
-    valid ones.
+This module tests the module 'account_edi_ubl_cii', it is separated since dependencies to some
+localizations were required. Its name begins with 'l10n' to not overload runbot.
+
+The test files are separated by sources, they were taken from:
+
+* the factur-x doc (form the FNFE)
+* the peppol-bis-invoice-3 doc (the github repository: https://github.com/OpenPEPPOL/peppol-bis-invoice-3/tree/master/rules/examples contains examples)
+* odoo, these files pass all validation tests (using ecosio or the FNFE validator)
+
+We test that the external examples are correctly imported (currency, total amount and total tax match).
+We also test that generating xml from odoo with given parameters gives exactly the same xml as the expected,
+valid ones.
     
 
 ## Installation
@@ -23,41 +23,19 @@ pip install odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests
 
 ## Dependencies
 
-This addon depends on:
-- l10n_generic_coa
 - account_edi_ubl_cii
-- l10n_fr
+- l10n_fr_account
 - l10n_be
 - l10n_de
 - l10n_nl
 - l10n_au
 
-## Manifest Information
-
-- **Name**: Testing the Import/Export invoices with UBL/CII
-- **Version**: 1.0
-- **Category**: Hidden/Tests
-- **License**: LGPL-3
-- **Installable**: True
-
 ## Source
 
-Based on [OCA/OCB](https://github.com/OCA/OCB) branch 16.0, addon `l10n_account_edi_ubl_cii_tests`.
+- Repository: https://github.com/OCA/OCB
+- Branch: 19.0
+- Path: addons/l10n_account_edi_ubl_cii_tests
 
 ## License
 
-This package maintains the original LGPL-3 license from the upstream Odoo project.
-
-## Documentation
-
-- Overview: doc/OVERVIEW.md
-- Architecture: doc/ARCHITECTURE.md
-- Models: doc/MODELS.md
-- Controllers: doc/CONTROLLERS.md
-- Wizards: doc/WIZARDS.md
-- Install: doc/INSTALL.md
-- Usage: doc/USAGE.md
-- Configuration: doc/CONFIGURATION.md
-- Dependencies: doc/DEPENDENCIES.md
-- Troubleshooting: doc/TROUBLESHOOTING.md
-- FAQ: doc/FAQ.md
+This package preserves the original LGPL-3 license.

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/__manifest__.py

@@ -2,32 +2,30 @@
 {
     'name': "Testing the Import/Export invoices with UBL/CII",
     'version': '1.0',
-    'category': 'Hidden/Tests',
+    'category': 'Accounting/Accounting',
     'description': """
-    This module tests the module 'account_edi_ubl_cii', it is separated since dependencies to some 
-    localizations were required. Its name begins with 'l10n' to not overload runbot.
-    
-    The test files are separated by sources, they were taken from:
-    
-    * the factur-x doc (form the FNFE)
-    * the peppol-bis-invoice-3 doc (the github repository: https://github.com/OpenPEPPOL/peppol-bis-invoice-3/tree/master/rules/examples contains examples)
-    * odoo, these files pass all validation tests (using ecosio or the FNFE validator)
-    
-    We test that the external examples are correctly imported (currency, total amount and total tax match).
-    We also test that generating xml from odoo with given parameters gives exactly the same xml as the expected, 
-    valid ones.
+This module tests the module 'account_edi_ubl_cii', it is separated since dependencies to some
+localizations were required. Its name begins with 'l10n' to not overload runbot.
+
+The test files are separated by sources, they were taken from:
+
+* the factur-x doc (form the FNFE)
+* the peppol-bis-invoice-3 doc (the github repository: https://github.com/OpenPEPPOL/peppol-bis-invoice-3/tree/master/rules/examples contains examples)
+* odoo, these files pass all validation tests (using ecosio or the FNFE validator)
+
+We test that the external examples are correctly imported (currency, total amount and total tax match).
+We also test that generating xml from odoo with given parameters gives exactly the same xml as the expected,
+valid ones.
     """,
     'depends': [
-        'l10n_generic_coa',
         'account_edi_ubl_cii',
-        'l10n_fr',
+        'l10n_fr_account',
         'l10n_be',
         'l10n_de',
         'l10n_nl',
         'l10n_au',
     ],
     'installable': True,
-    'application': False,
-    'auto_install': False,
+    'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/__init__.py

@@ -6,3 +6,5 @@ from . import test_xml_cii_fr
 from . import test_xml_cii_us
 from . import test_xml_ubl_nl
 from . import test_xml_ubl_au
+from . import test_xml_ubl_sg
+from . import test_xml_ubl_attacheddocument

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/common.py

@@ -2,34 +2,43 @@
 import base64
 
 from freezegun import freeze_time
-from collections import Counter
+from os.path import join as opj
 
-from odoo.addons.account_edi.tests.common import AccountEdiTestCommon
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
 from odoo import fields
-from odoo.modules.module import get_resource_path
-from odoo.tests import tagged
+from odoo.tools import misc
+
 from lxml import etree
 
 
-class TestUBLCommon(AccountEdiTestCommon):
+class TestUBLCommon(AccountTestInvoicingCommon):
 
     @classmethod
-    def setUpClass(cls, chart_template_ref=None, edi_format_ref=None):
-        super().setUpClass(chart_template_ref=chart_template_ref, edi_format_ref=edi_format_ref)
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.other_currency = cls.setup_other_currency('USD')
 
         # Required for `product_uom_id` to be visible in the form views
-        cls.env.user.groups_id += cls.env.ref('uom.group_uom')
-
-        # Ensure the testing currency is using a valid ISO code.
-        real_usd = cls.env.ref('base.USD')
-        real_usd.name = 'FUSD'
-        real_usd.flush_model(['name'])
-        cls.currency_data['currency'].name = 'USD'
+        cls.env.user.group_ids += cls.env.ref('uom.group_uom')
 
         # remove this tax, otherwise, at import, this tax with children taxes can be selected and the total is wrong
         cls.tax_armageddon.children_tax_ids.unlink()
         cls.tax_armageddon.unlink()
 
+        cls.move_template = cls.env['mail.template'].create({
+            'auto_delete': True,
+            'body_html': '<p>TemplateBody for <t t-out="object.name"></t><t t-out="object.invoice_user_id.signature or \'\'"></t></p>',
+            'description': 'Sent to customers with their invoices in attachment',
+            'email_from': "{{ (object.invoice_user_id.email_formatted or user.email_formatted) }}",
+            'model_id': cls.env['ir.model']._get_id('account.move'),
+            'name': "Invoice: Test Sending",
+            'partner_to': "{{ object.partner_id.id }}",
+            'subject': "{{ object.company_id.name }} Invoice (Ref {{ object.name or 'n/a' }})",
+            'report_template_ids': [(4, cls.env.ref('account.account_invoices').id)],
+            'lang': "{{ object.partner_id.lang }}",
+        })
+
         # Fixed Taxes
         cls.recupel = cls.env['account.tax'].create({
             'name': "RECUPEL",
@@ -46,17 +55,6 @@ class TestUBLCommon(AccountEdiTestCommon):
             'sequence': 2,
         })
 
-    @classmethod
-    def setup_company_data(cls, company_name, chart_template=None, **kwargs):
-        # OVERRIDE to force the company with EUR currency.
-        eur = cls.env.ref('base.EUR')
-        if not eur.active:
-            eur.active = True
-
-        res = super().setup_company_data(company_name, chart_template=chart_template, **kwargs)
-        res['company'].currency_id = eur
-        return res
-
     def assert_same_invoice(self, invoice1, invoice2, **invoice_kwargs):
         self.assertEqual(len(invoice1.invoice_line_ids), len(invoice2.invoice_line_ids))
         self.assertRecordValues(invoice2, [{
@@ -87,76 +85,58 @@ class TestUBLCommon(AccountEdiTestCommon):
     @freeze_time('2017-01-01')
     def _assert_imported_invoice_from_etree(self, invoice, attachment):
         """
-        Create an account.move directly from an attachment file, asserts the invoice obtained is the same as the expected
+        Create an account.move directly from an xml file, asserts the invoice obtained is the same as the expected
         invoice.
         """
         # /!\ use the same journal as the invoice's one to import the attachment !
-        new_invoice = self.edi_format\
-            .with_context(default_move_type=invoice.move_type)\
-            ._create_document_from_attachment(attachment)
+        invoice.journal_id.create_document_from_attachment(attachment.ids)
+        new_invoice = self.env['account.move'].search([], order='id desc', limit=1)
 
         self.assertTrue(new_invoice)
         self.assert_same_invoice(invoice, new_invoice)
 
-    def _assert_imported_invoice_from_file(self, subfolder, filename, amount_total, amount_tax, list_line_subtotals,
-                                           list_line_price_unit=None, list_line_discount=None, list_line_taxes=None,
-                                           move_type='in_invoice', currency_id=None):
+    def _update_invoice_from_file(self, module_name, subfolder, filename, invoice):
+        """ Create an attachment from a file and post it on the invoice
         """
-        Create an empty account.move, update the file to fill its fields, asserts the currency, total and tax amounts
-        are as expected.
-        """
-        if not currency_id:
-            currency_id = self.env.ref('base.EUR').id
-
-        # Create empty account.move, then update a file
-        if move_type == 'in_invoice':
-            invoice = self._create_empty_vendor_bill()
-        elif move_type == 'out_invoice':
-            invoice = self.env['account.move'].create({
-                'move_type': move_type,
-                'journal_id': self.company_data['default_journal_sale'].id,
+        file_path = opj(module_name, subfolder, filename)
+        with misc.file_open(file_path, 'rb', filter_ext=('.xml',)) as file:
+            attachment = self.env['ir.attachment'].create({
+                'name': filename,
+                'datas': base64.encodebytes(file.read()),
+                'res_id': invoice.id,
+                'res_model': 'account.move',
             })
+            invoice.message_post(message_type='comment', attachment_ids=attachment.ids)
+
+    def _assert_imported_invoice_from_file(self, subfolder, filename, invoice_vals, move_type='in_invoice'):
+        """ Create an empty account.move, update the xml file, and then check the invoice values. """
+        if move_type in self.env['account.move'].get_purchase_types():
+            journal = self.company_data['default_journal_purchase']
         else:
-            invoice = self.env['account.move'].create({
-                'move_type': move_type,
-                'journal_id': self.company_data['default_journal_purchase'].id,
-            })
-        invoice_count = len(self.env['account.move'].search([]))
-
-        # Import the file to fill the empty invoice
-        self.update_invoice_from_file('l10n_account_edi_ubl_cii_tests', subfolder, filename, invoice)
-
-        # Checks
-        self.assertEqual(len(self.env['account.move'].search([])), invoice_count)
-        self.assertRecordValues(invoice, [{
-            'amount_total': amount_total,
-            'amount_tax': amount_tax,
-            'currency_id': currency_id,
-        }])
-        self.assertEqual(
-            Counter(invoice.invoice_line_ids.mapped('price_subtotal')),
-            Counter(list_line_subtotals),
+            journal = self.company_data['default_journal_sale']
+        invoice = self.env['account.move'].create({'move_type': move_type, 'journal_id': journal.id})
+        self._update_invoice_from_file(
+            module_name='l10n_account_edi_ubl_cii_tests',
+            subfolder=subfolder,
+            filename=filename,
+            invoice=invoice,
         )
-        if list_line_price_unit:
-            self.assertEqual(invoice.invoice_line_ids.mapped('price_unit'), list_line_price_unit)
-        if list_line_discount:
-            # See test_import_tax_included: sometimes, it's impossible to retrieve the exact discount at import because
-            # of rounding during export. The obtained discount might be 10.001 while the expected is 10.
-            dp = self.env.ref('product.decimal_discount').precision_get("Discount")
-            self.assertEqual([round(d, dp) for d in invoice.invoice_line_ids.mapped('discount')], list_line_discount)
-        if list_line_taxes:
-            for line, taxes in zip(invoice.invoice_line_ids, list_line_taxes):
-                self.assertEqual(line.tax_ids, taxes)
+        invoice_vals = invoice_vals.copy()
+        invoice_lines = invoice_vals.pop('invoice_lines', False)
+        self.assertRecordValues(invoice, [invoice_vals])
+        if invoice_lines:
+            self.assertRecordValues(invoice.invoice_line_ids, invoice_lines)
 
     # -------------------------------------------------------------------------
     # EXPORT HELPERS
     # -------------------------------------------------------------------------
 
     @freeze_time('2017-01-01')
-    def _generate_move(self, seller, buyer, **invoice_kwargs):
+    def _generate_move(self, seller, buyer, send=True, **invoice_kwargs):
         """
         Create and post an account.move.
         """
+
         # Setup the seller.
         self.env.company.write({
             'partner_id': seller.id,
@@ -175,7 +155,7 @@ class TestUBLCommon(AccountEdiTestCommon):
             'invoice_payment_term_id': self.pay_terms_b.id,
             'invoice_date': '2017-01-01',
             'date': '2017-01-01',
-            'currency_id': self.currency_data['currency'].id,
+            'currency_id': self.other_currency.id,
             'narration': 'test narration',
             'ref': 'ref_move',
             **invoice_kwargs,
@@ -187,23 +167,24 @@ class TestUBLCommon(AccountEdiTestCommon):
                 for i, invoice_line_kwargs in enumerate(invoice_kwargs.get('invoice_line_ids', []))
             ],
         })
-        # this is needed for formats not enabled by default on the journal
-        account_move.journal_id.edi_format_ids += self.edi_format
+
         account_move.action_post()
+        if send:
+            # will set the right UBL format by default thanks to the partner's compute
+            account_move._generate_and_send(sending_methods=['manual'])
         return account_move
 
-    def _assert_invoice_attachment(self, invoice, xpaths, expected_file):
+    def _assert_invoice_attachment(self, attachment, xpaths, expected_file_path):
         """
         Get attachment from a posted account.move, and asserts it's the same as the expected xml file.
         """
-        attachment = invoice._get_edi_attachment(self.edi_format)
         self.assertTrue(attachment)
-        xml_filename = attachment.name
+
         xml_content = base64.b64decode(attachment.with_context(bin_size=False).datas)
         xml_etree = self.get_xml_tree_from_string(xml_content)
 
-        expected_file_path = get_resource_path('l10n_account_edi_ubl_cii_tests', 'tests/test_files', expected_file)
-        expected_etree = etree.parse(expected_file_path).getroot()
+        expected_file_full_path = misc.file_path(f'{self.test_module}/tests/test_files/{expected_file_path}')
+        expected_etree = etree.parse(expected_file_full_path).getroot()
 
         modified_etree = self.with_applied_xpath(
             expected_etree,
@@ -217,32 +198,45 @@ class TestUBLCommon(AccountEdiTestCommon):
 
         return attachment
 
-    def _import_invoice_attachment(self, invoice, edi_code, journal):
-        """ Extract the attachment from the invoice and import it on the given journal.
+    def _test_import_partner(self, attachment, seller, buyer):
         """
-        # Get the attachment from the invoice
-        edi_attachment = invoice.edi_document_ids.filtered(
-            lambda doc: doc.edi_format_id.code == edi_code).attachment_id
-        edi_etree = self.get_xml_tree_from_string(edi_attachment.raw)
+        Given a buyer and seller in an EDI attachment.
+        * Uploading the attachment as an invoice should create an invoice with the partner = buyer.
+        * Uploading the attachment as a vendor bill should create a bill with the partner = seller.
+        """
+        # Import attachment as an invoice
+        new_invoice = self.company_data['default_journal_sale']._create_document_from_attachment(attachment.ids)
+        self.assertEqual(buyer, new_invoice.partner_id)
 
-        # import the attachment and return the resulting invoice
-        return self.edi_format._create_invoice_from_xml_tree(
-            filename='test_filename',
-            tree=edi_etree,
-            journal=journal,
-        )
+        # Import attachment as a vendor bill
+        new_invoice = self.company_data['default_journal_purchase']._create_document_from_attachment(attachment.ids)
+        self.assertEqual(seller, new_invoice.partner_id)
 
-    def _test_encoding_in_attachment(self, edi_code, filename):
+    def _test_import_in_journal(self, attachment):
+        """
+        If the context contains the info about the current default journal, we should use it
+        instead of infering the journal from the move type.
+        """
+        journal2 = self.company_data['default_journal_sale'].copy()
+        journal2.default_account_id = self.company_data['default_account_revenue'].id
+        journal3 = journal2.copy()
+        journal3.default_account_id = self.company_data['default_account_revenue'].id  # Not copied
+
+        # Use the journal if it's set
+        new_invoice = journal2._create_document_from_attachment(attachment.id)
+        self.assertEqual(new_invoice.journal_id, journal2)
+
+        # If no journal, fallback on the context
+        new_invoice2 = self.env['account.journal'].with_context(default_journal_id=journal3.id)._create_document_from_attachment(attachment.id)
+        self.assertEqual(new_invoice2.journal_id, journal3)
+
+        # If no journal and no journal in the context, fallback on the move type
+        new_invoice3 = self.env['account.journal'].with_context(default_move_type='out_invoice')._create_document_from_attachment(attachment.id)
+        self.assertEqual(new_invoice3.journal_id, self.company_data['default_journal_sale'])
+
+    def _test_encoding_in_attachment(self, attachment, filename):
         """
         Generate an invoice, assert that the tag '<?xml version='1.0' encoding='UTF-8'?>' is present in the attachment
         """
-        invoice = self._generate_move(
-            seller=self.partner_1,
-            buyer=self.partner_2,
-            move_type='out_invoice',
-            invoice_line_ids=[{'product_id': self.product_a.id}],
-        )
-        edi_attachment = invoice.edi_document_ids.filtered(
-            lambda doc: doc.edi_format_id.code == edi_code).attachment_id
-        self.assertEqual(edi_attachment.name, filename)
-        self.assertIn(b"<?xml version='1.0' encoding='UTF-8'?>", edi_attachment.raw)
+        self.assertTrue(filename in attachment.name)
+        self.assertIn(b"<?xml version='1.0' encoding='UTF-8'?>", attachment.raw)

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_factur-x_doc/facturx_credit_note_type380.xml

@@ -95,7 +95,7 @@
             <ram:CompleteNumber>+33 4 72 07 08 56</ram:CompleteNumber>
           </ram:TelephoneUniversalCommunication>
           <ram:EmailURIUniversalCommunication>
-            <ram:URIID schemeID="SMTP">tony.dubois@aubonmoulin.fr</ram:URIID>
+            <ram:URIID>tony.dubois@aubonmoulin.fr</ram:URIID>
           </ram:EmailURIUniversalCommunication>
         </ram:DefinedTradeContact>
         <ram:PostalTradeAddress>
@@ -119,7 +119,7 @@
             <ram:CompleteNumber>+33 4 72 07 08 67</ram:CompleteNumber>
           </ram:TelephoneUniversalCommunication>
           <ram:EmailURIUniversalCommunication>
-            <ram:URIID schemeID="SMTP">alexandre.payet@majolieboutique.net</ram:URIID>
+            <ram:URIID>alexandre.payet@majolieboutique.net</ram:URIID>
           </ram:EmailURIUniversalCommunication>
         </ram:DefinedTradeContact>
         <ram:PostalTradeAddress>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_factur-x_doc/facturx_credit_note_type381.xml

@@ -95,7 +95,7 @@
             <ram:CompleteNumber>+33 4 72 07 08 56</ram:CompleteNumber>
           </ram:TelephoneUniversalCommunication>
           <ram:EmailURIUniversalCommunication>
-            <ram:URIID schemeID="SMTP">tony.dubois@aubonmoulin.fr</ram:URIID>
+            <ram:URIID>tony.dubois@aubonmoulin.fr</ram:URIID>
           </ram:EmailURIUniversalCommunication>
         </ram:DefinedTradeContact>
         <ram:PostalTradeAddress>
@@ -119,7 +119,7 @@
             <ram:CompleteNumber>+33 4 72 07 08 67</ram:CompleteNumber>
           </ram:TelephoneUniversalCommunication>
           <ram:EmailURIUniversalCommunication>
-            <ram:URIID schemeID="SMTP">alexandre.payet@majolieboutique.net</ram:URIID>
+            <ram:URIID>alexandre.payet@majolieboutique.net</ram:URIID>
           </ram:EmailURIUniversalCommunication>
         </ram:DefinedTradeContact>
         <ram:PostalTradeAddress>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/a_nz_out_invoice.xml

@@ -10,11 +10,20 @@
   <cbc:DocumentCurrencyCode>USD</cbc:DocumentCurrencyCode>
   <cbc:BuyerReference>ref_partner_2</cbc:BuyerReference>
   <cac:OrderReference>
-    <cbc:ID>ref_move</cbc:ID>
+    <cbc:ID>___ignore___</cbc:ID>
   </cac:OrderReference>
+  <cac:AdditionalDocumentReference>
+    <cbc:ID>___ignore___</cbc:ID>
+    <cac:Attachment>
+      <cbc:EmbeddedDocumentBinaryObject>___ignore___</cbc:EmbeddedDocumentBinaryObject>
+    </cac:Attachment>
+  </cac:AdditionalDocumentReference>
   <cac:AccountingSupplierParty>
     <cac:Party>
       <cbc:EndpointID schemeID="0151">83914571673</cbc:EndpointID>
+      <cac:PartyIdentification>
+        <cbc:ID>ref_partner_1</cbc:ID>
+      </cac:PartyIdentification>
       <cac:PartyName>
         <cbc:Name>partner_1</cbc:Name>
       </cac:PartyName>
@@ -46,6 +55,9 @@
   <cac:AccountingCustomerParty>
     <cac:Party>
       <cbc:EndpointID schemeID="0151">53930548027</cbc:EndpointID>
+      <cac:PartyIdentification>
+        <cbc:ID>ref_partner_2</cbc:ID>
+      </cac:PartyIdentification>
       <cac:PartyName>
         <cbc:Name>partner_2</cbc:Name>
       </cac:PartyName>
@@ -72,6 +84,23 @@
       </cac:Contact>
     </cac:Party>
   </cac:AccountingCustomerParty>
+  <cac:Delivery>
+    <cac:DeliveryLocation>
+      <cac:Address>
+        <cbc:StreetName>Parliament Dr</cbc:StreetName>
+        <cbc:CityName>Canberra</cbc:CityName>
+        <cbc:PostalZone>2600</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>AU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:Address>
+    </cac:DeliveryLocation>
+    <cac:DeliveryParty>
+      <cac:PartyName>
+        <cbc:Name>partner_2</cbc:Name>
+      </cac:PartyName>
+    </cac:DeliveryParty>
+  </cac:Delivery>
   <cac:PaymentMeans>
     <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
     <cbc:PaymentID>INV/2017/00001</cbc:PaymentID>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/a_nz_out_invoice_attacheddocument_b64.xml

@@ -0,0 +1,179 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<AttachedDocument xmlns:ext="urn:oasis:names:specification:ubl:schema:xsd:CommonExtensionComponents-2" xmlns:ccts="urn:un:unece:uncefact:data:specification:CoreComponentTypeSchemaModule:2" xmlns:xades="http://uri.etsi.org/01903/v1.3.2#" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns="urn:oasis:names:specification:ubl:schema:xsd:AttachedDocument-2" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:xades141="http://uri.etsi.org/01903/v1.4.1#">
+    <cbc:UBLVersionID>2.1</cbc:UBLVersionID>
+    <cbc:CustomizationID>urn:cen.eu:en16931:2017#conformant#urn:fdc:peppol.eu:2017:poacc:billing:international:aunz:3.0</cbc:CustomizationID>
+    <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
+    <cbc:ID>AttachedDocument</cbc:ID>
+    <cbc:IssueDate>2017-01-01</cbc:IssueDate>
+    <cbc:IssueTime>12:00:00</cbc:IssueTime>
+    <cbc:DocumentType>string</cbc:DocumentType>
+    <cbc:ParentDocumentID>INV/2017/00001</cbc:ParentDocumentID>
+    <cac:SenderParty>
+      <cbc:EndpointID schemeID="0151">83914571673</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>partner_1</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Spring St.</cbc:StreetName>
+        <cbc:CityName>Melbourne</cbc:CityName>
+        <cbc:PostalZone>3002</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>AU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>83914571673</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>GST</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>partner_1</cbc:RegistrationName>
+        <cbc:CompanyID schemeID="0151">83914571673</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>partner_1</cbc:Name>
+        <cbc:Telephone>+31 180 6 225789</cbc:Telephone>
+        <cbc:ElectronicMail>info@outlook.au</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:SenderParty>
+    <cac:ReceiverParty>
+      <cbc:EndpointID schemeID="0151">53930548027</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>partner_2</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Parliament Dr</cbc:StreetName>
+        <cbc:CityName>Canberra</cbc:CityName>
+        <cbc:PostalZone>2600</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>AU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>53930548027</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>GST</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>partner_2</cbc:RegistrationName>
+        <cbc:CompanyID schemeID="0151">53930548027</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>partner_2</cbc:Name>
+      </cac:Contact>
+    </cac:ReceiverParty>
+    <cac:Attachment>
+        <cbc:EmbeddedDocumentBinaryObject mimeCode="text/xml">
+PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4KPEludm9pY2UgeG1sbnM9InVy
+bjpvYXNpczpuYW1lczpzcGVjaWZpY2F0aW9uOnVibDpzY2hlbWE6eHNkOkludm9pY2UtMiIgeG1s
+bnM6Y2FjPSJ1cm46b2FzaXM6bmFtZXM6c3BlY2lmaWNhdGlvbjp1Ymw6c2NoZW1hOnhzZDpDb21t
+b25BZ2dyZWdhdGVDb21wb25lbnRzLTIiIHhtbG5zOmNiYz0idXJuOm9hc2lzOm5hbWVzOnNwZWNp
+ZmljYXRpb246dWJsOnNjaGVtYTp4c2Q6Q29tbW9uQmFzaWNDb21wb25lbnRzLTIiPgogIDxjYmM6
+Q3VzdG9taXphdGlvbklEPnVybjpjZW4uZXU6ZW4xNjkzMToyMDE3I2NvbmZvcm1hbnQjdXJuOmZk
+YzpwZXBwb2wuZXU6MjAxNzpwb2FjYzpiaWxsaW5nOmludGVybmF0aW9uYWw6YXVuejozLjA8L2Ni
+YzpDdXN0b21pemF0aW9uSUQ+CiAgPGNiYzpQcm9maWxlSUQ+dXJuOmZkYzpwZXBwb2wuZXU6MjAx
+Nzpwb2FjYzpiaWxsaW5nOjAxOjEuMDwvY2JjOlByb2ZpbGVJRD4KICA8Y2JjOklEPklOVi8yMDE3
+LzAwMDAxPC9jYmM6SUQ+CiAgPGNiYzpJc3N1ZURhdGU+MjAxNy0wMS0wMTwvY2JjOklzc3VlRGF0
+ZT4KPGNiYzpEdWVEYXRlPjIwMTctMDItMjg8L2NiYzpEdWVEYXRlPgo8Y2JjOkludm9pY2VUeXBl
+Q29kZT4zODA8L2NiYzpJbnZvaWNlVHlwZUNvZGU+CjxjYmM6Tm90ZT50ZXN0IG5hcnJhdGlvbjwv
+Y2JjOk5vdGU+CjxjYmM6RG9jdW1lbnRDdXJyZW5jeUNvZGU+VVNEPC9jYmM6RG9jdW1lbnRDdXJy
+ZW5jeUNvZGU+CjxjYmM6QnV5ZXJSZWZlcmVuY2U+cmVmX3BhcnRuZXJfMjwvY2JjOkJ1eWVyUmVm
+ZXJlbmNlPgo8Y2FjOk9yZGVyUmVmZXJlbmNlPgo8Y2JjOklEPl9fX2lnbm9yZV9fXzwvY2JjOklE
+Pgo8L2NhYzpPcmRlclJlZmVyZW5jZT4KPGNhYzpBZGRpdGlvbmFsRG9jdW1lbnRSZWZlcmVuY2U+
+CjxjYmM6SUQ+X19faWdub3JlX19fPC9jYmM6SUQ+CjxjYmM6QXR0YWNobWVudD4KPGNiYzpFbWJl
+ZGRlZERvY3VtZW50QmluYXJ5T2JqZWN0Pl9fX2lnbm9yZV9fXzwvY2JjOkVtYmVkZGVkRG9jdW1l
+bnRCaW5hcnlPYmplY3Q+CjwvY2JjOkF0dGFjaG1lbnQ+CjwvY2FjOkFkZGl0aW9uYWxEb2N1bWVu
+dFJlZmVyZW5jZT4KPGNhYzpBY2NvdW50aW5nU3VwcGxpZXJQYXJ0eT4KPGNhYzpQYXJ0eT4KPGNi
+YzpFbmRwb2ludElEIHNjaGVtZUlEPSIwMTUxIj44MzkxNDU3MTY3MzwvY2JjOkVuZHBvaW50SUQ+
+CjxjYWM6UGFydHlOYW1lPgo8Y2JjOk5hbWU+cGFydG5lcl8xPC9jYmM6TmFtZT4KPC9jYWM6UGFy
+dHlOYW1lPgo8Y2FjOlBvc3RhbEFkZHJlc3M+CjxjYmM6U3RyZWV0TmFtZT5TcHJpbmcgU3QuPC9j
+YmM6U3RyZWV0TmFtZT4KPGNiYzpDaXR5TmFtZT5NZWxib3VybmU8L2NiYzpDaXR5TmFtZT4KPGNi
+YzpQb3N0YWxab25lPjMwMDI8L2NiYzpQb3N0YWxab25lPgo8Y2FjOkNvdW50cnk+CjxjYmM6SWRl
+bnRpZmljYXRpb25Db2RlPkFVPC9jYmM6SWRlbnRpZmljYXRpb25Db2RlPgo8L2NhYzpDb3VudHJ5
+Pgo8L2NhYzpQb3N0YWxBZGRyZXNzPgo8Y2FjOlBhcnR5VGF4U2NoZW1lPgo8Y2JjOkNvbXBhbnlJ
+RD44MzkxNDU3MTY3MzwvY2JjOkNvbXBhbnlJRD4KPGNhYzpUYXhTY2hlbWU+CjxjYmM6SUQ+R1NU
+PC9jYmM6SUQ+CjwvY2FjOlRheFNjaGVtZT4KPC9jYWM6UGFydHlUYXhTY2hlbWU+CjxjYWM6UGFy
+dHlMZWdhbEVudGl0eT4KPGNiYzpSZWdpc3RyYXRpb25OYW1lPnBhcnRuZXJfMTwvY2JjOlJlZ2lz
+dHJhdGlvbk5hbWU+CjxjYmM6Q29tcGFueUlEIHNjaGVtZUlEPSIwMTUxIj44MzkxNDU3MTY3Mzwv
+Y2JjOkNvbXBhbnlJRD4KPC9jYWM6UGFydHlMZWdhbEVudGl0eT4KPGNhYzpDb250YWN0Pgo8Y2Jj
+Ok5hbWU+cGFydG5lcl8xPC9jYmM6TmFtZT4KPGNiYzpUZWxlcGhvbmU+KzMxIDE4MCA2IDIyNTc4
+OTwvY2JjOlRlbGVwaG9uZT4KPGNiYzpFbGVjdHJvbmljTWFpbD5pbmZvQG91dGxvb2suYXU8L2Ni
+YzpFbGVjdHJvbmljTWFpbD4KPC9jYWM6Q29udGFjdD4KPC9jYWM6UGFydHk+CjwvY2FjOkFjY291
+bnRpbmdTdXBwbGllclBhcnR5Pgo8Y2FjOkFjY291bnRpbmdDdXN0b21lclBhcnR5Pgo8Y2FjOlBh
+cnR5Pgo8Y2JjOkVuZHBvaW50SUQgc2NoZW1lSUQ9IjAxNTEiPjUzOTMwNTQ4MDI3PC9jYmM6RW5k
+cG9pbnRJRD4KPGNhYzpQYXJ0eU5hbWU+CjxjYmM6TmFtZT5wYXJ0bmVyXzI8L2NiYzpOYW1lPgo8
+L2NhYzpQYXJ0eU5hbWU+CjxjYWM6UG9zdGFsQWRkcmVzcz4KPGNiYzpTdHJlZXROYW1lPlBhcmxp
+YW1lbnQgRHI8L2NiYzpTdHJlZXROYW1lPgo8Y2JjOkNpdHlOYW1lPkNhbmJlcnJhPC9jYmM6Q2l0
+eU5hbWU+CjxjYmM6UG9zdGFsWm9uZT4yNjAwPC9jYmM6UG9zdGFsWm9uZT4KPGNhYzpDb3VudHJ5
+Pgo8Y2JjOklkZW50aWZpY2F0aW9uQ29kZT5BVTwvY2JjOklkZW50aWZpY2F0aW9uQ29kZT4KPC9j
+YWM6Q291bnRyeT4KPC9jYWM6UG9zdGFsQWRkcmVzcz4KPGNhYzpQYXJ0eVRheFNjaGVtZT4KPGNi
+YzpDb21wYW55SUQ+NTM5MzA1NDgwMjc8L2NiYzpDb21wYW55SUQ+CjxjYWM6VGF4U2NoZW1lPgo8
+Y2JjOklEPkdTVDwvY2JjOklEPgo8L2NhYzpUYXhTY2hlbWU+CjwvY2FjOlBhcnR5VGF4U2NoZW1l
+Pgo8Y2FjOlBhcnR5TGVnYWxFbnRpdHk+CjxjYmM6UmVnaXN0cmF0aW9uTmFtZT5wYXJ0bmVyXzI8
+L2NiYzpSZWdpc3RyYXRpb25OYW1lPgo8Y2JjOkNvbXBhbnlJRCBzY2hlbWVJRD0iMDE1MSI+NTM5
+MzA1NDgwMjc8L2NiYzpDb21wYW55SUQ+CjwvY2FjOlBhcnR5TGVnYWxFbnRpdHk+CjxjYWM6Q29u
+dGFjdD4KPGNiYzpOYW1lPnBhcnRuZXJfMjwvY2JjOk5hbWU+CjwvY2FjOkNvbnRhY3Q+CjwvY2Fj
+OlBhcnR5Pgo8L2NhYzpBY2NvdW50aW5nQ3VzdG9tZXJQYXJ0eT4KPGNhYzpEZWxpdmVyeT4KPGNh
+YzpEZWxpdmVyeUxvY2F0aW9uPgo8Y2FjOkFkZHJlc3M+CjxjYmM6U3RyZWV0TmFtZT5QYXJsaWFt
+ZW50IERyPC9jYmM6U3RyZWV0TmFtZT4KPGNiYzpDaXR5TmFtZT5DYW5iZXJyYTwvY2JjOkNpdHlO
+YW1lPgo8Y2JjOlBvc3RhbFpvbmU+MjYwMDwvY2JjOlBvc3RhbFpvbmU+CjxjYWM6Q291bnRyeT4K
+PGNiYzpJZGVudGlmaWNhdGlvbkNvZGU+QVU8L2NiYzpJZGVudGlmaWNhdGlvbkNvZGU+CjwvY2Fj
+OkNvdW50cnk+CjwvY2FjOkFkZHJlc3M+CjwvY2FjOkRlbGl2ZXJ5TG9jYXRpb24+CjwvY2FjOkRl
+bGl2ZXJ5Pgo8Y2FjOlBheW1lbnRNZWFucz4KPGNiYzpQYXltZW50TWVhbnNDb2RlIG5hbWU9ImNy
+ZWRpdCB0cmFuc2ZlciI+MzA8L2NiYzpQYXltZW50TWVhbnNDb2RlPgo8Y2JjOlBheW1lbnRJRD5J
+TlYvMjAxNy8wMDAwMTwvY2JjOlBheW1lbnRJRD4KPGNhYzpQYXllZUZpbmFuY2lhbEFjY291bnQ+
+CjxjYmM6SUQ+MDAwMDk5OTk4QjU3PC9jYmM6SUQ+CjwvY2FjOlBheWVlRmluYW5jaWFsQWNjb3Vu
+dD4KPC9jYWM6UGF5bWVudE1lYW5zPgo8Y2FjOlBheW1lbnRUZXJtcz4KPGNiYzpOb3RlPlBheW1l
+bnQgdGVybXM6IDMwJSBBZHZhbmNlIEVuZCBvZiBGb2xsb3dpbmcgTW9udGg8L2NiYzpOb3RlPgo8
+L2NhYzpQYXltZW50VGVybXM+CjxjYWM6VGF4VG90YWw+CjxjYmM6VGF4QW1vdW50IGN1cnJlbmN5
+SUQ9IlVTRCI+MjY4LjIwPC9jYmM6VGF4QW1vdW50Pgo8Y2FjOlRheFN1YnRvdGFsPgo8Y2JjOlRh
+eGFibGVBbW91bnQgY3VycmVuY3lJRD0iVVNEIj4yNjgyLjAwPC9jYmM6VGF4YWJsZUFtb3VudD4K
+PGNiYzpUYXhBbW91bnQgY3VycmVuY3lJRD0iVVNEIj4yNjguMjA8L2NiYzpUYXhBbW91bnQ+Cjxj
+YWM6VGF4Q2F0ZWdvcnk+CjxjYmM6SUQ+UzwvY2JjOklEPgo8Y2JjOlBlcmNlbnQ+MTAuMDwvY2Jj
+OlBlcmNlbnQ+CjxjYWM6VGF4U2NoZW1lPgo8Y2JjOklEPkdTVDwvY2JjOklEPgo8L2NhYzpUYXhT
+Y2hlbWU+CjwvY2FjOlRheENhdGVnb3J5Pgo8L2NhYzpUYXhTdWJ0b3RhbD4KPC9jYWM6VGF4VG90
+YWw+CjxjYWM6TGVnYWxNb25ldGFyeVRvdGFsPgo8Y2JjOkxpbmVFeHRlbnNpb25BbW91bnQgY3Vy
+cmVuY3lJRD0iVVNEIj4yNjgyLjAwPC9jYmM6TGluZUV4dGVuc2lvbkFtb3VudD4KPGNiYzpUYXhF
+eGNsdXNpdmVBbW91bnQgY3VycmVuY3lJRD0iVVNEIj4yNjgyLjAwPC9jYmM6VGF4RXhjbHVzaXZl
+QW1vdW50Pgo8Y2JjOlRheEluY2x1c2l2ZUFtb3VudCBjdXJyZW5jeUlEPSJVU0QiPjI5NTAuMjA8
+L2NiYzpUYXhJbmNsdXNpdmVBbW91bnQ+CjxjYmM6UHJlcGFpZEFtb3VudCBjdXJyZW5jeUlEPSJV
+U0QiPjAuMDA8L2NiYzpQcmVwYWlkQW1vdW50Pgo8Y2JjOlBheWFibGVBbW91bnQgY3VycmVuY3lJ
+RD0iVVNEIj4yOTUwLjIwPC9jYmM6UGF5YWJsZUFtb3VudD4KPC9jYWM6TGVnYWxNb25ldGFyeVRv
+dGFsPgo8Y2FjOkludm9pY2VMaW5lPgo8Y2JjOklEPjU1NzwvY2JjOklEPgo8Y2JjOkludm9pY2Vk
+UXVhbnRpdHkgdW5pdENvZGU9IkRaTiI+Mi4wPC9jYmM6SW52b2ljZWRRdWFudGl0eT4KPGNiYzpM
+aW5lRXh0ZW5zaW9uQW1vdW50IGN1cnJlbmN5SUQ9IlVTRCI+MTc4Mi4wMDwvY2JjOkxpbmVFeHRl
+bnNpb25BbW91bnQ+CjxjYWM6QWxsb3dhbmNlQ2hhcmdlPgo8Y2JjOkNoYXJnZUluZGljYXRvcj5m
+YWxzZTwvY2JjOkNoYXJnZUluZGljYXRvcj4KPGNiYzpBbGxvd2FuY2VDaGFyZ2VSZWFzb25Db2Rl
+Pjk1PC9jYmM6QWxsb3dhbmNlQ2hhcmdlUmVhc29uQ29kZT4KPGNiYzpBbW91bnQgY3VycmVuY3lJ
+RD0iVVNEIj4xOTguMDA8L2NiYzpBbW91bnQ+CjwvY2FjOkFsbG93YW5jZUNoYXJnZT4KPGNhYzpJ
+dGVtPgo8Y2JjOkRlc2NyaXB0aW9uPnByb2R1Y3RfYTwvY2JjOkRlc2NyaXB0aW9uPgo8Y2JjOk5h
+bWU+cHJvZHVjdF9hPC9jYmM6TmFtZT4KPGNhYzpDbGFzc2lmaWVkVGF4Q2F0ZWdvcnk+CjxjYmM6
+SUQ+UzwvY2JjOklEPgo8Y2JjOlBlcmNlbnQ+MTAuMDwvY2JjOlBlcmNlbnQ+CjxjYWM6VGF4U2No
+ZW1lPgo8Y2JjOklEPkdTVDwvY2JjOklEPgo8L2NhYzpUYXhTY2hlbWU+CjwvY2FjOkNsYXNzaWZp
+ZWRUYXhDYXRlZ29yeT4KPC9jYWM6SXRlbT4KPGNhYzpQcmljZT4KPGNiYzpQcmljZUFtb3VudCBj
+dXJyZW5jeUlEPSJVU0QiPjk5MC4wPC9jYmM6UHJpY2VBbW91bnQ+CjwvY2FjOlByaWNlPgo8L2Nh
+YzpJbnZvaWNlTGluZT4KPGNhYzpJbnZvaWNlTGluZT4KPGNiYzpJRD41NTg8L2NiYzpJRD4KPGNi
+YzpJbnZvaWNlZFF1YW50aXR5IHVuaXRDb2RlPSJDNjIiPjEwLjA8L2NiYzpJbnZvaWNlZFF1YW50
+aXR5Pgo8Y2JjOkxpbmVFeHRlbnNpb25BbW91bnQgY3VycmVuY3lJRD0iVVNEIj4xMDAwLjAwPC9j
+YmM6TGluZUV4dGVuc2lvbkFtb3VudD4KPGNhYzpJdGVtPgo8Y2JjOkRlc2NyaXB0aW9uPnByb2R1
+Y3RfYjwvY2JjOkRlc2NyaXB0aW9uPgo8Y2JjOk5hbWU+cHJvZHVjdF9iPC9jYmM6TmFtZT4KPGNh
+YzpDbGFzc2lmaWVkVGF4Q2F0ZWdvcnk+CjxjYmM6SUQ+UzwvY2JjOklEPgo8Y2JjOlBlcmNlbnQ+
+MTAuMDwvY2JjOlBlcmNlbnQ+CjxjYWM6VGF4U2NoZW1lPgo8Y2JjOklEPkdTVDwvY2JjOklEPgo8
+L2NhYzpUYXhTY2hlbWU+CjwvY2FjOkNsYXNzaWZpZWRUYXhDYXRlZ29yeT4KPC9jYWM6SXRlbT4K
+PGNhYzpQcmljZT4KPGNiYzpQcmljZUFtb3VudCBjdXJyZW5jeUlEPSJVU0QiPjEwMC4wPC9jYmM6
+UHJpY2VBbW91bnQ+CjwvY2FjOlByaWNlPgo8L2NhYzpJbnZvaWNlTGluZT4KPGNhYzpJbnZvaWNl
+TGluZT4KPGNiYzpJRD41NTk8L2NiYzpJRD4KPGNiYzpJbnZvaWNlZFF1YW50aXR5IHVuaXRDb2Rl
+PSJDNjIiPi0xLjA8L2NiYzpJbnZvaWNlZFF1YW50aXR5Pgo8Y2JjOkxpbmVFeHRlbnNpb25BbW91
+bnQgY3VycmVuY3lJRD0iVVNEIj4tMTAwLjAwPC9jYmM6TGluZUV4dGVuc2lvbkFtb3VudD4KPGNh
+YzpJdGVtPgo8Y2JjOkRlc2NyaXB0aW9uPnByb2R1Y3RfYjwvY2JjOkRlc2NyaXB0aW9uPgo8Y2Jj
+Ok5hbWU+cHJvZHVjdF9iPC9jYmM6TmFtZT4KPGNhYzpDbGFzc2lmaWVkVGF4Q2F0ZWdvcnk+Cjxj
+YmM6SUQ+UzwvY2JjOklEPgo8Y2JjOlBlcmNlbnQ+MTAuMDwvY2JjOlBlcmNlbnQ+CjxjYWM6VGF4
+U2NoZW1lPgo8Y2JjOklEPkdTVDwvY2JjOklEPgo8L2NhYzpUYXhTY2hlbWU+CjwvY2FjOkNsYXNz
+aWZpZWRUYXhDYXRlZ29yeT4KPC9jYWM6SXRlbT4KPGNhYzpQcmljZT4KPGNiYzpQcmljZUFtb3Vu
+dCBjdXJyZW5jeUlEPSJVU0QiPjEwMC4wPC9jYmM6UHJpY2VBbW91bnQ+CjwvY2FjOlByaWNlPgo8
+L2NhYzpJbnZvaWNlTGluZT4KPC9JbnZvaWNlPg==
+        </cbc:EmbeddedDocumentBinaryObject>
+    </cac:Attachment>
+</AttachedDocument>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/a_nz_out_invoice_attacheddocument_description.xml

@@ -0,0 +1,259 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<AttachedDocument xmlns:ext="urn:oasis:names:specification:ubl:schema:xsd:CommonExtensionComponents-2" xmlns:ccts="urn:un:unece:uncefact:data:specification:CoreComponentTypeSchemaModule:2" xmlns:xades="http://uri.etsi.org/01903/v1.3.2#" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns="urn:oasis:names:specification:ubl:schema:xsd:AttachedDocument-2" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:xades141="http://uri.etsi.org/01903/v1.4.1#">
+    <cbc:UBLVersionID>2.1</cbc:UBLVersionID>
+    <cbc:CustomizationID>urn:cen.eu:en16931:2017#conformant#urn:fdc:peppol.eu:2017:poacc:billing:international:aunz:3.0</cbc:CustomizationID>
+    <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
+    <cbc:ID>AttachedDocument</cbc:ID>
+    <cbc:IssueDate>2017-01-01</cbc:IssueDate>
+    <cbc:IssueTime>12:00:00</cbc:IssueTime>
+    <cbc:DocumentType>string</cbc:DocumentType>
+    <cbc:ParentDocumentID>INV/2017/00001</cbc:ParentDocumentID>
+    <cac:SenderParty>
+      <cbc:EndpointID schemeID="0151">83914571673</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>partner_1</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Spring St.</cbc:StreetName>
+        <cbc:CityName>Melbourne</cbc:CityName>
+        <cbc:PostalZone>3002</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>AU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>83914571673</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>GST</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>partner_1</cbc:RegistrationName>
+        <cbc:CompanyID schemeID="0151">83914571673</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>partner_1</cbc:Name>
+        <cbc:Telephone>+31 180 6 225789</cbc:Telephone>
+        <cbc:ElectronicMail>info@outlook.au</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:SenderParty>
+    <cac:ReceiverParty>
+      <cbc:EndpointID schemeID="0151">53930548027</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>partner_2</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Parliament Dr</cbc:StreetName>
+        <cbc:CityName>Canberra</cbc:CityName>
+        <cbc:PostalZone>2600</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>AU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>53930548027</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>GST</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>partner_2</cbc:RegistrationName>
+        <cbc:CompanyID schemeID="0151">53930548027</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>partner_2</cbc:Name>
+      </cac:Contact>
+    </cac:ReceiverParty>
+    <cac:Attachment>
+        <cac:ExternalReference>
+            <cbc:MimeCode>text/xml</cbc:MimeCode>
+            <cbc:EncodingCode>UTF-8</cbc:EncodingCode>
+            <cbc:Description><![CDATA[<?xml version='1.0' encoding='UTF-8'?>
+<Invoice xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
+  <cbc:CustomizationID>urn:cen.eu:en16931:2017#conformant#urn:fdc:peppol.eu:2017:poacc:billing:international:aunz:3.0</cbc:CustomizationID>
+  <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
+  <cbc:ID>INV/2017/00001</cbc:ID>
+  <cbc:IssueDate>2017-01-01</cbc:IssueDate>
+  <cbc:DueDate>2017-02-28</cbc:DueDate>
+  <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
+  <cbc:Note>test narration</cbc:Note>
+  <cbc:DocumentCurrencyCode>USD</cbc:DocumentCurrencyCode>
+  <cbc:BuyerReference>ref_partner_2</cbc:BuyerReference>
+  <cac:OrderReference>
+    <cbc:ID>___ignore___</cbc:ID>
+  </cac:OrderReference>
+  <cac:AdditionalDocumentReference>
+    <cbc:ID>___ignore___</cbc:ID>
+    <cac:Attachment>
+      <cbc:EmbeddedDocumentBinaryObject>___ignore___</cbc:EmbeddedDocumentBinaryObject>
+    </cac:Attachment>
+  </cac:AdditionalDocumentReference>
+  <cac:AccountingSupplierParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="0151">83914571673</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>partner_1</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Spring St.</cbc:StreetName>
+        <cbc:CityName>Melbourne</cbc:CityName>
+        <cbc:PostalZone>3002</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>AU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>83914571673</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>GST</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>partner_1</cbc:RegistrationName>
+        <cbc:CompanyID schemeID="0151">83914571673</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>partner_1</cbc:Name>
+        <cbc:Telephone>+31 180 6 225789</cbc:Telephone>
+        <cbc:ElectronicMail>info@outlook.au</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingSupplierParty>
+  <cac:AccountingCustomerParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="0151">53930548027</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>partner_2</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Parliament Dr</cbc:StreetName>
+        <cbc:CityName>Canberra</cbc:CityName>
+        <cbc:PostalZone>2600</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>AU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>53930548027</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>GST</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>partner_2</cbc:RegistrationName>
+        <cbc:CompanyID schemeID="0151">53930548027</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>partner_2</cbc:Name>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingCustomerParty>
+  <cac:Delivery>
+    <cac:DeliveryLocation>
+      <cac:Address>
+        <cbc:StreetName>Parliament Dr</cbc:StreetName>
+        <cbc:CityName>Canberra</cbc:CityName>
+        <cbc:PostalZone>2600</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>AU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:Address>
+    </cac:DeliveryLocation>
+  </cac:Delivery>
+  <cac:PaymentMeans>
+    <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
+    <cbc:PaymentID>INV/2017/00001</cbc:PaymentID>
+    <cac:PayeeFinancialAccount>
+      <cbc:ID>000099998B57</cbc:ID>
+    </cac:PayeeFinancialAccount>
+  </cac:PaymentMeans>
+  <cac:PaymentTerms>
+    <cbc:Note>Payment terms: 30% Advance End of Following Month</cbc:Note>
+  </cac:PaymentTerms>
+  <cac:TaxTotal>
+    <cbc:TaxAmount currencyID="USD">268.20</cbc:TaxAmount>
+    <cac:TaxSubtotal>
+      <cbc:TaxableAmount currencyID="USD">2682.00</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="USD">268.20</cbc:TaxAmount>
+      <cac:TaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>10.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>GST</cbc:ID>
+        </cac:TaxScheme>
+      </cac:TaxCategory>
+    </cac:TaxSubtotal>
+  </cac:TaxTotal>
+  <cac:LegalMonetaryTotal>
+    <cbc:LineExtensionAmount currencyID="USD">2682.00</cbc:LineExtensionAmount>
+    <cbc:TaxExclusiveAmount currencyID="USD">2682.00</cbc:TaxExclusiveAmount>
+    <cbc:TaxInclusiveAmount currencyID="USD">2950.20</cbc:TaxInclusiveAmount>
+    <cbc:PrepaidAmount currencyID="USD">0.00</cbc:PrepaidAmount>
+    <cbc:PayableAmount currencyID="USD">2950.20</cbc:PayableAmount>
+  </cac:LegalMonetaryTotal>
+  <cac:InvoiceLine>
+    <cbc:ID>557</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="DZN">2.0</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="USD">1782.00</cbc:LineExtensionAmount>
+    <cac:AllowanceCharge>
+      <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+      <cbc:AllowanceChargeReasonCode>95</cbc:AllowanceChargeReasonCode>
+      <cbc:Amount currencyID="USD">198.00</cbc:Amount>
+    </cac:AllowanceCharge>
+    <cac:Item>
+      <cbc:Description>product_a</cbc:Description>
+      <cbc:Name>product_a</cbc:Name>
+      <cac:ClassifiedTaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>10.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>GST</cbc:ID>
+        </cac:TaxScheme>
+      </cac:ClassifiedTaxCategory>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="USD">990.0</cbc:PriceAmount>
+    </cac:Price>
+  </cac:InvoiceLine>
+  <cac:InvoiceLine>
+    <cbc:ID>558</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="C62">10.0</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="USD">1000.00</cbc:LineExtensionAmount>
+    <cac:Item>
+      <cbc:Description>product_b</cbc:Description>
+      <cbc:Name>product_b</cbc:Name>
+      <cac:ClassifiedTaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>10.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>GST</cbc:ID>
+        </cac:TaxScheme>
+      </cac:ClassifiedTaxCategory>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="USD">100.0</cbc:PriceAmount>
+    </cac:Price>
+  </cac:InvoiceLine>
+  <cac:InvoiceLine>
+    <cbc:ID>559</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="C62">-1.0</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="USD">-100.00</cbc:LineExtensionAmount>
+    <cac:Item>
+      <cbc:Description>product_b</cbc:Description>
+      <cbc:Name>product_b</cbc:Name>
+      <cac:ClassifiedTaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>10.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>GST</cbc:ID>
+        </cac:TaxScheme>
+      </cac:ClassifiedTaxCategory>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="USD">100.0</cbc:PriceAmount>
+    </cac:Price>
+  </cac:InvoiceLine>
+</Invoice>]]></cbc:Description>
+        </cac:ExternalReference>
+    </cac:Attachment>
+</AttachedDocument>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/a_nz_out_refund.xml

@@ -9,11 +9,20 @@
   <cbc:DocumentCurrencyCode>USD</cbc:DocumentCurrencyCode>
   <cbc:BuyerReference>ref_partner_2</cbc:BuyerReference>
   <cac:OrderReference>
-    <cbc:ID>ref_move</cbc:ID>
+    <cbc:ID>___ignore___</cbc:ID>
   </cac:OrderReference>
+  <cac:AdditionalDocumentReference>
+    <cbc:ID>___ignore___</cbc:ID>
+    <cac:Attachment>
+      <cbc:EmbeddedDocumentBinaryObject>___ignore___</cbc:EmbeddedDocumentBinaryObject>
+    </cac:Attachment>
+  </cac:AdditionalDocumentReference>
   <cac:AccountingSupplierParty>
     <cac:Party>
       <cbc:EndpointID schemeID="0151">83914571673</cbc:EndpointID>
+      <cac:PartyIdentification>
+        <cbc:ID>ref_partner_1</cbc:ID>
+      </cac:PartyIdentification>
       <cac:PartyName>
         <cbc:Name>partner_1</cbc:Name>
       </cac:PartyName>
@@ -45,6 +54,9 @@
   <cac:AccountingCustomerParty>
     <cac:Party>
       <cbc:EndpointID schemeID="0151">53930548027</cbc:EndpointID>
+      <cac:PartyIdentification>
+        <cbc:ID>ref_partner_2</cbc:ID>
+      </cac:PartyIdentification>
       <cac:PartyName>
         <cbc:Name>partner_2</cbc:Name>
       </cac:PartyName>
@@ -71,6 +83,23 @@
       </cac:Contact>
     </cac:Party>
   </cac:AccountingCustomerParty>
+  <cac:Delivery>
+    <cac:DeliveryLocation>
+      <cac:Address>
+        <cbc:StreetName>Parliament Dr</cbc:StreetName>
+        <cbc:CityName>Canberra</cbc:CityName>
+        <cbc:PostalZone>2600</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>AU</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:Address>
+    </cac:DeliveryLocation>
+    <cac:DeliveryParty>
+      <cac:PartyName>
+        <cbc:Name>partner_2</cbc:Name>
+      </cac:PartyName>
+    </cac:DeliveryParty>
+  </cac:Delivery>
   <cac:PaymentMeans>
     <cbc:PaymentMeansCode name="standing agreement">57</cbc:PaymentMeansCode>
     <cbc:PaymentID>RINV/2017/00001</cbc:PaymentID>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/bis3_ecotaxes_case1.xml

@@ -15,9 +15,18 @@
     <cac:OrderReference>
         <cbc:ID>___ignore___</cbc:ID>
     </cac:OrderReference>
+    <cac:AdditionalDocumentReference>
+        <cbc:ID>___ignore___</cbc:ID>
+        <cac:Attachment>
+            <cbc:EmbeddedDocumentBinaryObject mimeCode="___ignore___" filename="___ignore___">___ignore___</cbc:EmbeddedDocumentBinaryObject>
+        </cac:Attachment>
+    </cac:AdditionalDocumentReference>
     <cac:AccountingSupplierParty>
         <cac:Party>
-            <cbc:EndpointID schemeID="9925">BE0202239951</cbc:EndpointID>
+            <cbc:EndpointID schemeID="0208">0202239951</cbc:EndpointID>
+            <cac:PartyIdentification>
+                <cbc:ID schemeID="0208">0202239951</cbc:ID>
+            </cac:PartyIdentification>
             <cac:PartyName>
                 <cbc:Name>partner_1</cbc:Name>
             </cac:PartyName>
@@ -37,7 +46,7 @@
             </cac:PartyTaxScheme>
             <cac:PartyLegalEntity>
                 <cbc:RegistrationName>partner_1</cbc:RegistrationName>
-                <cbc:CompanyID>BE0202239951</cbc:CompanyID>
+                <cbc:CompanyID schemeID="0208">0202239951</cbc:CompanyID>
             </cac:PartyLegalEntity>
             <cac:Contact>
                 <cbc:Name>partner_1</cbc:Name>
@@ -46,7 +55,10 @@
     </cac:AccountingSupplierParty>
     <cac:AccountingCustomerParty>
         <cac:Party>
-            <cbc:EndpointID schemeID="9925">BE0477472701</cbc:EndpointID>
+            <cbc:EndpointID schemeID="0208">0477472701</cbc:EndpointID>
+            <cac:PartyIdentification>
+                <cbc:ID schemeID="0208">0477472701</cbc:ID>
+            </cac:PartyIdentification>
             <cac:PartyName>
                 <cbc:Name>partner_2</cbc:Name>
             </cac:PartyName>
@@ -66,13 +78,30 @@
             </cac:PartyTaxScheme>
             <cac:PartyLegalEntity>
                 <cbc:RegistrationName>partner_2</cbc:RegistrationName>
-                <cbc:CompanyID>BE0477472701</cbc:CompanyID>
+                <cbc:CompanyID schemeID="0208">0477472701</cbc:CompanyID>
             </cac:PartyLegalEntity>
             <cac:Contact>
                 <cbc:Name>partner_2</cbc:Name>
             </cac:Contact>
         </cac:Party>
     </cac:AccountingCustomerParty>
+    <cac:Delivery>
+        <cac:DeliveryLocation>
+            <cac:Address>
+                <cbc:StreetName>Rue des Bourlottes 9</cbc:StreetName>
+                <cbc:CityName>Ramillies</cbc:CityName>
+                <cbc:PostalZone>1367</cbc:PostalZone>
+                <cac:Country>
+                    <cbc:IdentificationCode>BE</cbc:IdentificationCode>
+                </cac:Country>
+            </cac:Address>
+        </cac:DeliveryLocation>
+        <cac:DeliveryParty>
+            <cac:PartyName>
+                <cbc:Name>partner_2</cbc:Name>
+            </cac:PartyName>
+        </cac:DeliveryParty>
+    </cac:Delivery>
     <cac:PaymentMeans>
         <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
         <cbc:PaymentID>___ignore___</cbc:PaymentID>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/bis3_ecotaxes_case2.xml

@@ -15,9 +15,18 @@
     <cac:OrderReference>
         <cbc:ID>___ignore___</cbc:ID>
     </cac:OrderReference>
+    <cac:AdditionalDocumentReference>
+        <cbc:ID>___ignore___</cbc:ID>
+        <cac:Attachment>
+            <cbc:EmbeddedDocumentBinaryObject mimeCode="___ignore___" filename="___ignore___">___ignore___</cbc:EmbeddedDocumentBinaryObject>
+        </cac:Attachment>
+    </cac:AdditionalDocumentReference>
     <cac:AccountingSupplierParty>
         <cac:Party>
-            <cbc:EndpointID schemeID="9925">BE0202239951</cbc:EndpointID>
+            <cbc:EndpointID schemeID="0208">0202239951</cbc:EndpointID>
+            <cac:PartyIdentification>
+                <cbc:ID schemeID="0208">0202239951</cbc:ID>
+            </cac:PartyIdentification>
             <cac:PartyName>
                 <cbc:Name>partner_1</cbc:Name>
             </cac:PartyName>
@@ -37,7 +46,7 @@
             </cac:PartyTaxScheme>
             <cac:PartyLegalEntity>
                 <cbc:RegistrationName>partner_1</cbc:RegistrationName>
-                <cbc:CompanyID>BE0202239951</cbc:CompanyID>
+                <cbc:CompanyID schemeID="0208">0202239951</cbc:CompanyID>
             </cac:PartyLegalEntity>
             <cac:Contact>
                 <cbc:Name>partner_1</cbc:Name>
@@ -46,7 +55,10 @@
     </cac:AccountingSupplierParty>
     <cac:AccountingCustomerParty>
         <cac:Party>
-            <cbc:EndpointID schemeID="9925">BE0477472701</cbc:EndpointID>
+            <cbc:EndpointID schemeID="0208">0477472701</cbc:EndpointID>
+            <cac:PartyIdentification>
+                <cbc:ID schemeID="0208">0477472701</cbc:ID>
+            </cac:PartyIdentification>
             <cac:PartyName>
                 <cbc:Name>partner_2</cbc:Name>
             </cac:PartyName>
@@ -66,13 +78,30 @@
             </cac:PartyTaxScheme>
             <cac:PartyLegalEntity>
                 <cbc:RegistrationName>partner_2</cbc:RegistrationName>
-                <cbc:CompanyID>BE0477472701</cbc:CompanyID>
+                <cbc:CompanyID schemeID="0208">0477472701</cbc:CompanyID>
             </cac:PartyLegalEntity>
             <cac:Contact>
                 <cbc:Name>partner_2</cbc:Name>
             </cac:Contact>
         </cac:Party>
     </cac:AccountingCustomerParty>
+    <cac:Delivery>
+        <cac:DeliveryLocation>
+            <cac:Address>
+                <cbc:StreetName>Rue des Bourlottes 9</cbc:StreetName>
+                <cbc:CityName>Ramillies</cbc:CityName>
+                <cbc:PostalZone>1367</cbc:PostalZone>
+                <cac:Country>
+                    <cbc:IdentificationCode>BE</cbc:IdentificationCode>
+                </cac:Country>
+            </cac:Address>
+        </cac:DeliveryLocation>
+        <cac:DeliveryParty>
+            <cac:PartyName>
+                <cbc:Name>partner_2</cbc:Name>
+            </cac:PartyName>
+        </cac:DeliveryParty>
+    </cac:Delivery>
     <cac:PaymentMeans>
         <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
         <cbc:PaymentID>___ignore___</cbc:PaymentID>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/bis3_ecotaxes_case3.xml

@@ -15,9 +15,18 @@
     <cac:OrderReference>
         <cbc:ID>___ignore___</cbc:ID>
     </cac:OrderReference>
+    <cac:AdditionalDocumentReference>
+        <cbc:ID>___ignore___</cbc:ID>
+        <cac:Attachment>
+            <cbc:EmbeddedDocumentBinaryObject mimeCode="___ignore___" filename="___ignore___">___ignore___</cbc:EmbeddedDocumentBinaryObject>
+        </cac:Attachment>
+    </cac:AdditionalDocumentReference>
     <cac:AccountingSupplierParty>
         <cac:Party>
-            <cbc:EndpointID schemeID="9925">BE0202239951</cbc:EndpointID>
+            <cbc:EndpointID schemeID="0208">0202239951</cbc:EndpointID>
+            <cac:PartyIdentification>
+                <cbc:ID schemeID="0208">0202239951</cbc:ID>
+            </cac:PartyIdentification>
             <cac:PartyName>
                 <cbc:Name>partner_1</cbc:Name>
             </cac:PartyName>
@@ -37,7 +46,7 @@
             </cac:PartyTaxScheme>
             <cac:PartyLegalEntity>
                 <cbc:RegistrationName>partner_1</cbc:RegistrationName>
-                <cbc:CompanyID>BE0202239951</cbc:CompanyID>
+                <cbc:CompanyID schemeID="0208">0202239951</cbc:CompanyID>
             </cac:PartyLegalEntity>
             <cac:Contact>
                 <cbc:Name>partner_1</cbc:Name>
@@ -46,7 +55,10 @@
     </cac:AccountingSupplierParty>
     <cac:AccountingCustomerParty>
         <cac:Party>
-            <cbc:EndpointID schemeID="9925">BE0477472701</cbc:EndpointID>
+            <cbc:EndpointID schemeID="0208">0477472701</cbc:EndpointID>
+            <cac:PartyIdentification>
+                <cbc:ID schemeID="0208">0477472701</cbc:ID>
+            </cac:PartyIdentification>
             <cac:PartyName>
                 <cbc:Name>partner_2</cbc:Name>
             </cac:PartyName>
@@ -66,13 +78,30 @@
             </cac:PartyTaxScheme>
             <cac:PartyLegalEntity>
                 <cbc:RegistrationName>partner_2</cbc:RegistrationName>
-                <cbc:CompanyID>BE0477472701</cbc:CompanyID>
+                <cbc:CompanyID schemeID="0208">0477472701</cbc:CompanyID>
             </cac:PartyLegalEntity>
             <cac:Contact>
                 <cbc:Name>partner_2</cbc:Name>
             </cac:Contact>
         </cac:Party>
     </cac:AccountingCustomerParty>
+    <cac:Delivery>
+        <cac:DeliveryLocation>
+            <cac:Address>
+                <cbc:StreetName>Rue des Bourlottes 9</cbc:StreetName>
+                <cbc:CityName>Ramillies</cbc:CityName>
+                <cbc:PostalZone>1367</cbc:PostalZone>
+                <cac:Country>
+                    <cbc:IdentificationCode>BE</cbc:IdentificationCode>
+                </cac:Country>
+            </cac:Address>
+        </cac:DeliveryLocation>
+        <cac:DeliveryParty>
+            <cac:PartyName>
+                <cbc:Name>partner_2</cbc:Name>
+            </cac:PartyName>
+        </cac:DeliveryParty>
+    </cac:Delivery>
     <cac:PaymentMeans>
         <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
         <cbc:PaymentID>___ignore___</cbc:PaymentID>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/bis3_ecotaxes_case4.xml

@@ -15,9 +15,18 @@
     <cac:OrderReference>
         <cbc:ID>___ignore___</cbc:ID>
     </cac:OrderReference>
+    <cac:AdditionalDocumentReference>
+        <cbc:ID>___ignore___</cbc:ID>
+        <cac:Attachment>
+            <cbc:EmbeddedDocumentBinaryObject mimeCode="___ignore___" filename="___ignore___">___ignore___</cbc:EmbeddedDocumentBinaryObject>
+        </cac:Attachment>
+    </cac:AdditionalDocumentReference>
     <cac:AccountingSupplierParty>
         <cac:Party>
-            <cbc:EndpointID schemeID="9925">BE0202239951</cbc:EndpointID>
+            <cbc:EndpointID schemeID="0208">0202239951</cbc:EndpointID>
+            <cac:PartyIdentification>
+                <cbc:ID schemeID="0208">0202239951</cbc:ID>
+            </cac:PartyIdentification>
             <cac:PartyName>
                 <cbc:Name>partner_1</cbc:Name>
             </cac:PartyName>
@@ -37,7 +46,7 @@
             </cac:PartyTaxScheme>
             <cac:PartyLegalEntity>
                 <cbc:RegistrationName>partner_1</cbc:RegistrationName>
-                <cbc:CompanyID>BE0202239951</cbc:CompanyID>
+                <cbc:CompanyID schemeID="0208">0202239951</cbc:CompanyID>
             </cac:PartyLegalEntity>
             <cac:Contact>
                 <cbc:Name>partner_1</cbc:Name>
@@ -46,7 +55,10 @@
     </cac:AccountingSupplierParty>
     <cac:AccountingCustomerParty>
         <cac:Party>
-            <cbc:EndpointID schemeID="9925">BE0477472701</cbc:EndpointID>
+            <cbc:EndpointID schemeID="0208">0477472701</cbc:EndpointID>
+            <cac:PartyIdentification>
+                <cbc:ID schemeID="0208">0477472701</cbc:ID>
+            </cac:PartyIdentification>
             <cac:PartyName>
                 <cbc:Name>partner_2</cbc:Name>
             </cac:PartyName>
@@ -66,13 +78,30 @@
             </cac:PartyTaxScheme>
             <cac:PartyLegalEntity>
                 <cbc:RegistrationName>partner_2</cbc:RegistrationName>
-                <cbc:CompanyID>BE0477472701</cbc:CompanyID>
+                <cbc:CompanyID schemeID="0208">0477472701</cbc:CompanyID>
             </cac:PartyLegalEntity>
             <cac:Contact>
                 <cbc:Name>partner_2</cbc:Name>
             </cac:Contact>
         </cac:Party>
     </cac:AccountingCustomerParty>
+    <cac:Delivery>
+        <cac:DeliveryLocation>
+            <cac:Address>
+                <cbc:StreetName>Rue des Bourlottes 9</cbc:StreetName>
+                <cbc:CityName>Ramillies</cbc:CityName>
+                <cbc:PostalZone>1367</cbc:PostalZone>
+                <cac:Country>
+                    <cbc:IdentificationCode>BE</cbc:IdentificationCode>
+                </cac:Country>
+            </cac:Address>
+        </cac:DeliveryLocation>
+        <cac:DeliveryParty>
+            <cac:PartyName>
+                <cbc:Name>partner_2</cbc:Name>
+            </cac:PartyName>
+        </cac:DeliveryParty>
+    </cac:Delivery>
     <cac:PaymentMeans>
         <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
         <cbc:PaymentID>___ignore___</cbc:PaymentID>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/bis3_out_invoice.xml

@@ -8,13 +8,23 @@
   <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
   <cbc:Note>test narration</cbc:Note>
   <cbc:DocumentCurrencyCode>USD</cbc:DocumentCurrencyCode>
+  <cbc:TaxCurrencyCode>EUR</cbc:TaxCurrencyCode>
   <cbc:BuyerReference>ref_partner_2</cbc:BuyerReference>
   <cac:OrderReference>
-    <cbc:ID>ref_move</cbc:ID>
+    <cbc:ID>___ignore___</cbc:ID>
   </cac:OrderReference>
+  <cac:AdditionalDocumentReference>
+    <cbc:ID>___ignore___</cbc:ID>
+    <cac:Attachment>
+      <cbc:EmbeddedDocumentBinaryObject>___ignore___</cbc:EmbeddedDocumentBinaryObject>
+    </cac:Attachment>
+  </cac:AdditionalDocumentReference>
   <cac:AccountingSupplierParty>
     <cac:Party>
-      <cbc:EndpointID schemeID="9925">BE0202239951</cbc:EndpointID>
+      <cbc:EndpointID schemeID="0208">0202239951</cbc:EndpointID>
+      <cac:PartyIdentification>
+        <cbc:ID schemeID="0208">0202239951</cbc:ID>
+      </cac:PartyIdentification>
       <cac:PartyName>
         <cbc:Name>partner_1</cbc:Name>
       </cac:PartyName>
@@ -34,7 +44,7 @@
       </cac:PartyTaxScheme>
       <cac:PartyLegalEntity>
         <cbc:RegistrationName>partner_1</cbc:RegistrationName>
-        <cbc:CompanyID>BE0202239951</cbc:CompanyID>
+        <cbc:CompanyID schemeID="0208">0202239951</cbc:CompanyID>
       </cac:PartyLegalEntity>
       <cac:Contact>
         <cbc:Name>partner_1</cbc:Name>
@@ -43,7 +53,10 @@
   </cac:AccountingSupplierParty>
   <cac:AccountingCustomerParty>
     <cac:Party>
-      <cbc:EndpointID schemeID="9925">BE0477472701</cbc:EndpointID>
+      <cbc:EndpointID schemeID="0208">0477472701</cbc:EndpointID>
+      <cac:PartyIdentification>
+        <cbc:ID schemeID="0208">0477472701</cbc:ID>
+      </cac:PartyIdentification>
       <cac:PartyName>
         <cbc:Name>partner_2</cbc:Name>
       </cac:PartyName>
@@ -63,13 +76,31 @@
       </cac:PartyTaxScheme>
       <cac:PartyLegalEntity>
         <cbc:RegistrationName>partner_2</cbc:RegistrationName>
-        <cbc:CompanyID>BE0477472701</cbc:CompanyID>
+        <cbc:CompanyID schemeID="0208">0477472701</cbc:CompanyID>
       </cac:PartyLegalEntity>
       <cac:Contact>
         <cbc:Name>partner_2</cbc:Name>
       </cac:Contact>
     </cac:Party>
   </cac:AccountingCustomerParty>
+  <cac:Delivery>
+    <cbc:ActualDeliveryDate>2017-01-15</cbc:ActualDeliveryDate>
+    <cac:DeliveryLocation>
+      <cac:Address>
+        <cbc:StreetName>Rue des Bourlottes 9</cbc:StreetName>
+        <cbc:CityName>Ramillies</cbc:CityName>
+        <cbc:PostalZone>1367</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>BE</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:Address>
+    </cac:DeliveryLocation>
+    <cac:DeliveryParty>
+      <cac:PartyName>
+        <cbc:Name>partner_2</cbc:Name>
+      </cac:PartyName>
+    </cac:DeliveryParty>
+  </cac:Delivery>
   <cac:PaymentMeans>
     <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
     <cbc:PaymentID>+++000/0000/26268+++</cbc:PaymentID>
@@ -105,6 +136,9 @@
       </cac:TaxCategory>
     </cac:TaxSubtotal>
   </cac:TaxTotal>
+  <cac:TaxTotal>
+    <cbc:TaxAmount currencyID="EUR">241.11</cbc:TaxAmount>
+  </cac:TaxTotal>
   <cac:LegalMonetaryTotal>
     <cbc:LineExtensionAmount currencyID="USD">2682.00</cbc:LineExtensionAmount>
     <cbc:TaxExclusiveAmount currencyID="USD">2682.00</cbc:TaxExclusiveAmount>
@@ -119,7 +153,10 @@
     <cac:AllowanceCharge>
       <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
       <cbc:AllowanceChargeReasonCode>95</cbc:AllowanceChargeReasonCode>
+      <cbc:AllowanceChargeReason>Discount</cbc:AllowanceChargeReason>
+      <cbc:MultiplierFactorNumeric>10.0</cbc:MultiplierFactorNumeric>
       <cbc:Amount currencyID="USD">198.00</cbc:Amount>
+      <cbc:BaseAmount currencyID="USD">1980.00</cbc:BaseAmount>
     </cac:AllowanceCharge>
     <cac:Item>
       <cbc:Description>product_a</cbc:Description>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/bis3_out_invoice_negative_unit_price.xml

@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Invoice xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
-    xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
-    xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
-    <cbc:CustomizationID>urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0
-    </cbc:CustomizationID>
-    <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
-    <cbc:ID>___ignore___</cbc:ID>
-    <cbc:IssueDate>2017-01-01</cbc:IssueDate>
-    <cbc:DueDate>2017-02-28</cbc:DueDate>
-    <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
-    <cbc:Note>test narration</cbc:Note>
-    <cbc:DocumentCurrencyCode>USD</cbc:DocumentCurrencyCode>
-    <cbc:BuyerReference>ref_partner_2</cbc:BuyerReference>
-    <cac:OrderReference>
-        <cbc:ID>___ignore___</cbc:ID>
-    </cac:OrderReference>
-    <cac:AccountingSupplierParty>
-        <cac:Party>
-            <cbc:EndpointID schemeID="9925">BE0202239951</cbc:EndpointID>
-            <cac:PartyName>
-                <cbc:Name>partner_1</cbc:Name>
-            </cac:PartyName>
-            <cac:PostalAddress>
-                <cbc:StreetName>Chauss&#233;e de Namur 40</cbc:StreetName>
-                <cbc:CityName>Ramillies</cbc:CityName>
-                <cbc:PostalZone>1367</cbc:PostalZone>
-                <cac:Country>
-                    <cbc:IdentificationCode>BE</cbc:IdentificationCode>
-                </cac:Country>
-            </cac:PostalAddress>
-            <cac:PartyTaxScheme>
-                <cbc:CompanyID>BE0202239951</cbc:CompanyID>
-                <cac:TaxScheme>
-                    <cbc:ID>VAT</cbc:ID>
-                </cac:TaxScheme>
-            </cac:PartyTaxScheme>
-            <cac:PartyLegalEntity>
-                <cbc:RegistrationName>partner_1</cbc:RegistrationName>
-                <cbc:CompanyID>BE0202239951</cbc:CompanyID>
-            </cac:PartyLegalEntity>
-            <cac:Contact>
-                <cbc:Name>partner_1</cbc:Name>
-            </cac:Contact>
-        </cac:Party>
-    </cac:AccountingSupplierParty>
-    <cac:AccountingCustomerParty>
-        <cac:Party>
-            <cbc:EndpointID schemeID="9925">BE0477472701</cbc:EndpointID>
-            <cac:PartyName>
-                <cbc:Name>partner_2</cbc:Name>
-            </cac:PartyName>
-            <cac:PostalAddress>
-                <cbc:StreetName>Rue des Bourlottes 9</cbc:StreetName>
-                <cbc:CityName>Ramillies</cbc:CityName>
-                <cbc:PostalZone>1367</cbc:PostalZone>
-                <cac:Country>
-                    <cbc:IdentificationCode>BE</cbc:IdentificationCode>
-                </cac:Country>
-            </cac:PostalAddress>
-            <cac:PartyTaxScheme>
-                <cbc:CompanyID>BE0477472701</cbc:CompanyID>
-                <cac:TaxScheme>
-                    <cbc:ID>VAT</cbc:ID>
-                </cac:TaxScheme>
-            </cac:PartyTaxScheme>
-            <cac:PartyLegalEntity>
-                <cbc:RegistrationName>partner_2</cbc:RegistrationName>
-                <cbc:CompanyID>BE0477472701</cbc:CompanyID>
-            </cac:PartyLegalEntity>
-            <cac:Contact>
-                <cbc:Name>partner_2</cbc:Name>
-            </cac:Contact>
-        </cac:Party>
-    </cac:AccountingCustomerParty>
-    <cac:PaymentMeans>
-        <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
-        <cbc:PaymentID>___ignore___</cbc:PaymentID>
-        <cac:PayeeFinancialAccount>
-            <cbc:ID>BE15001559627230</cbc:ID>
-        </cac:PayeeFinancialAccount>
-    </cac:PaymentMeans>
-    <cac:PaymentTerms>
-        <cbc:Note>Payment terms: 30% Advance End of Following Month</cbc:Note>
-    </cac:PaymentTerms>
-    <cac:TaxTotal>
-        <cbc:TaxAmount currencyID="USD">15.75</cbc:TaxAmount>
-        <cac:TaxSubtotal>
-            <cbc:TaxableAmount currencyID="USD">75.00</cbc:TaxableAmount>
-            <cbc:TaxAmount currencyID="USD">15.75</cbc:TaxAmount>
-            <cac:TaxCategory>
-                <cbc:ID>S</cbc:ID>
-                <cbc:Percent>21.0</cbc:Percent>
-                <cac:TaxScheme>
-                    <cbc:ID>VAT</cbc:ID>
-                </cac:TaxScheme>
-            </cac:TaxCategory>
-        </cac:TaxSubtotal>
-    </cac:TaxTotal>
-    <cac:LegalMonetaryTotal>
-        <cbc:LineExtensionAmount currencyID="USD">75.00</cbc:LineExtensionAmount>
-        <cbc:TaxExclusiveAmount currencyID="USD">75.00</cbc:TaxExclusiveAmount>
-        <cbc:TaxInclusiveAmount currencyID="USD">90.75</cbc:TaxInclusiveAmount>
-        <cbc:PrepaidAmount currencyID="USD">0.00</cbc:PrepaidAmount>
-        <cbc:PayableAmount currencyID="USD">90.75</cbc:PayableAmount>
-    </cac:LegalMonetaryTotal>
-    <cac:InvoiceLine>
-        <cbc:ID>___ignore___</cbc:ID>
-        <cbc:InvoicedQuantity unitCode="C62">1.0</cbc:InvoicedQuantity>
-        <cbc:LineExtensionAmount currencyID="USD">100.00</cbc:LineExtensionAmount>
-        <cac:Item>
-            <cbc:Description>product_a</cbc:Description>
-            <cbc:Name>product_a</cbc:Name>
-            <cac:ClassifiedTaxCategory>
-                <cbc:ID>S</cbc:ID>
-                <cbc:Percent>21.0</cbc:Percent>
-                <cac:TaxScheme>
-                    <cbc:ID>VAT</cbc:ID>
-                </cac:TaxScheme>
-            </cac:ClassifiedTaxCategory>
-        </cac:Item>
-        <cac:Price>
-            <cbc:PriceAmount currencyID="USD">100.0</cbc:PriceAmount>
-        </cac:Price>
-    </cac:InvoiceLine>
-    <cac:InvoiceLine>
-        <cbc:ID>___ignore___</cbc:ID>
-        <cbc:InvoicedQuantity unitCode="C62">-1.0</cbc:InvoicedQuantity>
-        <cbc:LineExtensionAmount currencyID="USD">-25.00</cbc:LineExtensionAmount>
-        <cac:Item>
-            <cbc:Description>product_a</cbc:Description>
-            <cbc:Name>product_a</cbc:Name>
-            <cac:ClassifiedTaxCategory>
-                <cbc:ID>S</cbc:ID>
-                <cbc:Percent>21.0</cbc:Percent>
-                <cac:TaxScheme>
-                    <cbc:ID>VAT</cbc:ID>
-                </cac:TaxScheme>
-            </cac:ClassifiedTaxCategory>
-        </cac:Item>
-        <cac:Price>
-            <cbc:PriceAmount currencyID="USD">25.0</cbc:PriceAmount>
-        </cac:Price>
-    </cac:InvoiceLine>
-</Invoice>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/bis3_out_invoice_no_prices.xml

@@ -14,7 +14,10 @@
   </cac:OrderReference>
   <cac:AccountingSupplierParty>
     <cac:Party>
-      <cbc:EndpointID schemeID="9925">BE0202239951</cbc:EndpointID>
+      <cbc:EndpointID schemeID="0208">0202239951</cbc:EndpointID>
+      <cac:PartyIdentification>
+        <cbc:ID schemeID="0208">0202239951</cbc:ID>
+      </cac:PartyIdentification>
       <cac:PartyName>
         <cbc:Name>partner_1</cbc:Name>
       </cac:PartyName>
@@ -34,7 +37,7 @@
       </cac:PartyTaxScheme>
       <cac:PartyLegalEntity>
         <cbc:RegistrationName>partner_1</cbc:RegistrationName>
-        <cbc:CompanyID>BE0202239951</cbc:CompanyID>
+        <cbc:CompanyID schemeID="0208">0202239951</cbc:CompanyID>
       </cac:PartyLegalEntity>
       <cac:Contact>
         <cbc:Name>partner_1</cbc:Name>
@@ -43,7 +46,10 @@
   </cac:AccountingSupplierParty>
   <cac:AccountingCustomerParty>
     <cac:Party>
-      <cbc:EndpointID schemeID="9925">BE0477472701</cbc:EndpointID>
+      <cbc:EndpointID schemeID="0208">0477472701</cbc:EndpointID>
+      <cac:PartyIdentification>
+        <cbc:ID schemeID="0208">0477472701</cbc:ID>
+      </cac:PartyIdentification>
       <cac:PartyName>
         <cbc:Name>partner_2</cbc:Name>
       </cac:PartyName>
@@ -63,7 +69,7 @@
       </cac:PartyTaxScheme>
       <cac:PartyLegalEntity>
         <cbc:RegistrationName>partner_2</cbc:RegistrationName>
-        <cbc:CompanyID>BE0477472701</cbc:CompanyID>
+        <cbc:CompanyID schemeID="0208">0477472701</cbc:CompanyID>
       </cac:PartyLegalEntity>
       <cac:Contact>
         <cbc:Name>partner_2</cbc:Name>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/bis3_out_invoice_public_admin.xml

@@ -1,115 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
-  <cbc:CustomizationID>urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0</cbc:CustomizationID>
-  <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
-  <cbc:ID>INV/2017/01/0002</cbc:ID>
-  <cbc:IssueDate>2017-01-01</cbc:IssueDate>
-  <cbc:DueDate>2017-02-28</cbc:DueDate>
-  <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
-  <cbc:Note>test narration</cbc:Note>
-  <cbc:DocumentCurrencyCode>USD</cbc:DocumentCurrencyCode>
-  <cbc:BuyerReference>ref_partner_2</cbc:BuyerReference>
-  <cac:OrderReference>
-    <cbc:ID>ref_move</cbc:ID>
-  </cac:OrderReference>
-  <cac:AccountingSupplierParty>
-    <cac:Party>
-      <cbc:EndpointID schemeID="9925">BE0202239951</cbc:EndpointID>
-      <cac:PartyName>
-        <cbc:Name>partner_1</cbc:Name>
-      </cac:PartyName>
-      <cac:PostalAddress>
-        <cbc:StreetName>Chauss&#233;e de Namur 40</cbc:StreetName>
-        <cbc:CityName>Ramillies</cbc:CityName>
-        <cbc:PostalZone>1367</cbc:PostalZone>
-        <cac:Country>
-          <cbc:IdentificationCode>BE</cbc:IdentificationCode>
-        </cac:Country>
-      </cac:PostalAddress>
-      <cac:PartyTaxScheme>
-        <cbc:CompanyID>BE0202239951</cbc:CompanyID>
-        <cac:TaxScheme>
-          <cbc:ID>VAT</cbc:ID>
-        </cac:TaxScheme>
-      </cac:PartyTaxScheme>
-      <cac:PartyLegalEntity>
-        <cbc:RegistrationName>partner_1</cbc:RegistrationName>
-        <cbc:CompanyID>BE0202239951</cbc:CompanyID>
-      </cac:PartyLegalEntity>
-      <cac:Contact>
-        <cbc:Name>partner_1</cbc:Name>
-      </cac:Contact>
-    </cac:Party>
-  </cac:AccountingSupplierParty>
-  <cac:AccountingCustomerParty>
-    <cac:Party>
-      <cac:PartyName>
-        <cbc:Name>partner_2</cbc:Name>
-      </cac:PartyName>
-      <cac:PostalAddress>
-        <cbc:StreetName>Rue des Bourlottes 9</cbc:StreetName>
-        <cbc:CityName>Ramillies</cbc:CityName>
-        <cbc:PostalZone>1367</cbc:PostalZone>
-        <cac:Country>
-          <cbc:IdentificationCode>BE</cbc:IdentificationCode>
-        </cac:Country>
-      </cac:PostalAddress>
-      <cac:PartyLegalEntity>
-        <cbc:RegistrationName>partner_2</cbc:RegistrationName>
-      </cac:PartyLegalEntity>
-      <cac:Contact>
-        <cbc:Name>partner_2</cbc:Name>
-      </cac:Contact>
-    </cac:Party>
-  </cac:AccountingCustomerParty>
-  <cac:PaymentMeans>
-    <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
-    <cbc:PaymentID>+++000/0000/05959+++</cbc:PaymentID>
-    <cac:PayeeFinancialAccount>
-      <cbc:ID>BE15001559627230</cbc:ID>
-    </cac:PayeeFinancialAccount>
-  </cac:PaymentMeans>
-  <cac:PaymentTerms>
-    <cbc:Note>Payment terms: 30% Advance End of Following Month</cbc:Note>
-  </cac:PaymentTerms>
-  <cac:TaxTotal>
-    <cbc:TaxAmount currencyID="USD">42.00</cbc:TaxAmount>
-    <cac:TaxSubtotal>
-      <cbc:TaxableAmount currencyID="USD">200.00</cbc:TaxableAmount>
-      <cbc:TaxAmount currencyID="USD">42.00</cbc:TaxAmount>
-      <cac:TaxCategory>
-        <cbc:ID>S</cbc:ID>
-        <cbc:Percent>21.0</cbc:Percent>
-        <cac:TaxScheme>
-          <cbc:ID>VAT</cbc:ID>
-        </cac:TaxScheme>
-      </cac:TaxCategory>
-    </cac:TaxSubtotal>
-  </cac:TaxTotal>
-  <cac:LegalMonetaryTotal>
-    <cbc:LineExtensionAmount currencyID="USD">200.00</cbc:LineExtensionAmount>
-    <cbc:TaxExclusiveAmount currencyID="USD">200.00</cbc:TaxExclusiveAmount>
-    <cbc:TaxInclusiveAmount currencyID="USD">242.00</cbc:TaxInclusiveAmount>
-    <cbc:PrepaidAmount currencyID="USD">0.00</cbc:PrepaidAmount>
-    <cbc:PayableAmount currencyID="USD">242.00</cbc:PayableAmount>
-  </cac:LegalMonetaryTotal>
-  <cac:InvoiceLine>
-    <cbc:ID>234</cbc:ID>
-    <cbc:InvoicedQuantity unitCode="C62">2.0</cbc:InvoicedQuantity>
-    <cbc:LineExtensionAmount currencyID="USD">200.00</cbc:LineExtensionAmount>
-    <cac:Item>
-      <cbc:Description>product_a</cbc:Description>
-      <cbc:Name>product_a</cbc:Name>
-      <cac:ClassifiedTaxCategory>
-        <cbc:ID>S</cbc:ID>
-        <cbc:Percent>21.0</cbc:Percent>
-        <cac:TaxScheme>
-          <cbc:ID>VAT</cbc:ID>
-        </cac:TaxScheme>
-      </cac:ClassifiedTaxCategory>
-    </cac:Item>
-    <cac:Price>
-      <cbc:PriceAmount currencyID="USD">100.0</cbc:PriceAmount>
-    </cac:Price>
-  </cac:InvoiceLine>
-</Invoice>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/bis3_out_invoice_quantity_and_or_unit_price_zero.xml

@@ -2,7 +2,7 @@
 <Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
   <cbc:CustomizationID>urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0</cbc:CustomizationID>
   <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
-  <cbc:ID>___ignore___</cbc:ID>
+  <cbc:ID>INV/2017/01/0002</cbc:ID>
   <cbc:IssueDate>2017-01-01</cbc:IssueDate>
   <cbc:DueDate>2017-02-28</cbc:DueDate>
   <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
@@ -10,11 +10,20 @@
   <cbc:DocumentCurrencyCode>USD</cbc:DocumentCurrencyCode>
   <cbc:BuyerReference>ref_partner_2</cbc:BuyerReference>
   <cac:OrderReference>
-    <cbc:ID>ref_move</cbc:ID>
+    <cbc:ID>___ignore___</cbc:ID>
   </cac:OrderReference>
+  <cac:AdditionalDocumentReference>
+    <cbc:ID>___ignore___</cbc:ID>
+    <cac:Attachment>
+      <cbc:EmbeddedDocumentBinaryObject>___ignore___</cbc:EmbeddedDocumentBinaryObject>
+    </cac:Attachment>
+  </cac:AdditionalDocumentReference>
   <cac:AccountingSupplierParty>
     <cac:Party>
-      <cbc:EndpointID schemeID="9925">BE0202239951</cbc:EndpointID>
+      <cbc:EndpointID schemeID="0208">0202239951</cbc:EndpointID>
+      <cac:PartyIdentification>
+        <cbc:ID schemeID="0208">0202239951</cbc:ID>
+      </cac:PartyIdentification>
       <cac:PartyName>
         <cbc:Name>partner_1</cbc:Name>
       </cac:PartyName>
@@ -34,7 +43,7 @@
       </cac:PartyTaxScheme>
       <cac:PartyLegalEntity>
         <cbc:RegistrationName>partner_1</cbc:RegistrationName>
-        <cbc:CompanyID>BE0202239951</cbc:CompanyID>
+        <cbc:CompanyID schemeID="0208">0202239951</cbc:CompanyID>
       </cac:PartyLegalEntity>
       <cac:Contact>
         <cbc:Name>partner_1</cbc:Name>
@@ -43,7 +52,10 @@
   </cac:AccountingSupplierParty>
   <cac:AccountingCustomerParty>
     <cac:Party>
-      <cbc:EndpointID schemeID="9925">BE0477472701</cbc:EndpointID>
+      <cbc:EndpointID schemeID="0208">0477472701</cbc:EndpointID>
+      <cac:PartyIdentification>
+        <cbc:ID schemeID="0208">0477472701</cbc:ID>
+      </cac:PartyIdentification>
       <cac:PartyName>
         <cbc:Name>partner_2</cbc:Name>
       </cac:PartyName>
@@ -63,16 +75,28 @@
       </cac:PartyTaxScheme>
       <cac:PartyLegalEntity>
         <cbc:RegistrationName>partner_2</cbc:RegistrationName>
-        <cbc:CompanyID>BE0477472701</cbc:CompanyID>
+        <cbc:CompanyID schemeID="0208">0477472701</cbc:CompanyID>
       </cac:PartyLegalEntity>
       <cac:Contact>
         <cbc:Name>partner_2</cbc:Name>
       </cac:Contact>
     </cac:Party>
   </cac:AccountingCustomerParty>
+  <cac:Delivery>
+    <cac:DeliveryLocation>
+      <cac:Address>
+        <cbc:StreetName>Rue des Bourlottes 9</cbc:StreetName>
+        <cbc:CityName>Ramillies</cbc:CityName>
+        <cbc:PostalZone>1367</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>BE</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:Address>
+    </cac:DeliveryLocation>
+  </cac:Delivery>
   <cac:PaymentMeans>
     <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
-    <cbc:PaymentID>___ignore___</cbc:PaymentID>
+    <cbc:PaymentID>+++000/0000/26268+++</cbc:PaymentID>
     <cac:PayeeFinancialAccount>
       <cbc:ID>BE15001559627230</cbc:ID>
     </cac:PayeeFinancialAccount>
@@ -81,10 +105,10 @@
     <cbc:Note>Payment terms: 30% Advance End of Following Month</cbc:Note>
   </cac:PaymentTerms>
   <cac:TaxTotal>
-    <cbc:TaxAmount currencyID="USD">108.02</cbc:TaxAmount>
+    <cbc:TaxAmount currencyID="USD">630.00</cbc:TaxAmount>
     <cac:TaxSubtotal>
-      <cbc:TaxableAmount currencyID="USD">400.00</cbc:TaxableAmount>
-      <cbc:TaxAmount currencyID="USD">84.03</cbc:TaxAmount>
+      <cbc:TaxableAmount currencyID="USD">3000.00</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="USD">630</cbc:TaxAmount>
       <cac:TaxCategory>
         <cbc:ID>S</cbc:ID>
         <cbc:Percent>21.0</cbc:Percent>
@@ -93,73 +117,43 @@
         </cac:TaxScheme>
       </cac:TaxCategory>
     </cac:TaxSubtotal>
-    <cac:TaxSubtotal>
-      <cbc:TaxableAmount currencyID="USD">200.00</cbc:TaxableAmount>
-      <cbc:TaxAmount currencyID="USD">23.99</cbc:TaxAmount>
-      <cac:TaxCategory>
-        <cbc:ID>S</cbc:ID>
-        <cbc:Percent>12.0</cbc:Percent>
-        <cac:TaxScheme>
-          <cbc:ID>VAT</cbc:ID>
-        </cac:TaxScheme>
-      </cac:TaxCategory>
-    </cac:TaxSubtotal>
   </cac:TaxTotal>
   <cac:LegalMonetaryTotal>
-    <cbc:LineExtensionAmount currencyID="USD">600.00</cbc:LineExtensionAmount>
-    <cbc:TaxExclusiveAmount currencyID="USD">600.00</cbc:TaxExclusiveAmount>
-    <cbc:TaxInclusiveAmount currencyID="USD">708.02</cbc:TaxInclusiveAmount>
+    <cbc:LineExtensionAmount currencyID="USD">3000.00</cbc:LineExtensionAmount>
+    <cbc:TaxExclusiveAmount currencyID="USD">3000.00</cbc:TaxExclusiveAmount>
+    <cbc:TaxInclusiveAmount currencyID="USD">3630.00</cbc:TaxInclusiveAmount>
     <cbc:PrepaidAmount currencyID="USD">0.00</cbc:PrepaidAmount>
-    <cbc:PayableAmount currencyID="USD">708.02</cbc:PayableAmount>
+    <cbc:PayableAmount currencyID="USD">3630.00</cbc:PayableAmount>
   </cac:LegalMonetaryTotal>
   <cac:InvoiceLine>
-    <cbc:ID>1</cbc:ID>
-    <cbc:InvoicedQuantity unitCode="C62">1.0</cbc:InvoicedQuantity>
-    <cbc:LineExtensionAmount currencyID="USD">200.00</cbc:LineExtensionAmount>
-    <cac:Item>
-      <cbc:Description>product_a</cbc:Description>
-      <cbc:Name>product_a</cbc:Name>
-      <cac:ClassifiedTaxCategory>
-        <cbc:ID>S</cbc:ID>
-        <cbc:Percent>21.0</cbc:Percent>
-        <cac:TaxScheme>
-          <cbc:ID>VAT</cbc:ID>
-        </cac:TaxScheme>
-      </cac:ClassifiedTaxCategory>
-    </cac:Item>
-    <cac:Price>
-      <cbc:PriceAmount currencyID="USD">200.0</cbc:PriceAmount>
-    </cac:Price>
-  </cac:InvoiceLine>
-  <cac:InvoiceLine>
-    <cbc:ID>2</cbc:ID>
-    <cbc:InvoicedQuantity unitCode="C62">1.0</cbc:InvoicedQuantity>
-    <cbc:LineExtensionAmount currencyID="USD">200.00</cbc:LineExtensionAmount>
-    <cac:Item>
-      <cbc:Description>product_a</cbc:Description>
-      <cbc:Name>product_a</cbc:Name>
-      <cac:ClassifiedTaxCategory>
-        <cbc:ID>S</cbc:ID>
-        <cbc:Percent>21.0</cbc:Percent>
-        <cac:TaxScheme>
-          <cbc:ID>VAT</cbc:ID>
-        </cac:TaxScheme>
-      </cac:ClassifiedTaxCategory>
-    </cac:Item>
-    <cac:Price>
-      <cbc:PriceAmount currencyID="USD">200.0</cbc:PriceAmount>
-    </cac:Price>
-  </cac:InvoiceLine>
-  <cac:InvoiceLine>
-    <cbc:ID>3</cbc:ID>
-    <cbc:InvoicedQuantity unitCode="DZN">1.0</cbc:InvoicedQuantity>
-    <cbc:LineExtensionAmount currencyID="USD">100.00</cbc:LineExtensionAmount>
+    <cbc:ID>901</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="C62">0</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="USD">1000.00</cbc:LineExtensionAmount>
     <cac:Item>
       <cbc:Description>product_b</cbc:Description>
       <cbc:Name>product_b</cbc:Name>
       <cac:ClassifiedTaxCategory>
         <cbc:ID>S</cbc:ID>
-        <cbc:Percent>12.0</cbc:Percent>
+        <cbc:Percent>21.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:ClassifiedTaxCategory>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="USD">0</cbc:PriceAmount>
+    </cac:Price>
+  </cac:InvoiceLine>
+  <cac:InvoiceLine>
+    <cbc:ID>902</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="C62">0</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="USD">1000.00</cbc:LineExtensionAmount>
+    <cac:Item>
+      <cbc:Description>product_b</cbc:Description>
+      <cbc:Name>product_b</cbc:Name>
+      <cac:ClassifiedTaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>21.0</cbc:Percent>
         <cac:TaxScheme>
           <cbc:ID>VAT</cbc:ID>
         </cac:TaxScheme>
@@ -170,22 +164,22 @@
     </cac:Price>
   </cac:InvoiceLine>
   <cac:InvoiceLine>
-    <cbc:ID>4</cbc:ID>
-    <cbc:InvoicedQuantity unitCode="DZN">1.0</cbc:InvoicedQuantity>
-    <cbc:LineExtensionAmount currencyID="USD">100.00</cbc:LineExtensionAmount>
+    <cbc:ID>903</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="C62">100</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="USD">1000.00</cbc:LineExtensionAmount>
     <cac:Item>
       <cbc:Description>product_b</cbc:Description>
       <cbc:Name>product_b</cbc:Name>
       <cac:ClassifiedTaxCategory>
         <cbc:ID>S</cbc:ID>
-        <cbc:Percent>12.0</cbc:Percent>
+        <cbc:Percent>21.0</cbc:Percent>
         <cac:TaxScheme>
           <cbc:ID>VAT</cbc:ID>
         </cac:TaxScheme>
       </cac:ClassifiedTaxCategory>
     </cac:Item>
     <cac:Price>
-      <cbc:PriceAmount currencyID="USD">100.0</cbc:PriceAmount>
+      <cbc:PriceAmount currencyID="USD">0</cbc:PriceAmount>
     </cac:Price>
   </cac:InvoiceLine>
 </Invoice>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/bis3_out_invoice_rounding.xml

@@ -1,126 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<Invoice xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
-         xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
-         xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
-    <cbc:CustomizationID>urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0
-    </cbc:CustomizationID>
-    <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
-    <cbc:ID>___ignore___</cbc:ID>
-    <cbc:IssueDate>2017-01-01</cbc:IssueDate>
-    <cbc:DueDate>2017-02-28</cbc:DueDate>
-    <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
-    <cbc:Note>test narration</cbc:Note>
-    <cbc:DocumentCurrencyCode>USD</cbc:DocumentCurrencyCode>
-    <cbc:BuyerReference>ref_partner_2</cbc:BuyerReference>
-    <cac:OrderReference>
-        <cbc:ID>___ignore___</cbc:ID>
-    </cac:OrderReference>
-    <cac:AccountingSupplierParty>
-        <cac:Party>
-            <cbc:EndpointID schemeID="9925">BE0202239951</cbc:EndpointID>
-            <cac:PartyName>
-                <cbc:Name>partner_1</cbc:Name>
-            </cac:PartyName>
-            <cac:PostalAddress>
-                <cbc:StreetName>Chauss&#233;e de Namur 40</cbc:StreetName>
-                <cbc:CityName>Ramillies</cbc:CityName>
-                <cbc:PostalZone>1367</cbc:PostalZone>
-                <cac:Country>
-                    <cbc:IdentificationCode>BE</cbc:IdentificationCode>
-                </cac:Country>
-            </cac:PostalAddress>
-            <cac:PartyTaxScheme>
-                <cbc:CompanyID>BE0202239951</cbc:CompanyID>
-                <cac:TaxScheme>
-                    <cbc:ID>VAT</cbc:ID>
-                </cac:TaxScheme>
-            </cac:PartyTaxScheme>
-            <cac:PartyLegalEntity>
-                <cbc:RegistrationName>partner_1</cbc:RegistrationName>
-                <cbc:CompanyID>BE0202239951</cbc:CompanyID>
-            </cac:PartyLegalEntity>
-            <cac:Contact>
-                <cbc:Name>partner_1</cbc:Name>
-            </cac:Contact>
-        </cac:Party>
-    </cac:AccountingSupplierParty>
-    <cac:AccountingCustomerParty>
-        <cac:Party>
-            <cbc:EndpointID schemeID="9925">BE0477472701</cbc:EndpointID>
-            <cac:PartyName>
-                <cbc:Name>partner_2</cbc:Name>
-            </cac:PartyName>
-            <cac:PostalAddress>
-                <cbc:StreetName>Rue des Bourlottes 9</cbc:StreetName>
-                <cbc:CityName>Ramillies</cbc:CityName>
-                <cbc:PostalZone>1367</cbc:PostalZone>
-                <cac:Country>
-                    <cbc:IdentificationCode>BE</cbc:IdentificationCode>
-                </cac:Country>
-            </cac:PostalAddress>
-            <cac:PartyTaxScheme>
-                <cbc:CompanyID>BE0477472701</cbc:CompanyID>
-                <cac:TaxScheme>
-                    <cbc:ID>VAT</cbc:ID>
-                </cac:TaxScheme>
-            </cac:PartyTaxScheme>
-            <cac:PartyLegalEntity>
-                <cbc:RegistrationName>partner_2</cbc:RegistrationName>
-                <cbc:CompanyID>BE0477472701</cbc:CompanyID>
-            </cac:PartyLegalEntity>
-            <cac:Contact>
-                <cbc:Name>partner_2</cbc:Name>
-            </cac:Contact>
-        </cac:Party>
-    </cac:AccountingCustomerParty>
-    <cac:PaymentMeans>
-        <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
-        <cbc:PaymentID>___ignore___</cbc:PaymentID>
-        <cac:PayeeFinancialAccount>
-            <cbc:ID>BE15001559627230</cbc:ID>
-        </cac:PayeeFinancialAccount>
-    </cac:PaymentMeans>
-    <cac:PaymentTerms>
-        <cbc:Note>Payment terms: 30% Advance End of Following Month</cbc:Note>
-    </cac:PaymentTerms>
-    <cac:TaxTotal>
-        <cbc:TaxAmount currencyID="USD">959.07</cbc:TaxAmount>
-        <cac:TaxSubtotal>
-            <cbc:TaxableAmount currencyID="USD">4567.00</cbc:TaxableAmount>
-            <cbc:TaxAmount currencyID="USD">959.07</cbc:TaxAmount>
-            <cac:TaxCategory>
-                <cbc:ID>S</cbc:ID>
-                <cbc:Percent>21.0</cbc:Percent>
-                <cac:TaxScheme>
-                    <cbc:ID>VAT</cbc:ID>
-                </cac:TaxScheme>
-            </cac:TaxCategory>
-        </cac:TaxSubtotal>
-    </cac:TaxTotal>
-    <cac:LegalMonetaryTotal>
-        <cbc:LineExtensionAmount currencyID="USD">4567.00</cbc:LineExtensionAmount>
-        <cbc:TaxExclusiveAmount currencyID="USD">4567.00</cbc:TaxExclusiveAmount>
-        <cbc:TaxInclusiveAmount currencyID="USD">5526.07</cbc:TaxInclusiveAmount>
-        <cbc:PrepaidAmount currencyID="USD">0.00</cbc:PrepaidAmount>
-        <cbc:PayableAmount currencyID="USD">5526.07</cbc:PayableAmount>
-    </cac:LegalMonetaryTotal>
-    <cac:InvoiceLine>
-        <cbc:ID>___ignore___</cbc:ID>
-        <cbc:InvoicedQuantity unitCode="C62">10000.0</cbc:InvoicedQuantity>
-        <cbc:LineExtensionAmount currencyID="USD">4567.00</cbc:LineExtensionAmount>
-        <cac:Item>
-            <cbc:Description>product_a</cbc:Description>
-            <cbc:Name>product_a</cbc:Name>
-            <cac:ClassifiedTaxCategory>
-                <cbc:ID>S</cbc:ID>
-                <cbc:Percent>21.0</cbc:Percent>
-                <cac:TaxScheme>
-                    <cbc:ID>VAT</cbc:ID>
-                </cac:TaxScheme>
-            </cac:ClassifiedTaxCategory>
-        </cac:Item>
-        <cac:Price>
-            <cbc:PriceAmount currencyID="USD">0.4567</cbc:PriceAmount>
-        </cac:Price>
-    </cac:InvoiceLine>
-</Invoice>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/bis3_out_invoice_tax_exempt.xml

@@ -1,124 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
-  <cbc:CustomizationID>urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0</cbc:CustomizationID>
-  <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
-  <cbc:ID>___ignore___</cbc:ID>
-  <cbc:IssueDate>2017-01-01</cbc:IssueDate>
-  <cbc:DueDate>2017-02-28</cbc:DueDate>
-  <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
-  <cbc:Note>test narration</cbc:Note>
-  <cbc:DocumentCurrencyCode>USD</cbc:DocumentCurrencyCode>
-  <cbc:BuyerReference>ref_partner_2</cbc:BuyerReference>
-  <cac:OrderReference>
-    <cbc:ID>ref_move</cbc:ID>
-  </cac:OrderReference>
-  <cac:AccountingSupplierParty>
-    <cac:Party>
-      <cbc:EndpointID schemeID="9925">BE0202239951</cbc:EndpointID>
-      <cac:PartyName>
-        <cbc:Name>partner_1</cbc:Name>
-      </cac:PartyName>
-      <cac:PostalAddress>
-        <cbc:StreetName>Chaussée de Namur 40</cbc:StreetName>
-        <cbc:CityName>Ramillies</cbc:CityName>
-        <cbc:PostalZone>1367</cbc:PostalZone>
-        <cac:Country>
-          <cbc:IdentificationCode>BE</cbc:IdentificationCode>
-        </cac:Country>
-      </cac:PostalAddress>
-      <cac:PartyTaxScheme>
-        <cbc:CompanyID>BE0202239951</cbc:CompanyID>
-        <cac:TaxScheme>
-          <cbc:ID>VAT</cbc:ID>
-        </cac:TaxScheme>
-      </cac:PartyTaxScheme>
-      <cac:PartyLegalEntity>
-        <cbc:RegistrationName>partner_1</cbc:RegistrationName>
-        <cbc:CompanyID>BE0202239951</cbc:CompanyID>
-      </cac:PartyLegalEntity>
-      <cac:Contact>
-        <cbc:Name>partner_1</cbc:Name>
-      </cac:Contact>
-    </cac:Party>
-  </cac:AccountingSupplierParty>
-  <cac:AccountingCustomerParty>
-    <cac:Party>
-      <cbc:EndpointID schemeID="9925">BE0477472701</cbc:EndpointID>
-      <cac:PartyName>
-        <cbc:Name>partner_2</cbc:Name>
-      </cac:PartyName>
-      <cac:PostalAddress>
-        <cbc:StreetName>Rue des Bourlottes 9</cbc:StreetName>
-        <cbc:CityName>Ramillies</cbc:CityName>
-        <cbc:PostalZone>1367</cbc:PostalZone>
-        <cac:Country>
-          <cbc:IdentificationCode>BE</cbc:IdentificationCode>
-        </cac:Country>
-      </cac:PostalAddress>
-      <cac:PartyTaxScheme>
-        <cbc:CompanyID>BE0477472701</cbc:CompanyID>
-        <cac:TaxScheme>
-          <cbc:ID>VAT</cbc:ID>
-        </cac:TaxScheme>
-      </cac:PartyTaxScheme>
-      <cac:PartyLegalEntity>
-        <cbc:RegistrationName>partner_2</cbc:RegistrationName>
-        <cbc:CompanyID>BE0477472701</cbc:CompanyID>
-      </cac:PartyLegalEntity>
-      <cac:Contact>
-        <cbc:Name>partner_2</cbc:Name>
-      </cac:Contact>
-    </cac:Party>
-  </cac:AccountingCustomerParty>
-  <cac:PaymentMeans>
-    <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
-    <cbc:PaymentID>___ignore___</cbc:PaymentID>
-    <cac:PayeeFinancialAccount>
-      <cbc:ID>BE15001559627230</cbc:ID>
-    </cac:PayeeFinancialAccount>
-  </cac:PaymentMeans>
-  <cac:PaymentTerms>
-    <cbc:Note>Payment terms: 30% Advance End of Following Month</cbc:Note>
-  </cac:PaymentTerms>
-  <cac:TaxTotal>
-    <cbc:TaxAmount currencyID="USD">0.00</cbc:TaxAmount>
-    <cac:TaxSubtotal>
-      <cbc:TaxableAmount currencyID="USD">990.00</cbc:TaxableAmount>
-      <cbc:TaxAmount currencyID="USD">0.00</cbc:TaxAmount>
-      <cac:TaxCategory>
-        <cbc:ID>E</cbc:ID>
-        <cbc:Percent>0.0</cbc:Percent>
-        <cbc:TaxExemptionReason>Articles 226 items 11 to 15 Directive 2006/112/EN</cbc:TaxExemptionReason>
-        <cac:TaxScheme>
-          <cbc:ID>VAT</cbc:ID>
-        </cac:TaxScheme>
-      </cac:TaxCategory>
-    </cac:TaxSubtotal>
-  </cac:TaxTotal>
-  <cac:LegalMonetaryTotal>
-    <cbc:LineExtensionAmount currencyID="USD">990.00</cbc:LineExtensionAmount>
-    <cbc:TaxExclusiveAmount currencyID="USD">990.00</cbc:TaxExclusiveAmount>
-    <cbc:TaxInclusiveAmount currencyID="USD">990.00</cbc:TaxInclusiveAmount>
-    <cbc:PrepaidAmount currencyID="USD">0.00</cbc:PrepaidAmount>
-    <cbc:PayableAmount currencyID="USD">990.00</cbc:PayableAmount>
-  </cac:LegalMonetaryTotal>
-  <cac:InvoiceLine>
-    <cbc:ID>1</cbc:ID>
-    <cbc:InvoicedQuantity unitCode="C62">1.0</cbc:InvoicedQuantity>
-    <cbc:LineExtensionAmount currencyID="USD">990.00</cbc:LineExtensionAmount>
-    <cac:Item>
-      <cbc:Description>product_a</cbc:Description>
-      <cbc:Name>product_a</cbc:Name>
-      <cac:ClassifiedTaxCategory>
-        <cbc:ID>E</cbc:ID>
-        <cbc:Percent>0.0</cbc:Percent>
-        <cac:TaxScheme>
-          <cbc:ID>VAT</cbc:ID>
-        </cac:TaxScheme>
-      </cac:ClassifiedTaxCategory>
-    </cac:Item>
-    <cac:Price>
-      <cbc:PriceAmount currencyID="USD">990.0</cbc:PriceAmount>
-    </cac:Price>
-  </cac:InvoiceLine>
-</Invoice>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/bis3_out_refund.xml

@@ -7,13 +7,23 @@
   <cbc:CreditNoteTypeCode>381</cbc:CreditNoteTypeCode>
   <cbc:Note>test narration</cbc:Note>
   <cbc:DocumentCurrencyCode>USD</cbc:DocumentCurrencyCode>
+  <cbc:TaxCurrencyCode>EUR</cbc:TaxCurrencyCode>
   <cbc:BuyerReference>ref_partner_2</cbc:BuyerReference>
   <cac:OrderReference>
     <cbc:ID>ref_move</cbc:ID>
   </cac:OrderReference>
+  <cac:AdditionalDocumentReference>
+    <cbc:ID>___ignore___</cbc:ID>
+    <cac:Attachment>
+      <cbc:EmbeddedDocumentBinaryObject>___ignore___</cbc:EmbeddedDocumentBinaryObject>
+    </cac:Attachment>
+  </cac:AdditionalDocumentReference>
   <cac:AccountingSupplierParty>
     <cac:Party>
-      <cbc:EndpointID schemeID="9925">BE0202239951</cbc:EndpointID>
+      <cbc:EndpointID schemeID="0208">0202239951</cbc:EndpointID>
+      <cac:PartyIdentification>
+        <cbc:ID schemeID="0208">0202239951</cbc:ID>
+      </cac:PartyIdentification>
       <cac:PartyName>
         <cbc:Name>partner_1</cbc:Name>
       </cac:PartyName>
@@ -33,7 +43,7 @@
       </cac:PartyTaxScheme>
       <cac:PartyLegalEntity>
         <cbc:RegistrationName>partner_1</cbc:RegistrationName>
-        <cbc:CompanyID>BE0202239951</cbc:CompanyID>
+        <cbc:CompanyID schemeID="0208">0202239951</cbc:CompanyID>
       </cac:PartyLegalEntity>
       <cac:Contact>
         <cbc:Name>partner_1</cbc:Name>
@@ -42,7 +52,10 @@
   </cac:AccountingSupplierParty>
   <cac:AccountingCustomerParty>
     <cac:Party>
-      <cbc:EndpointID schemeID="9925">BE0477472701</cbc:EndpointID>
+      <cbc:EndpointID schemeID="0208">0477472701</cbc:EndpointID>
+      <cac:PartyIdentification>
+        <cbc:ID schemeID="0208">0477472701</cbc:ID>
+      </cac:PartyIdentification>
       <cac:PartyName>
         <cbc:Name>partner_2</cbc:Name>
       </cac:PartyName>
@@ -62,13 +75,30 @@
       </cac:PartyTaxScheme>
       <cac:PartyLegalEntity>
         <cbc:RegistrationName>partner_2</cbc:RegistrationName>
-        <cbc:CompanyID>BE0477472701</cbc:CompanyID>
+        <cbc:CompanyID schemeID="0208">0477472701</cbc:CompanyID>
       </cac:PartyLegalEntity>
       <cac:Contact>
         <cbc:Name>partner_2</cbc:Name>
       </cac:Contact>
     </cac:Party>
   </cac:AccountingCustomerParty>
+  <cac:Delivery>
+    <cac:DeliveryLocation>
+      <cac:Address>
+        <cbc:StreetName>Rue des Bourlottes 9</cbc:StreetName>
+        <cbc:CityName>Ramillies</cbc:CityName>
+        <cbc:PostalZone>1367</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>BE</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:Address>
+    </cac:DeliveryLocation>
+    <cac:DeliveryParty>
+      <cac:PartyName>
+        <cbc:Name>partner_2</cbc:Name>
+      </cac:PartyName>
+    </cac:DeliveryParty>
+  </cac:Delivery>
   <cac:PaymentMeans>
     <cbc:PaymentMeansCode name="standing agreement">57</cbc:PaymentMeansCode>
     <cbc:PaymentID>RINV/2017/01/0001</cbc:PaymentID>
@@ -104,6 +134,9 @@
       </cac:TaxCategory>
     </cac:TaxSubtotal>
   </cac:TaxTotal>
+  <cac:TaxTotal>
+    <cbc:TaxAmount currencyID="EUR">241.11</cbc:TaxAmount>
+  </cac:TaxTotal>
   <cac:LegalMonetaryTotal>
     <cbc:LineExtensionAmount currencyID="USD">2682.00</cbc:LineExtensionAmount>
     <cbc:TaxExclusiveAmount currencyID="USD">2682.00</cbc:TaxExclusiveAmount>
@@ -118,7 +151,10 @@
     <cac:AllowanceCharge>
       <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
       <cbc:AllowanceChargeReasonCode>95</cbc:AllowanceChargeReasonCode>
+      <cbc:AllowanceChargeReason>Discount</cbc:AllowanceChargeReason>
+      <cbc:MultiplierFactorNumeric>10.0</cbc:MultiplierFactorNumeric>
       <cbc:Amount currencyID="USD">198.00</cbc:Amount>
+      <cbc:BaseAmount currencyID="USD">1980.00</cbc:BaseAmount>
     </cac:AllowanceCharge>
     <cac:Item>
       <cbc:Description>product_a</cbc:Description>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/bis3_pay_term.xml

@@ -5,7 +5,7 @@
     <cbc:CustomizationID>urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0
     </cbc:CustomizationID>
     <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
-    <cbc:ID>INV/2017/00002</cbc:ID>
+    <cbc:ID>___ignore___</cbc:ID>
     <cbc:IssueDate>2017-01-01</cbc:IssueDate>
     <cbc:DueDate>2017-01-31</cbc:DueDate>
     <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
@@ -15,9 +15,20 @@
     <cac:OrderReference>
         <cbc:ID>ref_move</cbc:ID>
     </cac:OrderReference>
+    <cac:AdditionalDocumentReference>
+        <cbc:ID>___ignore___</cbc:ID>
+        <cac:Attachment>
+            <cbc:EmbeddedDocumentBinaryObject mimeCode="___ignore___" filename="___ignore___">
+                ___ignore___
+            </cbc:EmbeddedDocumentBinaryObject>
+        </cac:Attachment>
+    </cac:AdditionalDocumentReference>
     <cac:AccountingSupplierParty>
         <cac:Party>
-            <cbc:EndpointID schemeID="9925">BE0202239951</cbc:EndpointID>
+            <cbc:EndpointID schemeID="0208">0202239951</cbc:EndpointID>
+            <cac:PartyIdentification>
+                <cbc:ID schemeID="0208">0202239951</cbc:ID>
+            </cac:PartyIdentification>
             <cac:PartyName>
                 <cbc:Name>partner_1</cbc:Name>
             </cac:PartyName>
@@ -37,7 +48,7 @@
             </cac:PartyTaxScheme>
             <cac:PartyLegalEntity>
                 <cbc:RegistrationName>partner_1</cbc:RegistrationName>
-                <cbc:CompanyID>BE0202239951</cbc:CompanyID>
+                <cbc:CompanyID schemeID="0208">0202239951</cbc:CompanyID>
             </cac:PartyLegalEntity>
             <cac:Contact>
                 <cbc:Name>partner_1</cbc:Name>
@@ -46,7 +57,10 @@
     </cac:AccountingSupplierParty>
     <cac:AccountingCustomerParty>
         <cac:Party>
-            <cbc:EndpointID schemeID="9925">BE0477472701</cbc:EndpointID>
+            <cbc:EndpointID schemeID="0208">0477472701</cbc:EndpointID>
+            <cac:PartyIdentification>
+                <cbc:ID schemeID="0208">0477472701</cbc:ID>
+            </cac:PartyIdentification>
             <cac:PartyName>
                 <cbc:Name>partner_2</cbc:Name>
             </cac:PartyName>
@@ -66,13 +80,30 @@
             </cac:PartyTaxScheme>
             <cac:PartyLegalEntity>
                 <cbc:RegistrationName>partner_2</cbc:RegistrationName>
-                <cbc:CompanyID>BE0477472701</cbc:CompanyID>
+                <cbc:CompanyID schemeID="0208">0477472701</cbc:CompanyID>
             </cac:PartyLegalEntity>
             <cac:Contact>
                 <cbc:Name>partner_2</cbc:Name>
             </cac:Contact>
         </cac:Party>
     </cac:AccountingCustomerParty>
+    <cac:Delivery>
+        <cac:DeliveryLocation>
+            <cac:Address>
+                <cbc:StreetName>Rue des Bourlottes 9</cbc:StreetName>
+                <cbc:CityName>Ramillies</cbc:CityName>
+                <cbc:PostalZone>1367</cbc:PostalZone>
+                <cac:Country>
+                    <cbc:IdentificationCode>BE</cbc:IdentificationCode>
+                </cac:Country>
+            </cac:Address>
+        </cac:DeliveryLocation>
+        <cac:DeliveryParty>
+            <cac:PartyName>
+                <cbc:Name>partner_2</cbc:Name>
+            </cac:PartyName>
+        </cac:DeliveryParty>
+    </cac:Delivery>
     <cac:PaymentMeans>
         <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
         <cbc:PaymentID>___ignore___</cbc:PaymentID>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/bis3_pay_term_ecotax.xml

@@ -1,172 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
-         xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
-         xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
-    <cbc:CustomizationID>urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0
-    </cbc:CustomizationID>
-    <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
-    <cbc:ID>INV/2017/00002</cbc:ID>
-    <cbc:IssueDate>2017-01-01</cbc:IssueDate>
-    <cbc:DueDate>2017-01-31</cbc:DueDate>
-    <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
-    <cbc:Note>test narration</cbc:Note>
-    <cbc:DocumentCurrencyCode>USD</cbc:DocumentCurrencyCode>
-    <cbc:BuyerReference>ref_partner_2</cbc:BuyerReference>
-    <cac:OrderReference>
-        <cbc:ID>ref_move</cbc:ID>
-    </cac:OrderReference>
-    <cac:AccountingSupplierParty>
-        <cac:Party>
-            <cbc:EndpointID schemeID="9925">BE0202239951</cbc:EndpointID>
-            <cac:PartyName>
-                <cbc:Name>partner_1</cbc:Name>
-            </cac:PartyName>
-            <cac:PostalAddress>
-                <cbc:StreetName>Chaussée de Namur 40</cbc:StreetName>
-                <cbc:CityName>Ramillies</cbc:CityName>
-                <cbc:PostalZone>1367</cbc:PostalZone>
-                <cac:Country>
-                    <cbc:IdentificationCode>BE</cbc:IdentificationCode>
-                </cac:Country>
-            </cac:PostalAddress>
-            <cac:PartyTaxScheme>
-                <cbc:CompanyID>BE0202239951</cbc:CompanyID>
-                <cac:TaxScheme>
-                    <cbc:ID>VAT</cbc:ID>
-                </cac:TaxScheme>
-            </cac:PartyTaxScheme>
-            <cac:PartyLegalEntity>
-                <cbc:RegistrationName>partner_1</cbc:RegistrationName>
-                <cbc:CompanyID>BE0202239951</cbc:CompanyID>
-            </cac:PartyLegalEntity>
-            <cac:Contact>
-                <cbc:Name>partner_1</cbc:Name>
-            </cac:Contact>
-        </cac:Party>
-    </cac:AccountingSupplierParty>
-    <cac:AccountingCustomerParty>
-        <cac:Party>
-            <cbc:EndpointID schemeID="9925">BE0477472701</cbc:EndpointID>
-            <cac:PartyName>
-                <cbc:Name>partner_2</cbc:Name>
-            </cac:PartyName>
-            <cac:PostalAddress>
-                <cbc:StreetName>Rue des Bourlottes 9</cbc:StreetName>
-                <cbc:CityName>Ramillies</cbc:CityName>
-                <cbc:PostalZone>1367</cbc:PostalZone>
-                <cac:Country>
-                    <cbc:IdentificationCode>BE</cbc:IdentificationCode>
-                </cac:Country>
-            </cac:PostalAddress>
-            <cac:PartyTaxScheme>
-                <cbc:CompanyID>BE0477472701</cbc:CompanyID>
-                <cac:TaxScheme>
-                    <cbc:ID>VAT</cbc:ID>
-                </cac:TaxScheme>
-            </cac:PartyTaxScheme>
-            <cac:PartyLegalEntity>
-                <cbc:RegistrationName>partner_2</cbc:RegistrationName>
-                <cbc:CompanyID>BE0477472701</cbc:CompanyID>
-            </cac:PartyLegalEntity>
-            <cac:Contact>
-                <cbc:Name>partner_2</cbc:Name>
-            </cac:Contact>
-        </cac:Party>
-    </cac:AccountingCustomerParty>
-    <cac:PaymentMeans>
-        <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
-        <cbc:PaymentID>___ignore___</cbc:PaymentID>
-        <cac:PayeeFinancialAccount>
-            <cbc:ID>BE15001559627230</cbc:ID>
-        </cac:PayeeFinancialAccount>
-    </cac:PaymentMeans>
-    <cac:PaymentTerms>
-        <cbc:Note>Payment terms: 30 Days, 2% Early Payment Discount under 7 days</cbc:Note>
-    </cac:PaymentTerms>
-    <cac:AllowanceCharge>
-        <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
-        <cbc:AllowanceChargeReasonCode>66</cbc:AllowanceChargeReasonCode>
-        <cbc:AllowanceChargeReason>Conditional cash/payment discount</cbc:AllowanceChargeReason>
-        <cbc:Amount currencyID="USD">1.98</cbc:Amount>
-        <cac:TaxCategory>
-            <cbc:ID>S</cbc:ID>
-            <cbc:Percent>21.0</cbc:Percent>
-            <cac:TaxScheme>
-                <cbc:ID>VAT</cbc:ID>
-            </cac:TaxScheme>
-        </cac:TaxCategory>
-    </cac:AllowanceCharge>
-    <cac:AllowanceCharge>
-        <cbc:ChargeIndicator>true</cbc:ChargeIndicator>
-        <cbc:AllowanceChargeReasonCode>ZZZ</cbc:AllowanceChargeReasonCode>
-        <cbc:AllowanceChargeReason>Conditional cash/payment discount</cbc:AllowanceChargeReason>
-        <cbc:Amount currencyID="USD">1.98</cbc:Amount>
-        <cac:TaxCategory>
-            <cbc:ID>E</cbc:ID>
-            <cbc:Percent>0.0</cbc:Percent>
-            <cac:TaxScheme>
-                <cbc:ID>VAT</cbc:ID>
-            </cac:TaxScheme>
-        </cac:TaxCategory>
-    </cac:AllowanceCharge>
-    <cac:TaxTotal>
-        <cbc:TaxAmount currencyID="USD">20.58</cbc:TaxAmount>
-        <cac:TaxSubtotal>
-            <cbc:TaxableAmount currencyID="USD">98.02</cbc:TaxableAmount>
-            <cbc:TaxAmount currencyID="USD">20.58</cbc:TaxAmount>
-            <cac:TaxCategory>
-                <cbc:ID>S</cbc:ID>
-                <cbc:Percent>21.0</cbc:Percent>
-                <cac:TaxScheme>
-                    <cbc:ID>VAT</cbc:ID>
-                </cac:TaxScheme>
-            </cac:TaxCategory>
-        </cac:TaxSubtotal>
-        <cac:TaxSubtotal>
-            <cbc:TaxableAmount currencyID="USD">1.98</cbc:TaxableAmount>
-            <cbc:TaxAmount currencyID="USD">0.00</cbc:TaxAmount>
-            <cac:TaxCategory>
-                <cbc:ID>E</cbc:ID>
-                <cbc:Percent>0.0</cbc:Percent>
-                <cbc:TaxExemptionReason>Exempt from tax</cbc:TaxExemptionReason>
-                <cac:TaxScheme>
-                    <cbc:ID>VAT</cbc:ID>
-                </cac:TaxScheme>
-            </cac:TaxCategory>
-        </cac:TaxSubtotal>
-    </cac:TaxTotal>
-    <cac:LegalMonetaryTotal>
-        <cbc:LineExtensionAmount currencyID="USD">100.00</cbc:LineExtensionAmount>
-        <cbc:TaxExclusiveAmount currencyID="USD">100.00</cbc:TaxExclusiveAmount>
-        <cbc:TaxInclusiveAmount currencyID="USD">120.58</cbc:TaxInclusiveAmount>
-        <cbc:AllowanceTotalAmount currencyID="USD">1.98</cbc:AllowanceTotalAmount>
-        <cbc:ChargeTotalAmount currencyID="USD">1.98</cbc:ChargeTotalAmount>
-        <cbc:PrepaidAmount currencyID="USD">0.00</cbc:PrepaidAmount>
-        <cbc:PayableAmount currencyID="USD">120.58</cbc:PayableAmount>
-    </cac:LegalMonetaryTotal>
-    <cac:InvoiceLine>
-        <cbc:ID>___ignore___</cbc:ID>
-        <cbc:InvoicedQuantity unitCode="C62">1.0</cbc:InvoicedQuantity>
-        <cbc:LineExtensionAmount currencyID="USD">100.00</cbc:LineExtensionAmount>
-        <cac:AllowanceCharge>
-            <cbc:ChargeIndicator>true</cbc:ChargeIndicator>
-            <cbc:AllowanceChargeReasonCode>AEO</cbc:AllowanceChargeReasonCode>
-            <cbc:AllowanceChargeReason>RECUPEL</cbc:AllowanceChargeReason>
-            <cbc:Amount currencyID="USD">1.00</cbc:Amount>
-        </cac:AllowanceCharge>
-        <cac:Item>
-            <cbc:Description>product_a</cbc:Description>
-            <cbc:Name>product_a</cbc:Name>
-            <cac:ClassifiedTaxCategory>
-                <cbc:ID>S</cbc:ID>
-                <cbc:Percent>21.0</cbc:Percent>
-                <cac:TaxScheme>
-                    <cbc:ID>VAT</cbc:ID>
-                </cac:TaxScheme>
-            </cac:ClassifiedTaxCategory>
-        </cac:Item>
-        <cac:Price>
-            <cbc:PriceAmount currencyID="USD">99.0</cbc:PriceAmount>
-        </cac:Price>
-    </cac:InvoiceLine>
-</Invoice>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/facturx_ecotaxes_case1.xml

@@ -65,7 +65,7 @@
                         <ram:CompleteNumber>+1 (650) 555-0111</ram:CompleteNumber>
                     </ram:TelephoneUniversalCommunication>
                     <ram:EmailURIUniversalCommunication>
-                        <ram:URIID schemeID="SMTP">partner1@yourcompany.com</ram:URIID>
+                        <ram:URIID>partner1@yourcompany.com</ram:URIID>
                     </ram:EmailURIUniversalCommunication>
                 </ram:DefinedTradeContact>
                 <ram:PostalTradeAddress>
@@ -133,6 +133,14 @@
                 <ram:DueDateTypeCode>5</ram:DueDateTypeCode>
                 <ram:RateApplicablePercent>21.0</ram:RateApplicablePercent>
             </ram:ApplicableTradeTax>
+            <ram:BillingSpecifiedPeriod>
+                <ram:StartDateTime>
+                    <udt:DateTimeString format="102">20170101</udt:DateTimeString>
+                </ram:StartDateTime>
+                <ram:EndDateTime>
+                    <udt:DateTimeString format="102">20170228</udt:DateTimeString>
+                </ram:EndDateTime>
+            </ram:BillingSpecifiedPeriod>
             <ram:SpecifiedTradePaymentTerms>
                 <ram:Description>30% Advance End of Following Month</ram:Description>
                 <ram:DueDateDateTime>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/facturx_ecotaxes_case2.xml

@@ -73,7 +73,7 @@
                         <ram:CompleteNumber>+1 (650) 555-0111</ram:CompleteNumber>
                     </ram:TelephoneUniversalCommunication>
                     <ram:EmailURIUniversalCommunication>
-                        <ram:URIID schemeID="SMTP">partner1@yourcompany.com</ram:URIID>
+                        <ram:URIID>partner1@yourcompany.com</ram:URIID>
                     </ram:EmailURIUniversalCommunication>
                 </ram:DefinedTradeContact>
                 <ram:PostalTradeAddress>
@@ -141,6 +141,14 @@
                 <ram:DueDateTypeCode>5</ram:DueDateTypeCode>
                 <ram:RateApplicablePercent>21.0</ram:RateApplicablePercent>
             </ram:ApplicableTradeTax>
+            <ram:BillingSpecifiedPeriod>
+                <ram:StartDateTime>
+                    <udt:DateTimeString format="102">20170101</udt:DateTimeString>
+                </ram:StartDateTime>
+                <ram:EndDateTime>
+                    <udt:DateTimeString format="102">20170228</udt:DateTimeString>
+                </ram:EndDateTime>
+            </ram:BillingSpecifiedPeriod>
             <ram:SpecifiedTradePaymentTerms>
                 <ram:Description>30% Advance End of Following Month</ram:Description>
                 <ram:DueDateDateTime>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/facturx_ecotaxes_case3.xml

@@ -65,7 +65,7 @@
                         <ram:CompleteNumber>+1 (650) 555-0111</ram:CompleteNumber>
                     </ram:TelephoneUniversalCommunication>
                     <ram:EmailURIUniversalCommunication>
-                        <ram:URIID schemeID="SMTP">partner1@yourcompany.com</ram:URIID>
+                        <ram:URIID>partner1@yourcompany.com</ram:URIID>
                     </ram:EmailURIUniversalCommunication>
                 </ram:DefinedTradeContact>
                 <ram:PostalTradeAddress>
@@ -133,6 +133,14 @@
                 <ram:DueDateTypeCode>5</ram:DueDateTypeCode>
                 <ram:RateApplicablePercent>21.0</ram:RateApplicablePercent>
             </ram:ApplicableTradeTax>
+            <ram:BillingSpecifiedPeriod>
+                <ram:StartDateTime>
+                    <udt:DateTimeString format="102">20170101</udt:DateTimeString>
+                </ram:StartDateTime>
+                <ram:EndDateTime>
+                    <udt:DateTimeString format="102">20170228</udt:DateTimeString>
+                </ram:EndDateTime>
+            </ram:BillingSpecifiedPeriod>
             <ram:SpecifiedTradePaymentTerms>
                 <ram:Description>30% Advance End of Following Month</ram:Description>
                 <ram:DueDateDateTime>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/facturx_out_invoice.xml

@@ -119,7 +119,7 @@
             <ram:CompleteNumber>+1 (650) 555-0111</ram:CompleteNumber>
           </ram:TelephoneUniversalCommunication>
           <ram:EmailURIUniversalCommunication>
-            <ram:URIID schemeID="SMTP">partner1@yourcompany.com</ram:URIID>
+            <ram:URIID>partner1@yourcompany.com</ram:URIID>
           </ram:EmailURIUniversalCommunication>
         </ram:DefinedTradeContact>
         <ram:PostalTradeAddress>
@@ -195,6 +195,14 @@
         <ram:DueDateTypeCode>5</ram:DueDateTypeCode>
         <ram:RateApplicablePercent>12.0</ram:RateApplicablePercent>
       </ram:ApplicableTradeTax>
+      <ram:BillingSpecifiedPeriod>
+        <ram:StartDateTime>
+          <udt:DateTimeString format="102">20170101</udt:DateTimeString>
+        </ram:StartDateTime>
+        <ram:EndDateTime>
+          <udt:DateTimeString format="102">20170228</udt:DateTimeString>
+        </ram:EndDateTime>
+      </ram:BillingSpecifiedPeriod>
       <ram:SpecifiedTradePaymentTerms>
         <ram:Description>30% Advance End of Following Month</ram:Description>
         <ram:DueDateDateTime>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/facturx_out_invoice_tax_incl.xml

@@ -154,7 +154,7 @@
             <ram:CompleteNumber>+1 (650) 555-0111</ram:CompleteNumber>
           </ram:TelephoneUniversalCommunication>
           <ram:EmailURIUniversalCommunication>
-            <ram:URIID schemeID="SMTP">partner1@yourcompany.com</ram:URIID>
+            <ram:URIID>partner1@yourcompany.com</ram:URIID>
           </ram:EmailURIUniversalCommunication>
         </ram:DefinedTradeContact>
         <ram:PostalTradeAddress>
@@ -222,6 +222,14 @@
         <ram:DueDateTypeCode>5</ram:DueDateTypeCode>
         <ram:RateApplicablePercent>5.0</ram:RateApplicablePercent>
       </ram:ApplicableTradeTax>
+      <ram:BillingSpecifiedPeriod>
+        <ram:StartDateTime>
+          <udt:DateTimeString format="102">20170101</udt:DateTimeString>
+        </ram:StartDateTime>
+        <ram:EndDateTime>
+          <udt:DateTimeString format="102">20170228</udt:DateTimeString>
+        </ram:EndDateTime>
+      </ram:BillingSpecifiedPeriod>
       <ram:SpecifiedTradePaymentTerms>
         <ram:Description>30% Advance End of Following Month</ram:Description>
         <ram:DueDateDateTime>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/facturx_out_refund.xml

@@ -119,7 +119,7 @@
             <ram:CompleteNumber>+1 (650) 555-0111</ram:CompleteNumber>
           </ram:TelephoneUniversalCommunication>
           <ram:EmailURIUniversalCommunication>
-            <ram:URIID schemeID="SMTP">partner1@yourcompany.com</ram:URIID>
+            <ram:URIID>partner1@yourcompany.com</ram:URIID>
           </ram:EmailURIUniversalCommunication>
         </ram:DefinedTradeContact>
         <ram:PostalTradeAddress>
@@ -194,6 +194,14 @@
         <ram:DueDateTypeCode>5</ram:DueDateTypeCode>
         <ram:RateApplicablePercent>12.0</ram:RateApplicablePercent>
       </ram:ApplicableTradeTax>
+      <ram:BillingSpecifiedPeriod>
+        <ram:StartDateTime>
+          <udt:DateTimeString format="102">20170101</udt:DateTimeString>
+        </ram:StartDateTime>
+        <ram:EndDateTime>
+          <udt:DateTimeString format="102">20170228</udt:DateTimeString>
+        </ram:EndDateTime>
+      </ram:BillingSpecifiedPeriod>
       <ram:SpecifiedTradePaymentTerms>
         <ram:Description>30% Advance End of Following Month</ram:Description>
         <ram:DueDateDateTime>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/facturx_positive_discount_price_unit.xml

@@ -0,0 +1,179 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rsm:CrossIndustryInvoice xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100">
+  <rsm:ExchangedDocumentContext>
+    <ram:GuidelineSpecifiedDocumentContextParameter>
+      <ram:ID>urn:cen.eu:en16931:2017#conformant#urn:factur-x.eu:1p0:extended</ram:ID>
+    </ram:GuidelineSpecifiedDocumentContextParameter>
+  </rsm:ExchangedDocumentContext>
+  <rsm:ExchangedDocument>
+    <ram:ID>INV/2017/00001</ram:ID>
+    <ram:TypeCode>380</ram:TypeCode>
+    <ram:IssueDateTime>
+      <udt:DateTimeString format="102">20170101</udt:DateTimeString>
+    </ram:IssueDateTime>
+    <ram:IncludedNote>
+      <ram:Content>test narration</ram:Content>
+    </ram:IncludedNote>
+  </rsm:ExchangedDocument>
+  <rsm:SupplyChainTradeTransaction>
+    <ram:IncludedSupplyChainTradeLineItem>
+      <ram:AssociatedDocumentLineDocument>
+        <ram:LineID>1</ram:LineID>
+      </ram:AssociatedDocumentLineDocument>
+      <ram:SpecifiedTradeProduct>
+        <ram:Name>product_a</ram:Name>
+      </ram:SpecifiedTradeProduct>
+      <ram:SpecifiedLineTradeAgreement>
+        <ram:GrossPriceProductTradePrice>
+          <ram:ChargeAmount>100.00</ram:ChargeAmount>
+        </ram:GrossPriceProductTradePrice>
+        <ram:NetPriceProductTradePrice>
+          <ram:ChargeAmount>100.00</ram:ChargeAmount>
+        </ram:NetPriceProductTradePrice>
+      </ram:SpecifiedLineTradeAgreement>
+      <ram:SpecifiedLineTradeDelivery>
+        <ram:BilledQuantity unitCode="C62">1.0</ram:BilledQuantity>
+      </ram:SpecifiedLineTradeDelivery>
+      <ram:SpecifiedLineTradeSettlement>
+        <ram:ApplicableTradeTax>
+          <ram:TypeCode>VAT</ram:TypeCode>
+          <ram:CategoryCode>S</ram:CategoryCode>
+          <ram:RateApplicablePercent>20.0</ram:RateApplicablePercent>
+        </ram:ApplicableTradeTax>
+        <ram:SpecifiedTradeSettlementLineMonetarySummation>
+          <ram:LineTotalAmount>100.00</ram:LineTotalAmount>
+        </ram:SpecifiedTradeSettlementLineMonetarySummation>
+      </ram:SpecifiedLineTradeSettlement>
+    </ram:IncludedSupplyChainTradeLineItem>
+    <ram:IncludedSupplyChainTradeLineItem>
+      <ram:AssociatedDocumentLineDocument>
+        <ram:LineID>2</ram:LineID>
+      </ram:AssociatedDocumentLineDocument>
+      <ram:SpecifiedTradeProduct>
+        <ram:Name>product_b</ram:Name>
+      </ram:SpecifiedTradeProduct>
+      <ram:SpecifiedLineTradeAgreement>
+        <ram:GrossPriceProductTradePrice>
+          <ram:ChargeAmount>50.00</ram:ChargeAmount>
+        </ram:GrossPriceProductTradePrice>
+        <ram:NetPriceProductTradePrice>
+          <ram:ChargeAmount>50.00</ram:ChargeAmount>
+        </ram:NetPriceProductTradePrice>
+      </ram:SpecifiedLineTradeAgreement>
+      <ram:SpecifiedLineTradeDelivery>
+        <ram:BilledQuantity unitCode="DZN">-1.0</ram:BilledQuantity>
+      </ram:SpecifiedLineTradeDelivery>
+      <ram:SpecifiedLineTradeSettlement>
+        <ram:ApplicableTradeTax>
+          <ram:TypeCode>VAT</ram:TypeCode>
+          <ram:CategoryCode>S</ram:CategoryCode>
+          <ram:RateApplicablePercent>20.0</ram:RateApplicablePercent>
+        </ram:ApplicableTradeTax>
+        <ram:SpecifiedTradeSettlementLineMonetarySummation>
+          <ram:LineTotalAmount>-50.00</ram:LineTotalAmount>
+        </ram:SpecifiedTradeSettlementLineMonetarySummation>
+      </ram:SpecifiedLineTradeSettlement>
+    </ram:IncludedSupplyChainTradeLineItem>
+    <ram:ApplicableHeaderTradeAgreement>
+      <ram:BuyerReference>ref_partner_2</ram:BuyerReference>
+      <ram:SellerTradeParty>
+        <ram:Name>partner_1</ram:Name>
+        <ram:DefinedTradeContact>
+          <ram:PersonName>partner_1</ram:PersonName>
+          <ram:TelephoneUniversalCommunication>
+            <ram:CompleteNumber>+1 (650) 555-0111</ram:CompleteNumber>
+          </ram:TelephoneUniversalCommunication>
+          <ram:EmailURIUniversalCommunication>
+            <ram:URIID>partner1@yourcompany.com</ram:URIID>
+          </ram:EmailURIUniversalCommunication>
+        </ram:DefinedTradeContact>
+        <ram:PostalTradeAddress>
+          <ram:PostcodeCode>75000</ram:PostcodeCode>
+          <ram:LineOne>Rue Jean Jaurès, 42</ram:LineOne>
+          <ram:CityName>Paris</ram:CityName>
+          <ram:CountryID>FR</ram:CountryID>
+        </ram:PostalTradeAddress>
+        <ram:SpecifiedTaxRegistration>
+          <ram:ID schemeID="VA">FR05677404089</ram:ID>
+        </ram:SpecifiedTaxRegistration>
+      </ram:SellerTradeParty>
+      <ram:BuyerTradeParty>
+        <ram:Name>partner_2</ram:Name>
+        <ram:DefinedTradeContact>
+          <ram:PersonName>partner_2</ram:PersonName>
+        </ram:DefinedTradeContact>
+        <ram:PostalTradeAddress>
+          <ram:PostcodeCode>52330</ram:PostcodeCode>
+          <ram:LineOne>Rue Charles de Gaulle</ram:LineOne>
+          <ram:CityName>Colombey-les-Deux-Églises</ram:CityName>
+          <ram:CountryID>FR</ram:CountryID>
+        </ram:PostalTradeAddress>
+        <ram:SpecifiedTaxRegistration>
+          <ram:ID schemeID="VA">FR35562153452</ram:ID>
+        </ram:SpecifiedTaxRegistration>
+      </ram:BuyerTradeParty>
+      <ram:BuyerOrderReferencedDocument>
+        <ram:IssuerAssignedID>ref_move</ram:IssuerAssignedID>
+      </ram:BuyerOrderReferencedDocument>
+    </ram:ApplicableHeaderTradeAgreement>
+    <ram:ApplicableHeaderTradeDelivery>
+      <ram:ShipToTradeParty>
+        <ram:Name>partner_2</ram:Name>
+        <ram:DefinedTradeContact>
+          <ram:PersonName>partner_2</ram:PersonName>
+        </ram:DefinedTradeContact>
+        <ram:PostalTradeAddress>
+          <ram:PostcodeCode>52330</ram:PostcodeCode>
+          <ram:LineOne>Rue Charles de Gaulle</ram:LineOne>
+          <ram:CityName>Colombey-les-Deux-Églises</ram:CityName>
+          <ram:CountryID>FR</ram:CountryID>
+        </ram:PostalTradeAddress>
+      </ram:ShipToTradeParty>
+      <ram:ActualDeliverySupplyChainEvent>
+        <ram:OccurrenceDateTime>
+          <udt:DateTimeString format="102">20170101</udt:DateTimeString>
+        </ram:OccurrenceDateTime>
+      </ram:ActualDeliverySupplyChainEvent>
+    </ram:ApplicableHeaderTradeDelivery>
+    <ram:ApplicableHeaderTradeSettlement>
+      <ram:PaymentReference>INV/2017/00001</ram:PaymentReference>
+      <ram:InvoiceCurrencyCode>USD</ram:InvoiceCurrencyCode>
+      <ram:SpecifiedTradeSettlementPaymentMeans>
+        <ram:TypeCode>42</ram:TypeCode>
+        <ram:PayeePartyCreditorFinancialAccount>
+          <ram:ProprietaryID>FR15001559627230</ram:ProprietaryID>
+        </ram:PayeePartyCreditorFinancialAccount>
+      </ram:SpecifiedTradeSettlementPaymentMeans>
+      <ram:ApplicableTradeTax>
+        <ram:CalculatedAmount>10.00</ram:CalculatedAmount>
+        <ram:TypeCode>VAT</ram:TypeCode>
+        <ram:BasisAmount>50.00</ram:BasisAmount>
+        <ram:CategoryCode>S</ram:CategoryCode>
+        <ram:DueDateTypeCode>5</ram:DueDateTypeCode>
+        <ram:RateApplicablePercent>20.0</ram:RateApplicablePercent>
+      </ram:ApplicableTradeTax>
+      <ram:BillingSpecifiedPeriod>
+        <ram:StartDateTime>
+          <udt:DateTimeString format="102">20170101</udt:DateTimeString>
+        </ram:StartDateTime>
+        <ram:EndDateTime>
+          <udt:DateTimeString format="102">20170228</udt:DateTimeString>
+        </ram:EndDateTime>
+      </ram:BillingSpecifiedPeriod>
+      <ram:SpecifiedTradePaymentTerms>
+        <ram:Description>30% Advance End of Following Month</ram:Description>
+        <ram:DueDateDateTime>
+          <udt:DateTimeString format="102">20170228</udt:DateTimeString>
+        </ram:DueDateDateTime>
+      </ram:SpecifiedTradePaymentTerms>
+      <ram:SpecifiedTradeSettlementHeaderMonetarySummation>
+        <ram:LineTotalAmount>50.00</ram:LineTotalAmount>
+        <ram:TaxBasisTotalAmount>50.00</ram:TaxBasisTotalAmount>
+        <ram:TaxTotalAmount currencyID="USD">10.00</ram:TaxTotalAmount>
+        <ram:GrandTotalAmount>60.00</ram:GrandTotalAmount>
+        <ram:TotalPrepaidAmount>0.00</ram:TotalPrepaidAmount>
+        <ram:DuePayableAmount>60.00</ram:DuePayableAmount>
+      </ram:SpecifiedTradeSettlementHeaderMonetarySummation>
+    </ram:ApplicableHeaderTradeSettlement>
+  </rsm:SupplyChainTradeTransaction>
+</rsm:CrossIndustryInvoice>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/facturx_test_import_partner.xml

@@ -51,7 +51,7 @@
                         <ram:CompleteNumber>+1 (650) 555-0111</ram:CompleteNumber>
                     </ram:TelephoneUniversalCommunication>
                     <ram:EmailURIUniversalCommunication>
-                        <ram:URIID schemeID="SMTP">partner1@yourcompany.com</ram:URIID>
+                        <ram:URIID>partner1@yourcompany.com</ram:URIID>
                     </ram:EmailURIUniversalCommunication>
                 </ram:DefinedTradeContact>
                 <ram:PostalTradeAddress>
@@ -72,7 +72,7 @@
                         <ram:CompleteNumber>1111</ram:CompleteNumber>
                     </ram:TelephoneUniversalCommunication>
                     <ram:EmailURIUniversalCommunication>
-                        <ram:URIID schemeID="SMTP">buyer@yahoo.com</ram:URIID>
+                        <ram:URIID>buyer@yahoo.com</ram:URIID>
                     </ram:EmailURIUniversalCommunication>
                 </ram:DefinedTradeContact>
                 <ram:SpecifiedTaxRegistration>
@@ -92,7 +92,7 @@
                         <ram:CompleteNumber>1111</ram:CompleteNumber>
                     </ram:TelephoneUniversalCommunication>
                     <ram:EmailURIUniversalCommunication>
-                        <ram:URIID schemeID="SMTP">buyer@yahoo.com</ram:URIID>
+                        <ram:URIID>buyer@yahoo.com</ram:URIID>
                     </ram:EmailURIUniversalCommunication>
                 </ram:DefinedTradeContact>
             </ram:ShipToTradeParty>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/nlcius_out_invoice.xml

@@ -12,9 +12,18 @@
   <cac:OrderReference>
     <cbc:ID>ref_move</cbc:ID>
   </cac:OrderReference>
+  <cac:AdditionalDocumentReference>
+    <cbc:ID>___ignore___</cbc:ID>
+    <cac:Attachment>
+      <cbc:EmbeddedDocumentBinaryObject>___ignore___</cbc:EmbeddedDocumentBinaryObject>
+   </cac:Attachment>
+  </cac:AdditionalDocumentReference>
   <cac:AccountingSupplierParty>
     <cac:Party>
       <cbc:EndpointID schemeID="0106">77777677</cbc:EndpointID>
+      <cac:PartyIdentification>
+        <cbc:ID>ref_partner_1</cbc:ID>
+      </cac:PartyIdentification>
       <cac:PartyIdentification>
         <cbc:ID>77777677</cbc:ID>
       </cac:PartyIdentification>
@@ -48,9 +57,9 @@
   </cac:AccountingSupplierParty>
   <cac:AccountingCustomerParty>
     <cac:Party>
-      <cbc:EndpointID schemeID="0106">1234567</cbc:EndpointID>
+      <cbc:EndpointID schemeID="9944">NL41452B11</cbc:EndpointID>
       <cac:PartyIdentification>
-        <cbc:ID>1234567</cbc:ID>
+        <cbc:ID>NL41452B11</cbc:ID>
       </cac:PartyIdentification>
       <cac:PartyName>
         <cbc:Name>partner_2</cbc:Name>
@@ -71,13 +80,30 @@
       </cac:PartyTaxScheme>
       <cac:PartyLegalEntity>
         <cbc:RegistrationName>partner_2</cbc:RegistrationName>
-        <cbc:CompanyID schemeID="0106">1234567</cbc:CompanyID>
+        <cbc:CompanyID schemeID="0106">123456789</cbc:CompanyID>
       </cac:PartyLegalEntity>
       <cac:Contact>
         <cbc:Name>partner_2</cbc:Name>
       </cac:Contact>
     </cac:Party>
   </cac:AccountingCustomerParty>
+  <cac:Delivery>
+    <cac:DeliveryLocation>
+      <cac:Address>
+        <cbc:StreetName>Europaweg, 2</cbc:StreetName>
+        <cbc:CityName>Rotterdam</cbc:CityName>
+        <cbc:PostalZone>1200</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>NL</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:Address>
+    </cac:DeliveryLocation>
+    <cac:DeliveryParty>
+      <cac:PartyName>
+        <cbc:Name>partner_2</cbc:Name>
+      </cac:PartyName>
+    </cac:DeliveryParty>
+  </cac:Delivery>
   <cac:PaymentMeans>
     <cbc:PaymentMeansCode>30</cbc:PaymentMeansCode>
     <cbc:PaymentID>INV/2017/00002</cbc:PaymentID>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/nlcius_out_refund.xml

@@ -16,9 +16,18 @@
       <cbc:ID>ref_move</cbc:ID>
     </cac:InvoiceDocumentReference>
   </cac:BillingReference>
+  <cac:AdditionalDocumentReference>
+    <cbc:ID>___ignore___</cbc:ID>
+    <cac:Attachment>
+      <cbc:EmbeddedDocumentBinaryObject>___ignore___</cbc:EmbeddedDocumentBinaryObject>
+    </cac:Attachment>
+  </cac:AdditionalDocumentReference>
   <cac:AccountingSupplierParty>
     <cac:Party>
       <cbc:EndpointID schemeID="0106">77777677</cbc:EndpointID>
+      <cac:PartyIdentification>
+        <cbc:ID>ref_partner_1</cbc:ID>
+      </cac:PartyIdentification>
       <cac:PartyIdentification>
         <cbc:ID>77777677</cbc:ID>
       </cac:PartyIdentification>
@@ -52,9 +61,9 @@
   </cac:AccountingSupplierParty>
   <cac:AccountingCustomerParty>
     <cac:Party>
-      <cbc:EndpointID schemeID="0106">1234567</cbc:EndpointID>
+      <cbc:EndpointID schemeID="9944">NL41452B11</cbc:EndpointID>
       <cac:PartyIdentification>
-        <cbc:ID>1234567</cbc:ID>
+        <cbc:ID>NL41452B11</cbc:ID>
       </cac:PartyIdentification>
       <cac:PartyName>
         <cbc:Name>partner_2</cbc:Name>
@@ -75,13 +84,30 @@
       </cac:PartyTaxScheme>
       <cac:PartyLegalEntity>
         <cbc:RegistrationName>partner_2</cbc:RegistrationName>
-        <cbc:CompanyID schemeID="0106">1234567</cbc:CompanyID>
+        <cbc:CompanyID schemeID="0106">123456789</cbc:CompanyID>
       </cac:PartyLegalEntity>
       <cac:Contact>
         <cbc:Name>partner_2</cbc:Name>
       </cac:Contact>
     </cac:Party>
   </cac:AccountingCustomerParty>
+  <cac:Delivery>
+    <cac:DeliveryLocation>
+      <cac:Address>
+        <cbc:StreetName>Europaweg, 2</cbc:StreetName>
+        <cbc:CityName>Rotterdam</cbc:CityName>
+        <cbc:PostalZone>1200</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>NL</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:Address>
+    </cac:DeliveryLocation>
+    <cac:DeliveryParty>
+      <cac:PartyName>
+        <cbc:Name>partner_2</cbc:Name>
+      </cac:PartyName>
+    </cac:DeliveryParty>
+  </cac:Delivery>
   <cac:PaymentMeans>
     <cbc:PaymentMeansCode>57</cbc:PaymentMeansCode>
     <cbc:PaymentID>RINV/2017/00001</cbc:PaymentID>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/sg_out_invoice.xml

@@ -0,0 +1,190 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
+  <cbc:CustomizationID>urn:cen.eu:en16931:2017#conformant#urn:fdc:peppol.eu:2017:poacc:billing:international:sg:3.0</cbc:CustomizationID>
+  <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
+  <cbc:ID>INV/2017/00001</cbc:ID>
+  <cbc:IssueDate>2017-01-01</cbc:IssueDate>
+  <cbc:DueDate>2017-02-28</cbc:DueDate>
+  <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
+  <cbc:Note>test narration</cbc:Note>
+  <cbc:DocumentCurrencyCode>USD</cbc:DocumentCurrencyCode>
+  <cbc:BuyerReference>ref_partner_2</cbc:BuyerReference>
+  <cac:OrderReference>
+    <cbc:ID>ref_move</cbc:ID>
+  </cac:OrderReference>
+  <cac:AdditionalDocumentReference>
+    <cbc:ID>INV_2017_00001.pdf</cbc:ID>
+    <cac:Attachment>
+      <cbc:EmbeddedDocumentBinaryObject mimeCode="application/pdf" filename="INV_2017_00001.pdf">___ignore___</cbc:EmbeddedDocumentBinaryObject>
+    </cac:Attachment>
+  </cac:AdditionalDocumentReference>
+  <cac:AccountingSupplierParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="0195">197401143C</cbc:EndpointID>
+      <cac:PartyIdentification>
+        <cbc:ID>ref_partner_1</cbc:ID>
+      </cac:PartyIdentification>
+      <cac:PartyName>
+        <cbc:Name>partner_1</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Tyersall Avenue</cbc:StreetName>
+        <cbc:CityName>Central Singapore</cbc:CityName>
+        <cbc:PostalZone>248048</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>SG</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>197401143C</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>GST</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>partner_1</cbc:RegistrationName>
+        <cbc:CompanyID>197401143C</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>partner_1</cbc:Name>
+        <cbc:Telephone>+65 9123 4567</cbc:Telephone>
+        <cbc:ElectronicMail>info@outlook.sg</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingSupplierParty>
+  <cac:AccountingCustomerParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="0195">S16FC0121D</cbc:EndpointID>
+      <cac:PartyIdentification>
+        <cbc:ID>ref_partner_2</cbc:ID>
+      </cac:PartyIdentification>
+      <cac:PartyName>
+        <cbc:Name>partner_2</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>that other street, 3</cbc:StreetName>
+        <cbc:CityName>East Singapore</cbc:CityName>
+        <cbc:PostalZone>248050</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>SG</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>S16FC0121D</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>GST</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>partner_2</cbc:RegistrationName>
+        <cbc:CompanyID>S16FC0121D</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>partner_2</cbc:Name>
+        <cbc:Telephone>+65 9123 4589</cbc:Telephone>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingCustomerParty>
+  <cac:Delivery>
+    <cac:DeliveryLocation>
+      <cac:Address>
+        <cbc:StreetName>that other street, 3</cbc:StreetName>
+        <cbc:CityName>East Singapore</cbc:CityName>
+        <cbc:PostalZone>248050</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>SG</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:Address>
+    </cac:DeliveryLocation>
+    <cac:DeliveryParty>
+      <cac:PartyName>
+        <cbc:Name>partner_2</cbc:Name>
+      </cac:PartyName>
+    </cac:DeliveryParty>
+  </cac:Delivery>
+  <cac:PaymentMeans>
+    <cbc:PaymentMeansCode name="Credit Card">54</cbc:PaymentMeansCode>
+    <cbc:PaymentID>INV/2017/00001</cbc:PaymentID>
+    <cac:PayeeFinancialAccount>
+      <cbc:ID>000099998B57</cbc:ID>
+    </cac:PayeeFinancialAccount>
+  </cac:PaymentMeans>
+  <cac:PaymentTerms>
+    <cbc:Note>Payment terms: 30% Advance End of Following Month</cbc:Note>
+  </cac:PaymentTerms>
+  <cac:TaxTotal>
+    <cbc:TaxAmount currencyID="USD">160.00</cbc:TaxAmount>
+    <cac:TaxSubtotal>
+      <cbc:TaxableAmount currencyID="USD">1600.00</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="USD">160.00</cbc:TaxAmount>
+      <cac:TaxCategory>
+        <cbc:ID>SR</cbc:ID>
+        <cbc:Percent>10.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>GST</cbc:ID>
+        </cac:TaxScheme>
+      </cac:TaxCategory>
+    </cac:TaxSubtotal>
+    <cac:TaxSubtotal>
+      <cbc:TaxableAmount currencyID="USD">1000.00</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="USD">0.00</cbc:TaxAmount>
+      <cac:TaxCategory>
+        <cbc:ID>ZR</cbc:ID>
+        <cbc:Percent>0.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>GST</cbc:ID>
+        </cac:TaxScheme>
+      </cac:TaxCategory>
+    </cac:TaxSubtotal>
+  </cac:TaxTotal>
+  <cac:LegalMonetaryTotal>
+    <cbc:LineExtensionAmount currencyID="USD">2600.00</cbc:LineExtensionAmount>
+    <cbc:TaxExclusiveAmount currencyID="USD">2600.00</cbc:TaxExclusiveAmount>
+    <cbc:TaxInclusiveAmount currencyID="USD">2760.00</cbc:TaxInclusiveAmount>
+    <cbc:PrepaidAmount currencyID="USD">0.00</cbc:PrepaidAmount>
+    <cbc:PayableAmount currencyID="USD">2760.00</cbc:PayableAmount>
+  </cac:LegalMonetaryTotal>
+  <cac:InvoiceLine>
+    <cbc:ID>1</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="C62">2.0</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="USD">1600.00</cbc:LineExtensionAmount>
+    <cac:AllowanceCharge>
+      <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+      <cbc:AllowanceChargeReasonCode>95</cbc:AllowanceChargeReasonCode>
+      <cbc:Amount currencyID="USD">400.00</cbc:Amount>
+    </cac:AllowanceCharge>
+    <cac:Item>
+      <cbc:Description>product_a</cbc:Description>
+      <cbc:Name>product_a</cbc:Name>
+      <cac:ClassifiedTaxCategory>
+        <cbc:ID>SR</cbc:ID>
+        <cbc:Percent>10.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>GST</cbc:ID>
+        </cac:TaxScheme>
+      </cac:ClassifiedTaxCategory>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="USD">1000.0</cbc:PriceAmount>
+    </cac:Price>
+  </cac:InvoiceLine>
+  <cac:InvoiceLine>
+    <cbc:ID>2</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="DZN">2.0</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="USD">1000.00</cbc:LineExtensionAmount>
+    <cac:Item>
+      <cbc:Description>product_b</cbc:Description>
+      <cbc:Name>product_b</cbc:Name>
+      <cac:ClassifiedTaxCategory>
+        <cbc:ID>ZR</cbc:ID>
+        <cbc:Percent>0.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>GST</cbc:ID>
+        </cac:TaxScheme>
+      </cac:ClassifiedTaxCategory>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="USD">500.0</cbc:PriceAmount>
+    </cac:Price>
+  </cac:InvoiceLine>
+</Invoice>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/sg_out_refund.xml

@@ -0,0 +1,189 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
+  <cbc:CustomizationID>urn:cen.eu:en16931:2017#conformant#urn:fdc:peppol.eu:2017:poacc:billing:international:sg:3.0</cbc:CustomizationID>
+  <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
+  <cbc:ID>RINV/2017/00001</cbc:ID>
+  <cbc:IssueDate>2017-01-01</cbc:IssueDate>
+  <cbc:CreditNoteTypeCode>381</cbc:CreditNoteTypeCode>
+  <cbc:Note>test narration</cbc:Note>
+  <cbc:DocumentCurrencyCode>USD</cbc:DocumentCurrencyCode>
+  <cbc:BuyerReference>ref_partner_2</cbc:BuyerReference>
+  <cac:OrderReference>
+    <cbc:ID>ref_move</cbc:ID>
+  </cac:OrderReference>
+  <cac:AdditionalDocumentReference>
+    <cbc:ID>RINV_2017_00001.pdf</cbc:ID>
+    <cac:Attachment>
+      <cbc:EmbeddedDocumentBinaryObject mimeCode="application/pdf" filename="RINV_2017_00001.pdf">___ignore___</cbc:EmbeddedDocumentBinaryObject>
+    </cac:Attachment>
+  </cac:AdditionalDocumentReference>
+  <cac:AccountingSupplierParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="0195">197401143C</cbc:EndpointID>
+      <cac:PartyIdentification>
+        <cbc:ID>ref_partner_1</cbc:ID>
+      </cac:PartyIdentification>
+      <cac:PartyName>
+        <cbc:Name>partner_1</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Tyersall Avenue</cbc:StreetName>
+        <cbc:CityName>Central Singapore</cbc:CityName>
+        <cbc:PostalZone>248048</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>SG</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>197401143C</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>GST</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>partner_1</cbc:RegistrationName>
+        <cbc:CompanyID>197401143C</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>partner_1</cbc:Name>
+        <cbc:Telephone>+65 9123 4567</cbc:Telephone>
+        <cbc:ElectronicMail>info@outlook.sg</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingSupplierParty>
+  <cac:AccountingCustomerParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="0195">S16FC0121D</cbc:EndpointID>
+      <cac:PartyIdentification>
+        <cbc:ID>ref_partner_2</cbc:ID>
+      </cac:PartyIdentification>
+      <cac:PartyName>
+        <cbc:Name>partner_2</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>that other street, 3</cbc:StreetName>
+        <cbc:CityName>East Singapore</cbc:CityName>
+        <cbc:PostalZone>248050</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>SG</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>S16FC0121D</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>GST</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>partner_2</cbc:RegistrationName>
+        <cbc:CompanyID>S16FC0121D</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>partner_2</cbc:Name>
+        <cbc:Telephone>+65 9123 4589</cbc:Telephone>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingCustomerParty>
+  <cac:Delivery>
+    <cac:DeliveryLocation>
+      <cac:Address>
+        <cbc:StreetName>that other street, 3</cbc:StreetName>
+        <cbc:CityName>East Singapore</cbc:CityName>
+        <cbc:PostalZone>248050</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>SG</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:Address>
+    </cac:DeliveryLocation>
+    <cac:DeliveryParty>
+      <cac:PartyName>
+        <cbc:Name>partner_2</cbc:Name>
+      </cac:PartyName>
+    </cac:DeliveryParty>
+  </cac:Delivery>
+  <cac:PaymentMeans>
+    <cbc:PaymentMeansCode name="Credit Card">54</cbc:PaymentMeansCode>
+    <cbc:PaymentID>RINV/2017/00001</cbc:PaymentID>
+    <cac:PayeeFinancialAccount>
+      <cbc:ID>93999574162167</cbc:ID>
+    </cac:PayeeFinancialAccount>
+  </cac:PaymentMeans>
+  <cac:PaymentTerms>
+    <cbc:Note>Payment terms: 30% Advance End of Following Month</cbc:Note>
+  </cac:PaymentTerms>
+  <cac:TaxTotal>
+    <cbc:TaxAmount currencyID="USD">160.00</cbc:TaxAmount>
+    <cac:TaxSubtotal>
+      <cbc:TaxableAmount currencyID="USD">1600.00</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="USD">160.00</cbc:TaxAmount>
+      <cac:TaxCategory>
+        <cbc:ID>SR</cbc:ID>
+        <cbc:Percent>10.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>GST</cbc:ID>
+        </cac:TaxScheme>
+      </cac:TaxCategory>
+    </cac:TaxSubtotal>
+    <cac:TaxSubtotal>
+      <cbc:TaxableAmount currencyID="USD">1000.00</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="USD">0.00</cbc:TaxAmount>
+      <cac:TaxCategory>
+        <cbc:ID>ZR</cbc:ID>
+        <cbc:Percent>0.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>GST</cbc:ID>
+        </cac:TaxScheme>
+      </cac:TaxCategory>
+    </cac:TaxSubtotal>
+  </cac:TaxTotal>
+  <cac:LegalMonetaryTotal>
+    <cbc:LineExtensionAmount currencyID="USD">2600.00</cbc:LineExtensionAmount>
+    <cbc:TaxExclusiveAmount currencyID="USD">2600.00</cbc:TaxExclusiveAmount>
+    <cbc:TaxInclusiveAmount currencyID="USD">2760.00</cbc:TaxInclusiveAmount>
+    <cbc:PrepaidAmount currencyID="USD">0.00</cbc:PrepaidAmount>
+    <cbc:PayableAmount currencyID="USD">2760.00</cbc:PayableAmount>
+  </cac:LegalMonetaryTotal>
+  <cac:CreditNoteLine>
+    <cbc:ID>1</cbc:ID>
+    <cbc:CreditedQuantity unitCode="C62">2.0</cbc:CreditedQuantity>
+    <cbc:LineExtensionAmount currencyID="USD">1600.00</cbc:LineExtensionAmount>
+    <cac:AllowanceCharge>
+      <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+      <cbc:AllowanceChargeReasonCode>95</cbc:AllowanceChargeReasonCode>
+      <cbc:Amount currencyID="USD">400.00</cbc:Amount>
+    </cac:AllowanceCharge>
+    <cac:Item>
+      <cbc:Description>product_a</cbc:Description>
+      <cbc:Name>product_a</cbc:Name>
+      <cac:ClassifiedTaxCategory>
+        <cbc:ID>SR</cbc:ID>
+        <cbc:Percent>10.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>GST</cbc:ID>
+        </cac:TaxScheme>
+      </cac:ClassifiedTaxCategory>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="USD">1000.0</cbc:PriceAmount>
+    </cac:Price>
+  </cac:CreditNoteLine>
+  <cac:CreditNoteLine>
+    <cbc:ID>2</cbc:ID>
+    <cbc:CreditedQuantity unitCode="DZN">2.0</cbc:CreditedQuantity>
+    <cbc:LineExtensionAmount currencyID="USD">1000.00</cbc:LineExtensionAmount>
+    <cac:Item>
+      <cbc:Description>product_b</cbc:Description>
+      <cbc:Name>product_b</cbc:Name>
+      <cac:ClassifiedTaxCategory>
+        <cbc:ID>ZR</cbc:ID>
+        <cbc:Percent>0.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>GST</cbc:ID>
+        </cac:TaxScheme>
+      </cac:ClassifiedTaxCategory>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="USD">500.0</cbc:PriceAmount>
+    </cac:Price>
+  </cac:CreditNoteLine>
+</CreditNote>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/ubl_test_import_partner.xml

@@ -17,7 +17,10 @@
     </cac:OrderReference>
     <cac:AccountingSupplierParty>
         <cac:Party>
-            <cbc:EndpointID schemeID="9925">BE0202239951</cbc:EndpointID>
+            <cbc:EndpointID schemeID="0208">0202239951</cbc:EndpointID>
+            <cac:PartyIdentification>
+                <cbc:ID schemeID="0208">0202239951</cbc:ID>
+            </cac:PartyIdentification>
             <cac:PartyName>
                 <cbc:Name>partner_1</cbc:Name>
             </cac:PartyName>
@@ -37,7 +40,7 @@
             </cac:PartyTaxScheme>
             <cac:PartyLegalEntity>
                 <cbc:RegistrationName>partner_1</cbc:RegistrationName>
-                <cbc:CompanyID>BE0202239951</cbc:CompanyID>
+                <cbc:CompanyID schemeID="0208">0202239951</cbc:CompanyID>
             </cac:PartyLegalEntity>
             <cac:Contact>
                 <cbc:Name>partner_1</cbc:Name>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/xrechnung_ubl_out_invoice.xml

@@ -8,13 +8,22 @@
   <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
   <cbc:Note>test narration</cbc:Note>
   <cbc:DocumentCurrencyCode>USD</cbc:DocumentCurrencyCode>
-  <cbc:BuyerReference>ref_partner_2</cbc:BuyerReference>
+  <cbc:BuyerReference>123456789</cbc:BuyerReference>
   <cac:OrderReference>
     <cbc:ID>ref_move</cbc:ID>
   </cac:OrderReference>
+  <cac:AdditionalDocumentReference>
+    <cbc:ID>___ignore___</cbc:ID>
+    <cac:Attachment>
+      <cbc:EmbeddedDocumentBinaryObject>___ignore___</cbc:EmbeddedDocumentBinaryObject>
+   </cac:Attachment>
+  </cac:AdditionalDocumentReference>
   <cac:AccountingSupplierParty>
     <cac:Party>
       <cbc:EndpointID schemeID="9930">DE257486969</cbc:EndpointID>
+      <cac:PartyIdentification>
+        <cbc:ID>ref_partner_1</cbc:ID>
+      </cac:PartyIdentification>
       <cac:PartyName>
         <cbc:Name>partner_1</cbc:Name>
       </cac:PartyName>
@@ -45,7 +54,10 @@
   </cac:AccountingSupplierParty>
   <cac:AccountingCustomerParty>
     <cac:Party>
-      <cbc:EndpointID schemeID="9930">DE186775212</cbc:EndpointID>
+      <cbc:EndpointID schemeID="0204">123456789</cbc:EndpointID>
+      <cac:PartyIdentification>
+        <cbc:ID>ref_partner_2</cbc:ID>
+      </cac:PartyIdentification>
       <cac:PartyName>
         <cbc:Name>partner_2</cbc:Name>
       </cac:PartyName>
@@ -72,6 +84,24 @@
       </cac:Contact>
     </cac:Party>
   </cac:AccountingCustomerParty>
+  <cac:Delivery>
+    <cbc:ActualDeliveryDate>2017-01-01</cbc:ActualDeliveryDate>
+    <cac:DeliveryLocation>
+      <cac:Address>
+        <cbc:StreetName>Europa-Park-Straße 2</cbc:StreetName>
+        <cbc:CityName>Rust</cbc:CityName>
+        <cbc:PostalZone>77977</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>DE</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:Address>
+    </cac:DeliveryLocation>
+    <cac:DeliveryParty>
+      <cac:PartyName>
+        <cbc:Name>partner_2</cbc:Name>
+      </cac:PartyName>
+    </cac:DeliveryParty>
+  </cac:Delivery>
   <cac:PaymentMeans>
     <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
     <cbc:PaymentID>INV/2017/01/0002</cbc:PaymentID>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/xrechnung_ubl_out_invoice_without_vat.xml

@@ -1,119 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
-  <cbc:CustomizationID>urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung_3.0</cbc:CustomizationID>
-  <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
-  <cbc:ID>INV/2017/01/0002</cbc:ID>
-  <cbc:IssueDate>2017-01-01</cbc:IssueDate>
-  <cbc:DueDate>2017-02-28</cbc:DueDate>
-  <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
-  <cbc:Note>test narration</cbc:Note>
-  <cbc:DocumentCurrencyCode>USD</cbc:DocumentCurrencyCode>
-  <cbc:BuyerReference>ref_partner_2</cbc:BuyerReference>
-  <cac:OrderReference>
-    <cbc:ID>ref_move</cbc:ID>
-  </cac:OrderReference>
-  <cac:AccountingSupplierParty>
-    <cac:Party>
-      <cbc:EndpointID schemeID="9930">DE257486969</cbc:EndpointID>
-      <cac:PartyName>
-        <cbc:Name>partner_1</cbc:Name>
-      </cac:PartyName>
-      <cac:PostalAddress>
-        <cbc:StreetName>Legoland-Allee 3</cbc:StreetName>
-        <cbc:CityName>Günzburg</cbc:CityName>
-        <cbc:PostalZone>89312</cbc:PostalZone>
-        <cac:Country>
-          <cbc:IdentificationCode>DE</cbc:IdentificationCode>
-        </cac:Country>
-      </cac:PostalAddress>
-      <cac:PartyTaxScheme>
-        <cbc:CompanyID>DE257486969</cbc:CompanyID>
-        <cac:TaxScheme>
-          <cbc:ID>VAT</cbc:ID>
-        </cac:TaxScheme>
-      </cac:PartyTaxScheme>
-      <cac:PartyLegalEntity>
-        <cbc:RegistrationName>partner_1</cbc:RegistrationName>
-        <cbc:CompanyID>DE257486969</cbc:CompanyID>
-      </cac:PartyLegalEntity>
-      <cac:Contact>
-        <cbc:Name>partner_1</cbc:Name>
-        <cbc:Telephone>+49 180 6 225789</cbc:Telephone>
-        <cbc:ElectronicMail>info@legoland.de</cbc:ElectronicMail>
-      </cac:Contact>
-    </cac:Party>
-  </cac:AccountingSupplierParty>
-  <cac:AccountingCustomerParty>
-    <cac:Party>
-      <cbc:EndpointID schemeID="EM">partner_2@test.test</cbc:EndpointID>
-      <cac:PartyName>
-        <cbc:Name>partner_2</cbc:Name>
-      </cac:PartyName>
-      <cac:PostalAddress>
-        <cbc:StreetName>Europa-Park-Straße 2</cbc:StreetName>
-        <cbc:CityName>Rust</cbc:CityName>
-        <cbc:PostalZone>77977</cbc:PostalZone>
-        <cac:Country>
-          <cbc:IdentificationCode>DE</cbc:IdentificationCode>
-        </cac:Country>
-      </cac:PostalAddress>
-      <cac:PartyLegalEntity>
-        <cbc:RegistrationName>partner_2</cbc:RegistrationName>
-      </cac:PartyLegalEntity>
-      <cac:Contact>
-        <cbc:Name>partner_2</cbc:Name>
-        <cbc:ElectronicMail>partner_2@test.test</cbc:ElectronicMail>
-      </cac:Contact>
-    </cac:Party>
-  </cac:AccountingCustomerParty>
-  <cac:PaymentMeans>
-    <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
-    <cbc:PaymentID>INV/2017/01/0002</cbc:PaymentID>
-    <cac:PayeeFinancialAccount>
-      <cbc:ID>DE48500105176424548921</cbc:ID>
-    </cac:PayeeFinancialAccount>
-  </cac:PaymentMeans>
-  <cac:PaymentTerms>
-    <cbc:Note>Payment terms: 30% Advance End of Following Month</cbc:Note>
-  </cac:PaymentTerms>
-  <cac:TaxTotal>
-    <cbc:TaxAmount currencyID="USD">19.00</cbc:TaxAmount>
-    <cac:TaxSubtotal>
-      <cbc:TaxableAmount currencyID="USD">100.00</cbc:TaxableAmount>
-      <cbc:TaxAmount currencyID="USD">19.00</cbc:TaxAmount>
-      <cac:TaxCategory>
-        <cbc:ID>S</cbc:ID>
-        <cbc:Percent>19.0</cbc:Percent>
-        <cac:TaxScheme>
-          <cbc:ID>VAT</cbc:ID>
-        </cac:TaxScheme>
-      </cac:TaxCategory>
-    </cac:TaxSubtotal>
-  </cac:TaxTotal>
-  <cac:LegalMonetaryTotal>
-    <cbc:LineExtensionAmount currencyID="USD">100.00</cbc:LineExtensionAmount>
-    <cbc:TaxExclusiveAmount currencyID="USD">100.00</cbc:TaxExclusiveAmount>
-    <cbc:TaxInclusiveAmount currencyID="USD">119.00</cbc:TaxInclusiveAmount>
-    <cbc:PrepaidAmount currencyID="USD">0.00</cbc:PrepaidAmount>
-    <cbc:PayableAmount currencyID="USD">119.00</cbc:PayableAmount>
-  </cac:LegalMonetaryTotal>
-  <cac:InvoiceLine>
-    <cbc:ID>1708</cbc:ID>
-    <cbc:InvoicedQuantity unitCode="C62">1.0</cbc:InvoicedQuantity>
-    <cbc:LineExtensionAmount currencyID="USD">100.00</cbc:LineExtensionAmount>
-    <cac:Item>
-      <cbc:Description>product_a</cbc:Description>
-      <cbc:Name>product_a</cbc:Name>
-      <cac:ClassifiedTaxCategory>
-        <cbc:ID>S</cbc:ID>
-        <cbc:Percent>19.0</cbc:Percent>
-        <cac:TaxScheme>
-          <cbc:ID>VAT</cbc:ID>
-        </cac:TaxScheme>
-      </cac:ClassifiedTaxCategory>
-    </cac:Item>
-    <cac:Price>
-      <cbc:PriceAmount currencyID="USD">100.0</cbc:PriceAmount>
-    </cac:Price>
-  </cac:InvoiceLine>
-</Invoice>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/xrechnung_ubl_out_refund.xml

@@ -7,13 +7,22 @@
   <cbc:CreditNoteTypeCode>381</cbc:CreditNoteTypeCode>
   <cbc:Note>test narration</cbc:Note>
   <cbc:DocumentCurrencyCode>USD</cbc:DocumentCurrencyCode>
-  <cbc:BuyerReference>ref_partner_2</cbc:BuyerReference>
+  <cbc:BuyerReference>123456789</cbc:BuyerReference>
   <cac:OrderReference>
     <cbc:ID>ref_move</cbc:ID>
   </cac:OrderReference>
+  <cac:AdditionalDocumentReference>
+    <cbc:ID>___ignore___</cbc:ID>
+    <cac:Attachment>
+      <cbc:EmbeddedDocumentBinaryObject>___ignore___</cbc:EmbeddedDocumentBinaryObject>
+   </cac:Attachment>
+  </cac:AdditionalDocumentReference>
   <cac:AccountingSupplierParty>
     <cac:Party>
       <cbc:EndpointID schemeID="9930">DE257486969</cbc:EndpointID>
+      <cac:PartyIdentification>
+        <cbc:ID>ref_partner_1</cbc:ID>
+      </cac:PartyIdentification>
       <cac:PartyName>
         <cbc:Name>partner_1</cbc:Name>
       </cac:PartyName>
@@ -44,7 +53,10 @@
   </cac:AccountingSupplierParty>
   <cac:AccountingCustomerParty>
     <cac:Party>
-      <cbc:EndpointID schemeID="9930">DE186775212</cbc:EndpointID>
+      <cbc:EndpointID schemeID="0204">123456789</cbc:EndpointID>
+      <cac:PartyIdentification>
+        <cbc:ID>ref_partner_2</cbc:ID>
+      </cac:PartyIdentification>
       <cac:PartyName>
         <cbc:Name>partner_2</cbc:Name>
       </cac:PartyName>
@@ -71,6 +83,24 @@
       </cac:Contact>
     </cac:Party>
   </cac:AccountingCustomerParty>
+  <cac:Delivery>
+    <cbc:ActualDeliveryDate>2017-01-01</cbc:ActualDeliveryDate>
+    <cac:DeliveryLocation>
+      <cac:Address>
+        <cbc:StreetName>Europa-Park-Straße 2</cbc:StreetName>
+        <cbc:CityName>Rust</cbc:CityName>
+        <cbc:PostalZone>77977</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>DE</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:Address>
+    </cac:DeliveryLocation>
+    <cac:DeliveryParty>
+      <cac:PartyName>
+        <cbc:Name>partner_2</cbc:Name>
+      </cac:PartyName>
+    </cac:DeliveryParty>
+  </cac:Delivery>
   <cac:PaymentMeans>
     <cbc:PaymentMeansCode name="standing agreement">57</cbc:PaymentMeansCode>
     <cbc:PaymentID>RINV/2017/01/0001</cbc:PaymentID>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/zugferd_out_invoice.xml

@@ -0,0 +1,222 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rsm:CrossIndustryInvoice xmlns:qdt="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100">
+  <rsm:ExchangedDocumentContext>
+    <ram:GuidelineSpecifiedDocumentContextParameter>
+      <ram:ID>urn:cen.eu:en16931:2017#conformant#urn:zugferd.de:2p2:extended</ram:ID>
+    </ram:GuidelineSpecifiedDocumentContextParameter>
+  </rsm:ExchangedDocumentContext>
+  <rsm:ExchangedDocument>
+    <ram:ID>INV/2017/00001</ram:ID>
+    <ram:TypeCode>380</ram:TypeCode>
+    <ram:IssueDateTime>
+      <udt:DateTimeString format="102">20170101</udt:DateTimeString>
+    </ram:IssueDateTime>
+      <ram:IncludedNote>
+      <ram:Content>test narration</ram:Content>
+    </ram:IncludedNote>
+  </rsm:ExchangedDocument>
+  <rsm:SupplyChainTradeTransaction>
+    <ram:IncludedSupplyChainTradeLineItem>
+      <ram:AssociatedDocumentLineDocument>
+        <ram:LineID>1</ram:LineID>
+      </ram:AssociatedDocumentLineDocument>
+      <ram:SpecifiedTradeProduct>
+        <ram:Name>product_a</ram:Name>
+      </ram:SpecifiedTradeProduct>
+      <ram:SpecifiedLineTradeAgreement>
+        <ram:GrossPriceProductTradePrice>
+          <ram:ChargeAmount>990.00</ram:ChargeAmount>
+          <ram:AppliedTradeAllowanceCharge>
+            <ram:ChargeIndicator>
+              <udt:Indicator>false</udt:Indicator>
+            </ram:ChargeIndicator>
+            <ram:ActualAmount>99.00</ram:ActualAmount>
+          </ram:AppliedTradeAllowanceCharge>
+        </ram:GrossPriceProductTradePrice>
+        <ram:NetPriceProductTradePrice>
+          <ram:ChargeAmount>891.00</ram:ChargeAmount>
+        </ram:NetPriceProductTradePrice>
+      </ram:SpecifiedLineTradeAgreement>
+      <ram:SpecifiedLineTradeDelivery>
+        <ram:BilledQuantity unitCode="DZN">2.0</ram:BilledQuantity>
+      </ram:SpecifiedLineTradeDelivery>
+      <ram:SpecifiedLineTradeSettlement>
+        <ram:ApplicableTradeTax>
+          <ram:TypeCode>VAT</ram:TypeCode>
+          <ram:CategoryCode>S</ram:CategoryCode>
+          <ram:RateApplicablePercent>19.0</ram:RateApplicablePercent>
+        </ram:ApplicableTradeTax>
+        <ram:SpecifiedTradeSettlementLineMonetarySummation>
+          <ram:LineTotalAmount>1782.00</ram:LineTotalAmount>
+        </ram:SpecifiedTradeSettlementLineMonetarySummation>
+      </ram:SpecifiedLineTradeSettlement>
+    </ram:IncludedSupplyChainTradeLineItem>
+    <ram:IncludedSupplyChainTradeLineItem>
+      <ram:AssociatedDocumentLineDocument>
+        <ram:LineID>2</ram:LineID>
+      </ram:AssociatedDocumentLineDocument>
+      <ram:SpecifiedTradeProduct>
+        <ram:Name>product_b</ram:Name>
+      </ram:SpecifiedTradeProduct>
+      <ram:SpecifiedLineTradeAgreement>
+        <ram:GrossPriceProductTradePrice>
+          <ram:ChargeAmount>100.00</ram:ChargeAmount>
+        </ram:GrossPriceProductTradePrice>
+        <ram:NetPriceProductTradePrice>
+          <ram:ChargeAmount>100.00</ram:ChargeAmount>
+        </ram:NetPriceProductTradePrice>
+      </ram:SpecifiedLineTradeAgreement>
+      <ram:SpecifiedLineTradeDelivery>
+        <ram:BilledQuantity unitCode="C62">10.0</ram:BilledQuantity>
+      </ram:SpecifiedLineTradeDelivery>
+      <ram:SpecifiedLineTradeSettlement>
+        <ram:ApplicableTradeTax>
+          <ram:TypeCode>VAT</ram:TypeCode>
+          <ram:CategoryCode>S</ram:CategoryCode>
+          <ram:RateApplicablePercent>7.0</ram:RateApplicablePercent>
+        </ram:ApplicableTradeTax>
+        <ram:SpecifiedTradeSettlementLineMonetarySummation>
+          <ram:LineTotalAmount>1000.00</ram:LineTotalAmount>
+        </ram:SpecifiedTradeSettlementLineMonetarySummation>
+      </ram:SpecifiedLineTradeSettlement>
+    </ram:IncludedSupplyChainTradeLineItem>
+    <ram:IncludedSupplyChainTradeLineItem>
+      <ram:AssociatedDocumentLineDocument>
+        <ram:LineID>3</ram:LineID>
+      </ram:AssociatedDocumentLineDocument>
+      <ram:SpecifiedTradeProduct>
+        <ram:Name>product_b</ram:Name>
+      </ram:SpecifiedTradeProduct>
+      <ram:SpecifiedLineTradeAgreement>
+        <ram:GrossPriceProductTradePrice>
+          <ram:ChargeAmount>100.00</ram:ChargeAmount>
+        </ram:GrossPriceProductTradePrice>
+        <ram:NetPriceProductTradePrice>
+          <ram:ChargeAmount>100.00</ram:ChargeAmount>
+        </ram:NetPriceProductTradePrice>
+      </ram:SpecifiedLineTradeAgreement>
+      <ram:SpecifiedLineTradeDelivery>
+        <ram:BilledQuantity unitCode="C62">-1.0</ram:BilledQuantity>
+      </ram:SpecifiedLineTradeDelivery>
+      <ram:SpecifiedLineTradeSettlement>
+        <ram:ApplicableTradeTax>
+          <ram:TypeCode>VAT</ram:TypeCode>
+          <ram:CategoryCode>S</ram:CategoryCode>
+          <ram:RateApplicablePercent>7.0</ram:RateApplicablePercent>
+        </ram:ApplicableTradeTax>
+        <ram:SpecifiedTradeSettlementLineMonetarySummation>
+          <ram:LineTotalAmount>-100.00</ram:LineTotalAmount>
+        </ram:SpecifiedTradeSettlementLineMonetarySummation>
+      </ram:SpecifiedLineTradeSettlement>
+    </ram:IncludedSupplyChainTradeLineItem>
+    <ram:ApplicableHeaderTradeAgreement>
+      <ram:BuyerReference>ref_partner_2</ram:BuyerReference>
+      <ram:SellerTradeParty>
+        <ram:Name>partner_1</ram:Name>
+        <ram:DefinedTradeContact>
+          <ram:PersonName>partner_1</ram:PersonName>
+          <ram:TelephoneUniversalCommunication>
+            <ram:CompleteNumber>+49 180 6 225789</ram:CompleteNumber>
+          </ram:TelephoneUniversalCommunication>
+          <ram:EmailURIUniversalCommunication>
+            <ram:URIID>info@legoland.de</ram:URIID>
+          </ram:EmailURIUniversalCommunication>
+        </ram:DefinedTradeContact>
+        <ram:PostalTradeAddress>
+          <ram:PostcodeCode>89312</ram:PostcodeCode>
+          <ram:LineOne>Legoland-Allee 3</ram:LineOne>
+          <ram:CityName>Günzburg</ram:CityName>
+          <ram:CountryID>DE</ram:CountryID>
+        </ram:PostalTradeAddress>
+        <ram:SpecifiedTaxRegistration>
+          <ram:ID schemeID="VA">DE257486969</ram:ID>
+        </ram:SpecifiedTaxRegistration>
+      </ram:SellerTradeParty>
+      <ram:BuyerTradeParty>
+        <ram:Name>partner_2</ram:Name>
+        <ram:DefinedTradeContact>
+          <ram:PersonName>partner_2</ram:PersonName>
+        </ram:DefinedTradeContact>
+        <ram:PostalTradeAddress>
+          <ram:PostcodeCode>77977</ram:PostcodeCode>
+          <ram:LineOne>Europa-Park-Straße 2</ram:LineOne>
+          <ram:CityName>Rust</ram:CityName>
+          <ram:CountryID>DE</ram:CountryID>
+        </ram:PostalTradeAddress>
+        <ram:SpecifiedTaxRegistration>
+          <ram:ID schemeID="VA">DE186775212</ram:ID>
+        </ram:SpecifiedTaxRegistration>
+      </ram:BuyerTradeParty>
+      <ram:BuyerOrderReferencedDocument>
+        <ram:IssuerAssignedID>ref_move</ram:IssuerAssignedID>
+      </ram:BuyerOrderReferencedDocument>
+    </ram:ApplicableHeaderTradeAgreement>
+    <ram:ApplicableHeaderTradeDelivery>
+      <ram:ShipToTradeParty>
+        <ram:Name>partner_2</ram:Name>
+        <ram:DefinedTradeContact>
+          <ram:PersonName>partner_2</ram:PersonName>
+        </ram:DefinedTradeContact>
+        <ram:PostalTradeAddress>
+          <ram:PostcodeCode>77977</ram:PostcodeCode>
+          <ram:LineOne>Europa-Park-Straße 2</ram:LineOne>
+          <ram:CityName>Rust</ram:CityName>
+          <ram:CountryID>DE</ram:CountryID>
+        </ram:PostalTradeAddress>
+      </ram:ShipToTradeParty>
+      <ram:ActualDeliverySupplyChainEvent>
+        <ram:OccurrenceDateTime>
+          <udt:DateTimeString format="102">20170101</udt:DateTimeString>
+        </ram:OccurrenceDateTime>
+      </ram:ActualDeliverySupplyChainEvent>
+    </ram:ApplicableHeaderTradeDelivery>
+    <ram:ApplicableHeaderTradeSettlement>
+      <ram:PaymentReference>INV/2017/00001</ram:PaymentReference>
+      <ram:InvoiceCurrencyCode>USD</ram:InvoiceCurrencyCode>
+      <ram:SpecifiedTradeSettlementPaymentMeans>
+        <ram:TypeCode>42</ram:TypeCode>
+        <ram:PayeePartyCreditorFinancialAccount>
+          <ram:IBANID>DE48500105176424548921</ram:IBANID>
+        </ram:PayeePartyCreditorFinancialAccount>
+      </ram:SpecifiedTradeSettlementPaymentMeans>
+      <ram:ApplicableTradeTax>
+        <ram:CalculatedAmount>338.58</ram:CalculatedAmount>
+        <ram:TypeCode>VAT</ram:TypeCode>
+        <ram:BasisAmount>1782.00</ram:BasisAmount>
+        <ram:CategoryCode>S</ram:CategoryCode>
+        <ram:DueDateTypeCode>5</ram:DueDateTypeCode>
+        <ram:RateApplicablePercent>19.0</ram:RateApplicablePercent>
+      </ram:ApplicableTradeTax>
+      <ram:ApplicableTradeTax>
+        <ram:CalculatedAmount>63.00</ram:CalculatedAmount>
+        <ram:TypeCode>VAT</ram:TypeCode>
+        <ram:BasisAmount>900.00</ram:BasisAmount>
+        <ram:CategoryCode>S</ram:CategoryCode>
+        <ram:DueDateTypeCode>5</ram:DueDateTypeCode>
+        <ram:RateApplicablePercent>7.0</ram:RateApplicablePercent>
+      </ram:ApplicableTradeTax>
+      <ram:BillingSpecifiedPeriod>
+        <ram:StartDateTime>
+          <udt:DateTimeString format="102">20170101</udt:DateTimeString>
+        </ram:StartDateTime>
+        <ram:EndDateTime>
+          <udt:DateTimeString format="102">20170228</udt:DateTimeString>
+        </ram:EndDateTime>
+      </ram:BillingSpecifiedPeriod>
+      <ram:SpecifiedTradePaymentTerms>
+          <ram:Description>30% Advance End of Following Month</ram:Description>
+        <ram:DueDateDateTime>
+          <udt:DateTimeString format="102">20170228</udt:DateTimeString>
+        </ram:DueDateDateTime>
+      </ram:SpecifiedTradePaymentTerms>
+      <ram:SpecifiedTradeSettlementHeaderMonetarySummation>
+        <ram:LineTotalAmount>2682.00</ram:LineTotalAmount>
+        <ram:TaxBasisTotalAmount>2682.00</ram:TaxBasisTotalAmount>
+        <ram:TaxTotalAmount currencyID="USD">401.58</ram:TaxTotalAmount>
+        <ram:GrandTotalAmount>3083.58</ram:GrandTotalAmount>
+        <ram:TotalPrepaidAmount>0.00</ram:TotalPrepaidAmount>
+        <ram:DuePayableAmount>3083.58</ram:DuePayableAmount>
+      </ram:SpecifiedTradeSettlementHeaderMonetarySummation>
+    </ram:ApplicableHeaderTradeSettlement>
+  </rsm:SupplyChainTradeTransaction>
+</rsm:CrossIndustryInvoice>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/zugferd_out_invoice_without_vat.xml

@@ -0,0 +1,153 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rsm:CrossIndustryInvoice xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
+  <rsm:ExchangedDocumentContext>
+    <ram:GuidelineSpecifiedDocumentContextParameter>
+      <ram:ID>urn:cen.eu:en16931:2017#conformant#urn:zugferd.de:2p2:extended</ram:ID>
+    </ram:GuidelineSpecifiedDocumentContextParameter>
+  </rsm:ExchangedDocumentContext>
+  <rsm:ExchangedDocument>
+    <ram:ID>INV/2017/00001</ram:ID>
+    <ram:TypeCode>380</ram:TypeCode>
+    <ram:IssueDateTime>
+      <udt:DateTimeString format="102">20170101</udt:DateTimeString>
+    </ram:IssueDateTime>
+      <ram:IncludedNote>
+      <ram:Content>test narration</ram:Content>
+    </ram:IncludedNote>
+  </rsm:ExchangedDocument>
+  <rsm:SupplyChainTradeTransaction>
+    <ram:IncludedSupplyChainTradeLineItem>
+      <ram:AssociatedDocumentLineDocument>
+        <ram:LineID>1</ram:LineID>
+      </ram:AssociatedDocumentLineDocument>
+      <ram:SpecifiedTradeProduct>
+        <ram:Name>product_a</ram:Name>
+      </ram:SpecifiedTradeProduct>
+      <ram:SpecifiedLineTradeAgreement>
+        <ram:GrossPriceProductTradePrice>
+          <ram:ChargeAmount>100.00</ram:ChargeAmount>
+        </ram:GrossPriceProductTradePrice>
+        <ram:NetPriceProductTradePrice>
+          <ram:ChargeAmount>100.00</ram:ChargeAmount>
+        </ram:NetPriceProductTradePrice>
+      </ram:SpecifiedLineTradeAgreement>
+      <ram:SpecifiedLineTradeDelivery>
+        <ram:BilledQuantity unitCode="C62">1.0</ram:BilledQuantity>
+      </ram:SpecifiedLineTradeDelivery>
+      <ram:SpecifiedLineTradeSettlement>
+        <ram:ApplicableTradeTax>
+          <ram:TypeCode>VAT</ram:TypeCode>
+          <ram:CategoryCode>S</ram:CategoryCode>
+          <ram:RateApplicablePercent>19.0</ram:RateApplicablePercent>
+        </ram:ApplicableTradeTax>
+        <ram:SpecifiedTradeSettlementLineMonetarySummation>
+          <ram:LineTotalAmount>100.00</ram:LineTotalAmount>
+        </ram:SpecifiedTradeSettlementLineMonetarySummation>
+      </ram:SpecifiedLineTradeSettlement>
+    </ram:IncludedSupplyChainTradeLineItem>
+    <ram:ApplicableHeaderTradeAgreement>
+      <ram:BuyerReference>ref_partner_2</ram:BuyerReference>
+      <ram:SellerTradeParty>
+        <ram:Name>partner_1</ram:Name>
+        <ram:DefinedTradeContact>
+          <ram:PersonName>partner_1</ram:PersonName>
+          <ram:TelephoneUniversalCommunication>
+            <ram:CompleteNumber>+49 180 6 225789</ram:CompleteNumber>
+          </ram:TelephoneUniversalCommunication>
+          <ram:EmailURIUniversalCommunication>
+            <ram:URIID>info@legoland.de</ram:URIID>
+          </ram:EmailURIUniversalCommunication>
+        </ram:DefinedTradeContact>
+        <ram:PostalTradeAddress>
+          <ram:PostcodeCode>89312</ram:PostcodeCode>
+          <ram:LineOne>Legoland-Allee 3</ram:LineOne>
+          <ram:CityName>Günzburg</ram:CityName>
+          <ram:CountryID>DE</ram:CountryID>
+        </ram:PostalTradeAddress>
+        <ram:SpecifiedTaxRegistration>
+          <ram:ID schemeID="VA">DE257486969</ram:ID>
+        </ram:SpecifiedTaxRegistration>
+      </ram:SellerTradeParty>
+      <ram:BuyerTradeParty>
+        <ram:Name>partner_2</ram:Name>
+        <ram:DefinedTradeContact>
+          <ram:PersonName>partner_2</ram:PersonName>
+          <ram:EmailURIUniversalCommunication>
+            <ram:URIID>partner_2@test.test</ram:URIID>
+          </ram:EmailURIUniversalCommunication>
+        </ram:DefinedTradeContact>
+        <ram:PostalTradeAddress>
+          <ram:PostcodeCode>77977</ram:PostcodeCode>
+          <ram:LineOne>Europa-Park-Straße 2</ram:LineOne>
+          <ram:CityName>Rust</ram:CityName>
+          <ram:CountryID>DE</ram:CountryID>
+        </ram:PostalTradeAddress>
+      </ram:BuyerTradeParty>
+      <ram:BuyerOrderReferencedDocument>
+        <ram:IssuerAssignedID>ref_move</ram:IssuerAssignedID>
+      </ram:BuyerOrderReferencedDocument>
+    </ram:ApplicableHeaderTradeAgreement>
+    <ram:ApplicableHeaderTradeDelivery>
+      <ram:ShipToTradeParty>
+        <ram:Name>partner_2</ram:Name>
+        <ram:DefinedTradeContact>
+          <ram:PersonName>partner_2</ram:PersonName>
+          <ram:EmailURIUniversalCommunication>
+            <ram:URIID>partner_2@test.test</ram:URIID>
+          </ram:EmailURIUniversalCommunication>
+        </ram:DefinedTradeContact>
+        <ram:PostalTradeAddress>
+          <ram:PostcodeCode>77977</ram:PostcodeCode>
+          <ram:LineOne>Europa-Park-Straße 2</ram:LineOne>
+          <ram:CityName>Rust</ram:CityName>
+          <ram:CountryID>DE</ram:CountryID>
+        </ram:PostalTradeAddress>
+      </ram:ShipToTradeParty>
+      <ram:ActualDeliverySupplyChainEvent>
+        <ram:OccurrenceDateTime>
+          <udt:DateTimeString format="102">20170101</udt:DateTimeString>
+        </ram:OccurrenceDateTime>
+      </ram:ActualDeliverySupplyChainEvent>
+    </ram:ApplicableHeaderTradeDelivery>
+    <ram:ApplicableHeaderTradeSettlement>
+      <ram:PaymentReference>INV/2017/00001</ram:PaymentReference>
+      <ram:InvoiceCurrencyCode>USD</ram:InvoiceCurrencyCode>
+      <ram:SpecifiedTradeSettlementPaymentMeans>
+        <ram:TypeCode>42</ram:TypeCode>
+        <ram:PayeePartyCreditorFinancialAccount>
+          <ram:IBANID>DE48500105176424548921</ram:IBANID>
+        </ram:PayeePartyCreditorFinancialAccount>
+      </ram:SpecifiedTradeSettlementPaymentMeans>
+      <ram:ApplicableTradeTax>
+        <ram:CalculatedAmount>19.00</ram:CalculatedAmount>
+        <ram:TypeCode>VAT</ram:TypeCode>
+        <ram:BasisAmount>100.00</ram:BasisAmount>
+        <ram:CategoryCode>S</ram:CategoryCode>
+        <ram:DueDateTypeCode>5</ram:DueDateTypeCode>
+        <ram:RateApplicablePercent>19.0</ram:RateApplicablePercent>
+      </ram:ApplicableTradeTax>
+      <ram:BillingSpecifiedPeriod>
+        <ram:StartDateTime>
+          <udt:DateTimeString format="102">20170101</udt:DateTimeString>
+        </ram:StartDateTime>
+        <ram:EndDateTime>
+          <udt:DateTimeString format="102">20170228</udt:DateTimeString>
+        </ram:EndDateTime>
+      </ram:BillingSpecifiedPeriod>
+      <ram:SpecifiedTradePaymentTerms>
+          <ram:Description>30% Advance End of Following Month</ram:Description>
+        <ram:DueDateDateTime>
+          <udt:DateTimeString format="102">20170228</udt:DateTimeString>
+        </ram:DueDateDateTime>
+      </ram:SpecifiedTradePaymentTerms>
+      <ram:SpecifiedTradeSettlementHeaderMonetarySummation>
+        <ram:LineTotalAmount>100.00</ram:LineTotalAmount>
+        <ram:TaxBasisTotalAmount>100.00</ram:TaxBasisTotalAmount>
+        <ram:TaxTotalAmount currencyID="USD">19.00</ram:TaxTotalAmount>
+        <ram:GrandTotalAmount>119.00</ram:GrandTotalAmount>
+        <ram:TotalPrepaidAmount>0.00</ram:TotalPrepaidAmount>
+        <ram:DuePayableAmount>119.00</ram:DuePayableAmount>
+      </ram:SpecifiedTradeSettlementHeaderMonetarySummation>
+    </ram:ApplicableHeaderTradeSettlement>
+  </rsm:SupplyChainTradeTransaction>
+</rsm:CrossIndustryInvoice>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/zugferd_out_refund.xml

@@ -0,0 +1,221 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rsm:CrossIndustryInvoice xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
+  <rsm:ExchangedDocumentContext>
+    <ram:GuidelineSpecifiedDocumentContextParameter>
+      <ram:ID>urn:cen.eu:en16931:2017#conformant#urn:zugferd.de:2p2:extended</ram:ID>
+    </ram:GuidelineSpecifiedDocumentContextParameter>
+  </rsm:ExchangedDocumentContext>
+  <rsm:ExchangedDocument>
+    <ram:ID>RINV/2017/00001</ram:ID>
+    <ram:TypeCode>381</ram:TypeCode>
+    <ram:IssueDateTime>
+      <udt:DateTimeString format="102">20170101</udt:DateTimeString>
+    </ram:IssueDateTime>
+      <ram:IncludedNote>
+      <ram:Content>test narration</ram:Content>
+    </ram:IncludedNote>
+  </rsm:ExchangedDocument>
+  <rsm:SupplyChainTradeTransaction>
+    <ram:IncludedSupplyChainTradeLineItem>
+      <ram:AssociatedDocumentLineDocument>
+        <ram:LineID>1</ram:LineID>
+      </ram:AssociatedDocumentLineDocument>
+      <ram:SpecifiedTradeProduct>
+        <ram:Name>product_a</ram:Name>
+      </ram:SpecifiedTradeProduct>
+      <ram:SpecifiedLineTradeAgreement>
+        <ram:GrossPriceProductTradePrice>
+          <ram:ChargeAmount>990.00</ram:ChargeAmount>
+          <ram:AppliedTradeAllowanceCharge>
+            <ram:ChargeIndicator>
+              <udt:Indicator>false</udt:Indicator>
+            </ram:ChargeIndicator>
+            <ram:ActualAmount>99.00</ram:ActualAmount>
+          </ram:AppliedTradeAllowanceCharge>
+        </ram:GrossPriceProductTradePrice>
+        <ram:NetPriceProductTradePrice>
+          <ram:ChargeAmount>891.00</ram:ChargeAmount>
+        </ram:NetPriceProductTradePrice>
+      </ram:SpecifiedLineTradeAgreement>
+      <ram:SpecifiedLineTradeDelivery>
+        <ram:BilledQuantity unitCode="DZN">2.0</ram:BilledQuantity>
+      </ram:SpecifiedLineTradeDelivery>
+      <ram:SpecifiedLineTradeSettlement>
+        <ram:ApplicableTradeTax>
+          <ram:TypeCode>VAT</ram:TypeCode>
+          <ram:CategoryCode>S</ram:CategoryCode>
+          <ram:RateApplicablePercent>19.0</ram:RateApplicablePercent>
+        </ram:ApplicableTradeTax>
+        <ram:SpecifiedTradeSettlementLineMonetarySummation>
+          <ram:LineTotalAmount>1782.00</ram:LineTotalAmount>
+        </ram:SpecifiedTradeSettlementLineMonetarySummation>
+      </ram:SpecifiedLineTradeSettlement>
+    </ram:IncludedSupplyChainTradeLineItem>
+    <ram:IncludedSupplyChainTradeLineItem>
+      <ram:AssociatedDocumentLineDocument>
+        <ram:LineID>2</ram:LineID>
+      </ram:AssociatedDocumentLineDocument>
+      <ram:SpecifiedTradeProduct>
+        <ram:Name>product_b</ram:Name>
+      </ram:SpecifiedTradeProduct>
+      <ram:SpecifiedLineTradeAgreement>
+        <ram:GrossPriceProductTradePrice>
+          <ram:ChargeAmount>100.00</ram:ChargeAmount>
+        </ram:GrossPriceProductTradePrice>
+        <ram:NetPriceProductTradePrice>
+          <ram:ChargeAmount>100.00</ram:ChargeAmount>
+        </ram:NetPriceProductTradePrice>
+      </ram:SpecifiedLineTradeAgreement>
+      <ram:SpecifiedLineTradeDelivery>
+        <ram:BilledQuantity unitCode="C62">10.0</ram:BilledQuantity>
+      </ram:SpecifiedLineTradeDelivery>
+      <ram:SpecifiedLineTradeSettlement>
+        <ram:ApplicableTradeTax>
+          <ram:TypeCode>VAT</ram:TypeCode>
+          <ram:CategoryCode>S</ram:CategoryCode>
+          <ram:RateApplicablePercent>7.0</ram:RateApplicablePercent>
+        </ram:ApplicableTradeTax>
+        <ram:SpecifiedTradeSettlementLineMonetarySummation>
+          <ram:LineTotalAmount>1000.00</ram:LineTotalAmount>
+        </ram:SpecifiedTradeSettlementLineMonetarySummation>
+      </ram:SpecifiedLineTradeSettlement>
+    </ram:IncludedSupplyChainTradeLineItem>
+    <ram:IncludedSupplyChainTradeLineItem>
+      <ram:AssociatedDocumentLineDocument>
+        <ram:LineID>3</ram:LineID>
+      </ram:AssociatedDocumentLineDocument>
+      <ram:SpecifiedTradeProduct>
+        <ram:Name>product_b</ram:Name>
+      </ram:SpecifiedTradeProduct>
+      <ram:SpecifiedLineTradeAgreement>
+        <ram:GrossPriceProductTradePrice>
+          <ram:ChargeAmount>100.00</ram:ChargeAmount>
+        </ram:GrossPriceProductTradePrice>
+        <ram:NetPriceProductTradePrice>
+          <ram:ChargeAmount>100.00</ram:ChargeAmount>
+        </ram:NetPriceProductTradePrice>
+      </ram:SpecifiedLineTradeAgreement>
+      <ram:SpecifiedLineTradeDelivery>
+        <ram:BilledQuantity unitCode="C62">-1.0</ram:BilledQuantity>
+      </ram:SpecifiedLineTradeDelivery>
+      <ram:SpecifiedLineTradeSettlement>
+        <ram:ApplicableTradeTax>
+          <ram:TypeCode>VAT</ram:TypeCode>
+          <ram:CategoryCode>S</ram:CategoryCode>
+          <ram:RateApplicablePercent>7.0</ram:RateApplicablePercent>
+        </ram:ApplicableTradeTax>
+        <ram:SpecifiedTradeSettlementLineMonetarySummation>
+          <ram:LineTotalAmount>-100.00</ram:LineTotalAmount>
+        </ram:SpecifiedTradeSettlementLineMonetarySummation>
+      </ram:SpecifiedLineTradeSettlement>
+    </ram:IncludedSupplyChainTradeLineItem>
+    <ram:ApplicableHeaderTradeAgreement>
+      <ram:BuyerReference>ref_partner_2</ram:BuyerReference>
+      <ram:SellerTradeParty>
+        <ram:Name>partner_1</ram:Name>
+        <ram:DefinedTradeContact>
+          <ram:PersonName>partner_1</ram:PersonName>
+          <ram:TelephoneUniversalCommunication>
+            <ram:CompleteNumber>+49 180 6 225789</ram:CompleteNumber>
+          </ram:TelephoneUniversalCommunication>
+          <ram:EmailURIUniversalCommunication>
+            <ram:URIID>info@legoland.de</ram:URIID>
+          </ram:EmailURIUniversalCommunication>
+        </ram:DefinedTradeContact>
+        <ram:PostalTradeAddress>
+          <ram:PostcodeCode>89312</ram:PostcodeCode>
+          <ram:LineOne>Legoland-Allee 3</ram:LineOne>
+          <ram:CityName>Günzburg</ram:CityName>
+          <ram:CountryID>DE</ram:CountryID>
+        </ram:PostalTradeAddress>
+        <ram:SpecifiedTaxRegistration>
+          <ram:ID schemeID="VA">DE257486969</ram:ID>
+        </ram:SpecifiedTaxRegistration>
+      </ram:SellerTradeParty>
+      <ram:BuyerTradeParty>
+        <ram:Name>partner_2</ram:Name>
+        <ram:DefinedTradeContact>
+          <ram:PersonName>partner_2</ram:PersonName>
+        </ram:DefinedTradeContact>
+        <ram:PostalTradeAddress>
+          <ram:PostcodeCode>77977</ram:PostcodeCode>
+          <ram:LineOne>Europa-Park-Straße 2</ram:LineOne>
+          <ram:CityName>Rust</ram:CityName>
+          <ram:CountryID>DE</ram:CountryID>
+        </ram:PostalTradeAddress>
+        <ram:SpecifiedTaxRegistration>
+          <ram:ID schemeID="VA">DE186775212</ram:ID>
+        </ram:SpecifiedTaxRegistration>
+      </ram:BuyerTradeParty>
+      <ram:BuyerOrderReferencedDocument>
+        <ram:IssuerAssignedID>ref_move</ram:IssuerAssignedID>
+      </ram:BuyerOrderReferencedDocument>
+    </ram:ApplicableHeaderTradeAgreement>
+    <ram:ApplicableHeaderTradeDelivery>
+      <ram:ShipToTradeParty>
+        <ram:Name>partner_2</ram:Name>
+        <ram:DefinedTradeContact>
+          <ram:PersonName>partner_2</ram:PersonName>
+        </ram:DefinedTradeContact>
+        <ram:PostalTradeAddress>
+          <ram:PostcodeCode>77977</ram:PostcodeCode>
+          <ram:LineOne>Europa-Park-Straße 2</ram:LineOne>
+          <ram:CityName>Rust</ram:CityName>
+          <ram:CountryID>DE</ram:CountryID>
+        </ram:PostalTradeAddress>
+      </ram:ShipToTradeParty>
+      <ram:ActualDeliverySupplyChainEvent>
+        <ram:OccurrenceDateTime>
+          <udt:DateTimeString format="102">20170101</udt:DateTimeString>
+        </ram:OccurrenceDateTime>
+      </ram:ActualDeliverySupplyChainEvent>
+    </ram:ApplicableHeaderTradeDelivery>
+    <ram:ApplicableHeaderTradeSettlement>
+      <ram:InvoiceCurrencyCode>USD</ram:InvoiceCurrencyCode>
+      <ram:SpecifiedTradeSettlementPaymentMeans>
+        <ram:TypeCode>42</ram:TypeCode>
+        <ram:PayeePartyCreditorFinancialAccount>
+          <ram:IBANID>DE50500105175653254743</ram:IBANID>
+        </ram:PayeePartyCreditorFinancialAccount>
+      </ram:SpecifiedTradeSettlementPaymentMeans>
+      <ram:ApplicableTradeTax>
+        <ram:CalculatedAmount>338.58</ram:CalculatedAmount>
+        <ram:TypeCode>VAT</ram:TypeCode>
+        <ram:BasisAmount>1782.00</ram:BasisAmount>
+        <ram:CategoryCode>S</ram:CategoryCode>
+        <ram:DueDateTypeCode>5</ram:DueDateTypeCode>
+        <ram:RateApplicablePercent>19.0</ram:RateApplicablePercent>
+      </ram:ApplicableTradeTax>
+      <ram:ApplicableTradeTax>
+        <ram:CalculatedAmount>63.00</ram:CalculatedAmount>
+        <ram:TypeCode>VAT</ram:TypeCode>
+        <ram:BasisAmount>900.00</ram:BasisAmount>
+        <ram:CategoryCode>S</ram:CategoryCode>
+        <ram:DueDateTypeCode>5</ram:DueDateTypeCode>
+        <ram:RateApplicablePercent>7.0</ram:RateApplicablePercent>
+      </ram:ApplicableTradeTax>
+      <ram:BillingSpecifiedPeriod>
+        <ram:StartDateTime>
+          <udt:DateTimeString format="102">20170101</udt:DateTimeString>
+        </ram:StartDateTime>
+        <ram:EndDateTime>
+          <udt:DateTimeString format="102">20170228</udt:DateTimeString>
+        </ram:EndDateTime>
+      </ram:BillingSpecifiedPeriod>
+      <ram:SpecifiedTradePaymentTerms>
+          <ram:Description>30% Advance End of Following Month</ram:Description>
+        <ram:DueDateDateTime>
+          <udt:DateTimeString format="102">20170228</udt:DateTimeString>
+        </ram:DueDateDateTime>
+      </ram:SpecifiedTradePaymentTerms>
+      <ram:SpecifiedTradeSettlementHeaderMonetarySummation>
+        <ram:LineTotalAmount>2682.00</ram:LineTotalAmount>
+        <ram:TaxBasisTotalAmount>2682.00</ram:TaxBasisTotalAmount>
+        <ram:TaxTotalAmount currencyID="USD">401.58</ram:TaxTotalAmount>
+        <ram:GrandTotalAmount>3083.58</ram:GrandTotalAmount>
+        <ram:TotalPrepaidAmount>0.00</ram:TotalPrepaidAmount>
+        <ram:DuePayableAmount>3083.58</ram:DuePayableAmount>
+      </ram:SpecifiedTradeSettlementHeaderMonetarySummation>
+    </ram:ApplicableHeaderTradeSettlement>
+  </rsm:SupplyChainTradeTransaction>
+</rsm:CrossIndustryInvoice>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_peppol-bis-invoice-3_doc/bis3_allowance.xml

@@ -23,7 +23,6 @@
     </cac:ContractDocumentReference>
     <cac:AdditionalDocumentReference>
         <cbc:ID schemeID="ABT">DR35141</cbc:ID>
-        <cbc:DocumentTypeCode>130</cbc:DocumentTypeCode>
     </cac:AdditionalDocumentReference>
     <cac:AdditionalDocumentReference>
         <cbc:ID>ts12345</cbc:ID>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_files/from_peppol-bis-invoice-3_doc/bis3_invoice_ignore_lineextensionamount.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+  xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+  xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+  <cbc:CustomizationID>urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0</cbc:CustomizationID>
+  <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
+  <cbc:ID>Correction1</cbc:ID>
+  <cbc:IssueDate>2017-11-13</cbc:IssueDate>
+  <cbc:DueDate>2017-12-01</cbc:DueDate>
+  <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
+  <cbc:DocumentCurrencyCode>EUR</cbc:DocumentCurrencyCode>
+
+  <cac:InvoiceLine>
+    <cbc:ID>1</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="DAY">1</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="EUR"/>
+    <cac:Item>
+      <cbc:Description>Empty line extension amount</cbc:Description>
+      <cbc:Name>Item empty</cbc:Name>
+    </cac:Item>
+  </cac:InvoiceLine>
+
+  <cac:InvoiceLine>
+    <cbc:ID>2</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="DAY">1</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="EUR">0</cbc:LineExtensionAmount>
+    <cac:Item>
+      <cbc:Description>Zero line extension amount</cbc:Description>
+      <cbc:Name>Item zero</cbc:Name>
+    </cac:Item>
+  </cac:InvoiceLine>
+
+  <cac:InvoiceLine>
+    <cbc:ID>3</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="DAY">1</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="EUR">1000</cbc:LineExtensionAmount>
+    <cac:Item>
+      <cbc:Description>Non zero line extension amount</cbc:Description>
+      <cbc:Name>Item with price</cbc:Name>
+    </cac:Item>
+  </cac:InvoiceLine>
+
+</Invoice>

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_xml_cii_fr.py

@@ -7,11 +7,9 @@ from odoo.tests import tagged
 class TestCIIFR(TestUBLCommon):
 
     @classmethod
-    def setUpClass(cls,
-                   chart_template_ref="l10n_fr.l10n_fr_pcg_chart_template",
-                   edi_format_ref="account_edi_ubl_cii.edi_facturx_1_0_05",
-                   ):
-        super().setUpClass(chart_template_ref=chart_template_ref, edi_format_ref=edi_format_ref)
+    @TestUBLCommon.setup_country('fr')
+    def setUpClass(cls):
+        super().setUpClass()
 
         cls.partner_1 = cls.env['res.partner'].create({
             'name': "partner_1",
@@ -20,10 +18,11 @@ class TestCIIFR(TestUBLCommon):
             'city': "Paris",
             'vat': 'FR05677404089',
             'country_id': cls.env.ref('base.fr').id,
-            'bank_ids': [(0, 0, {'acc_number': 'FR15001559627230'})],
+            'bank_ids': [(0, 0, {'acc_number': 'FR15001559627230', 'allow_out_payment': True})],
             'phone': '+1 (650) 555-0111',
             'email': "partner1@yourcompany.com",
             'ref': 'ref_partner_1',
+            'invoice_edi_format': 'facturx',
         })
 
         cls.partner_2 = cls.env['res.partner'].create({
@@ -33,8 +32,9 @@ class TestCIIFR(TestUBLCommon):
             'city': "Colombey-les-Deux-Églises",
             'vat': 'FR35562153452',
             'country_id': cls.env.ref('base.fr').id,
-            'bank_ids': [(0, 0, {'acc_number': 'FR90735788866632'})],
+            'bank_ids': [(0, 0, {'acc_number': 'FR90735788866632', 'allow_out_payment': True})],
             'ref': 'ref_partner_2',
+            'invoice_edi_format': 'facturx',
         })
 
         cls.tax_21 = cls.env['account.tax'].create({
@@ -96,21 +96,18 @@ class TestCIIFR(TestUBLCommon):
             'amount_type': 'percent',
             'amount': 5,
             'type_tax_use': 'sale',
-            'price_include': True,
+            'price_include_override': 'tax_included',
         })
 
     @classmethod
-    def setup_company_data(cls, company_name, chart_template):
-        # OVERRIDE
-        # to force the company to be french
-        res = super().setup_company_data(
-            company_name,
-            chart_template=chart_template,
-            country_id=cls.env.ref("base.fr").id,
+    def setup_independent_company(cls, **kwargs):
+        return super().setup_independent_company(
             phone='+1 (650) 555-0111',  # [BR-DE-6] "Seller contact telephone number" (BT-42) is required
             email="info@yourcompany.com",  # [BR-DE-7] The element "Seller contact email address" (BT-43) is required
+            vat='FR23334175221', # [BR-CO-26]-In order for the buyer to automatically ...
+            zip='123', # [BR-DE-4] The element "Seller post code" (BT-38) must be transmitted.
+            **kwargs,
         )
-        return res
 
     ####################################################
     # Test export - import
@@ -120,27 +117,27 @@ class TestCIIFR(TestUBLCommon):
         acc_bank = self.env['res.partner.bank'].create({
             'acc_number': 'FR15001559627231',
             'partner_id': self.company_data['company'].partner_id.id,
+            'allow_out_payment': True,
         })
-        invoice = self.env['account.move'].create({
-            'move_type': 'out_invoice',
-            'journal_id': self.journal.id,
-            'partner_id': self.partner_1.id,
-            'partner_bank_id': acc_bank.id,
-            'invoice_date': '2017-01-01',
-            'date': '2017-01-01',
-            'currency_id': self.currency_data['currency'].id,
-            'invoice_line_ids': [(0, 0, {
+
+        invoice = self._generate_move(
+            self.partner_1,
+            self.partner_2,
+            move_type='out_invoice',
+            partner_bank_id=acc_bank.id,
+            invoice_line_ids=[{
                 'product_id': self.product_a.id,
                 'product_uom_id': self.env.ref('uom.product_uom_dozen').id,
                 'price_unit': 275.0,
                 'quantity': 5,
                 'discount': 20.0,
                 'tax_ids': [(6, 0, self.tax_21.ids)],
-            })],
-        })
-        invoice.action_post()
-        pdf_attachment = invoice._get_edi_attachment(self.edi_format)
-        self.assertEqual(pdf_attachment['name'], 'factur-x.xml')
+            }],
+        )
+
+        pdf_attachment = invoice.ubl_cii_xml_id
+        facturx_filename = self.env['account.edi.xml.cii']._export_invoice_filename(invoice)
+        self.assertEqual(pdf_attachment['name'], facturx_filename)
 
     def test_export_import_invoice(self):
         invoice = self._generate_move(
@@ -173,21 +170,22 @@ class TestCIIFR(TestUBLCommon):
             ],
         )
         attachment = self._assert_invoice_attachment(
-            invoice,
+            invoice.ubl_cii_xml_id,
             xpaths='''
                 <xpath expr="./*[local-name()='ExchangedDocument']/*[local-name()='ID']" position="replace">
-                        <ID>___ignore___</ID>
+                        <ram:ID xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100">___ignore___</ram:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='IssuerAssignedID']" position="replace">
-                        <IssuerAssignedID>___ignore___</IssuerAssignedID>
+                        <ram:IssuerAssignedID xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100">___ignore___</ram:IssuerAssignedID>
                 </xpath>
                 <xpath expr=".//*[local-name()='PaymentReference']" position="replace">
-                        <PaymentReference>___ignore___</PaymentReference>
+                        <ram:PaymentReference xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100">___ignore___</ram:PaymentReference>
                 </xpath>
             ''',
-            expected_file='from_odoo/facturx_out_invoice.xml',
+            expected_file_path='from_odoo/facturx_out_invoice.xml',
         )
-        self.assertEqual(attachment.name, "factur-x.xml")
+        facturx_filename = self.env['account.edi.xml.cii']._export_invoice_filename(invoice)
+        self.assertEqual(attachment.name, facturx_filename)
         self._assert_imported_invoice_from_etree(invoice, attachment)
 
     def test_export_import_refund(self):
@@ -221,18 +219,19 @@ class TestCIIFR(TestUBLCommon):
             ],
         )
         attachment = self._assert_invoice_attachment(
-            refund,
+            refund.ubl_cii_xml_id,
             xpaths='''
                 <xpath expr="./*[local-name()='ExchangedDocument']/*[local-name()='ID']" position="replace">
-                        <ID>___ignore___</ID>
+                        <ram:ID xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100">___ignore___</ram:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='IssuerAssignedID']" position="replace">
-                        <IssuerAssignedID>___ignore___</IssuerAssignedID>
+                        <ram:IssuerAssignedID xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100">___ignore___</ram:IssuerAssignedID>
                 </xpath>
             ''',
-            expected_file='from_odoo/facturx_out_refund.xml'
+            expected_file_path='from_odoo/facturx_out_refund.xml'
         )
-        self.assertEqual(attachment.name, "factur-x.xml")
+        facturx_filename = self.env['account.edi.xml.cii']._export_invoice_filename(refund)
+        self.assertEqual(attachment.name, facturx_filename)
         self._assert_imported_invoice_from_etree(refund, attachment)
 
     def test_export_tax_included(self):
@@ -274,20 +273,27 @@ class TestCIIFR(TestUBLCommon):
             ],
         )
         self._assert_invoice_attachment(
-            invoice,
+            invoice.ubl_cii_xml_id,
             xpaths='''
                 <xpath expr="./*[local-name()='ExchangedDocument']/*[local-name()='ID']" position="replace">
-                        <ID>___ignore___</ID>
+                        <ram:ID xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100">___ignore___</ram:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='IssuerAssignedID']" position="replace">
-                        <IssuerAssignedID>___ignore___</IssuerAssignedID>
+                        <ram:IssuerAssignedID xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100">___ignore___</ram:IssuerAssignedID>
                 </xpath>
             ''',
-            expected_file='from_odoo/facturx_out_invoice_tax_incl.xml'
+            expected_file_path='from_odoo/facturx_out_invoice_tax_incl.xml'
         )
 
     def test_encoding_in_attachment_facturx(self):
-        self._test_encoding_in_attachment('facturx_1_0_05', 'factur-x.xml')
+        invoice = self._generate_move(
+            seller=self.partner_1,
+            buyer=self.partner_2,
+            move_type='out_invoice',
+            invoice_line_ids=[{'product_id': self.product_a.id}],
+        )
+        facturx_filename = self.env['account.edi.xml.cii']._export_invoice_filename(invoice)
+        self._test_encoding_in_attachment(invoice.ubl_cii_xml_id, facturx_filename)
 
     def test_export_with_fixed_taxes_case1(self):
         # CASE 1: simple invoice with a recupel tax
@@ -305,7 +311,7 @@ class TestCIIFR(TestUBLCommon):
             ],
         )
         self.assertEqual(invoice.amount_total, 121)
-        self._assert_invoice_attachment(invoice, None, 'from_odoo/facturx_ecotaxes_case1.xml')
+        self._assert_invoice_attachment(invoice.ubl_cii_xml_id, None, 'from_odoo/facturx_ecotaxes_case1.xml')
 
     def test_export_with_fixed_taxes_case2(self):
         # CASE 2: Same but with several ecotaxes
@@ -323,12 +329,12 @@ class TestCIIFR(TestUBLCommon):
             ],
         )
         self.assertEqual(invoice.amount_total, 121)
-        self._assert_invoice_attachment(invoice, None, 'from_odoo/facturx_ecotaxes_case2.xml')
+        self._assert_invoice_attachment(invoice.ubl_cii_xml_id, None, 'from_odoo/facturx_ecotaxes_case2.xml')
 
     def test_export_with_fixed_taxes_case3(self):
         # CASE 3: same as Case 1 but taxes are Price Included
-        self.recupel.price_include = True
-        self.tax_21.price_include = True
+        self.recupel.price_include_override = 'tax_included'
+        self.tax_21.price_include_override = 'tax_included'
 
         # Price TTC = 121 = (99 + 1 ) * 1.21
         invoice = self._generate_move(
@@ -345,62 +351,45 @@ class TestCIIFR(TestUBLCommon):
             ],
         )
         self.assertEqual(invoice.amount_total, 121)
-        self._assert_invoice_attachment(invoice, None, 'from_odoo/facturx_ecotaxes_case3.xml')
+        self._assert_invoice_attachment(invoice.ubl_cii_xml_id, None, 'from_odoo/facturx_ecotaxes_case3.xml')
 
     ####################################################
     # Test import
     ####################################################
 
     def test_import_partner_facturx(self):
-        """
-        Given an invoice where partner_1 is the vendor and partner_2 is the customer with an EDI attachment.
-        * Uploading the attachment as an invoice should create an invoice with the buyer = partner_2.
-        * Uploading the attachment as a vendor bill should create a bill with the vendor = partner_1.
-        """
         invoice = self._generate_move(
             seller=self.partner_1,
             buyer=self.partner_2,
             move_type='out_invoice',
             invoice_line_ids=[{'product_id': self.product_a.id}],
         )
-        new_invoice = self._import_invoice_attachment(invoice, 'facturx_1_0_05', self.company_data['default_journal_sale'])
-        self.assertEqual(self.partner_2, new_invoice.partner_id)
+        self._test_import_partner(invoice.ubl_cii_xml_id, self.partner_1, self.partner_2)
 
-        new_invoice = self._import_invoice_attachment(invoice, 'facturx_1_0_05', self.company_data['default_journal_purchase'])
-        self.assertEqual(self.partner_1, new_invoice.partner_id)
-
-    def test_import_journal_facturx(self):
-        """
-        If the context contains the info about the current default journal, we should use it
-        instead of infering the journal from the move type.
-        """
-        journal2 = self.company_data['default_journal_sale'].copy()
-        journal2.default_account_id = self.company_data['default_account_revenue'].id
+    def test_import_in_journal_facturx(self):
         invoice = self._generate_move(
             seller=self.partner_1,
             buyer=self.partner_2,
             move_type='out_invoice',
             invoice_line_ids=[{'product_id': self.product_a.id}],
         )
-        edi_attachment = invoice._get_edi_attachment(self.env.ref('account_edi_ubl_cii.edi_facturx_1_0_05')).id
-
-        new_invoice = self.env['account.journal'].with_context(default_move_type='out_invoice')._create_document_from_attachment(edi_attachment)
-        self.assertEqual(new_invoice.journal_id, self.company_data['default_journal_sale'])
-
-        new_invoice = self.env['account.journal'].with_context(default_journal_id=journal2.id)._create_document_from_attachment(edi_attachment)
-        self.assertEqual(new_invoice.journal_id, journal2)
+        self._test_import_in_journal(invoice.ubl_cii_xml_id)
 
     def test_import_and_create_partner_facturx(self):
         """ Tests whether the partner is created at import if no match is found when decoding the EDI attachment
         """
+        self.env['res.partner.bank'].sudo().create({
+            'acc_number': 'FR15001559627230',
+            'partner_id': self.company_data['company'].partner_id.id,
+        })
         partner_vals = {
             'name': "Buyer",
-            'mail': "buyer@yahoo.com",
+            'email': "buyer@yahoo.com",
             'phone': "1111",
             'vat': "FR89215010646",
         }
         # assert there is no matching partner
-        partner_match = self.env['account.edi.format']._retrieve_partner(**partner_vals)
+        partner_match = self.env['res.partner']._retrieve_partner(**partner_vals)
         self.assertFalse(partner_match)
 
         # Import attachment as an invoice
@@ -408,14 +397,13 @@ class TestCIIFR(TestUBLCommon):
             'move_type': 'out_invoice',
             'journal_id': self.company_data['default_journal_sale'].id,
         })
-        self.update_invoice_from_file(
+        self._update_invoice_from_file(
             module_name='l10n_account_edi_ubl_cii_tests',
             subfolder='tests/test_files/from_odoo',
             filename='facturx_test_import_partner.xml',
             invoice=invoice)
 
         # assert a new partner has been created
-        partner_vals['email'] = partner_vals.pop('mail')
         self.assertRecordValues(invoice.partner_id, [partner_vals])
 
     def test_import_tax_included(self):
@@ -435,62 +423,127 @@ class TestCIIFR(TestUBLCommon):
         -----------------------
         Total: 574.004
         """
+        # /!\ The price_unit are different for taxes with price_include, because all amounts in Factur-X should be
+        # tax excluded. At import, the tax included amounts are thus converted into tax excluded ones.
+        # Yet, the line subtotals and total will be the same (if an equivalent tax exist with price_include = False)
+        invoice_vals = {
+            'amount_total': 574.004,
+            'amount_tax': 27.334,
+            'currency_id': self.env['res.currency'].search([('name', '=', 'USD')], limit=1).id,
+            'invoice_lines': [
+                {'price_unit': 95.24, 'price_subtotal': 95.24, 'quantity': 1, 'discount': 0, 'tax_ids': self.tax_5_purchase.ids},
+                {'price_unit': 100, 'price_subtotal': 100, 'quantity': 1, 'discount': 0, 'tax_ids': self.tax_5_purchase.ids},
+                {'price_unit': 190.48, 'price_subtotal': 171.43, 'quantity': 1, 'discount': 10.001049979000411, 'tax_ids': self.tax_5_purchase.ids},
+                {'price_unit': 200, 'price_subtotal': 180, 'quantity': 1, 'discount': 10.0, 'tax_ids': self.tax_5_purchase.ids},
+            ]
+        }
         self._assert_imported_invoice_from_file(
             subfolder='tests/test_files/from_odoo',
             filename='facturx_out_invoice_tax_incl.xml',
-            amount_total=574.004,
-            amount_tax=27.334,
-            list_line_subtotals=[95.24, 100, 171.43, 180],
-            # /!\ The price_unit are different for taxes with price_include, because all amounts in Factur-X should be
-            # tax excluded. At import, the tax included amounts are thus converted into tax excluded ones.
-            # Yet, the line subtotals and total will be the same (if an equivalent tax exist with price_include = False)
-            list_line_price_unit=[95.24, 100, 190.48, 200],
-            # rounding error since for line 3: we round several times...
-            # when exporting the invoice, we compute the price tax excluded = 200/1.05 ~= 190.48
+            # Discount of line 3: when exporting the invoice, we compute the price tax excluded = 200/1.05 ~= 190.48
             # then, when computing the discount amount: 190.48 * 0.1 ~= 19.05 => price net amount = 171.43
             # Thus, at import: price_unit = 190.48, and discount = 100 * (1 - 171.43 / 190.48) = 10.001049979
-            list_line_discount=[0, 0, 10, 10],
-            # Again, all taxes in the imported invoice are price_include = False
-            list_line_taxes=[self.tax_5_purchase]*4,
             move_type='in_invoice',
-            currency_id=self.env['res.currency'].search([('name', '=', 'USD')], limit=1).id,
+            invoice_vals=invoice_vals,
         )
 
     def test_import_fnfe_examples(self):
+        self.env['res.partner.bank'].sudo().create({
+            'acc_number': 'FR76 1254 2547 2569 8542 5874 698',
+            'partner_id': self.company_data['company'].partner_id.id,
+        })
         # Source: official documentation of the FNFE (subdirectory: "5. FACTUR-X 1.0.06 - Examples")
         subfolder = 'tests/test_files/from_factur-x_doc'
         # the 2 following files have the same pdf but one is labelled as an invoice and the other as a refund
+        invoice_vals = {
+            'amount_total': 233.47,
+            'amount_tax': 14.99,
+            'invoice_lines': [{'price_subtotal': 20.48}, {'price_subtotal': 198}]
+        }
         # source: Avoir_FR_type380_EN16931.pdf
-        self._assert_imported_invoice_from_file(subfolder=subfolder, filename='facturx_credit_note_type380.xml',
-            amount_total=233.47, amount_tax=14.99, list_line_subtotals=[20.48, 198], move_type='in_refund')
+        self._assert_imported_invoice_from_file(
+            subfolder=subfolder,
+            filename='facturx_credit_note_type380.xml',
+            invoice_vals=invoice_vals,
+            move_type='in_refund',
+        )
         # source: Avoir_FR_type381_EN16931.pdf
-        self._assert_imported_invoice_from_file(subfolder=subfolder, filename='facturx_credit_note_type381.xml',
-            amount_total=233.47, amount_tax=14.99, list_line_subtotals=[20.48, 198], move_type='in_refund')
+        self._assert_imported_invoice_from_file(
+            subfolder=subfolder,
+            filename='facturx_credit_note_type381.xml',
+            invoice_vals=invoice_vals,
+            move_type='in_refund',
+        )
         # source: Facture_F20220024_EN_16931_basis_quantity, basis quantity != 1 for one of the lines
-        self._assert_imported_invoice_from_file(subfolder=subfolder, filename='facturx_invoice_basis_quantity.xml',
-            amount_total=108, amount_tax=8, list_line_subtotals=[-5, 10, 60, 28, 7])
+        self._assert_imported_invoice_from_file(
+            subfolder=subfolder,
+            filename='facturx_invoice_basis_quantity.xml',
+            invoice_vals={'amount_total': 108, 'amount_tax': 8},
+        )
         # source: Facture_F20220029_EN_16931_K.pdf, credit note labelled as an invoice with negative amounts
-        self._assert_imported_invoice_from_file(subfolder=subfolder, filename='facturx_invoice_negative_amounts.xml',
-            amount_total=100, amount_tax=0, list_line_subtotals=[-5, 10, 60, 30, 5], move_type='in_refund')
+        self._assert_imported_invoice_from_file(
+            subfolder=subfolder,
+            filename='facturx_invoice_negative_amounts.xml',
+            invoice_vals={
+                'amount_total': 100,
+                'amount_tax': 0,
+                'invoice_lines': [{'price_subtotal': p} for p in (-5, 10, 60, 30, 5)],
+            },
+            move_type='in_refund',
+        )
 
     def test_import_fixed_taxes(self):
         """ Tests whether we correctly decode the xml attachments created using fixed taxes.
         See the tests above to create these xml attachments ('test_export_with_fixed_taxes_case_[X]').
         NB: use move_type = 'out_invoice' s.t. we can retrieve the taxes used to create the invoices.
         """
+        self.env['res.partner.bank'].sudo().create({
+            'acc_number': 'FR15001559627230',
+            'partner_id': self.company_data['company'].partner_id.id,
+        })
         subfolder = "tests/test_files/from_odoo"
-        self._assert_imported_invoice_from_file(
-            subfolder=subfolder, filename='facturx_ecotaxes_case1.xml', amount_total=121, amount_tax=22,
-            list_line_subtotals=[99], currency_id=self.currency_data['currency'].id, list_line_price_unit=[99],
-            list_line_discount=[0], list_line_taxes=[self.tax_21+self.recupel], move_type='out_invoice',
-        )
-        self._assert_imported_invoice_from_file(
-            subfolder=subfolder, filename='facturx_ecotaxes_case2.xml', amount_total=121, amount_tax=23,
-            list_line_subtotals=[98], currency_id=self.currency_data['currency'].id, list_line_price_unit=[98],
-            list_line_discount=[0], list_line_taxes=[self.tax_21+self.recupel+self.auvibel], move_type='out_invoice',
-        )
-        self._assert_imported_invoice_from_file(
-            subfolder=subfolder, filename='facturx_ecotaxes_case3.xml', amount_total=121, amount_tax=22,
-            list_line_subtotals=[99], currency_id=self.currency_data['currency'].id, list_line_price_unit=[99],
-            list_line_discount=[0], list_line_taxes=[self.tax_21+self.recupel], move_type='out_invoice',
+        kwargs = {
+            'subfolder': subfolder,
+            'move_type': 'out_invoice',
+            'invoice_vals': {
+                'amount_total': 121,
+                'amount_tax': 22,
+                'currency_id': self.other_currency.id,
+                'invoice_lines': [{
+                    'name': "product_a",
+                    'quantity': 1,
+                    'price_unit': 99,
+                    'discount': 0,
+                    'tax_ids': (self.tax_21 + self.recupel).ids,
+                }],
+            },
+        }
+        self._assert_imported_invoice_from_file(filename='facturx_ecotaxes_case1.xml', **kwargs)
+        self._assert_imported_invoice_from_file(filename='facturx_ecotaxes_case3.xml', **kwargs)
+        kwargs['invoice_vals'].update({
+            'amount_tax': 23,
+            'invoice_lines': [{
+                'name': "product_a",
+                'quantity': 1,
+                'price_unit': 98,
+                'discount': 0,
+                'tax_ids': (self.tax_21 + self.recupel + self.auvibel).ids,
+            }],
+        })
+        self._assert_imported_invoice_from_file(filename='facturx_ecotaxes_case2.xml', **kwargs)
+
+    def test_facturx_has_no_negative_lines(self):
+        """
+        Test that the is no negative ChargeAmount in the facturx xml
+        """
+        invoice = self._generate_move(
+            seller=self.partner_1,
+            buyer=self.partner_2,
+            move_type='out_invoice',
+            invoice_line_ids=[
+                {'product_id': self.product_a.id, 'quantity': 1, 'price_unit': 100.0, 'tax_ids': [(6, 0, [self.tax_sale_a.id])]},
+                {'product_id': self.product_b.id, 'quantity': 1, 'price_unit': -50.0, 'tax_ids': [(6, 0, [self.tax_sale_a.id])]}
+            ]
         )
+
+        self._assert_invoice_attachment(invoice.ubl_cii_xml_id, None, 'from_odoo/facturx_positive_discount_price_unit.xml')

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_xml_cii_us.py

@@ -7,11 +7,8 @@ from odoo.tests import tagged
 class TestCIIUS(TestUBLCommon):
 
     @classmethod
-    def setUpClass(cls,
-                   chart_template_ref=None,
-                   edi_format_ref="account_edi_ubl_cii.edi_facturx_1_0_05",
-                   ):
-        super().setUpClass(chart_template_ref=chart_template_ref, edi_format_ref=edi_format_ref)
+    def setUpClass(cls):
+        super().setUpClass()
 
         cls.partner_1 = cls.env['res.partner'].create({
             'name': "partner_1",
@@ -29,16 +26,6 @@ class TestCIIUS(TestUBLCommon):
             'amount': 0,
         })
 
-    @classmethod
-    def setup_company_data(cls, company_name, chart_template):
-        # OVERRIDE
-        res = super().setup_company_data(
-            company_name,
-            chart_template=chart_template,
-            country_id=cls.env.ref("base.us").id,
-        )
-        return res
-
     def test_print_pdf_us_company(self):
         """ Even for a US company, a printed PDF should contain a Factur-X xml
         """
@@ -54,25 +41,29 @@ class TestCIIUS(TestUBLCommon):
                 },
             ],
         )
-        collected_streams = self.env['ir.actions.report']._render_qweb_pdf_prepare_streams(
-            report_ref='account.report_invoice_with_payments',
-            data=None,
-            res_ids=invoice.ids,
-        )
-        self.assertTrue(
-            bytes("<rsm:CrossIndustryInvoice", 'utf8') in collected_streams[invoice.id]['stream'].getvalue(),
-            "Any invoice's PDF should contain a factur-x.xml"
-        )
+
+        # Default XML acting as the default EDI
+        edi_attachment = self.env['ir.attachment'].search([
+            ('res_model', '=', 'account.move'),
+            ('res_id', '=', invoice.id)
+        ])
+        self.assertEqual(edi_attachment.name, "factur-x.xml")
 
     def test_import_facturx_us_company(self):
         """ Even for a US company, importing a PDF containing a Factur-X xml
         should create the correct invoice
         """
+        self.env['res.partner.bank'].sudo().create({
+            'acc_number': 'FR76 1254 2547 2569 8542 5874 698',
+            'partner_id': self.company_data['company'].partner_id.id,
+        })
         self._assert_imported_invoice_from_file(
             subfolder='tests/test_files/from_factur-x_doc',
             filename='facturx_invoice_negative_amounts.xml',
-            amount_total=100,
-            amount_tax=0,
-            list_line_subtotals=[-5, 10, 60, 30, 5],
+            invoice_vals={
+                'amount_total': 100,
+                'amount_tax': 0,
+                'invoice_lines': [{'price_subtotal': x} for x in (-5, 10, 60, 30, 5)],
+            },
             move_type='in_refund'
         )

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_xml_ubl_attacheddocument.py

@@ -0,0 +1,75 @@
+from odoo.addons.l10n_account_edi_ubl_cii_tests.tests.common import TestUBLCommon
+from odoo.tests import tagged
+
+
+@tagged('post_install_l10n', 'post_install', '-at_install')
+class TestUBLAttachedDocument(TestUBLCommon):
+
+    @classmethod
+    @TestUBLCommon.setup_country('au')
+    def setUpClass(cls):
+        """ AttachedDocuments are a wrapper of multiple different types of documents, as such we
+        need a country/localization to import a file properly. This is not Australia specific
+        but instead just re-using the files and setup from other test classes. """
+        super().setUpClass()
+
+        cls.partner_1 = cls.env['res.partner'].create({
+            'name': "partner_1",
+            'street': "Spring St.",
+            'zip': "3002",
+            'city': "Melbourne",
+            'vat': '83 914 571 673',
+            'phone': '+31 180 6 225789',
+            'email': 'info@outlook.au',
+            'country_id': cls.env.ref('base.au').id,
+            'bank_ids': [(0, 0, {'acc_number': '000099998B57'})],
+            'ref': 'ref_partner_1',
+            'invoice_edi_format': 'ubl_a_nz',
+        })
+
+        cls.partner_2 = cls.env['res.partner'].create({
+            'name': "partner_2",
+            'street': "Parliament Dr",
+            'zip': "2600",
+            'city': "Canberra",
+            'vat': '53 930 548 027',
+            'country_id': cls.env.ref('base.au').id,
+            'bank_ids': [(0, 0, {'acc_number': '93999574162167'})],
+            'ref': 'ref_partner_2',
+            'invoice_edi_format': 'ubl_a_nz',
+        })
+
+        cls.tax_10 = cls.env['account.tax'].create({
+            'name': 'tax_10',
+            'amount_type': 'percent',
+            'amount': 10,
+            'type_tax_use': 'sale',
+            'country_id': cls.env.ref('base.au').id,
+        })
+
+    def test_import_attached_document_invoice_xml(self):
+        """ The original invoice can be stored in one of two places, either as a base64 encoded
+        string in EmbeddedDocumentBinaryObject or as a CDATA[] value inside of an
+        ExternalReference/Description tag. Importing such files should ignore the outside wrapper
+        and return the correct original invoice takes from a_nz_out_invoice. """
+        self._assert_imported_invoice_from_file(
+            subfolder='tests/test_files/from_odoo',
+            filename='a_nz_out_invoice_attacheddocument_b64.xml',
+            invoice_vals={
+                'currency_id': self.other_currency.id,
+                'amount_total': 2950.2,
+                'amount_tax': 268.2,
+                'invoice_lines': [{'price_subtotal': x} for x in (1782, 1000, -100)]
+            },
+        )
+
+        self._assert_imported_invoice_from_file(
+            subfolder='tests/test_files/from_odoo',
+            filename='a_nz_out_invoice_attacheddocument_description.xml',
+            invoice_vals={
+                'currency_id': self.other_currency.id,
+                'amount_total': 2950.2,
+                'amount_tax': 268.2,
+                'invoice_lines': [{'price_subtotal': x} for x in (1782, 1000, -100)]
+            },
+        )

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_xml_ubl_au.py

@@ -7,11 +7,9 @@ from odoo.tests import tagged
 class TestUBLAU(TestUBLCommon):
 
     @classmethod
-    def setUpClass(cls,
-                   chart_template_ref="l10n_au.l10n_au_chart_template",
-                   edi_format_ref="account_edi_ubl_cii.ubl_a_nz",
-                   ):
-        super().setUpClass(chart_template_ref=chart_template_ref, edi_format_ref=edi_format_ref)
+    @TestUBLCommon.setup_country('au')
+    def setUpClass(cls):
+        super().setUpClass()
 
         cls.partner_1 = cls.env['res.partner'].create({
             'name': "partner_1",
@@ -22,8 +20,9 @@ class TestUBLAU(TestUBLCommon):
             'phone': '+31 180 6 225789',
             'email': 'info@outlook.au',
             'country_id': cls.env.ref('base.au').id,
-            'bank_ids': [(0, 0, {'acc_number': '000099998B57'})],
+            'bank_ids': [(0, 0, {'acc_number': '000099998B57', 'allow_out_payment': True})],
             'ref': 'ref_partner_1',
+            'invoice_edi_format': 'ubl_a_nz',
         })
 
         cls.partner_2 = cls.env['res.partner'].create({
@@ -33,8 +32,9 @@ class TestUBLAU(TestUBLCommon):
             'city': "Canberra",
             'vat': '53 930 548 027',
             'country_id': cls.env.ref('base.au').id,
-            'bank_ids': [(0, 0, {'acc_number': '93999574162167'})],
+            'bank_ids': [(0, 0, {'acc_number': '93999574162167', 'allow_out_payment': True})],
             'ref': 'ref_partner_2',
+            'invoice_edi_format': 'ubl_a_nz',
         })
 
         cls.tax_10 = cls.env['account.tax'].create({
@@ -45,16 +45,6 @@ class TestUBLAU(TestUBLCommon):
             'country_id': cls.env.ref('base.au').id,
         })
 
-    @classmethod
-    def setup_company_data(cls, company_name, chart_template):
-        # OVERRIDE
-        res = super().setup_company_data(
-            company_name,
-            chart_template=chart_template,
-            country_id=cls.env.ref("base.au").id,
-        )
-        return res
-
     ####################################################
     # Test export - import
     ####################################################
@@ -90,25 +80,29 @@ class TestUBLAU(TestUBLCommon):
             ],
         )
         attachment = self._assert_invoice_attachment(
-            invoice,
-            xpaths='''
+            invoice.ubl_cii_xml_id,
+            xpaths=f'''
                 <xpath expr="./*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='InvoiceLine'][1]/*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='InvoiceLine'][2]/*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='InvoiceLine'][3]/*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='PaymentMeans']/*[local-name()='PaymentID']" position="replace">
-                    <PaymentID>___ignore___</PaymentID>
+                    <cbc:PaymentID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:PaymentID>
+                </xpath>
+                <xpath expr=".//*[local-name()='AdditionalDocumentReference']/*[local-name()='Attachment']/*[local-name()='EmbeddedDocumentBinaryObject']" position="attributes">
+                    <attribute name="mimeCode">application/pdf</attribute>
+                    <attribute name="filename">{invoice.invoice_pdf_report_id.name}</attribute>
                 </xpath>
             ''',
-            expected_file='from_odoo/a_nz_out_invoice.xml',
+            expected_file_path='from_odoo/a_nz_out_invoice.xml',
         )
         self.assertEqual(attachment.name[-8:], "a_nz.xml")
         self._assert_imported_invoice_from_etree(invoice, attachment)
@@ -144,25 +138,29 @@ class TestUBLAU(TestUBLCommon):
             ],
         )
         attachment = self._assert_invoice_attachment(
-            refund,
-            xpaths='''
+            refund.ubl_cii_xml_id,
+            xpaths=f'''
                 <xpath expr="./*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='CreditNoteLine'][1]/*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='CreditNoteLine'][2]/*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='CreditNoteLine'][3]/*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='PaymentMeans']/*[local-name()='PaymentID']" position="replace">
-                    <PaymentID>___ignore___</PaymentID>
+                    <cbc:PaymentID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:PaymentID>
+                </xpath>
+                <xpath expr=".//*[local-name()='AdditionalDocumentReference']/*[local-name()='Attachment']/*[local-name()='EmbeddedDocumentBinaryObject']" position="attributes">
+                    <attribute name="mimeCode">application/pdf</attribute>
+                    <attribute name="filename">{refund.invoice_pdf_report_id.name}</attribute>
                 </xpath>
             ''',
-            expected_file='from_odoo/a_nz_out_refund.xml',
+            expected_file_path='from_odoo/a_nz_out_refund.xml',
         )
         self.assertEqual(attachment.name[-8:], "a_nz.xml")
         self._assert_imported_invoice_from_etree(refund, attachment)
@@ -175,8 +173,10 @@ class TestUBLAU(TestUBLCommon):
         self._assert_imported_invoice_from_file(
             subfolder='tests/test_files/from_odoo',
             filename='a_nz_out_invoice.xml',
-            amount_total=2950.2,
-            amount_tax=268.2,
-            list_line_subtotals=[1782, 1000, -100],
-            currency_id=self.currency_data['currency'].id
+            invoice_vals={
+                'currency_id': self.other_currency.id,
+                'amount_total': 2950.2,
+                'amount_tax': 268.2,
+                'invoice_lines': [{'price_subtotal': x} for x in (1782, 1000, -100)]
+            },
         )

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_xml_ubl_be.py

@@ -1,21 +1,21 @@
-# -*- coding: utf-8 -*-
 import base64
 from lxml import etree
 
-from odoo.addons.l10n_account_edi_ubl_cii_tests.tests.common import TestUBLCommon
-from odoo.tests import tagged
 from odoo import Command
+from odoo.addons.l10n_account_edi_ubl_cii_tests.tests.common import TestUBLCommon
+from odoo.addons.account.tests.test_account_move_send import TestAccountMoveSendCommon
+from odoo.tests import tagged
 
 
 @tagged('post_install_l10n', 'post_install', '-at_install')
-class TestUBLBE(TestUBLCommon):
+class TestUBLBE(TestUBLCommon, TestAccountMoveSendCommon):
 
     @classmethod
-    def setUpClass(cls,
-                   chart_template_ref="l10n_be.l10nbe_chart_template",
-                   edi_format_ref="account_edi_ubl_cii.ubl_bis3",
-                   ):
-        super().setUpClass(chart_template_ref=chart_template_ref, edi_format_ref=edi_format_ref)
+    @TestUBLCommon.setup_country("be")
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.company.vat = "BE0246697724"
 
         # seller
         cls.partner_1 = cls.env['res.partner'].create({
@@ -25,8 +25,9 @@ class TestUBLBE(TestUBLCommon):
             'city': "Ramillies",
             'vat': 'BE0202239951',
             'country_id': cls.env.ref('base.be').id,
-            'bank_ids': [(0, 0, {'acc_number': 'BE15001559627230'})],
+            'bank_ids': [(0, 0, {'acc_number': 'BE15001559627230', 'allow_out_payment': True})],
             'ref': 'ref_partner_1',
+            'invoice_edi_format': 'ubl_bis3',
         })
 
         # buyer
@@ -37,8 +38,9 @@ class TestUBLBE(TestUBLCommon):
             'city': "Ramillies",
             'vat': 'BE0477472701',
             'country_id': cls.env.ref('base.be').id,
-            'bank_ids': [(0, 0, {'acc_number': 'BE90735788866632'})],
+            'bank_ids': [(0, 0, {'acc_number': 'BE90735788866632', 'allow_out_payment': True})],
             'ref': 'ref_partner_2',
+            'invoice_edi_format': 'ubl_bis3',
         })
 
         cls.tax_25 = cls.env['account.tax'].create({
@@ -90,47 +92,21 @@ class TestUBLBE(TestUBLCommon):
             'country_id': cls.env.ref('base.be').id,
         })
 
-        cls.acc_bank = cls.env['res.partner.bank'].create({
-            'acc_number': 'BE15001559627231',
+        cls.env['res.partner.bank'].sudo().create({
+            'acc_number': 'BE15001559627230',
             'partner_id': cls.company_data['company'].partner_id.id,
         })
 
-        cls.invoice = cls.env['account.move'].create({
-            'move_type': 'out_invoice',
-            'journal_id': cls.journal.id,
-            'partner_id': cls.partner_1.id,
-            'partner_bank_id': cls.acc_bank.id,
-            'invoice_date': '2017-01-01',
-            'date': '2017-01-01',
-            'currency_id': cls.currency_data['currency'].id,
-            'invoice_line_ids': [(0, 0, {
-                'product_id': cls.product_a.id,
-                'product_uom_id': cls.env.ref('uom.product_uom_dozen').id,
-                'price_unit': 275.0,
-                'quantity': 5,
-                'discount': 20.0,
-                'tax_ids': [(6, 0, cls.tax_21.ids)],
-            })],
-        })
-
         cls.pay_term = cls.env['account.payment.term'].create({
             'name': "2/7 Net 30",
             'note': "Payment terms: 30 Days, 2% Early Payment Discount under 7 days",
+            'early_discount': True,
+            'discount_percentage': 2,
+            'discount_days': 7,
             'line_ids': [
-                Command.create({'value': 'balance', 'days': 30, 'discount_percentage': 2, 'discount_days': 7})],
+                Command.create({'value': 'percent', 'value_amount': 100.0, 'nb_days': 30})],
         })
 
-    @classmethod
-    def setup_company_data(cls, company_name, chart_template):
-        # OVERRIDE
-        # to force the company to be belgian
-        res = super().setup_company_data(
-            company_name,
-            chart_template=chart_template,
-            country_id=cls.env.ref("base.be").id,
-            vat="BE0246697724")
-        return res
-
     ####################################################
     # Test export - import
     ####################################################
@@ -140,6 +116,7 @@ class TestUBLBE(TestUBLCommon):
             self.partner_1,
             self.partner_2,
             move_type='out_invoice',
+            delivery_date='2017-01-15',
             invoice_line_ids=[
                 {
                     'product_id': self.product_a.id,
@@ -166,27 +143,31 @@ class TestUBLBE(TestUBLCommon):
             ],
         )
         attachment = self._assert_invoice_attachment(
-            invoice,
-            xpaths='''
+            invoice.ubl_cii_xml_id,
+            xpaths=f'''
                 <xpath expr="./*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='InvoiceLine'][1]/*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='InvoiceLine'][2]/*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='InvoiceLine'][3]/*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='PaymentMeans']/*[local-name()='PaymentID']" position="replace">
-                    <PaymentID>___ignore___</PaymentID>
+                    <cbc:PaymentID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:PaymentID>
+                </xpath>
+                <xpath expr=".//*[local-name()='AdditionalDocumentReference']/*[local-name()='Attachment']/*[local-name()='EmbeddedDocumentBinaryObject']" position="attributes">
+                    <attribute name="mimeCode">application/pdf</attribute>
+                    <attribute name="filename">{invoice.invoice_pdf_report_id.name}</attribute>
                 </xpath>
             ''',
-            expected_file='from_odoo/bis3_out_invoice.xml',
+            expected_file_path='from_odoo/bis3_out_invoice.xml',
         )
-        self.assertEqual(attachment.name[-12:], "ubl_bis3.xml")  # ensure we test the right format !
+        self.assertEqual(attachment.name[-12:], "ubl_bis3.xml")
         self._assert_imported_invoice_from_etree(invoice, attachment)
 
     def test_export_import_refund(self):
@@ -220,387 +201,75 @@ class TestUBLBE(TestUBLCommon):
             ],
         )
         attachment = self._assert_invoice_attachment(
-            refund,
-            xpaths='''
+            refund.ubl_cii_xml_id,
+            xpaths=f'''
                 <xpath expr="./*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr="./*[local-name()='PaymentMeans']/*[local-name()='PaymentID']" position="replace">
-                    <PaymentID>___ignore___</PaymentID>
+                    <cbc:PaymentID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:PaymentID>
                 </xpath>
                 <xpath expr=".//*[local-name()='CreditNoteLine'][1]/*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='CreditNoteLine'][2]/*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='CreditNoteLine'][3]/*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
+                </xpath>
+                <xpath expr=".//*[local-name()='AdditionalDocumentReference']/*[local-name()='Attachment']/*[local-name()='EmbeddedDocumentBinaryObject']" position="attributes">
+                    <attribute name="mimeCode">application/pdf</attribute>
+                    <attribute name="filename">{refund.invoice_pdf_report_id.name}</attribute>
                 </xpath>
             ''',
-            expected_file='from_odoo/bis3_out_refund.xml',
+            expected_file_path='from_odoo/bis3_out_refund.xml',
         )
         self.assertEqual(attachment.name[-12:], "ubl_bis3.xml")
         self._assert_imported_invoice_from_etree(refund, attachment)
 
     def test_encoding_in_attachment_ubl(self):
-        self._test_encoding_in_attachment('ubl_bis3', 'INV_2017_00002_ubl_bis3.xml')
-
-    def test_sending_to_public_admin(self):
-        """ A public administration has no VAT, but has an arbitrary number (see:
-        https://pch.gouvernement.lu/fr/peppol.html). When a partner has no VAT, the node PartyTaxScheme should
-        not appear.
-        NB: The `EndpointID` node should be filled with this arbitrary number, that is why `l10n_lu_peppol_id`
-        module was created. However we cannot use it here because it would require adding it to the dependencies of
-        `l10n_account_edi_ubl_cii_tests` in stable.
-        """
-        self.partner_2.vat = None
         invoice = self._generate_move(
-            self.partner_1,
-            self.partner_2,
+            seller=self.partner_1,
+            buyer=self.partner_2,
             move_type='out_invoice',
-            invoice_line_ids=[
-                {
-                    'product_id': self.product_a.id,
-                    'quantity': 2,
-                    'price_unit': 100,
-                    'tax_ids': [(6, 0, self.tax_21.ids)],
-                }
-            ],
+            invoice_line_ids=[{'product_id': self.product_a.id}],
         )
-        self._assert_invoice_attachment(
-            invoice,
-            xpaths='''
-                <xpath expr="./*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
-                </xpath>
-                <xpath expr="./*[local-name()='PaymentMeans']/*[local-name()='PaymentID']" position="replace">
-                    <PaymentID>___ignore___</PaymentID>
-                </xpath>
-                <xpath expr=".//*[local-name()='InvoiceLine'][1]/*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
-                </xpath>
-            ''',
-            expected_file='from_odoo/bis3_out_invoice_public_admin.xml',
-        )
-
-    def test_rounding_price_unit(self):
-        """ OpenPeppol states that:
-        * All document level amounts shall be rounded to two decimals for accounting
-        * Invoice line net amount shall be rounded to two decimals
-        See: https://docs.peppol.eu/poacc/billing/3.0/bis/#_rounding
-        Do not round the unit prices. It allows to obtain the correct line amounts when prices have more than 2
-        digits.
-        """
-        # Set the allowed number of digits for the price_unit
-        decimal_precision = self.env['decimal.precision'].search([('name', '=', 'Product Price')], limit=1)
-        self.assertTrue(bool(decimal_precision), "The decimal precision for Product Price is required for this test")
-        decimal_precision.digits = 4
-
-        invoice = self._generate_move(
-            self.partner_1,
-            self.partner_2,
-            move_type='out_invoice',
-            invoice_line_ids=[
-                {
-                    'product_id': self.product_a.id,
-                    'quantity': 10000,
-                    'price_unit': 0.4567,
-                    'tax_ids': [(6, 0, self.tax_21.ids)],
-                }
-            ],
-        )
-        self._assert_invoice_attachment(invoice, None, 'from_odoo/bis3_out_invoice_rounding.xml')
-
-    def test_export_with_fixed_taxes_case1(self):
-        # CASE 1: simple invoice with a recupel tax
-        invoice = self._generate_move(
-            self.partner_1,
-            self.partner_2,
-            move_type='out_invoice',
-            invoice_line_ids=[
-                {
-                    'product_id': self.product_a.id,
-                    'quantity': 1,
-                    'price_unit': 99,
-                    'tax_ids': [(6, 0, [self.recupel.id, self.tax_21.id])],
-                }
-            ],
-        )
-        self.assertEqual(invoice.amount_total, 121)
-        self._assert_invoice_attachment(invoice, None, 'from_odoo/bis3_ecotaxes_case1.xml')
-
-    def test_export_with_fixed_taxes_case2(self):
-        # CASE 2: Same but with several ecotaxes
-        invoice = self._generate_move(
-            self.partner_1,
-            self.partner_2,
-            move_type='out_invoice',
-            invoice_line_ids=[
-                {
-                    'product_id': self.product_a.id,
-                    'quantity': 1,
-                    'price_unit': 98,
-                    'tax_ids': [(6, 0, [self.recupel.id, self.auvibel.id, self.tax_21.id])],
-                }
-            ],
-        )
-        self.assertEqual(invoice.amount_total, 121)
-        self._assert_invoice_attachment(invoice, None, 'from_odoo/bis3_ecotaxes_case2.xml')
-
-    def test_export_with_fixed_taxes_case3(self):
-        # CASE 3: same as Case 1 but taxes are Price Included
-        self.recupel.price_include = True
-        self.tax_21.price_include = True
-
-        # Price TTC = 121 = (99 + 1 ) * 1.21
-        invoice = self._generate_move(
-            self.partner_1,
-            self.partner_2,
-            move_type='out_invoice',
-            invoice_line_ids=[
-                {
-                    'product_id': self.product_a.id,
-                    'quantity': 1,
-                    'price_unit': 121,
-                    'tax_ids': [(6, 0, [self.recupel.id, self.tax_21.id])],
-                }
-            ],
-        )
-        self.assertEqual(invoice.amount_total, 121)
-        self._assert_invoice_attachment(invoice, None, 'from_odoo/bis3_ecotaxes_case3.xml')
-
-    def test_export_with_fixed_taxes_case4(self):
-        """ CASE 4: simple invoice with a recupel tax + discount
-        1) Subtotal (price after discount, without taxes): 99 * 2 * (1-0.9) = 178.2
-        2) Taxes:
-            - recupel = 2
-            - VAT = (178.2 + 2) * 0.21 = 37.842
-        3) Total = 178.2 + 2 + 37.842 = 218.042
-        """
-        invoice = self._generate_move(
-            self.partner_1,
-            self.partner_2,
-            move_type='out_invoice',
-            invoice_line_ids=[
-                {
-                    'product_id': self.product_a.id,
-                    'quantity': 2,
-                    'discount': 10,
-                    'price_unit': 99,
-                    'tax_ids': [(6, 0, [self.recupel.id, self.tax_21.id])],
-                }
-            ],
-        )
-        self.assertEqual(invoice.amount_total, 218.042)
-        self._assert_invoice_attachment(invoice, None, 'from_odoo/bis3_ecotaxes_case4.xml')
-
-    def test_export_payment_terms(self):
-        """
-        Tests the early payment discount using the example case from the VBO/FEB.
-
-        ------------- + Price + Tax + Cash Discount (2%) + Taxable Amount + VAT --
-        Product A     |   200 |  6% |                 -4 |            196 |  11.76
-        Product B     |  2400 | 21% |                -48 |           2352 | 493.92
-        --------------+-------+-----+--------------------+----------------+-------
-
-        Subtotal (Taxable amount incl. payment discount): 2548
-        VAT: 505.68
-        Payable amount (excl. payment discount): 3105.68
-        Payable amount (incl. payment discount): 3053.68
-        """
-        invoice = self._generate_move(
-            self.partner_1,
-            self.partner_2,
-            move_type='out_invoice',
-            invoice_payment_term_id=self.pay_term.id,
-            invoice_line_ids=[
-                {
-                    'product_id': self.product_a.id,
-                    'quantity': 1,
-                    'price_unit': 200,
-                    'tax_ids': [(6, 0, [self.tax_6.id])],
-                },
-                {
-                    'product_id': self.product_b.id,
-                    'quantity': 1,
-                    'price_unit': 2400,
-                    'tax_ids': [(6, 0, [self.tax_21.id])],
-                }
-            ],
-        )
-        self._assert_invoice_attachment(invoice, None, 'from_odoo/bis3_pay_term.xml')
-
-    def test_export_payment_terms_fixed_tax(self):
-        """
-        Tests the early payment discount combined with a fixed tax.
-
-        ------------- + Price + Tax + Cash Discount (2%) + ------- Taxable Amount + VAT ----
-        Product A     |    99 | 21% |              -1.98 |  97.02 + 1 (fixed tax) |  20.5842
-        --------------+-------+-----+--------------------+------------------------+---------
-        NB: The fixed taxes (recupel, auvibel, etc) are excluded from the early payment discount !
-
-        Subtotal (Taxable amount incl. payment discount): 97.02 + 1
-        VAT: (97.02 + 1) * 0.21 = 20.58
-        Payable amount (excl. payment discount): 99 + 1 + 20.58 = 120.58
-        Payable amount (incl. payment discount): 97.02 + 1 + 20.58 = 118.60
-        """
-        invoice = self._generate_move(
-            self.partner_1,
-            self.partner_2,
-            move_type='out_invoice',
-            invoice_payment_term_id=self.pay_term.id,
-            invoice_line_ids=[
-                {
-                    'product_id': self.product_a.id,
-                    'quantity': 1,
-                    'price_unit': 99,
-                    'tax_ids': [(6, 0, [self.tax_21.id, self.recupel.id])],
-                },
-            ],
-        )
-        self._assert_invoice_attachment(invoice, None, 'from_odoo/bis3_pay_term_ecotax.xml')
-
-    def test_export_with_changed_taxes(self):
-        invoice = self._generate_move(
-            self.partner_1,
-            self.partner_2,
-            move_type='out_invoice',
-            invoice_line_ids=[
-                {
-                    'product_id': self.product_a.id,
-                    'quantity': 1,
-                    'price_unit': 200,
-                    'tax_ids': [Command.set([self.tax_21.id])],
-                },
-                {
-                    'product_id': self.product_a.id,
-                    'quantity': 1,
-                    'price_unit': 200,
-                    'tax_ids': [Command.set([self.tax_21.id])],
-                },
-                {
-                    'product_id': self.product_b.id,
-                    'quantity': 1,
-                    'price_unit': 100,
-                    'tax_ids': [Command.set([self.tax_12.id])],
-                },
-                {
-                    'product_id': self.product_b.id,
-                    'quantity': 1,
-                    'price_unit': 100,
-                    'tax_ids': [Command.set([self.tax_12.id])],
-                },
-            ],
-        )
-        self.assertRecordValues(invoice, [{
-            'amount_untaxed': 600.00,
-            'amount_tax': 108.00,  # tax_12: 24.00 ; tax_21: 84.00
-            'amount_total': 708.00
-        }])
-
-        invoice.button_draft()
-        tax_lines = invoice.line_ids.filtered(lambda line: line.display_type == 'tax')
-        tax_line_21 = next((line for line in tax_lines if line.name == 'tax_21'))
-        tax_line_12 = next((line for line in tax_lines if line.name == 'tax_12'))
-        invoice.line_ids = [
-            Command.update(tax_line_21.id, {'amount_currency': -84.03}), # distribute  3 cents over 2 lines
-            Command.update(tax_line_12.id, {'amount_currency': -23.99}), # distribute -1 cent  over 2 lines
-        ]
-        invoice.action_post()
-
-        self.assertRecordValues(invoice, [{
-            'amount_untaxed': 600.00,
-            'amount_tax': 108.02,  # tax_12: 23.99 ; tax_21: 84.03
-            'amount_total': 708.02
-        }])
-
-        self._assert_invoice_attachment(invoice, None, 'from_odoo/bis3_export_with_changed_taxes.xml')
-
-    def test_export_rounding_price_amount(self):
-        invoice = self._generate_move(
-            self.partner_1,
-            self.partner_2,
-            move_type='out_invoice',
-            invoice_line_ids=[
-                {'quantity': 3, 'price_unit': 102.15},
-                {'quantity': 3, 'price_unit': 83.60},
-            ],
-        )
-        attachment = invoice._get_edi_attachment(self.edi_format)
-        price_amounts = etree.fromstring(attachment.raw).findall('.//{*}InvoiceLine/{*}Price/{*}PriceAmount')
-        self.assertEqual(price_amounts[0].text, '102.15')
-        self.assertEqual(price_amounts[1].text, '83.6')
-
-    def test_export_tax_exempt(self):
-        invoice = self._generate_move(
-            self.partner_1,
-            self.partner_2,
-            move_type='out_invoice',
-            invoice_line_ids=[
-                {
-                    'product_id': self.product_a.id,
-                    'price_unit': 990.0,
-                    'tax_ids': [(6, 0, self.tax_0.ids)],
-                },
-            ],
-        )
-        self._assert_invoice_attachment(invoice, None, 'from_odoo/bis3_out_invoice_tax_exempt.xml')
+        self._test_encoding_in_attachment(invoice.ubl_cii_xml_id, 'ubl_bis3.xml')
 
     ####################################################
     # Test import
     ####################################################
 
     def test_import_partner_ubl(self):
-        """
-        Given an invoice where partner_1 is the vendor and partner_2 is the customer with an EDI attachment.
-        * Uploading the attachment as an invoice should create an invoice with the buyer = partner_2.
-        * Uploading the attachment as a vendor bill should create a bill with the vendor = partner_1.
-        """
         invoice = self._generate_move(
             seller=self.partner_1,
             buyer=self.partner_2,
             move_type='out_invoice',
             invoice_line_ids=[{'product_id': self.product_a.id}],
         )
-        new_invoice = self._import_invoice_attachment(invoice, 'ubl_bis3', self.company_data['default_journal_sale'])
-        self.assertEqual(self.partner_2, new_invoice.partner_id)
+        self._test_import_partner(invoice.ubl_cii_xml_id, self.partner_1, self.partner_2)
 
-        new_invoice = self._import_invoice_attachment(invoice, 'ubl_bis3', self.company_data['default_journal_purchase'])
-        self.assertEqual(self.partner_1, new_invoice.partner_id)
-
-    def test_import_journal_ubl(self):
-        """
-        If the context contains the info about the current default journal, we should use it
-        instead of infering the journal from the move type.
-        """
-        journal2 = self.company_data['default_journal_sale'].copy()
-        journal2.default_account_id = self.company_data['default_account_revenue'].id
+    def test_import_in_journal_ubl(self):
         invoice = self._generate_move(
             seller=self.partner_1,
             buyer=self.partner_2,
             move_type='out_invoice',
             invoice_line_ids=[{'product_id': self.product_a.id}],
         )
-        edi_attachment = invoice._get_edi_attachment(self.env.ref('account_edi_ubl_cii.ubl_bis3')).id
-
-        new_invoice = self.env['account.journal'].with_context(default_move_type='out_invoice')._create_document_from_attachment(edi_attachment)
-        self.assertEqual(new_invoice.journal_id, self.company_data['default_journal_sale'])
-
-        new_invoice = self.env['account.journal'].with_context(default_journal_id=journal2.id)._create_document_from_attachment(edi_attachment)
-        self.assertEqual(new_invoice.journal_id, journal2)
+        self._test_import_in_journal(invoice.ubl_cii_xml_id)
 
     def test_import_and_create_partner_ubl(self):
         """ Tests whether the partner is created at import if no match is found when decoding the EDI attachment
         """
         partner_vals = {
             'name': "Buyer",
-            'mail': "buyer@yahoo.com",
+            'email': "buyer@yahoo.com",
             'phone': "1111",
             'vat': "BE980737405",
         }
         # assert there is no matching partner
-        partner_match = self.env['account.edi.format']._retrieve_partner(**partner_vals)
+        partner_match = self.env['res.partner']._retrieve_partner(**partner_vals)
         self.assertFalse(partner_match)
 
         # Import attachment as an invoice
@@ -608,14 +277,13 @@ class TestUBLBE(TestUBLCommon):
             'move_type': 'out_invoice',
             'journal_id': self.company_data['default_journal_sale'].id,
         })
-        self.update_invoice_from_file(
+        self._update_invoice_from_file(
             module_name='l10n_account_edi_ubl_cii_tests',
             subfolder='tests/test_files/from_odoo',
             filename='ubl_test_import_partner.xml',
             invoice=invoice)
 
         # assert a new partner has been created
-        partner_vals['email'] = partner_vals.pop('mail')
         self.assertRecordValues(invoice.partner_id, [partner_vals])
 
     def test_import_export_invoice_xml(self):
@@ -623,9 +291,33 @@ class TestUBLBE(TestUBLCommon):
         Test whether the elements only specific to ubl_be are correctly exported
         and imported in the xml file
         """
-        self.invoice.action_post()
-        attachment = self.invoice._get_edi_attachment(self.edi_format)
+        acc_bank = self.env['res.partner.bank'].create({
+            'acc_number': 'BE15001559627231',
+            'partner_id': self.company_data['company'].partner_id.id,
+            'allow_out_payment': True,
+        })
+
+        invoice = self._generate_move(
+            self.partner_1,
+            self.partner_2,
+            move_type='out_invoice',
+            partner_id=self.partner_1.id,
+            partner_bank_id=acc_bank.id,
+            invoice_date='2017-01-01',
+            date='2017-01-01',
+            invoice_line_ids=[{
+                'product_id': self.product_a.id,
+                'product_uom_id': self.env.ref('uom.product_uom_dozen').id,
+                'price_unit': 275.0,
+                'quantity': 5,
+                'discount': 20.0,
+                'tax_ids': [(6, 0, self.tax_21.ids)],
+            }],
+        )
+
+        attachment = invoice.ubl_cii_xml_id
         self.assertTrue(attachment)
+
         xml_content = base64.b64decode(attachment.with_context(bin_size=False).datas)
         xml_etree = self.get_xml_tree_from_string(xml_content)
 
@@ -643,38 +335,88 @@ class TestUBLBE(TestUBLCommon):
 
         # Import:
         created_bill = self.env['account.move'].create({'move_type': 'in_invoice'})
+        self.env['res.partner'].search([('vat', '=', 'BE0246697724'), ('id', '!=', self.company_data['company'].id)]).vat = False  # clean demo company to avoid picking it as a partner
         created_bill.message_post(attachment_ids=[attachment.id])
         self.assertTrue(created_bill)
 
     def test_import_invoice_xml(self):
         kwargs = {
             'subfolder': 'tests/test_files/from_odoo',
-            'amount_total': 3164.22,
-            'amount_tax': 482.22,
-            'list_line_subtotals': [1782, 1000, -100],
-            'list_line_price_unit': [990, 100, 100],
-            'list_line_discount': [10, 0, 0],
-            'currency_id': self.currency_data['currency'].id,
+            'invoice_vals': {
+                'currency_id': self.other_currency.id,
+                'amount_total': 3164.22,
+                'amount_tax': 482.22,
+                'invoice_lines': [{
+                    'price_subtotal': subtotal,
+                    'price_unit': price_unit,
+                    'discount': discount,
+                } for (subtotal, price_unit, discount) in [(1782, 990, 10), (1000, 100, 0), (-100, 100, 0)]]
+            },
         }
         self._assert_imported_invoice_from_file(filename='bis3_out_invoice.xml', **kwargs)
         # same as the file above, but the <cac:Price> are missing in the invoice lines
         self._assert_imported_invoice_from_file(filename='bis3_out_invoice_no_prices.xml', **kwargs)
 
     def test_import_invoice_xml_open_peppol_examples(self):
+        self.env['res.partner.bank'].sudo().create({
+            'acc_number': 'IBAN32423940',
+            'partner_id': self.company_data['company'].partner_id.id,
+        })
         # Source: https://github.com/OpenPEPPOL/peppol-bis-invoice-3/tree/master/rules/examples
         subfolder = 'tests/test_files/from_peppol-bis-invoice-3_doc'
         # source: Allowance-example.xml
-        self._assert_imported_invoice_from_file(subfolder=subfolder, filename='bis3_allowance.xml', amount_total=7125,
-            amount_tax=1225, list_line_subtotals=[200, -200, 4000, 1000, 900])
+        self._assert_imported_invoice_from_file(
+            subfolder=subfolder,
+            filename='bis3_allowance.xml',
+            invoice_vals={
+                'amount_total': 7125,
+                'amount_tax': 1225,
+                'invoice_lines': [{'price_subtotal': x} for x in (200, -200, 3999, 1, 1000, 899, 1)],
+            },
+        )
         # source: base-creditnote-correction.xml
-        self._assert_imported_invoice_from_file(subfolder=subfolder, filename='bis3_credit_note.xml',
-            amount_total=1656.25, amount_tax=331.25, list_line_subtotals=[25, 2800, -1500], move_type='in_refund')
+        self._assert_imported_invoice_from_file(
+            subfolder=subfolder,
+            filename='bis3_credit_note.xml',
+            move_type='in_refund',
+            invoice_vals={
+                'amount_total': 1656.25,
+                'amount_tax': 331.25,
+                'invoice_lines': [{'price_subtotal': x} for x in (25, 2800, -1500)],
+            },
+        )
         # source: base-negative-inv-correction.xml
-        self._assert_imported_invoice_from_file(subfolder=subfolder, filename='bis3_invoice_negative_amounts.xml',
-            amount_total=1656.25, amount_tax=331.25, list_line_subtotals=[25, 2800, -1500], move_type='in_refund')
+        self._assert_imported_invoice_from_file(
+            subfolder=subfolder,
+            filename='bis3_invoice_negative_amounts.xml',
+            move_type='in_refund',
+            invoice_vals={
+                'amount_total': 1656.25,
+                'amount_tax': 331.25,
+                'invoice_lines': [{'price_subtotal': x} for x in (25, 2800, -1500)],
+            },
+        )
+        # source: base-creditnote-correction.xml with ignored LineExtensionAmount
+        self._assert_imported_invoice_from_file(
+            subfolder=subfolder,
+            filename='bis3_invoice_ignore_lineextensionamount.xml',
+            invoice_vals={
+                'amount_total': 1000,
+                'amount_tax': 0,
+                'invoice_lines': [{'price_subtotal': 1000}],
+            }
+        )
         # source: vat-category-E.xml
-        self._assert_imported_invoice_from_file(subfolder=subfolder, filename='bis3_tax_exempt_gbp.xml',
-            amount_total=1200, amount_tax=0, list_line_subtotals=[1200], currency_id=self.env.ref('base.GBP').id)
+        self._assert_imported_invoice_from_file(
+            subfolder=subfolder,
+            filename='bis3_tax_exempt_gbp.xml',
+            invoice_vals={
+                'currency_id': self.env.ref('base.GBP').id,
+                'amount_total': 1200,
+                'amount_tax': 0,
+                'invoice_lines': [{'price_subtotal': 1200}],
+            },
+        )
 
     def test_import_existing_invoice_flip_move_type(self):
         """ Tests whether the move_type of an existing invoice can be flipped when importing an attachment
@@ -683,7 +425,7 @@ class TestUBLBE(TestUBLCommon):
         the move type needs to be changed to 'out_refund'
         """
         invoice = self.env['account.move'].create({'move_type': 'out_invoice'})
-        self.update_invoice_from_file(
+        self._update_invoice_from_file(
             'l10n_account_edi_ubl_cii_tests',
             'tests/test_files/from_odoo',
             'bis3_out_refund.xml',
@@ -698,60 +440,201 @@ class TestUBLBE(TestUBLCommon):
         """
         subfolder = "tests/test_files/from_odoo"
         # The tax 21% from l10n_be is retrieved since it's a duplicate of self.tax_21
-        tax_21 = self.env.ref(f'l10n_be.{self.env.company.id}_attn_VAT-OUT-21-L')
+        tax_21 = self.env.ref(f'account.{self.env.company.id}_attn_VAT-OUT-21-L')
         self._assert_imported_invoice_from_file(
-            subfolder=subfolder, filename='bis3_ecotaxes_case1.xml', amount_total=121, amount_tax=22,
-            list_line_subtotals=[99], currency_id=self.currency_data['currency'].id, list_line_price_unit=[99],
-            list_line_discount=[0], list_line_taxes=[tax_21+self.recupel], move_type='out_invoice',
-        )
-        self._assert_imported_invoice_from_file(
-            subfolder=subfolder, filename='bis3_ecotaxes_case2.xml', amount_total=121, amount_tax=23,
-            list_line_subtotals=[98], currency_id=self.currency_data['currency'].id, list_line_price_unit=[98],
-            list_line_discount=[0], list_line_taxes=[tax_21+self.recupel+self.auvibel], move_type='out_invoice',
-        )
-        self._assert_imported_invoice_from_file(
-            subfolder=subfolder, filename='bis3_ecotaxes_case3.xml', amount_total=121, amount_tax=22,
-            list_line_subtotals=[99], currency_id=self.currency_data['currency'].id, list_line_price_unit=[99],
-            list_line_discount=[0], list_line_taxes=[tax_21+self.recupel], move_type='out_invoice',
-        )
-        self._assert_imported_invoice_from_file(
-            subfolder=subfolder, filename='bis3_ecotaxes_case4.xml', amount_total=218.04, amount_tax=39.84,
-            list_line_subtotals=[178.20000000000002], currency_id=self.currency_data['currency'].id,
-            list_line_price_unit=[99], list_line_discount=[10], list_line_taxes=[tax_21+self.recupel],
+            subfolder=subfolder,
+            filename='bis3_ecotaxes_case1.xml',
             move_type='out_invoice',
+            invoice_vals={
+                'currency_id': self.other_currency.id,
+                'amount_total': 121,
+                'amount_tax': 22,
+                'invoice_lines': [{
+                    'price_unit': 99,
+                    'discount': 0,
+                    'price_subtotal': 99,
+                    'tax_ids': (tax_21 + self.recupel).ids,
+                }]
+            }
+        )
+        self._assert_imported_invoice_from_file(
+            subfolder=subfolder,
+            filename='bis3_ecotaxes_case2.xml',
+            move_type='out_invoice',
+            invoice_vals={
+                'currency_id': self.other_currency.id,
+                'amount_total': 121,
+                'amount_tax': 23,
+                'invoice_lines': [{
+                    'price_unit': 98,
+                    'discount': 0,
+                    'price_subtotal': 98,
+                    'tax_ids': (tax_21 + self.recupel + self.auvibel).ids,
+                }]
+            },
+        )
+        self._assert_imported_invoice_from_file(
+            subfolder=subfolder,
+            filename='bis3_ecotaxes_case3.xml',
+            move_type='out_invoice',
+            invoice_vals={
+                'currency_id': self.other_currency.id,
+                'amount_total': 121,
+                'amount_tax': 22,
+                'invoice_lines': [{
+                    'price_unit': 99,
+                    'discount': 0,
+                    'price_subtotal': 99,
+                    'tax_ids': (tax_21 + self.recupel).ids,
+                }]
+            },
+        )
+        self._assert_imported_invoice_from_file(
+            subfolder=subfolder,
+            filename='bis3_ecotaxes_case4.xml',
+            move_type='out_invoice',
+            invoice_vals={
+                'currency_id': self.other_currency.id,
+                'amount_total': 218.04,
+                'amount_tax': 39.84,
+                'invoice_lines': [{
+                    'price_unit': 99,
+                    'quantity': 2,
+                    'discount': 10,
+                    'price_subtotal': 178.2,
+                    'tax_ids': (tax_21 + self.recupel).ids,
+                }]
+            },
         )
 
     def test_import_payment_terms(self):
         # The tax 21% from l10n_be is retrieved since it's a duplicate of self.tax_21
-        tax_21 = self.env.ref(f'l10n_be.{self.env.company.id}_attn_VAT-OUT-21-L')
+        tax_21 = self.env.ref(f'account.{self.env.company.id}_attn_VAT-OUT-21-L')
         self._assert_imported_invoice_from_file(
-            subfolder='tests/test_files/from_odoo', filename='bis3_pay_term.xml', amount_total=3105.68,
-            amount_tax=505.68, list_line_subtotals=[-4, -48, 52, 200, 2400],
-            currency_id=self.currency_data['currency'].id, list_line_price_unit=[-4, -48, 52, 200, 2400],
-            list_line_discount=[0, 0, 0, 0, 0], list_line_taxes=[self.tax_6, tax_21, self.tax_0, self.tax_6, tax_21],
+            subfolder='tests/test_files/from_odoo',
+            filename='bis3_pay_term.xml',
             move_type='out_invoice',
+            invoice_vals={
+                'currency_id': self.other_currency.id,
+                'amount_total': 3105.68,
+                'amount_tax': 505.68,
+                'invoice_lines': [
+                    {
+                        'price_unit': price_unit,
+                        'price_subtotal': price_unit,
+                        'discount': 0,
+                        'tax_ids': tax.ids,
+                    } for (price_unit, tax) in [
+                        (-4, self.tax_6),
+                        (-48, tax_21),
+                        (52, self.tax_0),
+                        (200, self.tax_6),
+                        (2400, tax_21),
+                    ]
+                ]
+            },
         )
 
-    def test_inverting_negative_price_unit(self):
-        """ We can not have negative unit prices, so we try to invert the unit price and quantity.
-        """
+    ####################################################
+    # Test Send & print
+    ####################################################
+
+    def test_send_and_print(self):
         invoice = self._generate_move(
             self.partner_1,
             self.partner_2,
+            send=False,
             move_type='out_invoice',
             invoice_line_ids=[
                 {
                     'product_id': self.product_a.id,
-                    'quantity': 1,
-                    'price_unit': 100.0,
-                    'tax_ids': [(6, 0, self.tax_21.ids)],
+                    'tax_ids': [Command.set(self.tax_21.ids)],
                 },
-                {
-                    'product_id': self.product_a.id,
-                    'quantity': 1,
-                    'price_unit': -25.0,
-                    'tax_ids': [(6, 0, self.tax_21.ids)],
-                }
             ],
         )
-        self._assert_invoice_attachment(invoice, None, 'from_odoo/bis3_out_invoice_negative_unit_price.xml')
+        self.assertEqual(self.partner_2.invoice_edi_format, 'ubl_bis3')
+        wizard = self.create_send_and_print(invoice, sending_methods=['manual'])
+        self.assertRecordValues(wizard, [{
+            'sending_methods': ['manual'],
+            'invoice_edi_format': 'ubl_bis3',
+            'extra_edi_checkboxes': False,
+        }])
+        self._assert_mail_attachments_widget(wizard, [
+            {
+                'mimetype': 'application/pdf',
+                'name': 'INV_2017_00001.pdf',
+                'placeholder': True,
+            },
+            {
+                'mimetype': 'application/xml',
+                'name': 'INV_2017_00001_ubl_bis3.xml',
+                'placeholder': True,
+            },
+        ])
+        self.assertFalse(invoice.invoice_pdf_report_id)
+        self.assertFalse(invoice.ubl_cii_xml_id)
+
+        # Send.
+        wizard.action_send_and_print()
+        self.assertTrue(invoice.invoice_pdf_report_id)
+        self.assertTrue(invoice.ubl_cii_xml_id)
+        invoice_attachments = self.env['ir.attachment'].search([
+            ('res_model', '=', invoice._name),
+            ('res_id', '=', invoice.id),
+            ('res_field', 'in', ('invoice_pdf_report_file', 'ubl_cii_xml_file')),
+        ])
+        self.assertEqual(len(invoice_attachments), 2)
+
+        # Send again.
+        wizard = self.create_send_and_print(invoice, sending_methods=['manual'])
+        self.assertRecordValues(wizard, [{
+            'sending_methods': ['manual'],
+            'invoice_edi_format': 'ubl_bis3',
+        }])
+        self._assert_mail_attachments_widget(wizard, [
+            {
+                'id': invoice.invoice_pdf_report_id.id,
+                'mimetype': 'application/pdf',
+                'name': 'INV_2019_00001.pdf',
+            },
+            {
+                'id': invoice.ubl_cii_xml_id.id,
+                'mimetype': 'application/xml',
+                'name': 'INV_2019_00001_ubl_bis3.xml',
+            },
+        ])
+        wizard.action_send_and_print()
+        self.assertTrue(invoice.invoice_pdf_report_id)
+        self.assertTrue(invoice.ubl_cii_xml_id)
+        invoice_attachments = self.env['ir.attachment'].search([
+            ('res_model', '=', invoice._name),
+            ('res_id', '=', invoice.id),
+            ('res_field', 'in', ('invoice_pdf_report_file', 'ubl_cii_xml_file')),
+        ])
+        self.assertEqual(len(invoice_attachments), 2)
+
+    def test_import_quantity_and_or_unit_price_zero(self):
+        """ Tests some special handling cases in which the quantity or unit_price are missing.
+        """
+        subfolder = "tests/test_files/from_odoo"
+        # The tax 21% from l10n_be is retrieved since it's a duplicate of self.tax_21
+        tax_21 = self.env.ref(f'account.{self.env.company.id}_attn_VAT-OUT-21-L')
+        self._assert_imported_invoice_from_file(
+            subfolder=subfolder,
+            filename='bis3_out_invoice_quantity_and_or_unit_price_zero.xml',
+            move_type='out_invoice',
+            invoice_vals={
+                'amount_total': 3630,
+                'amount_tax': 630,
+                'currency_id': self.other_currency.id,
+                'invoice_lines': [
+                    {
+                        'price_unit': price_unit,
+                        'quantity': quantity,
+                        'discount': 0,
+                        'tax_ids': tax_21.ids,
+                        'price_subtotal': 1000,
+                    } for price_unit, quantity in [(1000, 1), (100, 10), (10, 100)]
+                ]
+            }
+        )

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_xml_ubl_de.py

@@ -2,6 +2,7 @@
 from odoo import Command
 from odoo.addons.l10n_account_edi_ubl_cii_tests.tests.common import TestUBLCommon
 from odoo.tests import tagged
+from odoo.exceptions import UserError
 import base64
 
 
@@ -9,11 +10,9 @@ import base64
 class TestUBLDE(TestUBLCommon):
 
     @classmethod
-    def setUpClass(cls,
-                   chart_template_ref="l10n_de_skr03.l10n_de_chart_template",
-                   edi_format_ref="account_edi_ubl_cii.ubl_de",
-                   ):
-        super().setUpClass(chart_template_ref=chart_template_ref, edi_format_ref=edi_format_ref)
+    @TestUBLCommon.setup_country("de")
+    def setUpClass(cls):
+        super().setUpClass()
 
         cls.partner_1 = cls.env['res.partner'].create({
             'name': "partner_1",
@@ -24,8 +23,9 @@ class TestUBLDE(TestUBLCommon):
             'phone': '+49 180 6 225789',
             'email': 'info@legoland.de',
             'country_id': cls.env.ref('base.de').id,
-            'bank_ids': [(0, 0, {'acc_number': 'DE48500105176424548921'})],
+            'bank_ids': [(0, 0, {'acc_number': 'DE48500105176424548921', 'allow_out_payment': True})],
             'ref': 'ref_partner_1',
+            'invoice_edi_format': 'xrechnung',
         })
 
         cls.partner_2 = cls.env['res.partner'].create({
@@ -35,8 +35,9 @@ class TestUBLDE(TestUBLCommon):
             'city': "Rust",
             'vat': 'DE186775212',
             'country_id': cls.env.ref('base.de').id,
-            'bank_ids': [(0, 0, {'acc_number': 'DE50500105175653254743'})],
+            'bank_ids': [(0, 0, {'acc_number': 'DE50500105175653254743', 'allow_out_payment': True})],
             'ref': 'ref_partner_2',
+            'invoice_edi_format': 'zugferd',
         })
 
         cls.tax_19 = cls.env['account.tax'].create({
@@ -56,17 +57,22 @@ class TestUBLDE(TestUBLCommon):
         })
 
     @classmethod
-    def setup_company_data(cls, company_name, chart_template):
-        # OVERRIDE
-        # to force the company to be german + add phone and email
-        res = super().setup_company_data(
-            company_name,
-            chart_template=chart_template,
-            country_id=cls.env.ref("base.de").id,
+    def setup_independent_company(cls, **kwargs):
+        return super().setup_independent_company(
             phone="+49(0) 30 227-0",
             email="test@xrechnung@com",
+            **kwargs,
         )
-        return res
+
+    def _detach_attachment(self, attachment):
+        # attachments are protected from being edited because of the audit trail
+        # in the tests, we are reusing the ame attachment coming from another invoice, which would then switch invoice
+        self.env.cr.execute("UPDATE ir_attachment SET res_id = NULL WHERE id = %s", (attachment.id,))
+        attachment.invalidate_recordset()
+
+    def _assert_imported_invoice_from_etree(self, invoice, attachment):
+        self._detach_attachment(attachment)
+        return super()._assert_imported_invoice_from_etree(invoice, attachment)
 
     ####################################################
     # Test export - import
@@ -103,32 +109,82 @@ class TestUBLDE(TestUBLCommon):
             ],
         )
         attachment = self._assert_invoice_attachment(
-            invoice,
-            xpaths='''
-                <xpath expr="./*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
-                </xpath>
-                <xpath expr=".//*[local-name()='InvoiceLine'][1]/*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
-                </xpath>
-                <xpath expr=".//*[local-name()='InvoiceLine'][2]/*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
-                </xpath>
-                <xpath expr=".//*[local-name()='InvoiceLine'][3]/*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
-                </xpath>
-                <xpath expr=".//*[local-name()='PaymentMeans']/*[local-name()='PaymentID']" position="replace">
-                    <PaymentID>___ignore___</PaymentID>
-                </xpath>
-            ''',
-            expected_file='from_odoo/xrechnung_ubl_out_invoice.xml',
+            invoice.ubl_cii_xml_id,
+            xpaths=None,
+            expected_file_path='from_odoo/zugferd_out_invoice.xml',
         )
-        self.assertEqual(attachment.name[-10:], "ubl_de.xml")
+        self.assertEqual(attachment.name[-11:], "zugferd.xml")
         self._assert_imported_invoice_from_etree(invoice, attachment)
 
-    def test_export_import_invoice_without_vat(self):
-        self.partner_2.vat = False
-        self.partner_2.email = 'partner_2@test.test'
+    def test_export_import_invoice_xrechnung(self):
+        self.partner_2.write({
+            'peppol_eas': '0204',
+            'peppol_endpoint': '123456789',
+            'invoice_edi_format': 'xrechnung'
+        })
+        invoice = self._generate_move(
+            self.partner_1,
+            self.partner_2,
+            move_type='out_invoice',
+            invoice_line_ids=[
+                {
+                    'product_id': self.product_a.id,
+                    'quantity': 2.0,
+                    'product_uom_id': self.env.ref('uom.product_uom_dozen').id,
+                    'price_unit': 990.0,
+                    'discount': 10.0,
+                    'tax_ids': [(6, 0, self.tax_19.ids)],
+                },
+                {
+                    'product_id': self.product_b.id,
+                    'quantity': 10.0,
+                    'product_uom_id': self.env.ref('uom.product_uom_unit').id,
+                    'price_unit': 100.0,
+                    'tax_ids': [(6, 0, self.tax_7.ids)],
+                },
+                {
+                    'product_id': self.product_b.id,
+                    'quantity': -1.0,
+                    'product_uom_id': self.env.ref('uom.product_uom_unit').id,
+                    'price_unit': 100.0,
+                    'tax_ids': [(6, 0, self.tax_7.ids)],
+                },
+            ],
+        )
+        attachment = self._assert_invoice_attachment(
+            invoice.ubl_cii_xml_id,
+            xpaths=f'''
+                <xpath expr="./*[local-name()='ID']" position="replace">
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
+                </xpath>
+                <xpath expr=".//*[local-name()='InvoiceLine'][1]/*[local-name()='ID']" position="replace">
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
+                </xpath>
+                <xpath expr=".//*[local-name()='InvoiceLine'][2]/*[local-name()='ID']" position="replace">
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
+                </xpath>
+                <xpath expr=".//*[local-name()='InvoiceLine'][3]/*[local-name()='ID']" position="replace">
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
+                </xpath>
+                <xpath expr=".//*[local-name()='PaymentMeans']/*[local-name()='PaymentID']" position="replace">
+                    <cbc:PaymentID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:PaymentID>
+                </xpath>
+                <xpath expr=".//*[local-name()='AdditionalDocumentReference']/*[local-name()='Attachment']/*[local-name()='EmbeddedDocumentBinaryObject']" position="attributes">
+                    <attribute name="mimeCode">application/pdf</attribute>
+                    <attribute name="filename">{invoice.invoice_pdf_report_id.name}</attribute>
+                </xpath>
+            ''',
+            expected_file_path='from_odoo/xrechnung_ubl_out_invoice.xml',
+        )
+        self.assertEqual(attachment.name[-13:], "xrechnung.xml")
+        self._assert_imported_invoice_from_etree(invoice, attachment)
+
+    def test_export_import_invoice_without_vat_and_peppol_endpoint(self):
+        self.partner_2.write({
+            'vat': False,
+            'peppol_endpoint': False,
+            'email': 'partner_2@test.test',
+        })
         invoice = self._generate_move(
             self.partner_1,
             self.partner_2,
@@ -143,21 +199,10 @@ class TestUBLDE(TestUBLCommon):
             ],
         )
         attachment = self._assert_invoice_attachment(
-            invoice,
-            xpaths='''
-                <xpath expr="./*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
-                </xpath>
-                <xpath expr=".//*[local-name()='InvoiceLine'][1]/*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
-                </xpath>
-                <xpath expr=".//*[local-name()='PaymentMeans']/*[local-name()='PaymentID']" position="replace">
-                    <PaymentID>___ignore___</PaymentID>
-                </xpath>
-            ''',
-            expected_file='from_odoo/xrechnung_ubl_out_invoice_without_vat.xml',
+            invoice.ubl_cii_xml_id,
+            xpaths=None,
+            expected_file_path='from_odoo/zugferd_out_invoice_without_vat.xml',
         )
-        self.assertEqual(attachment.name[-10:], "ubl_de.xml")
         self._assert_imported_invoice_from_etree(invoice, attachment)
 
     def test_export_import_refund(self):
@@ -191,27 +236,75 @@ class TestUBLDE(TestUBLCommon):
             ],
         )
         attachment = self._assert_invoice_attachment(
-            refund,
-            xpaths='''
+            refund.ubl_cii_xml_id,
+            xpaths=None,
+            expected_file_path='from_odoo/zugferd_out_refund.xml',
+        )
+        self.assertEqual(attachment.name[-11:], "zugferd.xml")
+        self._assert_imported_invoice_from_etree(refund, attachment)
+
+    def test_export_import_refund_xrehnung(self):
+        self.partner_2.write({
+            'peppol_eas': '0204',
+            'peppol_endpoint': '123456789',
+            'invoice_edi_format': 'xrechnung'
+        })
+
+        refund = self._generate_move(
+            self.partner_1,
+            self.partner_2,
+            move_type='out_refund',
+            invoice_line_ids=[
+                {
+                    'product_id': self.product_a.id,
+                    'quantity': 2.0,
+                    'product_uom_id': self.env.ref('uom.product_uom_dozen').id,
+                    'price_unit': 990.0,
+                    'discount': 10.0,
+                    'tax_ids': [(6, 0, self.tax_19.ids)],
+                },
+                {
+                    'product_id': self.product_b.id,
+                    'quantity': 10.0,
+                    'product_uom_id': self.env.ref('uom.product_uom_unit').id,
+                    'price_unit': 100.0,
+                    'tax_ids': [(6, 0, self.tax_7.ids)],
+                },
+                {
+                    'product_id': self.product_b.id,
+                    'quantity': -1.0,
+                    'product_uom_id': self.env.ref('uom.product_uom_unit').id,
+                    'price_unit': 100.0,
+                    'tax_ids': [(6, 0, self.tax_7.ids)],
+                },
+            ],
+        )
+        attachment = self._assert_invoice_attachment(
+            refund.ubl_cii_xml_id,
+            xpaths=f'''
                 <xpath expr="./*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='CreditNoteLine'][1]/*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='CreditNoteLine'][2]/*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='CreditNoteLine'][3]/*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='PaymentMeans']/*[local-name()='PaymentID']" position="replace">
-                    <PaymentID>___ignore___</PaymentID>
+                    <cbc:PaymentID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:PaymentID>
+                </xpath>
+                <xpath expr=".//*[local-name()='AdditionalDocumentReference']/*[local-name()='Attachment']/*[local-name()='EmbeddedDocumentBinaryObject']" position="attributes">
+                    <attribute name="mimeCode">application/pdf</attribute>
+                    <attribute name="filename">{refund.invoice_pdf_report_id.name}</attribute>
                 </xpath>
             ''',
-            expected_file='from_odoo/xrechnung_ubl_out_refund.xml',
+            expected_file_path='from_odoo/xrechnung_ubl_out_refund.xml',
         )
-        self.assertEqual(attachment.name[-10:], "ubl_de.xml")
+        self.assertEqual(attachment.name[-13:], "xrechnung.xml")
         self._assert_imported_invoice_from_etree(refund, attachment)
 
     ####################################################
@@ -219,9 +312,16 @@ class TestUBLDE(TestUBLCommon):
     ####################################################
 
     def test_import_invoice_xml(self):
-        self._assert_imported_invoice_from_file(subfolder='tests/test_files/from_odoo',
-            filename='xrechnung_ubl_out_invoice.xml', amount_total=3083.58, amount_tax=401.58,
-            list_line_subtotals=[1782, 1000, -100], currency_id=self.currency_data['currency'].id)
+        self._assert_imported_invoice_from_file(
+            subfolder='tests/test_files/from_odoo',
+            filename='xrechnung_ubl_out_invoice.xml',
+            invoice_vals={
+                'currency_id': self.other_currency.id,
+                'amount_total': 3083.58,
+                'amount_tax': 401.58,
+                'invoice_lines': [{'price_subtotal': x} for x in (1782, 1000, -100)],
+            },
+        )
 
     def test_import_export_invoice_xml(self):
         """
@@ -231,29 +331,32 @@ class TestUBLDE(TestUBLCommon):
         acc_bank = self.env['res.partner.bank'].create({
             'acc_number': 'BE15001559627232',
             'partner_id': self.company_data['company'].partner_id.id,
+            'allow_out_payment': True,
         })
-        invoice = self.env['account.move'].create({
-            'move_type': 'out_invoice',
-            'journal_id': self.journal.id,
-            'partner_id': self.partner_1.id,
-            'partner_bank_id': acc_bank.id,
-            'invoice_date': '2017-01-01',
-            'date': '2017-01-01',
-            'currency_id': self.currency_data['currency'].id,
-            'invoice_line_ids': [(0, 0, {
+
+        invoice = self._generate_move(
+            self.partner_1,
+            self.partner_2,
+            move_type='out_invoice',
+            partner_id=self.partner_1.id,
+            partner_bank_id=acc_bank.id,
+            invoice_date='2017-01-01',
+            date='2017-01-01',
+            invoice_line_ids=[{
                 'product_id': self.product_a.id,
                 'product_uom_id': self.env.ref('uom.product_uom_dozen').id,
                 'price_unit': 275.0,
                 'quantity': 5,
                 'discount': 20.0,
                 'tax_ids': [(6, 0, self.tax_19.ids)],
-            })],
-        })
+            }],
+        )
 
         partner = invoice.commercial_partner_id
-        invoice.action_post()
-        attachment = invoice._get_edi_attachment(self.edi_format)
+        attachment = invoice.ubl_cii_xml_id
+
         self.assertTrue(attachment)
+
         xml_content = base64.b64decode(attachment.with_context(bin_size=False).datas)
         xml_etree = self.get_xml_tree_from_string(xml_content)
 
@@ -265,5 +368,37 @@ class TestUBLDE(TestUBLCommon):
         )
 
         created_bill = self.env['account.move'].create({'move_type': 'in_invoice'})
+        self._detach_attachment(attachment)
         created_bill.message_post(attachment_ids=[attachment.id])
         self.assertTrue(created_bill)
+
+    def test_leitweg_id(self):
+        partner = self.partner_2
+        partner.write({
+            'peppol_eas': '0204',
+            'peppol_endpoint': '123456789',
+            'invoice_edi_format': 'xrechnung',
+        })
+
+        acc_bank = self.env['res.partner.bank'].create({
+            'acc_number': 'DE15001559627232',
+            'partner_id': partner.id,
+            'allow_out_payment': True,
+        })
+
+        invoice = self._generate_move(
+            self.partner_1,
+            partner,
+            move_type='out_invoice',
+            partner_id=partner.id,
+            partner_bank_id=acc_bank.id,
+            invoice_date='2025-12-01',
+            invoice_line_ids=[{'product_id': self.product_a.id}],
+        )
+        attachment = invoice.ubl_cii_xml_id
+
+        self.assertTrue(attachment)
+
+        xml_content = base64.b64decode(attachment.with_context(bin_size=False).datas)
+        xml_etree = self.get_xml_tree_from_string(xml_content)
+        self.assertEqual(xml_etree.find('{*}BuyerReference').text, '123456789')

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_xml_ubl_nl.py

@@ -10,11 +10,9 @@ from lxml import etree
 class TestUBLNL(TestUBLCommon):
 
     @classmethod
-    def setUpClass(cls,
-                   chart_template_ref="l10n_nl.l10nnl_chart_template",
-                   edi_format_ref="account_edi_ubl_cii.edi_nlcius_1",
-                   ):
-        super().setUpClass(chart_template_ref=chart_template_ref, edi_format_ref=edi_format_ref)
+    @TestUBLCommon.setup_country('nl')
+    def setUpClass(cls):
+        super().setUpClass()
 
         cls.partner_1 = cls.env['res.partner'].create({
             'name': "partner_1",
@@ -25,9 +23,11 @@ class TestUBLNL(TestUBLCommon):
             'phone': '+31 180 6 225789',
             'email': 'info@outlook.nl',
             'country_id': cls.env.ref('base.nl').id,
-            'bank_ids': [(0, 0, {'acc_number': 'NL000099998B57'})],
-            'l10n_nl_kvk': '77777677',
+            'bank_ids': [(0, 0, {'acc_number': 'NL000099998B57', 'allow_out_payment': True})],
+            'peppol_eas': '0106',
+            'peppol_endpoint': '77777677',
             'ref': 'ref_partner_1',
+            'invoice_edi_format': 'nlcius',
         })
 
         cls.partner_2 = cls.env['res.partner'].create({
@@ -37,9 +37,12 @@ class TestUBLNL(TestUBLCommon):
             'city': "Rotterdam",
             'vat': 'NL41452B11',
             'country_id': cls.env.ref('base.nl').id,
-            'bank_ids': [(0, 0, {'acc_number': 'NL93999574162167'})],
-            'l10n_nl_kvk': '1234567',
+            'bank_ids': [(0, 0, {'acc_number': 'NL93999574162167', 'allow_out_payment': True})],
+            'peppol_eas': '9944',
+            'peppol_endpoint': 'NL41452B11',
+            'company_registry': '123456789',
             'ref': 'ref_partner_2',
+            'invoice_edi_format': 'nlcius',
         })
 
         cls.tax_19 = cls.env['account.tax'].create({
@@ -84,17 +87,6 @@ class TestUBLNL(TestUBLCommon):
             'sequence': 1,
         })
 
-    @classmethod
-    def setup_company_data(cls, company_name, chart_template):
-        # OVERRIDE
-        # to force the company to be dutch
-        res = super().setup_company_data(
-            company_name,
-            chart_template=chart_template,
-            country_id=cls.env.ref("base.nl").id,
-        )
-        return res
-
     ####################################################
     # Test export - import
     ####################################################
@@ -130,25 +122,29 @@ class TestUBLNL(TestUBLCommon):
             ],
         )
         attachment = self._assert_invoice_attachment(
-            invoice,
-            xpaths='''
+            invoice.ubl_cii_xml_id,
+            xpaths=f'''
                 <xpath expr="./*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='InvoiceLine'][1]/*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='InvoiceLine'][2]/*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='InvoiceLine'][3]/*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='PaymentMeans']/*[local-name()='PaymentID']" position="replace">
-                    <PaymentID>___ignore___</PaymentID>
+                    <cbc:PaymentID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:PaymentID>
+                </xpath>
+                <xpath expr=".//*[local-name()='AdditionalDocumentReference']/*[local-name()='Attachment']/*[local-name()='EmbeddedDocumentBinaryObject']" position="attributes">
+                    <attribute name="mimeCode">application/pdf</attribute>
+                    <attribute name="filename">{invoice.invoice_pdf_report_id.name}</attribute>
                 </xpath>
             ''',
-            expected_file='from_odoo/nlcius_out_invoice.xml',
+            expected_file_path='from_odoo/nlcius_out_invoice.xml',
         )
         self.assertEqual(attachment.name[-10:], "nlcius.xml")
         self._assert_imported_invoice_from_etree(invoice, attachment)
@@ -184,38 +180,38 @@ class TestUBLNL(TestUBLCommon):
             ],
         )
         attachment = self._assert_invoice_attachment(
-            refund,
-            xpaths='''
+            refund.ubl_cii_xml_id,
+            xpaths=f'''
                 <xpath expr="./*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='CreditNoteLine'][1]/*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='CreditNoteLine'][2]/*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='CreditNoteLine'][3]/*[local-name()='ID']" position="replace">
-                    <ID>___ignore___</ID>
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
                 </xpath>
                 <xpath expr=".//*[local-name()='PaymentMeans']/*[local-name()='PaymentID']" position="replace">
-                    <PaymentID>___ignore___</PaymentID>
+                    <cbc:PaymentID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:PaymentID>
+                </xpath>
+                <xpath expr=".//*[local-name()='AdditionalDocumentReference']/*[local-name()='Attachment']/*[local-name()='EmbeddedDocumentBinaryObject']" position="attributes">
+                    <attribute name="mimeCode">application/pdf</attribute>
+                    <attribute name="filename">{refund.invoice_pdf_report_id.name}</attribute>
                 </xpath>
             ''',
-            expected_file='from_odoo/nlcius_out_refund.xml',
+            expected_file_path='from_odoo/nlcius_out_refund.xml',
         )
         self.assertEqual(attachment.name[-10:], "nlcius.xml")
         self._assert_imported_invoice_from_etree(refund, attachment)
 
-    def test_export_fixed_tax_nlcius_and_peppol(self):
+    def test_export_fixed_tax(self):
         """
         Ensure that an invoice containing a product with a fixed tax posted to a journal with the peppol and nlcius edi
             tags generates edi documents with accurate LineExtensionAmount values
         """
-        self.journal.edi_format_ids = [
-            Command.link(self.env.ref('account_edi_ubl_cii.ubl_bis3').id)
-        ]
-
         invoice = self._generate_move(
             self.partner_1, self.partner_2,
             move_type='out_invoice',
@@ -226,17 +222,8 @@ class TestUBLNL(TestUBLCommon):
                 'tax_ids': [Command.set([self.tax_10_fixed.id, self.tax_7_purchase.id])]
             }]
         )
-
-        amounts = [
-            etree.fromstring(doc.attachment_id.raw).find(
-                './/{*}LegalMonetaryTotal/{*}LineExtensionAmount'
-            ).text
-            for doc in invoice.edi_document_ids.filtered(lambda d: d.edi_format_id.code in (
-                'ubl_bis3', 'nlcius_1'
-            ))
-        ]
-
-        self.assertEqual(amounts, ['60.00', '60.00'])
+        amount = etree.fromstring(invoice.ubl_cii_xml_id.raw).find('.//{*}LegalMonetaryTotal/{*}LineExtensionAmount').text
+        self.assertEqual(amount, '60.00')
 
     ####################################################
     # Test import
@@ -244,6 +231,13 @@ class TestUBLNL(TestUBLCommon):
 
     def test_import_invoice_xml(self):
         # test files https://github.com/peppolautoriteit-nl/validation ?
-        self._assert_imported_invoice_from_file(subfolder='tests/test_files/from_odoo',
-            filename='nlcius_out_invoice.xml', amount_total=3083.58, amount_tax=401.58,
-            list_line_subtotals=[1782, 1000, -100], currency_id=self.currency_data['currency'].id)
+        self._assert_imported_invoice_from_file(
+            subfolder='tests/test_files/from_odoo',
+            filename='nlcius_out_invoice.xml',
+            invoice_vals={
+                'currency_id': self.other_currency.id,
+                'amount_total': 3083.58,
+                'amount_tax': 401.58,
+                'invoice_lines': [{'price_subtotal': x} for x in (1782, 1000, -100)]
+            },
+        )

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/l10n_account_edi_ubl_cii_tests/tests/test_xml_ubl_sg.py

@@ -0,0 +1,142 @@
+from odoo import Command
+from odoo.tests import tagged
+from odoo.addons.l10n_account_edi_ubl_cii_tests.tests.common import TestUBLCommon
+
+
+@tagged('post_install_l10n', 'post_install', '-at_install')
+class TestUBLSG(TestUBLCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.partner_1 = cls.env['res.partner'].create({
+            'name': "partner_1",
+            'street': 'Tyersall Avenue',
+            'zip': '248048',
+            'city': 'Central Singapore',
+            'vat': '197401143C',
+            'phone': '+65 9123 4567',
+            'email': 'info@outlook.sg',
+            'country_id': cls.env.ref('base.sg').id,
+            'bank_ids': [(0, 0, {'acc_number': '000099998B57', 'allow_out_payment': True})],
+            'ref': 'ref_partner_1',
+            'invoice_edi_format': 'ubl_sg',
+            'peppol_eas': '0195',
+            'peppol_endpoint': '197401143C',
+        })
+
+        cls.partner_2 = cls.env['res.partner'].create({
+            'name': "partner_2",
+            'street': 'that other street, 3',
+            'zip': '248050',
+            'city': 'East Singapore',
+            'vat': 'S16FC0121D',
+            'phone': '+65 9123 4589',
+            'country_id': cls.env.ref('base.sg').id,
+            'bank_ids': [(0, 0, {'acc_number': '93999574162167', 'allow_out_payment': True})],
+            'ref': 'ref_partner_2',
+            'invoice_edi_format': 'ubl_sg',
+            'peppol_eas': '0195',
+            'peppol_endpoint': 'S16FC0121D',
+        })
+
+    ####################################################
+    # Test export - import
+    ####################################################
+
+    def test_export_import_invoice(self):
+        tax_10 = self.percent_tax(10)
+        tax_0 = self.percent_tax(0)
+        invoice = self._generate_move(
+            self.partner_1,
+            self.partner_2,
+            move_type='out_invoice',
+            invoice_line_ids=[
+                {
+                    'product_id': self.product_a.id,
+                    'quantity': 2.0,
+                    'price_unit': 1000.0,
+                    'discount': 20.0,
+                    'tax_ids': [(Command.set(tax_10.ids))],
+                },
+                {
+                    'product_id': self.product_b.id,
+                    'quantity': 2.0,
+                    'price_unit': 500.0,
+                    'tax_ids': [(Command.set(tax_0.ids))],
+                },
+            ],
+        )
+        attachment = self._assert_invoice_attachment(
+            invoice.ubl_cii_xml_id,
+            xpaths=f'''
+                <xpath expr="./*[local-name()='ID']" position="replace">
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
+                </xpath>
+                <xpath expr=".//*[local-name()='InvoiceLine'][1]/*[local-name()='ID']" position="replace">
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
+                </xpath>
+                <xpath expr=".//*[local-name()='InvoiceLine'][2]/*[local-name()='ID']" position="replace">
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
+                </xpath>
+                <xpath expr=".//*[local-name()='PaymentMeans']/*[local-name()='PaymentID']" position="replace">
+                    <cbc:PaymentID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:PaymentID>
+                </xpath>
+                <xpath expr=".//*[local-name()='AdditionalDocumentReference']/*[local-name()='Attachment']/*[local-name()='EmbeddedDocumentBinaryObject']" position="attributes">
+                    <attribute name="mimeCode">application/pdf</attribute>
+                    <attribute name="filename">{invoice.invoice_pdf_report_id.name}</attribute>
+                </xpath>
+            ''',
+            expected_file_path='from_odoo/sg_out_invoice.xml',
+        )
+        self.assertEqual(attachment.name[-6:], "sg.xml")
+        self._assert_imported_invoice_from_etree(invoice, attachment)
+
+    def test_export_import_refund(self):
+        tax_10 = self.percent_tax(10)
+        tax_0 = self.percent_tax(0)
+        refund = self._generate_move(
+            self.partner_1,
+            self.partner_2,
+            move_type='out_refund',
+            invoice_line_ids=[
+                {
+                    'product_id': self.product_a.id,
+                    'quantity': 2.0,
+                    'price_unit': 1000.0,
+                    'discount': 20.0,
+                    'tax_ids': [(Command.set(tax_10.ids))],
+                },
+                {
+                    'product_id': self.product_b.id,
+                    'quantity': 2.0,
+                    'price_unit': 500.0,
+                    'tax_ids': [(Command.set(tax_0.ids))],
+                },
+            ],
+        )
+        attachment = self._assert_invoice_attachment(
+            refund.ubl_cii_xml_id,
+            xpaths=f'''
+                <xpath expr="./*[local-name()='ID']" position="replace">
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
+                </xpath>
+                <xpath expr=".//*[local-name()='CreditNoteLine'][1]/*[local-name()='ID']" position="replace">
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
+                </xpath>
+                <xpath expr=".//*[local-name()='CreditNoteLine'][2]/*[local-name()='ID']" position="replace">
+                    <cbc:ID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:ID>
+                </xpath>
+                <xpath expr=".//*[local-name()='PaymentMeans']/*[local-name()='PaymentID']" position="replace">
+                    <cbc:PaymentID xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">___ignore___</cbc:PaymentID>
+                </xpath>
+                <xpath expr=".//*[local-name()='AdditionalDocumentReference']/*[local-name()='Attachment']/*[local-name()='EmbeddedDocumentBinaryObject']" position="attributes">
+                    <attribute name="mimeCode">application/pdf</attribute>
+                    <attribute name="filename">{refund.invoice_pdf_report_id.name}</attribute>
+                </xpath>
+            ''',
+            expected_file_path='from_odoo/sg_out_refund.xml',
+        )
+        self.assertEqual(attachment.name[-6:], "sg.xml")
+        self._assert_imported_invoice_from_etree(refund, attachment)

odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests/pyproject.toml

@@ -1,18 +1,19 @@
 [project]
 name = "odoo-bringout-oca-ocb-l10n_account_edi_ubl_cii_tests"
 version = "16.0.0"
-description = "Testing the Import/Export invoices with UBL/CII - Odoo addon"
+description = "Testing the Import/Export invoices with UBL/CII - 
+        Odoo addon
+        "
 authors = [
     { name = "Ernad Husremovic", email = "hernad@bring.out.ba" }
 ]
 dependencies = [
-    "odoo-bringout-oca-ocb-l10n_generic_coa>=16.0.0",
-    "odoo-bringout-oca-ocb-account_edi_ubl_cii>=16.0.0",
-    "odoo-bringout-oca-ocb-l10n_fr>=16.0.0",
-    "odoo-bringout-oca-ocb-l10n_be>=16.0.0",
-    "odoo-bringout-oca-ocb-l10n_de>=16.0.0",
-    "odoo-bringout-oca-ocb-l10n_nl>=16.0.0",
-    "odoo-bringout-oca-ocb-l10n_au>=16.0.0",
+    "odoo-bringout-oca-ocb-account_edi_ubl_cii>=19.0.0",
+    "TODO_MAP-l10n_fr_account>=19.0.0",
+    "odoo-bringout-oca-ocb-l10n_be>=19.0.0",
+    "odoo-bringout-oca-ocb-l10n_de>=19.0.0",
+    "odoo-bringout-oca-ocb-l10n_nl>=19.0.0",
+    "odoo-bringout-oca-ocb-l10n_au>=19.0.0",
     "requests>=2.25.1"
 ]
 readme = "README.md"
@@ -22,7 +23,7 @@ classifiers = [
     "Intended Audience :: Developers",
     "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.11", 
+    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Topic :: Office/Business",
 ]

odoo-bringout-oca-ocb-l10n_ar_website_sale/README.md

@@ -1,6 +1,6 @@
 # Argentinean eCommerce
 
-Be able to see Identification Type and AFIP Responsibility in ecommerce checkout form.
+Bridge Website Sale for Argentina
 
 ## Installation
 
@@ -10,36 +10,15 @@ pip install odoo-bringout-oca-ocb-l10n_ar_website_sale
 
 ## Dependencies
 
-This addon depends on:
 - website_sale
 - l10n_ar
 
-## Manifest Information
-
-- **Name**: Argentinean eCommerce
-- **Version**: 1.0
-- **Category**: Accounting/Localizations/Website
-- **License**: LGPL-3
-- **Installable**: True
-
 ## Source
 
-Based on [OCA/OCB](https://github.com/OCA/OCB) branch 16.0, addon `l10n_ar_website_sale`.
+- Repository: https://github.com/OCA/OCB
+- Branch: 19.0
+- Path: addons/l10n_ar_website_sale
 
 ## License
 
-This package maintains the original LGPL-3 license from the upstream Odoo project.
-
-## Documentation
-
-- Overview: doc/OVERVIEW.md
-- Architecture: doc/ARCHITECTURE.md
-- Models: doc/MODELS.md
-- Controllers: doc/CONTROLLERS.md
-- Wizards: doc/WIZARDS.md
-- Install: doc/INSTALL.md
-- Usage: doc/USAGE.md
-- Configuration: doc/CONFIGURATION.md
-- Dependencies: doc/DEPENDENCIES.md
-- Troubleshooting: doc/TROUBLESHOOTING.md
-- FAQ: doc/FAQ.md
+This package preserves the original LGPL-3 license.

odoo-bringout-oca-ocb-l10n_ar_website_sale/l10n_ar_website_sale/__init__.py

@@ -1,4 +1 @@
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-from . import controllers
 from . import models
-from . import tests

odoo-bringout-oca-ocb-l10n_ar_website_sale/l10n_ar_website_sale/__manifest__.py

@@ -1,23 +1,26 @@
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Argentinean eCommerce',
     'version': '1.0',
     'category': 'Accounting/Localizations/Website',
-    'sequence': 14,
-    'author': 'Odoo, ADHOC SA',
-    'description': """Be able to see Identification Type and AFIP Responsibility in ecommerce checkout form.""",
+    'countries': ['ar'],
+    'icon': '/base/static/img/country_flags/ar.png',
+    'description': """Bridge Website Sale for Argentina""",
     'depends': [
         'website_sale',
         'l10n_ar',
     ],
     'data': [
-        'data/ir_model_fields.xml',
+        'views/res_config_settings_views.xml',
         'views/templates.xml',
     ],
-    'demo': [
-        'demo/website_demo.xml',
-    ],
+    'assets': {
+        'web.assets_frontend': [
+            'l10n_ar_website_sale/static/src/interactions/**/*',
+            'l10n_ar_website_sale/static/src/scss/*.scss',
+        ]
+    },
     'installable': True,
     'auto_install': True,
+    'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }

odoo-bringout-oca-ocb-l10n_ar_website_sale/l10n_ar_website_sale/controllers/main.py

@@ -1,59 +0,0 @@
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-from odoo import _
-from odoo.addons.website_sale.controllers.main import WebsiteSale
-from odoo.http import request
-
-
-class L10nARWebsiteSale(WebsiteSale):
-
-    def _get_mandatory_fields_billing(self, country_id=False):
-        """Extend mandatory fields to add new identification and responsibility fields when company is argentina"""
-        res = super()._get_mandatory_fields_billing(country_id)
-        if request.website.sudo().company_id.country_id.code == "AR":
-            res += ["l10n_latam_identification_type_id", "l10n_ar_afip_responsibility_type_id", "vat"]
-        return res
-
-    def _get_country_related_render_values(self, kw, render_values):
-        res = super()._get_country_related_render_values(kw, render_values)
-        if request.website.sudo().company_id.country_id.code == "AR":
-            res.update({'identification': kw.get('l10n_latam_identification_type_id'),
-                        'responsibility': kw.get('l10n_ar_afip_responsibility_type_id'),
-                        'responsibility_types': request.env['l10n_ar.afip.responsibility.type'].search([]),
-                        'identification_types': request.env['l10n_latam.identification.type'].search(
-                            ['|', ('country_id', '=', False), ('country_id.code', '=', 'AR')])})
-        return res
-
-    def _get_vat_validation_fields(self, data):
-        res = super()._get_vat_validation_fields(data)
-        if request.website.sudo().company_id.country_id.code == "AR":
-            res.update({'l10n_latam_identification_type_id': int(data['l10n_latam_identification_type_id'])
-                                                             if data.get('l10n_latam_identification_type_id') else False})
-            res.update({'name': data['name'] if data.get('name') else False})
-        return res
-
-    def checkout_form_validate(self, mode, all_form_values, data):
-        """ We extend the method to add a new validation. If AFIP Resposibility is:
-
-        * Final Consumer or Foreign Customer: then it can select any identification type.
-        * Any other (Monotributista, RI, etc): should select always "CUIT" identification type"""
-        error, error_message = super().checkout_form_validate(mode, all_form_values, data)
-
-        # Identification type and AFIP Responsibility Combination
-        if request.website.sudo().company_id.country_id.code == "AR":
-            if mode[1] == 'billing':
-                if error and any(field in error for field in ['l10n_latam_identification_type_id', 'l10n_ar_afip_responsibility_type_id']):
-                    return error, error_message
-                id_type_id = data.get("l10n_latam_identification_type_id")
-                afip_resp_id = data.get("l10n_ar_afip_responsibility_type_id")
-
-                id_type = request.env['l10n_latam.identification.type'].browse(id_type_id) if id_type_id else False
-                afip_resp = request.env['l10n_ar.afip.responsibility.type'].browse(afip_resp_id) if afip_resp_id else False
-                cuit_id_type = request.env.ref('l10n_ar.it_cuit')
-
-                # Check if the AFIP responsibility is different from Final Consumer or Foreign Customer,
-                # and if the identification type is different from CUIT
-                if afip_resp.code not in ['5', '9'] and id_type != cuit_id_type:
-                    error["l10n_latam_identification_type_id"] = 'error'
-                    error_message.append(_('For the selected AFIP Responsibility you will need to set CUIT Identification Type'))
-
-        return error, error_message

odoo-bringout-oca-ocb-l10n_ar_website_sale/l10n_ar_website_sale/data/ir_model_fields.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <function model="ir.model.fields" name="formbuilder_whitelist">
-        <value>res.partner</value>
-        <value eval="[
-            'l10n_ar_afip_responsibility_type_id', 'l10n_latam_identification_type_id',
-        ]"/>
-    </function>
-
-</odoo>

odoo-bringout-oca-ocb-l10n_ar_website_sale/l10n_ar_website_sale/demo/website_demo.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo noupdate="1">
-
-    <record id="default_website_ri" model="website">
-        <field name="name">(AR) Responsable Inscripto Website</field>
-        <field name="company_id" ref="l10n_ar.company_ri"/>
-        <field name="logo" type="base64" file="l10n_ar_website_sale/static/description/icon.png"/>
-        <field name="domain" model="ir.config_parameter" eval="obj().env['ir.config_parameter'].sudo().get_param('web.base.url')"/>
-    </record>
-    <function model="payment.provider" name="copy">
-        <value eval="[ref('payment.payment_provider_transfer')]"/>
-        <value eval="{'company_id': ref('l10n_ar.company_ri'), 'state': 'enabled'}"/>
-    </function>
-    <function model="product.pricelist" name="write">
-        <value model="product.pricelist" eval="obj().search([('currency_id', '=', ref('base.ARS')), ('company_id', '=', ref('l10n_ar.company_ri'))]).id"/>
-        <value model="website" eval="{'sequence': 1, 'website_id': ref('l10n_ar_website_sale.default_website_ri')}"/>
-    </function>
-    <function model="product.product" name="write">
-        <value model="product.product" eval="obj().search([('taxes_id', '=', False)]).ids"/>
-        <value model="account.tax" eval="{'taxes_id': [(4, obj().search([('type_tax_use', '=', 'sale'), ('tax_group_id', '=', ref('l10n_ar.tax_group_iva_21')), ('company_id', '=', ref('l10n_ar.company_ri'))]).id)]}"/>
-    </function>
-
-</odoo>

odoo-bringout-oca-ocb-l10n_ar_website_sale/l10n_ar_website_sale/i18n/es.po

@@ -1,86 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# 	* l10n_ar_website_sale
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 16.0+e\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-15 10:56+0000\n"
-"PO-Revision-Date: 2024-11-15 10:56+0000\n"
-"Last-Translator: María Fernanda Alvarez Ramírez <mfar@odoo.com>\n"
-"Language-Team: \n"
-"Language: es\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. module: l10n_ar_website_sale
-#: model:website,contact_us_button_url:l10n_ar_website_sale.default_website_ri
-msgid "/contactus"
-msgstr "/contacto"
-
-#. module: l10n_ar_website_sale
-#: model_terms:ir.ui.view,arch_db:l10n_ar_website_sale.partner_info
-msgid "<option value=\"\">AFIP Responsibility...</option>"
-msgstr "<option value=\"\">Responsabilidad AFIP...</option>"
-
-#. module: l10n_ar_website_sale
-#: model_terms:ir.ui.view,arch_db:l10n_ar_website_sale.partner_info
-msgid "<option value=\"\">Identification Type...</option>"
-msgstr "<option value=\"\">Tipo de identificación...</option>"
-
-#. module: l10n_ar_website_sale
-#: model_terms:ir.ui.view,arch_db:l10n_ar_website_sale.partner_info
-msgid "AFIP Responsibility"
-msgstr "Responsabilidad AFIP"
-
-#. module: l10n_ar_website_sale
-#: model_terms:ir.ui.view,arch_db:l10n_ar_website_sale.partner_info
-msgid ""
-"Changing AFIP Responsibility type is not allowed once document(s) have been "
-"issued for your account. Please contact us directly for this operation."
-msgstr ""
-"No puede cambiar el tipo de responsabilidad AFIP después de que haya emitido "
-"documentos para su cuenta. Contáctenos para realizar esta operación."
-
-#. module: l10n_ar_website_sale
-#: model_terms:ir.ui.view,arch_db:l10n_ar_website_sale.partner_info
-msgid ""
-"Changing Identification type is not allowed once document(s) have been "
-"issued for your account. Please contact us directly for this operation."
-msgstr ""
-"No puede cambiar el tipo de identificación después de que haya emitido "
-"documentos para su cuenta. Contáctenos para realizar esta operación."
-
-#. module: l10n_ar_website_sale
-#. odoo-python
-#: code:addons/l10n_ar_website_sale/controllers/main.py:0
-#, python-format
-msgid ""
-"For the selected AFIP Responsibility you will need to set CUIT "
-"Identification Type"
-msgstr ""
-"Para la responsabilidad AFIP seleccionada debe elegir el tipo de "
-"identificación CUIT"
-
-#. module: l10n_ar_website_sale
-#: model_terms:ir.ui.view,arch_db:l10n_ar_website_sale.partner_info
-msgid "Identification Type"
-msgstr "Tipo de identificación"
-
-#. module: l10n_ar_website_sale
-#: model:website,prevent_zero_price_sale_text:l10n_ar_website_sale.default_website_ri
-msgid "Not Available For Sale"
-msgstr "No está disponible para la venta"
-
-#. module: l10n_ar_website_sale
-#: model_terms:ir.ui.view,arch_db:l10n_ar_website_sale.address
-msgid "Number"
-msgstr "Número"
-
-#. module: l10n_ar_website_sale
-#: model:ir.model,name:l10n_ar_website_sale.model_website
-msgid "Website"
-msgstr "Sitio web"

odoo-bringout-oca-ocb-l10n_ar_website_sale/l10n_ar_website_sale/i18n/es_419.po

@@ -0,0 +1,65 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * l10n_ar_website_sale
+#
+# "Fernanda Alvarez (mfar)" <mfar@odoo.com>, 2026.
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.4a1+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-12-30 19:04+0000\n"
+"PO-Revision-Date: 2026-01-31 10:05+0000\n"
+"Last-Translator: \"Fernanda Alvarez (mfar)\" <mfar@odoo.com>\n"
+"Language-Team: Spanish (Latin America) <https://translate.odoo.com/projects/"
+"odoo-19-l10n/l10n_ar_website_sale/es_419/>\n"
+"Language: es_419\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 5.14.3\n"
+
+#. module: l10n_ar_website_sale
+#: model:ir.model,name:l10n_ar_website_sale.model_res_config_settings
+msgid "Config Settings"
+msgstr "Ajustes de configuración"
+
+#. module: l10n_ar_website_sale
+#: model:ir.model.fields,field_description:l10n_ar_website_sale.field_product_template__display_name
+#: model:ir.model.fields,field_description:l10n_ar_website_sale.field_res_config_settings__display_name
+#: model:ir.model.fields,field_description:l10n_ar_website_sale.field_website__display_name
+msgid "Display Name"
+msgstr "Nombre Mostrado"
+
+#. module: l10n_ar_website_sale
+#: model:ir.model.fields,field_description:l10n_ar_website_sale.field_res_config_settings__l10n_ar_website_sale_show_both_prices
+#: model:ir.model.fields,field_description:l10n_ar_website_sale.field_website__l10n_ar_website_sale_show_both_prices
+msgid "Display Price without National Taxes"
+msgstr "Mostrar Precio sin Impuestos Nacionales"
+
+#. module: l10n_ar_website_sale
+#: model:ir.model.fields,field_description:l10n_ar_website_sale.field_product_template__id
+#: model:ir.model.fields,field_description:l10n_ar_website_sale.field_res_config_settings__id
+#: model:ir.model.fields,field_description:l10n_ar_website_sale.field_website__id
+msgid "ID"
+msgstr "ID"
+
+#. module: l10n_ar_website_sale
+#: model_terms:ir.ui.view,arch_db:l10n_ar_website_sale.l10n_ar_website_sale_products_item_inherit
+msgid "Precio s/Imp. Nac."
+msgstr "Precio s/Imp. Nac."
+
+#. module: l10n_ar_website_sale
+#: model_terms:ir.ui.view,arch_db:l10n_ar_website_sale.l10n_ar_website_sale_product_price_inherit
+msgid "Precio s/Imp. Nac.:"
+msgstr "Precio s/Imp. Nac.:"
+
+#. module: l10n_ar_website_sale
+#: model:ir.model,name:l10n_ar_website_sale.model_product_template
+msgid "Product"
+msgstr "Producto"
+
+#. module: l10n_ar_website_sale
+#: model:ir.model,name:l10n_ar_website_sale.model_website
+msgid "Website"
+msgstr "Website"

odoo-bringout-oca-ocb-l10n_ar_website_sale/l10n_ar_website_sale/i18n/l10n_ar_website_sale.pot

@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 16.0+e\n"
+"Project-Id-Version: Odoo Server 19.0+e\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-15 10:56+0000\n"
-"PO-Revision-Date: 2024-11-15 10:56+0000\n"
+"POT-Creation-Date: 2025-12-30 19:04+0000\n"
+"PO-Revision-Date: 2025-12-30 19:04+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,61 +16,43 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: l10n_ar_website_sale
-#: model:website,contact_us_button_url:l10n_ar_website_sale.default_website_ri
-msgid "/contactus"
+#: model:ir.model,name:l10n_ar_website_sale.model_res_config_settings
+msgid "Config Settings"
 msgstr ""
 
 #. module: l10n_ar_website_sale
-#: model_terms:ir.ui.view,arch_db:l10n_ar_website_sale.partner_info
-msgid "<option value=\"\">AFIP Responsibility...</option>"
+#: model:ir.model.fields,field_description:l10n_ar_website_sale.field_product_template__display_name
+#: model:ir.model.fields,field_description:l10n_ar_website_sale.field_res_config_settings__display_name
+#: model:ir.model.fields,field_description:l10n_ar_website_sale.field_website__display_name
+msgid "Display Name"
 msgstr ""
 
 #. module: l10n_ar_website_sale
-#: model_terms:ir.ui.view,arch_db:l10n_ar_website_sale.partner_info
-msgid "<option value=\"\">Identification Type...</option>"
+#: model:ir.model.fields,field_description:l10n_ar_website_sale.field_res_config_settings__l10n_ar_website_sale_show_both_prices
+#: model:ir.model.fields,field_description:l10n_ar_website_sale.field_website__l10n_ar_website_sale_show_both_prices
+msgid "Display Price without National Taxes"
 msgstr ""
 
 #. module: l10n_ar_website_sale
-#: model_terms:ir.ui.view,arch_db:l10n_ar_website_sale.partner_info
-msgid "AFIP Responsibility"
+#: model:ir.model.fields,field_description:l10n_ar_website_sale.field_product_template__id
+#: model:ir.model.fields,field_description:l10n_ar_website_sale.field_res_config_settings__id
+#: model:ir.model.fields,field_description:l10n_ar_website_sale.field_website__id
+msgid "ID"
 msgstr ""
 
 #. module: l10n_ar_website_sale
-#: model_terms:ir.ui.view,arch_db:l10n_ar_website_sale.partner_info
-msgid ""
-"Changing AFIP Responsibility type is not allowed once document(s) have been "
-"issued for your account. Please contact us directly for this operation."
+#: model_terms:ir.ui.view,arch_db:l10n_ar_website_sale.l10n_ar_website_sale_products_item_inherit
+msgid "Precio s/Imp. Nac."
 msgstr ""
 
 #. module: l10n_ar_website_sale
-#: model_terms:ir.ui.view,arch_db:l10n_ar_website_sale.partner_info
-msgid ""
-"Changing Identification type is not allowed once document(s) have been "
-"issued for your account. Please contact us directly for this operation."
+#: model_terms:ir.ui.view,arch_db:l10n_ar_website_sale.l10n_ar_website_sale_product_price_inherit
+msgid "Precio s/Imp. Nac.:"
 msgstr ""
 
 #. module: l10n_ar_website_sale
-#. odoo-python
-#: code:addons/l10n_ar_website_sale/controllers/main.py:0
-#, python-format
-msgid ""
-"For the selected AFIP Responsibility you will need to set CUIT "
-"Identification Type"
-msgstr ""
-
-#. module: l10n_ar_website_sale
-#: model_terms:ir.ui.view,arch_db:l10n_ar_website_sale.partner_info
-msgid "Identification Type"
-msgstr ""
-
-#. module: l10n_ar_website_sale
-#: model:website,prevent_zero_price_sale_text:l10n_ar_website_sale.default_website_ri
-msgid "Not Available For Sale"
-msgstr ""
-
-#. module: l10n_ar_website_sale
-#: model_terms:ir.ui.view,arch_db:l10n_ar_website_sale.address
-msgid "Number"
+#: model:ir.model,name:l10n_ar_website_sale.model_product_template
+msgid "Product"
 msgstr ""
 
 #. module: l10n_ar_website_sale

odoo-bringout-oca-ocb-l10n_ar_website_sale/l10n_ar_website_sale/models/__init__.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
+from . import product_template
+from . import res_config_settings
 from . import website
-from . import sale_order

odoo-bringout-oca-ocb-l10n_ar_website_sale/l10n_ar_website_sale/models/product_template.py

@@ -0,0 +1,79 @@
+from odoo import models
+from odoo.http import request
+
+
+class ProductTemplate(models.Model):
+    _inherit = 'product.template'
+
+    def _get_sales_prices(self, website):
+        '''
+        Resolution 4/2025 requires us to display both prices on the e-commerce site:
+            - Price including taxes
+            - Price excluding taxes
+
+        If the website is configured to use tax-included pricing, we calculate the tax-excluded
+        price separately. This tax-excluded price is displayed on the shop page (on both list and grid views).
+        '''
+
+        res = super()._get_sales_prices(website)
+        fiscal_position_id = request.fiscal_position
+        pricelist_prices = request.pricelist._compute_price_rule(self, 1.0)
+
+        if (
+            website
+            and website.company_id.country_code == 'AR'
+            and website.l10n_ar_website_sale_show_both_prices
+            and website.show_line_subtotals_tax_selection == 'tax_included'
+        ):
+            for template_id, template_val in res.items():
+                # Get applicable taxes for the product and map them using the website's FPOS
+                template = self.env['product.template'].browse(template_id)
+                product_taxes = template.sudo().taxes_id._filter_taxes_by_company(self.env.company)
+                mapped_taxes = fiscal_position_id.map_tax(product_taxes)
+
+                # Compute the tax-excluded value
+                total_excluded_value = mapped_taxes.compute_all(
+                    price_unit=pricelist_prices[template.id][0],
+                    currency=website.currency_id,
+                    product=template,
+                )['total_excluded']
+
+                # Store the tax-excluded price in the res for use in showing both prices
+                res[template_id]['l10n_ar_price_tax_excluded'] = total_excluded_value
+
+        return res
+
+    def _get_additionnal_combination_info(self, product_or_template, quantity, uom, date, website):
+        combination_info = super()._get_additionnal_combination_info(
+            product_or_template, quantity, uom, date, website
+        )
+        if (
+            website
+            and website.company_id.country_code == 'AR'
+            and website.l10n_ar_website_sale_show_both_prices
+            and website.show_line_subtotals_tax_selection == 'tax_included'
+        ):
+            # Get applicable taxes for the product and map them using the website's FPOS
+            product_taxes = product_or_template.sudo().taxes_id._filter_taxes_by_company(self.env.company)
+            mapped_taxes = request.fiscal_position.map_tax(product_taxes)
+
+            # Compute price per unit of product or template
+            pricelist_prices = request.pricelist._compute_price_rule(product_or_template, quantity)
+            unit_price = pricelist_prices[product_or_template.id][0]
+
+            # Compute the tax-excluded value
+            total_excluded_value = mapped_taxes.compute_all(
+                price_unit=unit_price,
+                currency=website.currency_id,
+                product=product_or_template,
+            )['total_excluded']
+
+            # Check if a discount is applied and adjust the tax-excluded price accordingly
+            if combination_info['has_discounted_price']:
+                discount_percent = (combination_info['list_price'] - combination_info['price']) / combination_info['list_price']
+                total_excluded_value = total_excluded_value * (1 - discount_percent)
+
+            # Store the tax-excluded price in the res for use in showing both prices
+            combination_info['l10n_ar_price_tax_excluded'] = total_excluded_value
+
+        return combination_info

odoo-bringout-oca-ocb-l10n_ar_website_sale/l10n_ar_website_sale/models/res_config_settings.py

@@ -0,0 +1,11 @@
+from odoo import fields, models
+
+
+class ResConfigSettings(models.TransientModel):
+    _inherit = 'res.config.settings'
+
+    # Website Dependent Settings
+    l10n_ar_website_sale_show_both_prices = fields.Boolean(
+        related='website_id.l10n_ar_website_sale_show_both_prices',
+        readonly=False,
+    )

odoo-bringout-oca-ocb-l10n_ar_website_sale/l10n_ar_website_sale/models/sale_order.py

@@ -1,25 +0,0 @@
-import pytz
-
-from odoo import fields, models
-
-
-class SaleOrder(models.Model):
-    _inherit = "sale.order"
-
-    def _create_invoices(self, grouped=False, final=False, date=None):
-        """ EXTENDS 'sale'
-        Necessary because if someone creates an invoice after 9 pm Argentina time, if the invoice is created
-        automatically, then it is created with the date of the next day (UTC date) instead of today.
-
-        This fix is necessary because it causes problems validating invoices in ARCA (ex AFIP), since when generating
-        the invoice with the date of the next day, no more invoices could be generated with today's date.
-
-        We took the same approach that was used in the POS module to set the date, in this case always forcing the
-        Argentina timezone """
-        invoices = super()._create_invoices(grouped=grouped, final=final, date=date)
-        for invoice in invoices:
-            if invoice.country_code == 'AR':
-                timezone = pytz.timezone('America/Buenos_Aires')
-                context_today_ar = fields.Datetime.now().astimezone(timezone).date()
-                invoice.invoice_date = context_today_ar
-        return invoices

odoo-bringout-oca-ocb-l10n_ar_website_sale/l10n_ar_website_sale/models/website.py

@@ -1,13 +1,27 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import models
+from odoo import api, fields, models
 
 
 class Website(models.Model):
-    _inherit = "website"
+    _inherit = 'website'
 
-    def _display_partner_b2b_fields(self):
-        """ Argentinean localization must always display b2b fields """
-        self.ensure_one()
-        return self.company_id.country_id.code == "AR" or super()._display_partner_b2b_fields()
+    l10n_ar_website_sale_show_both_prices = fields.Boolean(
+        string="Display Price without National Taxes",
+        compute='_compute_l10n_ar_website_sale_show_both_prices',
+        readonly=False,
+        store=True,
+    )
+
+    @api.depends('company_id')
+    def _compute_l10n_ar_website_sale_show_both_prices(self):
+        for website in self:
+            website.l10n_ar_website_sale_show_both_prices = (
+                website.company_id.account_fiscal_country_id.code == 'AR'
+            )
+
+    @api.depends('company_id.account_fiscal_country_id')
+    def _compute_show_line_subtotals_tax_selection(self):
+        # EXTENDS 'website_sale'
+        super()._compute_show_line_subtotals_tax_selection()
+        for website in self:
+            if website.company_id.account_fiscal_country_id.code == 'AR':
+                website.show_line_subtotals_tax_selection = 'tax_included'

odoo-bringout-oca-ocb-l10n_ar_website_sale/l10n_ar_website_sale/static/src/interactions/website_sale.js

@@ -0,0 +1,22 @@
+import { patch } from '@web/core/utils/patch';
+import { WebsiteSale } from '@website_sale/interactions/website_sale';
+
+patch(WebsiteSale.prototype, {
+    /**
+     * @override
+     * Updates the product's excluded price based on the selected variant.
+     * Ensuring availability info stays accurate.
+     */
+    _onChangeCombination(ev, parent, combination) {
+        super._onChangeCombination(...arguments);
+        const currencyValue = parent.querySelector(
+            '.o_l10n_ar_price_tax_excluded .oe_currency_value'
+        );
+        if (currencyValue) {
+            const { currency_precision, l10n_ar_price_tax_excluded } = combination;
+            currencyValue.textContent = this._priceToStr(
+                l10n_ar_price_tax_excluded, currency_precision,
+            );
+        }
+    },
+})

odoo-bringout-oca-ocb-l10n_ar_website_sale/l10n_ar_website_sale/static/src/scss/product_configurator.scss

@@ -0,0 +1,11 @@
+.o_wsale_products_opt_layout_list{
+    .o_wsale_product_sub{
+        .o_wsale_product_btn:has(.btn) + .o_l10n_ar_product_price {
+            text-align: end;
+        }
+        .o_wsale_product_btn:not(:has(.btn)) + .o_l10n_ar_product_price {
+            text-align: start;
+        }
+    
+    }
+}

odoo-bringout-oca-ocb-l10n_ar_website_sale/l10n_ar_website_sale/tests/__init__.py

@@ -1 +1 @@
-from . import test_invoice
+from . import test_l10n_ar_website_sale

odoo-bringout-oca-ocb-l10n_ar_website_sale/l10n_ar_website_sale/tests/test_invoice.py

@@ -1,45 +0,0 @@
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields
-from odoo.tests import tagged
-from odoo.tools import mute_logger
-from freezegun import freeze_time
-
-from odoo.addons.account_payment.tests.common import AccountPaymentCommon
-from odoo.addons.sale.tests.common import SaleCommon
-from odoo.addons.l10n_ar.tests.common import TestAr
-
-
-@tagged('-at_install', 'post_install', 'post_install_l10n')
-class TestWebsiteSaleInvoice(AccountPaymentCommon, SaleCommon, TestAr):
-
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        cls.website = cls.env['website'].create({'name': 'Test AR Website'})
-
-    def test_website_automatic_invoice_date(self):
-        # Set automatic invoice
-        self.env['ir.config_parameter'].sudo().set_param('sale.automatic_invoice', 'True')
-        self.frozen_today = "2025-01-24T21:10:00"
-        with freeze_time(self.frozen_today, tz_offset=3):
-
-            # Prepare values needed for AR invoice generation: Tax in all lines, and AFIP responsibility partner
-            self.sale_order.order_line.write({'tax_id': self.company_data['default_tax_sale']})
-            self.sale_order.partner_id = self.partner_cf
-            self.sale_order.currency_id = self.env.ref('base.ARS')
-
-            # Create SO on Test Website
-            self.sale_order.website_id = self.website.id
-
-            # Create the payment and invoices
-            self.amount = self.sale_order.amount_total
-            tx = self._create_transaction(flow='redirect', sale_order_ids=[self.sale_order.id], state='done')
-            with mute_logger('odoo.addons.sale.models.payment_transaction'):
-                tx.with_context(l10n_ar_invoice_skip_commit=True)._reconcile_after_done()
-
-            invoice = self.sale_order.invoice_ids
-            self.assertTrue(invoice, "Do not create the invoice")
-            self.assertEqual(invoice.state, "posted", "the invoice was not posted")
-            self.assertEqual(fields.Datetime.now().date().strftime("%Y-%m-%d"), '2025-01-25', "UCT should be next day")
-            self.assertEqual(invoice.invoice_date.strftime('%Y-%m-%d'), '2025-01-24', "Should be AR current date")

odoo-bringout-oca-ocb-l10n_ar_website_sale/l10n_ar_website_sale/tests/test_l10n_ar_website_sale.py

@@ -0,0 +1,150 @@
+from datetime import datetime
+
+from odoo.fields import Command
+from odoo.tests import tagged
+
+from odoo.addons.l10n_ar.tests.common import TestArCommon
+from odoo.addons.website_sale.tests.common import MockRequest
+
+
+@tagged('post_install_l10n', 'post_install', '-at_install')
+class TestL10nArWebsiteSale(TestArCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        # Set up Argentina-specific test company and website
+        cls.ar_company = cls.company_data['company']
+        cls.ar_website = cls.env['website'].create({
+            'name': 'AR Website',
+            'company_id': cls.ar_company.id,
+        })
+
+        # Create a base product template with default tax
+        cls.product_1 = cls.env['product.template'].create({
+            'name': 'Product 1',
+            'is_published': True,
+            'list_price': 1000,
+            'taxes_id': cls.env['account.chart.template'].ref('ri_tax_vat_21_ventas'),
+        })
+
+        # Create color attribute and values
+        cls.color_attribute = cls.env['product.attribute'].create({
+            'name': 'Color',
+            'display_type': 'color',
+        })
+        cls.color_white = cls.env['product.attribute.value'].create({
+            'name': 'White',
+            'html_color': '#FFFFFF',
+            'attribute_id': cls.color_attribute.id,
+        })
+        cls.color_black = cls.env['product.attribute.value'].create({
+            'name': 'Black',
+            'html_color': '#000000',
+            'attribute_id': cls.color_attribute.id,
+        })
+
+    def assertDictContains(self, actual_dict, expected_subset):
+        """Assert that actual_dict contains all key-value pairs from expected_subset."""
+        for key, expected_value in expected_subset.items():
+            self.assertEqual(actual_dict.get(key), expected_value)
+
+    def _get_combination_info(self, product_id=None, quantity=1):
+        """Helper method to retrieve combination info for a product."""
+        with MockRequest(self.env, website=self.ar_website):
+            return self.product_1._get_additionnal_combination_info(
+                product_or_template=product_id or self.product_1,
+                quantity=quantity,
+                uom=self.uom_unit,
+                date=datetime(2025, 5, 21),
+                website=self.ar_website
+            )
+
+    def test_default_website_sale_legal_values(self):
+        """Ensure legal default values are applied on AR website."""
+        self.assertEqual(self.ar_website.l10n_ar_website_sale_show_both_prices, True)
+        self.assertEqual(self.ar_website.show_line_subtotals_tax_selection, 'tax_included')
+
+    def test_price_calculation_with_tax_changes(self):
+        """Test list price and tax excluded price calculations for various tax setups."""
+        with self.subTest(scenario="Single 21% VAT - tax excluded"):
+            combo = self._get_combination_info()
+            self.assertDictContains(combo, {
+                'list_price': 1210.00,  # 1000 + 21%
+                'l10n_ar_price_tax_excluded': 1000.00,
+            })
+
+        with self.subTest(scenario="Mixed taxes - 10.5% excluded + 27% included"):
+            template = self.env['account.chart.template']
+            tax_27_included = template.ref('ri_tax_vat_27_ventas')
+            tax_10_5_excluded = template.ref('ri_tax_vat_10_ventas')
+
+            tax_27_included.price_include = True
+            tax_10_5_excluded.price_include = False
+
+            self.product_1.taxes_id = (tax_27_included + tax_10_5_excluded).ids
+            combo = self._get_combination_info()
+            self.assertDictContains(combo, {
+                'list_price': 1082.68,                 # Computed price including all taxes
+                'l10n_ar_price_tax_excluded': 787.40,  # Reverse calculated base price
+            })
+
+    def test_price_calculation_with_pricelist_rules(self):
+        """Check that pricelist rules are taken into account."""
+        self._enable_pricelists()
+        self.pricelist.update({
+            'website_id': self.ar_website.id,
+            'item_ids': [
+                Command.create({
+                    'compute_price': 'fixed',
+                    'fixed_price': 888.0,
+                    'min_quantity': 5.0,
+                    'applied_on': '1_product',
+                    'product_tmpl_id': self.product_1.id,
+                }),
+                Command.create({
+                    'compute_price': 'formula',
+                    'price_surcharge': 2.0,
+                    'applied_on': '3_global',
+                }),
+            ],
+        })
+
+        info_qty_3 = self._get_combination_info(quantity=3)
+        self.assertEqual(info_qty_3['l10n_ar_price_tax_excluded'], 1002.0)
+
+        info_qty_5 = self._get_combination_info(quantity=5)
+        self.assertEqual(info_qty_5['l10n_ar_price_tax_excluded'], 888.0)
+
+    def test_product_variant_prices_with_attributes(self):
+        """Test variant-specific price calculation with color attribute values."""
+        self.product_1.taxes_id = self.env['account.chart.template'].ref('ri_tax_vat_21_ventas')
+
+        # Add attribute line and values to product template
+        attribute_line = self.env['product.template.attribute.line'].create({
+            'product_tmpl_id': self.product_1.id,
+            'attribute_id': self.color_attribute.id,
+            'value_ids': [(6, 0, [self.color_white.id, self.color_black.id])]
+        })
+
+        # Set price extras for each variant
+        attribute_line.product_template_value_ids[0].price_extra = 100  # White
+        attribute_line.product_template_value_ids[1].price_extra = 200  # Black
+
+        white_variant = self.product_1.product_variant_ids[0]
+        black_variant = self.product_1.product_variant_ids[1]
+
+        with self.subTest(scenario="White variant with 100 extra + 21% VAT"):
+            combo = self._get_combination_info(product_id=white_variant)
+            self.assertDictContains(combo, {
+                'list_price': 1331.00,                # (1000+100) + 21%
+                'l10n_ar_price_tax_excluded': 1100.00,
+            })
+
+        with self.subTest(scenario="Black variant with 200 extra + 21% VAT"):
+            combo = self._get_combination_info(product_id=black_variant)
+            self.assertDictContains(combo, {
+                'list_price': 1452.00,                # (1000+200) + 21%
+                'l10n_ar_price_tax_excluded': 1200.00,
+            })

odoo-bringout-oca-ocb-l10n_ar_website_sale/l10n_ar_website_sale/views/res_config_settings_views.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id='res_config_settings_view_form' model='ir.ui.view'>
+        <field name='name'>res.config.settings.view.form.inherit.website.sale</field>
+        <field name='model'>res.config.settings</field>
+        <field name='inherit_id' ref='website_sale.res_config_settings_view_form'/>
+        <field name='arch' type='xml'>
+            <setting id='website_tax_inclusion_setting' position='inside'>
+                <div invisible='country_code != "AR" or show_line_subtotals_tax_selection != "tax_included"'>
+                    <field name='l10n_ar_website_sale_show_both_prices'/>
+                    <label for='l10n_ar_website_sale_show_both_prices'/>
+                </div>
+            </setting>
+        </field>
+    </record>
+
+</odoo>

odoo-bringout-oca-ocb-l10n_ar_website_sale/l10n_ar_website_sale/views/templates.xml

@@ -1,63 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <template id="partner_info" name="Argentinean partner">
-
-        <!-- show afip responsibility -->
-        <div t-attf-class="mb-3 #{error.get('l10n_ar_afip_responsibility_type_id') and 'o_has_error' or ''} col-xl-6">
-            <label class="col-form-label" for="l10n_ar_afip_responsibility_type_id">AFIP Responsibility</label>
-            <t t-if="partner.can_edit_vat()">
-                <select name="l10n_ar_afip_responsibility_type_id" t-attf-class="form-select #{error.get('l10n_ar_afip_responsibility_type_id') and 'is-invalid' or ''}">
-                    <option value="">AFIP Responsibility...</option>
-                    <t t-foreach="responsibility_types or []" t-as="resp_type">
-                        <option t-att-value="resp_type.id" t-att-selected="resp_type.id == int(responsibility) if responsibility else resp_type.id == partner.l10n_ar_afip_responsibility_type_id.id">
-                            <t t-esc="resp_type.name"/>
-                        </option>
-                    </t>
-                </select>
-            </t>
-            <t t-else="">
-                <p class="form-control" t-esc="partner.l10n_ar_afip_responsibility_type_id.name" readonly="1" title="Changing AFIP Responsibility type is not allowed once document(s) have been issued for your account. Please contact us directly for this operation."/>
-                <input name="l10n_ar_afip_responsibility_type_id" class="form-control" t-att-value="partner.l10n_ar_afip_responsibility_type_id.id" type='hidden'/>
-            </t>
-        </div>
-
-        <!-- show identification type -->
-        <div t-attf-class="mb-3 #{error.get('l10n_latam_identification_type_id') and 'o_has_error' or ''} col-xl-6">
-            <label class="col-form-label" for="l10n_latam_identification_type_id">Identification Type</label>
-            <t t-if="partner.can_edit_vat()">
-                <select name="l10n_latam_identification_type_id" t-attf-class="form-select #{error.get('l10n_latam_identification_type_id') and 'is-invalid' or ''}">
-                    <option value="">Identification Type...</option>
-                    <t t-foreach="identification_types or []" t-as="id_type">
-                        <option t-att-value="id_type.id" t-att-selected="id_type.id == int(identification) if identification else id_type.id == partner.l10n_latam_identification_type_id.id">
-                            <t t-esc="id_type.name"/>
-                        </option>
-                    </t>
-                </select>
-            </t>
-            <t t-else="">
-                <p class="form-control" t-esc="partner.l10n_latam_identification_type_id.name" readonly="1" title="Changing Identification type is not allowed once document(s) have been issued for your account. Please contact us directly for this operation."/>
-                <input name="l10n_latam_identification_type_id" class="form-control" t-att-value="partner.l10n_latam_identification_type_id.id" type='hidden'/>
-            </t>
-        </div>
-
+    <template id='l10n_ar_website_sale_product_price_inherit' inherit_id='website_sale.product_price'>
+        <xpath expr='//div[1]'>
+            <small t-if='combination_info.get("l10n_ar_price_tax_excluded")' class='h6 text-muted'>
+                Precio s/Imp. Nac.:
+                <span
+                    class='o_l10n_ar_price_tax_excluded'
+                    t-out='combination_info["l10n_ar_price_tax_excluded"]'
+                    t-options='{
+                        "widget": "monetary",
+                        "display_currency": website.currency_id,
+                    }'
+                />
+            </small>
+        </xpath>
     </template>
 
-    <template id="address" inherit_id="website_sale.address">
-        <xpath expr="//input[@name='vat']/.." position="before">
-            <t t-if="mode[1] == 'billing'" positon="inside">
-                <t t-if="res_company.country_id.code == 'AR'">
-                    <t t-set="partner" t-value="website_sale_order.partner_id"/>
-                    <t t-call="l10n_ar_website_sale.partner_info"/>
-                </t>
-            </t>
+    <template id='l10n_ar_website_sale_products_item_inherit' inherit_id='website_sale.products_item'>
+        <xpath expr='//div[hasclass("product_price")]' position='attributes'>
+            <attribute name='t-attf-class' add='o_l10n_ar_product_price'/>
+        </xpath>
+        <xpath expr='//div[hasclass("product_price")]' position='inside'>
+            <small t-if='template_price_vals.get("l10n_ar_price_tax_excluded")' class='d-block mt-1 text-muted'>
+                Precio s/Imp. Nac.
+                <span
+                    class='o_l10n_ar_price_tax_excluded'
+                    t-out='template_price_vals["l10n_ar_price_tax_excluded"]'
+                    t-options='{
+                        "widget": "monetary",
+                        "display_currency": website.currency_id,
+                    }'
+                />
+            </small>
         </xpath>
-        <label for="vat" position="attributes">
-            <attribute name="t-if">res_company.country_id.code != 'AR'</attribute>
-        </label>
-        <label for="vat" position="after">
-            <label t-if="res_company.country_id.code == 'AR'" class="col-form-label label-optional" for="vat">Number</label>
-        </label>
     </template>
 
 </odoo>

odoo-bringout-oca-ocb-l10n_ar_website_sale/pyproject.toml

@@ -1,13 +1,15 @@
 [project]
 name = "odoo-bringout-oca-ocb-l10n_ar_website_sale"
 version = "16.0.0"
-description = "Argentinean eCommerce - Odoo addon"
+description = "Argentinean eCommerce - 
+        Odoo addon
+        "
 authors = [
     { name = "Ernad Husremovic", email = "hernad@bring.out.ba" }
 ]
 dependencies = [
-    "odoo-bringout-oca-ocb-website_sale>=16.0.0",
-    "odoo-bringout-oca-ocb-l10n_ar>=16.0.0",
+    "odoo-bringout-oca-ocb-website_sale>=19.0.0",
+    "odoo-bringout-oca-ocb-l10n_ar>=19.0.0",
     "requests>=2.25.1"
 ]
 readme = "README.md"
@@ -17,7 +19,7 @@ classifiers = [
     "Intended Audience :: Developers",
     "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.11", 
+    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Topic :: Office/Business",
 ]

odoo-bringout-oca-ocb-l10n_at/README.md

@@ -22,38 +22,18 @@ pip install odoo-bringout-oca-ocb-l10n_at
 
 ## Dependencies
 
-This addon depends on:
 - account
+- account_edi_ubl_cii
 - base_iban
 - base_vat
 - l10n_din5008
 
-## Manifest Information
-
-- **Name**: Austria - Accounting
-- **Version**: 3.1.1
-- **Category**: Accounting/Localizations/Account Charts
-- **License**: LGPL-3
-- **Installable**: False
-
 ## Source
 
-Based on [OCA/OCB](https://github.com/OCA/OCB) branch 16.0, addon `l10n_at`.
+- Repository: https://github.com/OCA/OCB
+- Branch: 19.0
+- Path: addons/l10n_at
 
 ## License
 
-This package maintains the original LGPL-3 license from the upstream Odoo project.
-
-## Documentation
-
-- Overview: doc/OVERVIEW.md
-- Architecture: doc/ARCHITECTURE.md
-- Models: doc/MODELS.md
-- Controllers: doc/CONTROLLERS.md
-- Wizards: doc/WIZARDS.md
-- Install: doc/INSTALL.md
-- Usage: doc/USAGE.md
-- Configuration: doc/CONFIGURATION.md
-- Dependencies: doc/DEPENDENCIES.md
-- Troubleshooting: doc/TROUBLESHOOTING.md
-- FAQ: doc/FAQ.md
+This package preserves the original LGPL-3 license.

odoo-bringout-oca-ocb-l10n_at/l10n_at/__init__.py

@@ -1,5 +1,2 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-# Copyright (c) 2015 WT-IO-IT GmbH (https://www.wt-io-it.at)
-#                    Mag. Wolfgang Taferner <wolfgang.taferner@wt-io-it.at>
+from . import models

odoo-bringout-oca-ocb-l10n_at/l10n_at/__manifest__.py

@@ -1,21 +1,14 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-# Copyright (c) 2015 WT-IO-IT GmbH (https://www.wt-io-it.at)
-#                    Mag. Wolfgang Taferner <wolfgang.taferner@wt-io-it.at>
-
-# List of contributors:
-# Mag. Wolfgang Taferner <wolfgang.taferner@wt-io-it.at>
-# Josse Colpaert <jco@odoo.com>
-
 {
-    "name": "Austria - Accounting",
-    "version": "3.1.1",
-    "author": "WT-IO-IT GmbH, Wolfgang Taferner",
-    "website": "https://www.wt-io-it.at",
+    'name': 'Austria - Accounting',
+    'icon': '/account/static/description/l10n.png',
+    'countries': ['at'],
+    'version': '3.2.1',
+    'author': 'WT-IO-IT GmbH, Wolfgang Taferner (https://www.wt-io-it.at)',
+    'website': 'https://www.odoo.com/documentation/latest/applications/finance/fiscal_localizations.html',
     'category': 'Accounting/Localizations/Account Charts',
-    'summary': "Austrian Standardized Charts & Tax",
-    "description": """
+    'summary': 'Austrian Standardized Charts & Tax',
+    'description': """
 
 Austrian charts of accounts (Einheitskontenrahmen 2010).
 ==========================================================
@@ -28,22 +21,18 @@ Austrian charts of accounts (Einheitskontenrahmen 2010).
     * Defines tax reports U1/U30
 
     """,
-    "depends": [
-        "account",
-        "base_iban",
-        "base_vat",
-        "l10n_din5008",
+    'depends': [
+        'account',
+        'account_edi_ubl_cii',
+        'base_iban',
+        'base_vat',
+        'l10n_din5008',
     ],
-    "data": [
-        'data/res.country.state.csv',
+    'auto_install': ['account'],
+    'data': [
         'data/account_account_tag.xml',
-        'data/account_account_template.xml',
-        'data/account_chart_template.xml',
+        'data/account.account.tag.csv',
         'data/account_tax_report_data.xml',
-        'data/account_tax_group_data.xml',
-        'data/account_tax_template.xml',
-        'data/account_fiscal_position_template.xml',
-        'data/account_chart_template_configure_data.xml',
     ],
     'demo': [
         'demo/demo_company.xml',

odoo-bringout-oca-ocb-l10n_at/l10n_at/data/account.account.tag.csv

@@ -0,0 +1,951 @@
+"id","name","applicability","country_id/id"
+"account_tag_external_code_0010","0010","accounts","base.at"
+"account_tag_external_code_0011","0011","accounts","base.at"
+"account_tag_external_code_0019","0019","accounts","base.at"
+"account_tag_external_code_0020","0020","accounts","base.at"
+"account_tag_external_code_0021","0021","accounts","base.at"
+"account_tag_external_code_0029","0029","accounts","base.at"
+"account_tag_external_code_0100","0100","accounts","base.at"
+"account_tag_external_code_0101","0101","accounts","base.at"
+"account_tag_external_code_0109","0109","accounts","base.at"
+"account_tag_external_code_0110","0110","accounts","base.at"
+"account_tag_external_code_0111","0111","accounts","base.at"
+"account_tag_external_code_0112","0112","accounts","base.at"
+"account_tag_external_code_0113","0113","accounts","base.at"
+"account_tag_external_code_0119","0119","accounts","base.at"
+"account_tag_external_code_0120","0120","accounts","base.at"
+"account_tag_external_code_0121","0121","accounts","base.at"
+"account_tag_external_code_0129","0129","accounts","base.at"
+"account_tag_external_code_0130","0130","accounts","base.at"
+"account_tag_external_code_0131","0131","accounts","base.at"
+"account_tag_external_code_0132","0132","accounts","base.at"
+"account_tag_external_code_0133","0133","accounts","base.at"
+"account_tag_external_code_0134","0134","accounts","base.at"
+"account_tag_external_code_0140","0140","accounts","base.at"
+"account_tag_external_code_0141","0141","accounts","base.at"
+"account_tag_external_code_0149","0149","accounts","base.at"
+"account_tag_external_code_0150","0150","accounts","base.at"
+"account_tag_external_code_0151","0151","accounts","base.at"
+"account_tag_external_code_0159","0159","accounts","base.at"
+"account_tag_external_code_0160","0160","accounts","base.at"
+"account_tag_external_code_0169","0169","accounts","base.at"
+"account_tag_external_code_0170","0170","accounts","base.at"
+"account_tag_external_code_0179","0179","accounts","base.at"
+"account_tag_external_code_0180","0180","accounts","base.at"
+"account_tag_external_code_0200","0200","accounts","base.at"
+"account_tag_external_code_0205","0205","accounts","base.at"
+"account_tag_external_code_0210","0210","accounts","base.at"
+"account_tag_external_code_0219","0219","accounts","base.at"
+"account_tag_external_code_0220","0220","accounts","base.at"
+"account_tag_external_code_0229","0229","accounts","base.at"
+"account_tag_external_code_0300","0300","accounts","base.at"
+"account_tag_external_code_0301","0301","accounts","base.at"
+"account_tag_external_code_0310","0310","accounts","base.at"
+"account_tag_external_code_0311","0311","accounts","base.at"
+"account_tag_external_code_0320","0320","accounts","base.at"
+"account_tag_external_code_0321","0321","accounts","base.at"
+"account_tag_external_code_0330","0330","accounts","base.at"
+"account_tag_external_code_0331","0331","accounts","base.at"
+"account_tag_external_code_0340","0340","accounts","base.at"
+"account_tag_external_code_0341","0341","accounts","base.at"
+"account_tag_external_code_0349","0349","accounts","base.at"
+"account_tag_external_code_0350","0350","accounts","base.at"
+"account_tag_external_code_0351","0351","accounts","base.at"
+"account_tag_external_code_0359","0359","accounts","base.at"
+"account_tag_external_code_0360","0360","accounts","base.at"
+"account_tag_external_code_0361","0361","accounts","base.at"
+"account_tag_external_code_0370","0370","accounts","base.at"
+"account_tag_external_code_0371","0371","accounts","base.at"
+"account_tag_external_code_0379","0379","accounts","base.at"
+"account_tag_external_code_0400","0400","accounts","base.at"
+"account_tag_external_code_0401","0401","accounts","base.at"
+"account_tag_external_code_0410","0410","accounts","base.at"
+"account_tag_external_code_0411","0411","accounts","base.at"
+"account_tag_external_code_0420","0420","accounts","base.at"
+"account_tag_external_code_0421","0421","accounts","base.at"
+"account_tag_external_code_0430","0430","accounts","base.at"
+"account_tag_external_code_0431","0431","accounts","base.at"
+"account_tag_external_code_0439","0439","accounts","base.at"
+"account_tag_external_code_0440","0440","accounts","base.at"
+"account_tag_external_code_0441","0441","accounts","base.at"
+"account_tag_external_code_0500","0500","accounts","base.at"
+"account_tag_external_code_0501","0501","accounts","base.at"
+"account_tag_external_code_0510","0510","accounts","base.at"
+"account_tag_external_code_0511","0511","accounts","base.at"
+"account_tag_external_code_0520","0520","accounts","base.at"
+"account_tag_external_code_0521","0521","accounts","base.at"
+"account_tag_external_code_0530","0530","accounts","base.at"
+"account_tag_external_code_0531","0531","accounts","base.at"
+"account_tag_external_code_0540","0540","accounts","base.at"
+"account_tag_external_code_0541","0541","accounts","base.at"
+"account_tag_external_code_0550","0550","accounts","base.at"
+"account_tag_external_code_0551","0551","accounts","base.at"
+"account_tag_external_code_0555","0555","accounts","base.at"
+"account_tag_external_code_0556","0556","accounts","base.at"
+"account_tag_external_code_0559","0559","accounts","base.at"
+"account_tag_external_code_0600","0600","accounts","base.at"
+"account_tag_external_code_0601","0601","accounts","base.at"
+"account_tag_external_code_0605","0605","accounts","base.at"
+"account_tag_external_code_0606","0606","accounts","base.at"
+"account_tag_external_code_0610","0610","accounts","base.at"
+"account_tag_external_code_0611","0611","accounts","base.at"
+"account_tag_external_code_0612","0612","accounts","base.at"
+"account_tag_external_code_0613","0613","accounts","base.at"
+"account_tag_external_code_0620","0620","accounts","base.at"
+"account_tag_external_code_0621","0621","accounts","base.at"
+"account_tag_external_code_0630","0630","accounts","base.at"
+"account_tag_external_code_0631","0631","accounts","base.at"
+"account_tag_external_code_0640","0640","accounts","base.at"
+"account_tag_external_code_0641","0641","accounts","base.at"
+"account_tag_external_code_0650","0650","accounts","base.at"
+"account_tag_external_code_0651","0651","accounts","base.at"
+"account_tag_external_code_0655","0655","accounts","base.at"
+"account_tag_external_code_0659","0659","accounts","base.at"
+"account_tag_external_code_0660","0660","accounts","base.at"
+"account_tag_external_code_0661","0661","accounts","base.at"
+"account_tag_external_code_0670","0670","accounts","base.at"
+"account_tag_external_code_0671","0671","accounts","base.at"
+"account_tag_external_code_0680","0680","accounts","base.at"
+"account_tag_external_code_0681","0681","accounts","base.at"
+"account_tag_external_code_0685","0685","accounts","base.at"
+"account_tag_external_code_0686","0686","accounts","base.at"
+"account_tag_external_code_0689","0689","accounts","base.at"
+"account_tag_external_code_0700","0700","accounts","base.at"
+"account_tag_external_code_0701","0701","accounts","base.at"
+"account_tag_external_code_0702","0702","accounts","base.at"
+"account_tag_external_code_0710","0710","accounts","base.at"
+"account_tag_external_code_0711","0711","accounts","base.at"
+"account_tag_external_code_0780","0780","accounts","base.at"
+"account_tag_external_code_0781","0781","accounts","base.at"
+"account_tag_external_code_0800","0800","accounts","base.at"
+"account_tag_external_code_0810","0810","accounts","base.at"
+"account_tag_external_code_0820","0820","accounts","base.at"
+"account_tag_external_code_0830","0830","accounts","base.at"
+"account_tag_external_code_0840","0840","accounts","base.at"
+"account_tag_external_code_0850","0850","accounts","base.at"
+"account_tag_external_code_0860","0860","accounts","base.at"
+"account_tag_external_code_0862","0862","accounts","base.at"
+"account_tag_external_code_0867","0867","accounts","base.at"
+"account_tag_external_code_0870","0870","accounts","base.at"
+"account_tag_external_code_0880","0880","accounts","base.at"
+"account_tag_external_code_0900","0900","accounts","base.at"
+"account_tag_external_code_0910","0910","accounts","base.at"
+"account_tag_external_code_0920","0920","accounts","base.at"
+"account_tag_external_code_0940","0940","accounts","base.at"
+"account_tag_external_code_0950","0950","accounts","base.at"
+"account_tag_external_code_0959","0959","accounts","base.at"
+"account_tag_external_code_0980","0980","accounts","base.at"
+"account_tag_external_code_0990","0990","accounts","base.at"
+"account_tag_external_code_0995","0995","accounts","base.at"
+"account_tag_external_code_0996","0996","accounts","base.at"
+"account_tag_external_code_0997","0997","accounts","base.at"
+"account_tag_external_code_1000","1000","accounts","base.at"
+"account_tag_external_code_1001","1001","accounts","base.at"
+"account_tag_external_code_1100","1100","accounts","base.at"
+"account_tag_external_code_1101","1101","accounts","base.at"
+"account_tag_external_code_1200","1200","accounts","base.at"
+"account_tag_external_code_1201","1201","accounts","base.at"
+"account_tag_external_code_1300","1300","accounts","base.at"
+"account_tag_external_code_1301","1301","accounts","base.at"
+"account_tag_external_code_1350","1350","accounts","base.at"
+"account_tag_external_code_1351","1351","accounts","base.at"
+"account_tag_external_code_1360","1360","accounts","base.at"
+"account_tag_external_code_1361","1361","accounts","base.at"
+"account_tag_external_code_1400","1400","accounts","base.at"
+"account_tag_external_code_1401","1401","accounts","base.at"
+"account_tag_external_code_1500","1500","accounts","base.at"
+"account_tag_external_code_1501","1501","accounts","base.at"
+"account_tag_external_code_1600","1600","accounts","base.at"
+"account_tag_external_code_1601","1601","accounts","base.at"
+"account_tag_external_code_1700","1700","accounts","base.at"
+"account_tag_external_code_1800","1800","accounts","base.at"
+"account_tag_external_code_1801","1801","accounts","base.at"
+"account_tag_external_code_1803","1803","accounts","base.at"
+"account_tag_external_code_1910","1910","accounts","base.at"
+"account_tag_external_code_1920","1920","accounts","base.at"
+"account_tag_external_code_1930","1930","accounts","base.at"
+"account_tag_external_code_1940","1940","accounts","base.at"
+"account_tag_external_code_1950","1950","accounts","base.at"
+"account_tag_external_code_1960","1960","accounts","base.at"
+"account_tag_external_code_1970","1970","accounts","base.at"
+"account_tag_external_code_2000","2000","accounts","base.at"
+"account_tag_external_code_2080","2080","accounts","base.at"
+"account_tag_external_code_2090","2090","accounts","base.at"
+"account_tag_external_code_2100","2100","accounts","base.at"
+"account_tag_external_code_2130","2130","accounts","base.at"
+"account_tag_external_code_2140","2140","accounts","base.at"
+"account_tag_external_code_2150","2150","accounts","base.at"
+"account_tag_external_code_2180","2180","accounts","base.at"
+"account_tag_external_code_2190","2190","accounts","base.at"
+"account_tag_external_code_2200","2200","accounts","base.at"
+"account_tag_external_code_2201","2201","accounts","base.at"
+"account_tag_external_code_2230","2230","accounts","base.at"
+"account_tag_external_code_2240","2240","accounts","base.at"
+"account_tag_external_code_2250","2250","accounts","base.at"
+"account_tag_external_code_2251","2251","accounts","base.at"
+"account_tag_external_code_2280","2280","accounts","base.at"
+"account_tag_external_code_2290","2290","accounts","base.at"
+"account_tag_external_code_2291","2291","accounts","base.at"
+"account_tag_external_code_2292","2292","accounts","base.at"
+"account_tag_external_code_2293","2293","accounts","base.at"
+"account_tag_external_code_2294","2294","accounts","base.at"
+"account_tag_external_code_2295","2295","accounts","base.at"
+"account_tag_external_code_2300","2300","accounts","base.at"
+"account_tag_external_code_2310","2310","accounts","base.at"
+"account_tag_external_code_2320","2320","accounts","base.at"
+"account_tag_external_code_2330","2330","accounts","base.at"
+"account_tag_external_code_2340","2340","accounts","base.at"
+"account_tag_external_code_2350","2350","accounts","base.at"
+"account_tag_external_code_2470","2470","accounts","base.at"
+"account_tag_external_code_2480","2480","accounts","base.at"
+"account_tag_external_code_2490","2490","accounts","base.at"
+"account_tag_external_code_2500","2500","accounts","base.at"
+"account_tag_external_code_2501","2501","accounts","base.at"
+"account_tag_external_code_2502","2502","accounts","base.at"
+"account_tag_external_code_2504","2504","accounts","base.at"
+"account_tag_external_code_2505","2505","accounts","base.at"
+"account_tag_external_code_2506","2506","accounts","base.at"
+"account_tag_external_code_2507","2507","accounts","base.at"
+"account_tag_external_code_2509","2509","accounts","base.at"
+"account_tag_external_code_2510","2510","accounts","base.at"
+"account_tag_external_code_2511","2511","accounts","base.at"
+"account_tag_external_code_2512","2512","accounts","base.at"
+"account_tag_external_code_2513","2513","accounts","base.at"
+"account_tag_external_code_2515","2515","accounts","base.at"
+"account_tag_external_code_2517","2517","accounts","base.at"
+"account_tag_external_code_2518","2518","accounts","base.at"
+"account_tag_external_code_2519","2519","accounts","base.at"
+"account_tag_external_code_2520","2520","accounts","base.at"
+"account_tag_external_code_2530","2530","accounts","base.at"
+"account_tag_external_code_2531","2531","accounts","base.at"
+"account_tag_external_code_2532","2532","accounts","base.at"
+"account_tag_external_code_2533","2533","accounts","base.at"
+"account_tag_external_code_2534","2534","accounts","base.at"
+"account_tag_external_code_2535","2535","accounts","base.at"
+"account_tag_external_code_2536","2536","accounts","base.at"
+"account_tag_external_code_2537","2537","accounts","base.at"
+"account_tag_external_code_2538","2538","accounts","base.at"
+"account_tag_external_code_2540","2540","accounts","base.at"
+"account_tag_external_code_2541","2541","accounts","base.at"
+"account_tag_external_code_2542","2542","accounts","base.at"
+"account_tag_external_code_2543","2543","accounts","base.at"
+"account_tag_external_code_2560","2560","accounts","base.at"
+"account_tag_external_code_2565","2565","accounts","base.at"
+"account_tag_external_code_2570","2570","accounts","base.at"
+"account_tag_external_code_2573","2573","accounts","base.at"
+"account_tag_external_code_2575","2575","accounts","base.at"
+"account_tag_external_code_2577","2577","accounts","base.at"
+"account_tag_external_code_2580","2580","accounts","base.at"
+"account_tag_external_code_2582","2582","accounts","base.at"
+"account_tag_external_code_2584","2584","accounts","base.at"
+"account_tag_external_code_2586","2586","accounts","base.at"
+"account_tag_external_code_2590","2590","accounts","base.at"
+"account_tag_external_code_2600","2600","accounts","base.at"
+"account_tag_external_code_2601","2601","accounts","base.at"
+"account_tag_external_code_2602","2602","accounts","base.at"
+"account_tag_external_code_2610","2610","accounts","base.at"
+"account_tag_external_code_2612","2612","accounts","base.at"
+"account_tag_external_code_2620","2620","accounts","base.at"
+"account_tag_external_code_2630","2630","accounts","base.at"
+"account_tag_external_code_2680","2680","accounts","base.at"
+"account_tag_external_code_2690","2690","accounts","base.at"
+"account_tag_external_code_2700","2700","accounts","base.at"
+"account_tag_external_code_2730","2730","accounts","base.at"
+"account_tag_external_code_2740","2740","accounts","base.at"
+"account_tag_external_code_2750","2750","accounts","base.at"
+"account_tag_external_code_2780","2780","accounts","base.at"
+"account_tag_external_code_2790","2790","accounts","base.at"
+"account_tag_external_code_2800","2800","accounts","base.at"
+"account_tag_external_code_2880","2880","accounts","base.at"
+"account_tag_external_code_2885","2885","accounts","base.at"
+"account_tag_external_code_2890","2890","accounts","base.at"
+"account_tag_external_code_2900","2900","accounts","base.at"
+"account_tag_external_code_2940","2940","accounts","base.at"
+"account_tag_external_code_2950","2950","accounts","base.at"
+"account_tag_external_code_2960","2960","accounts","base.at"
+"account_tag_external_code_2970","2970","accounts","base.at"
+"account_tag_external_code_2980","2980","accounts","base.at"
+"account_tag_external_code_2990","2990","accounts","base.at"
+"account_tag_external_code_2999","2999","accounts","base.at"
+"account_tag_external_code_3000","3000","accounts","base.at"
+"account_tag_external_code_3010","3010","accounts","base.at"
+"account_tag_external_code_3020","3020","accounts","base.at"
+"account_tag_external_code_3030","3030","accounts","base.at"
+"account_tag_external_code_3035","3035","accounts","base.at"
+"account_tag_external_code_3040","3040","accounts","base.at"
+"account_tag_external_code_3041","3041","accounts","base.at"
+"account_tag_external_code_3042","3042","accounts","base.at"
+"account_tag_external_code_3043","3043","accounts","base.at"
+"account_tag_external_code_3044","3044","accounts","base.at"
+"account_tag_external_code_3050","3050","accounts","base.at"
+"account_tag_external_code_3051","3051","accounts","base.at"
+"account_tag_external_code_3052","3052","accounts","base.at"
+"account_tag_external_code_3060","3060","accounts","base.at"
+"account_tag_external_code_3061","3061","accounts","base.at"
+"account_tag_external_code_3070","3070","accounts","base.at"
+"account_tag_external_code_3071","3071","accounts","base.at"
+"account_tag_external_code_3080","3080","accounts","base.at"
+"account_tag_external_code_3085","3085","accounts","base.at"
+"account_tag_external_code_3090","3090","accounts","base.at"
+"account_tag_external_code_3100","3100","accounts","base.at"
+"account_tag_external_code_3105","3105","accounts","base.at"
+"account_tag_external_code_3110","3110","accounts","base.at"
+"account_tag_external_code_3180","3180","accounts","base.at"
+"account_tag_external_code_3200","3200","accounts","base.at"
+"account_tag_external_code_3201","3201","accounts","base.at"
+"account_tag_external_code_3202","3202","accounts","base.at"
+"account_tag_external_code_3203","3203","accounts","base.at"
+"account_tag_external_code_3204","3204","accounts","base.at"
+"account_tag_external_code_3205","3205","accounts","base.at"
+"account_tag_external_code_3210","3210","accounts","base.at"
+"account_tag_external_code_3300","3300","accounts","base.at"
+"account_tag_external_code_3360","3360","accounts","base.at"
+"account_tag_external_code_3370","3370","accounts","base.at"
+"account_tag_external_code_3380","3380","accounts","base.at"
+"account_tag_external_code_3390","3390","accounts","base.at"
+"account_tag_external_code_3400","3400","accounts","base.at"
+"account_tag_external_code_3401","3401","accounts","base.at"
+"account_tag_external_code_3440","3440","accounts","base.at"
+"account_tag_external_code_3441","3441","accounts","base.at"
+"account_tag_external_code_3450","3450","accounts","base.at"
+"account_tag_external_code_3455","3455","accounts","base.at"
+"account_tag_external_code_3460","3460","accounts","base.at"
+"account_tag_external_code_3470","3470","accounts","base.at"
+"account_tag_external_code_3480","3480","accounts","base.at"
+"account_tag_external_code_3481","3481","accounts","base.at"
+"account_tag_external_code_3485","3485","accounts","base.at"
+"account_tag_external_code_3486","3486","accounts","base.at"
+"account_tag_external_code_3490","3490","accounts","base.at"
+"account_tag_external_code_3491","3491","accounts","base.at"
+"account_tag_external_code_3492","3492","accounts","base.at"
+"account_tag_external_code_3493","3493","accounts","base.at"
+"account_tag_external_code_3495","3495","accounts","base.at"
+"account_tag_external_code_3500","3500","accounts","base.at"
+"account_tag_external_code_3501","3501","accounts","base.at"
+"account_tag_external_code_3502","3502","accounts","base.at"
+"account_tag_external_code_3503","3503","accounts","base.at"
+"account_tag_external_code_3504","3504","accounts","base.at"
+"account_tag_external_code_3505","3505","accounts","base.at"
+"account_tag_external_code_3506","3506","accounts","base.at"
+"account_tag_external_code_3507","3507","accounts","base.at"
+"account_tag_external_code_3509","3509","accounts","base.at"
+"account_tag_external_code_3510","3510","accounts","base.at"
+"account_tag_external_code_3511","3511","accounts","base.at"
+"account_tag_external_code_3516","3516","accounts","base.at"
+"account_tag_external_code_3517","3517","accounts","base.at"
+"account_tag_external_code_3520","3520","accounts","base.at"
+"account_tag_external_code_3530","3530","accounts","base.at"
+"account_tag_external_code_3540","3540","accounts","base.at"
+"account_tag_external_code_3541","3541","accounts","base.at"
+"account_tag_external_code_3542","3542","accounts","base.at"
+"account_tag_external_code_3550","3550","accounts","base.at"
+"account_tag_external_code_3551","3551","accounts","base.at"
+"account_tag_external_code_3554","3554","accounts","base.at"
+"account_tag_external_code_3556","3556","accounts","base.at"
+"account_tag_external_code_3560","3560","accounts","base.at"
+"account_tag_external_code_3590","3590","accounts","base.at"
+"account_tag_external_code_3600","3600","accounts","base.at"
+"account_tag_external_code_3610","3610","accounts","base.at"
+"account_tag_external_code_3620","3620","accounts","base.at"
+"account_tag_external_code_3630","3630","accounts","base.at"
+"account_tag_external_code_3640","3640","accounts","base.at"
+"account_tag_external_code_3650","3650","accounts","base.at"
+"account_tag_external_code_3700","3700","accounts","base.at"
+"account_tag_external_code_3750","3750","accounts","base.at"
+"account_tag_external_code_3760","3760","accounts","base.at"
+"account_tag_external_code_3800","3800","accounts","base.at"
+"account_tag_external_code_3900","3900","accounts","base.at"
+"account_tag_external_code_3990","3990","accounts","base.at"
+"account_tag_external_code_3999","3999","accounts","base.at"
+"account_tag_external_code_4000","4000","accounts","base.at"
+"account_tag_external_code_4010","4010","accounts","base.at"
+"account_tag_external_code_4012","4012","accounts","base.at"
+"account_tag_external_code_4014","4014","accounts","base.at"
+"account_tag_external_code_4016","4016","accounts","base.at"
+"account_tag_external_code_4019","4019","accounts","base.at"
+"account_tag_external_code_4030","4030","accounts","base.at"
+"account_tag_external_code_4031","4031","accounts","base.at"
+"account_tag_external_code_4050","4050","accounts","base.at"
+"account_tag_external_code_4052","4052","accounts","base.at"
+"account_tag_external_code_4054","4054","accounts","base.at"
+"account_tag_external_code_4060","4060","accounts","base.at"
+"account_tag_external_code_4062","4062","accounts","base.at"
+"account_tag_external_code_4064","4064","accounts","base.at"
+"account_tag_external_code_4066","4066","accounts","base.at"
+"account_tag_external_code_4068","4068","accounts","base.at"
+"account_tag_external_code_4069","4069","accounts","base.at"
+"account_tag_external_code_4070","4070","accounts","base.at"
+"account_tag_external_code_4080","4080","accounts","base.at"
+"account_tag_external_code_4084","4084","accounts","base.at"
+"account_tag_external_code_4090","4090","accounts","base.at"
+"account_tag_external_code_4092","4092","accounts","base.at"
+"account_tag_external_code_4095","4095","accounts","base.at"
+"account_tag_external_code_4096","4096","accounts","base.at"
+"account_tag_external_code_4098","4098","accounts","base.at"
+"account_tag_external_code_4100","4100","accounts","base.at"
+"account_tag_external_code_4110","4110","accounts","base.at"
+"account_tag_external_code_4111","4111","accounts","base.at"
+"account_tag_external_code_4120","4120","accounts","base.at"
+"account_tag_external_code_4200","4200","accounts","base.at"
+"account_tag_external_code_4210","4210","accounts","base.at"
+"account_tag_external_code_4290","4290","accounts","base.at"
+"account_tag_external_code_4310","4310","accounts","base.at"
+"account_tag_external_code_4350","4350","accounts","base.at"
+"account_tag_external_code_4352","4352","accounts","base.at"
+"account_tag_external_code_4353","4353","accounts","base.at"
+"account_tag_external_code_4354","4354","accounts","base.at"
+"account_tag_external_code_4356","4356","accounts","base.at"
+"account_tag_external_code_4358","4358","accounts","base.at"
+"account_tag_external_code_4360","4360","accounts","base.at"
+"account_tag_external_code_4362","4362","accounts","base.at"
+"account_tag_external_code_4364","4364","accounts","base.at"
+"account_tag_external_code_4400","4400","accounts","base.at"
+"account_tag_external_code_4401","4401","accounts","base.at"
+"account_tag_external_code_4402","4402","accounts","base.at"
+"account_tag_external_code_4403","4403","accounts","base.at"
+"account_tag_external_code_4416","4416","accounts","base.at"
+"account_tag_external_code_4419","4419","accounts","base.at"
+"account_tag_external_code_4420","4420","accounts","base.at"
+"account_tag_external_code_4421","4421","accounts","base.at"
+"account_tag_external_code_4422","4422","accounts","base.at"
+"account_tag_external_code_4423","4423","accounts","base.at"
+"account_tag_external_code_4424","4424","accounts","base.at"
+"account_tag_external_code_4425","4425","accounts","base.at"
+"account_tag_external_code_4430","4430","accounts","base.at"
+"account_tag_external_code_4449","4449","accounts","base.at"
+"account_tag_external_code_4450","4450","accounts","base.at"
+"account_tag_external_code_4451","4451","accounts","base.at"
+"account_tag_external_code_4452","4452","accounts","base.at"
+"account_tag_external_code_4453","4453","accounts","base.at"
+"account_tag_external_code_4454","4454","accounts","base.at"
+"account_tag_external_code_4455","4455","accounts","base.at"
+"account_tag_external_code_4456","4456","accounts","base.at"
+"account_tag_external_code_4457","4457","accounts","base.at"
+"account_tag_external_code_4458","4458","accounts","base.at"
+"account_tag_external_code_4459","4459","accounts","base.at"
+"account_tag_external_code_4460","4460","accounts","base.at"
+"account_tag_external_code_4461","4461","accounts","base.at"
+"account_tag_external_code_4462","4462","accounts","base.at"
+"account_tag_external_code_4466","4466","accounts","base.at"
+"account_tag_external_code_4469","4469","accounts","base.at"
+"account_tag_external_code_4470","4470","accounts","base.at"
+"account_tag_external_code_4480","4480","accounts","base.at"
+"account_tag_external_code_4481","4481","accounts","base.at"
+"account_tag_external_code_4482","4482","accounts","base.at"
+"account_tag_external_code_4486","4486","accounts","base.at"
+"account_tag_external_code_4489","4489","accounts","base.at"
+"account_tag_external_code_4490","4490","accounts","base.at"
+"account_tag_external_code_4500","4500","accounts","base.at"
+"account_tag_external_code_4510","4510","accounts","base.at"
+"account_tag_external_code_4520","4520","accounts","base.at"
+"account_tag_external_code_4580","4580","accounts","base.at"
+"account_tag_external_code_4600","4600","accounts","base.at"
+"account_tag_external_code_4605","4605","accounts","base.at"
+"account_tag_external_code_4610","4610","accounts","base.at"
+"account_tag_external_code_4630","4630","accounts","base.at"
+"account_tag_external_code_4631","4631","accounts","base.at"
+"account_tag_external_code_4660","4660","accounts","base.at"
+"account_tag_external_code_4700","4700","accounts","base.at"
+"account_tag_external_code_4701","4701","accounts","base.at"
+"account_tag_external_code_4702","4702","accounts","base.at"
+"account_tag_external_code_4705","4705","accounts","base.at"
+"account_tag_external_code_4709","4709","accounts","base.at"
+"account_tag_external_code_4800","4800","accounts","base.at"
+"account_tag_external_code_4810","4810","accounts","base.at"
+"account_tag_external_code_4820","4820","accounts","base.at"
+"account_tag_external_code_4826","4826","accounts","base.at"
+"account_tag_external_code_4829","4829","accounts","base.at"
+"account_tag_external_code_4830","4830","accounts","base.at"
+"account_tag_external_code_4831","4831","accounts","base.at"
+"account_tag_external_code_4835","4835","accounts","base.at"
+"account_tag_external_code_4840","4840","accounts","base.at"
+"account_tag_external_code_4850","4850","accounts","base.at"
+"account_tag_external_code_4851","4851","accounts","base.at"
+"account_tag_external_code_4852","4852","accounts","base.at"
+"account_tag_external_code_4855","4855","accounts","base.at"
+"account_tag_external_code_4860","4860","accounts","base.at"
+"account_tag_external_code_4865","4865","accounts","base.at"
+"account_tag_external_code_4866","4866","accounts","base.at"
+"account_tag_external_code_4867","4867","accounts","base.at"
+"account_tag_external_code_4870","4870","accounts","base.at"
+"account_tag_external_code_4871","4871","accounts","base.at"
+"account_tag_external_code_4872","4872","accounts","base.at"
+"account_tag_external_code_4875","4875","accounts","base.at"
+"account_tag_external_code_4880","4880","accounts","base.at"
+"account_tag_external_code_4881","4881","accounts","base.at"
+"account_tag_external_code_4882","4882","accounts","base.at"
+"account_tag_external_code_4885","4885","accounts","base.at"
+"account_tag_external_code_4900","4900","accounts","base.at"
+"account_tag_external_code_4901","4901","accounts","base.at"
+"account_tag_external_code_4902","4902","accounts","base.at"
+"account_tag_external_code_4903","4903","accounts","base.at"
+"account_tag_external_code_4940","4940","accounts","base.at"
+"account_tag_external_code_4941","4941","accounts","base.at"
+"account_tag_external_code_4942","4942","accounts","base.at"
+"account_tag_external_code_4943","4943","accounts","base.at"
+"account_tag_external_code_4980","4980","accounts","base.at"
+"account_tag_external_code_4981","4981","accounts","base.at"
+"account_tag_external_code_4982","4982","accounts","base.at"
+"account_tag_external_code_4983","4983","accounts","base.at"
+"account_tag_external_code_4995","4995","accounts","base.at"
+"account_tag_external_code_4999","4999","accounts","base.at"
+"account_tag_external_code_5000","5000","accounts","base.at"
+"account_tag_external_code_5001","5001","accounts","base.at"
+"account_tag_external_code_5002","5002","accounts","base.at"
+"account_tag_external_code_5003","5003","accounts","base.at"
+"account_tag_external_code_5004","5004","accounts","base.at"
+"account_tag_external_code_5005","5005","accounts","base.at"
+"account_tag_external_code_5006","5006","accounts","base.at"
+"account_tag_external_code_5007","5007","accounts","base.at"
+"account_tag_external_code_5080","5080","accounts","base.at"
+"account_tag_external_code_5084","5084","accounts","base.at"
+"account_tag_external_code_5100","5100","accounts","base.at"
+"account_tag_external_code_5200","5200","accounts","base.at"
+"account_tag_external_code_5300","5300","accounts","base.at"
+"account_tag_external_code_5310","5310","accounts","base.at"
+"account_tag_external_code_5320","5320","accounts","base.at"
+"account_tag_external_code_5330","5330","accounts","base.at"
+"account_tag_external_code_5340","5340","accounts","base.at"
+"account_tag_external_code_5350","5350","accounts","base.at"
+"account_tag_external_code_5360","5360","accounts","base.at"
+"account_tag_external_code_5370","5370","accounts","base.at"
+"account_tag_external_code_5400","5400","accounts","base.at"
+"account_tag_external_code_5410","5410","accounts","base.at"
+"account_tag_external_code_5411","5411","accounts","base.at"
+"account_tag_external_code_5412","5412","accounts","base.at"
+"account_tag_external_code_5414","5414","accounts","base.at"
+"account_tag_external_code_5415","5415","accounts","base.at"
+"account_tag_external_code_5416","5416","accounts","base.at"
+"account_tag_external_code_5417","5417","accounts","base.at"
+"account_tag_external_code_5440","5440","accounts","base.at"
+"account_tag_external_code_5441","5441","accounts","base.at"
+"account_tag_external_code_5450","5450","accounts","base.at"
+"account_tag_external_code_5451","5451","accounts","base.at"
+"account_tag_external_code_5460","5460","accounts","base.at"
+"account_tag_external_code_5461","5461","accounts","base.at"
+"account_tag_external_code_5470","5470","accounts","base.at"
+"account_tag_external_code_5471","5471","accounts","base.at"
+"account_tag_external_code_5500","5500","accounts","base.at"
+"account_tag_external_code_5501","5501","accounts","base.at"
+"account_tag_external_code_5600","5600","accounts","base.at"
+"account_tag_external_code_5601","5601","accounts","base.at"
+"account_tag_external_code_5610","5610","accounts","base.at"
+"account_tag_external_code_5615","5615","accounts","base.at"
+"account_tag_external_code_5620","5620","accounts","base.at"
+"account_tag_external_code_5621","5621","accounts","base.at"
+"account_tag_external_code_5700","5700","accounts","base.at"
+"account_tag_external_code_5750","5750","accounts","base.at"
+"account_tag_external_code_5770","5770","accounts","base.at"
+"account_tag_external_code_5772","5772","accounts","base.at"
+"account_tag_external_code_5774","5774","accounts","base.at"
+"account_tag_external_code_5780","5780","accounts","base.at"
+"account_tag_external_code_5800","5800","accounts","base.at"
+"account_tag_external_code_5801","5801","accounts","base.at"
+"account_tag_external_code_5802","5802","accounts","base.at"
+"account_tag_external_code_5803","5803","accounts","base.at"
+"account_tag_external_code_5805","5805","accounts","base.at"
+"account_tag_external_code_5806","5806","accounts","base.at"
+"account_tag_external_code_5810","5810","accounts","base.at"
+"account_tag_external_code_5811","5811","accounts","base.at"
+"account_tag_external_code_5812","5812","accounts","base.at"
+"account_tag_external_code_5820","5820","accounts","base.at"
+"account_tag_external_code_5821","5821","accounts","base.at"
+"account_tag_external_code_5822","5822","accounts","base.at"
+"account_tag_external_code_5830","5830","accounts","base.at"
+"account_tag_external_code_5831","5831","accounts","base.at"
+"account_tag_external_code_5834","5834","accounts","base.at"
+"account_tag_external_code_5835","5835","accounts","base.at"
+"account_tag_external_code_5840","5840","accounts","base.at"
+"account_tag_external_code_5842","5842","accounts","base.at"
+"account_tag_external_code_5844","5844","accounts","base.at"
+"account_tag_external_code_5850","5850","accounts","base.at"
+"account_tag_external_code_5851","5851","accounts","base.at"
+"account_tag_external_code_5852","5852","accounts","base.at"
+"account_tag_external_code_5853","5853","accounts","base.at"
+"account_tag_external_code_5855","5855","accounts","base.at"
+"account_tag_external_code_5856","5856","accounts","base.at"
+"account_tag_external_code_5857","5857","accounts","base.at"
+"account_tag_external_code_5858","5858","accounts","base.at"
+"account_tag_external_code_5860","5860","accounts","base.at"
+"account_tag_external_code_5880","5880","accounts","base.at"
+"account_tag_external_code_5900","5900","accounts","base.at"
+"account_tag_external_code_6000","6000","accounts","base.at"
+"account_tag_external_code_6005","6005","accounts","base.at"
+"account_tag_external_code_6010","6010","accounts","base.at"
+"account_tag_external_code_6015","6015","accounts","base.at"
+"account_tag_external_code_6020","6020","accounts","base.at"
+"account_tag_external_code_6025","6025","accounts","base.at"
+"account_tag_external_code_6030","6030","accounts","base.at"
+"account_tag_external_code_6040","6040","accounts","base.at"
+"account_tag_external_code_6050","6050","accounts","base.at"
+"account_tag_external_code_6060","6060","accounts","base.at"
+"account_tag_external_code_6070","6070","accounts","base.at"
+"account_tag_external_code_6090","6090","accounts","base.at"
+"account_tag_external_code_6100","6100","accounts","base.at"
+"account_tag_external_code_6200","6200","accounts","base.at"
+"account_tag_external_code_6205","6205","accounts","base.at"
+"account_tag_external_code_6210","6210","accounts","base.at"
+"account_tag_external_code_6220","6220","accounts","base.at"
+"account_tag_external_code_6225","6225","accounts","base.at"
+"account_tag_external_code_6230","6230","accounts","base.at"
+"account_tag_external_code_6240","6240","accounts","base.at"
+"account_tag_external_code_6250","6250","accounts","base.at"
+"account_tag_external_code_6260","6260","accounts","base.at"
+"account_tag_external_code_6270","6270","accounts","base.at"
+"account_tag_external_code_6290","6290","accounts","base.at"
+"account_tag_external_code_6400","6400","accounts","base.at"
+"account_tag_external_code_6401","6401","accounts","base.at"
+"account_tag_external_code_6402","6402","accounts","base.at"
+"account_tag_external_code_6403","6403","accounts","base.at"
+"account_tag_external_code_6404","6404","accounts","base.at"
+"account_tag_external_code_6410","6410","accounts","base.at"
+"account_tag_external_code_6411","6411","accounts","base.at"
+"account_tag_external_code_6420","6420","accounts","base.at"
+"account_tag_external_code_6421","6421","accounts","base.at"
+"account_tag_external_code_6450","6450","accounts","base.at"
+"account_tag_external_code_6451","6451","accounts","base.at"
+"account_tag_external_code_6452","6452","accounts","base.at"
+"account_tag_external_code_6453","6453","accounts","base.at"
+"account_tag_external_code_6454","6454","accounts","base.at"
+"account_tag_external_code_6455","6455","accounts","base.at"
+"account_tag_external_code_6460","6460","accounts","base.at"
+"account_tag_external_code_6461","6461","accounts","base.at"
+"account_tag_external_code_6500","6500","accounts","base.at"
+"account_tag_external_code_6560","6560","accounts","base.at"
+"account_tag_external_code_6580","6580","accounts","base.at"
+"account_tag_external_code_6590","6590","accounts","base.at"
+"account_tag_external_code_6600","6600","accounts","base.at"
+"account_tag_external_code_6601","6601","accounts","base.at"
+"account_tag_external_code_6602","6602","accounts","base.at"
+"account_tag_external_code_6603","6603","accounts","base.at"
+"account_tag_external_code_6660","6660","accounts","base.at"
+"account_tag_external_code_6661","6661","accounts","base.at"
+"account_tag_external_code_6662","6662","accounts","base.at"
+"account_tag_external_code_6663","6663","accounts","base.at"
+"account_tag_external_code_6670","6670","accounts","base.at"
+"account_tag_external_code_6680","6680","accounts","base.at"
+"account_tag_external_code_6685","6685","accounts","base.at"
+"account_tag_external_code_6690","6690","accounts","base.at"
+"account_tag_external_code_6695","6695","accounts","base.at"
+"account_tag_external_code_6700","6700","accounts","base.at"
+"account_tag_external_code_6710","6710","accounts","base.at"
+"account_tag_external_code_6720","6720","accounts","base.at"
+"account_tag_external_code_6730","6730","accounts","base.at"
+"account_tag_external_code_6731","6731","accounts","base.at"
+"account_tag_external_code_6740","6740","accounts","base.at"
+"account_tag_external_code_6750","6750","accounts","base.at"
+"account_tag_external_code_6751","6751","accounts","base.at"
+"account_tag_external_code_6790","6790","accounts","base.at"
+"account_tag_external_code_6791","6791","accounts","base.at"
+"account_tag_external_code_6800","6800","accounts","base.at"
+"account_tag_external_code_7000","7000","accounts","base.at"
+"account_tag_external_code_7005","7005","accounts","base.at"
+"account_tag_external_code_7010","7010","accounts","base.at"
+"account_tag_external_code_7011","7011","accounts","base.at"
+"account_tag_external_code_7020","7020","accounts","base.at"
+"account_tag_external_code_7021","7021","accounts","base.at"
+"account_tag_external_code_7022","7022","accounts","base.at"
+"account_tag_external_code_7030","7030","accounts","base.at"
+"account_tag_external_code_7040","7040","accounts","base.at"
+"account_tag_external_code_7041","7041","accounts","base.at"
+"account_tag_external_code_7042","7042","accounts","base.at"
+"account_tag_external_code_7050","7050","accounts","base.at"
+"account_tag_external_code_7090","7090","accounts","base.at"
+"account_tag_external_code_7100","7100","accounts","base.at"
+"account_tag_external_code_7110","7110","accounts","base.at"
+"account_tag_external_code_7120","7120","accounts","base.at"
+"account_tag_external_code_7130","7130","accounts","base.at"
+"account_tag_external_code_7140","7140","accounts","base.at"
+"account_tag_external_code_7150","7150","accounts","base.at"
+"account_tag_external_code_7160","7160","accounts","base.at"
+"account_tag_external_code_7161","7161","accounts","base.at"
+"account_tag_external_code_7162","7162","accounts","base.at"
+"account_tag_external_code_7170","7170","accounts","base.at"
+"account_tag_external_code_7171","7171","accounts","base.at"
+"account_tag_external_code_7180","7180","accounts","base.at"
+"account_tag_external_code_7200","7200","accounts","base.at"
+"account_tag_external_code_7201","7201","accounts","base.at"
+"account_tag_external_code_7202","7202","accounts","base.at"
+"account_tag_external_code_7203","7203","accounts","base.at"
+"account_tag_external_code_7204","7204","accounts","base.at"
+"account_tag_external_code_7205","7205","accounts","base.at"
+"account_tag_external_code_7206","7206","accounts","base.at"
+"account_tag_external_code_7209","7209","accounts","base.at"
+"account_tag_external_code_7210","7210","accounts","base.at"
+"account_tag_external_code_7215","7215","accounts","base.at"
+"account_tag_external_code_7216","7216","accounts","base.at"
+"account_tag_external_code_7220","7220","accounts","base.at"
+"account_tag_external_code_7225","7225","accounts","base.at"
+"account_tag_external_code_7230","7230","accounts","base.at"
+"account_tag_external_code_7235","7235","accounts","base.at"
+"account_tag_external_code_7300","7300","accounts","base.at"
+"account_tag_external_code_7320","7320","accounts","base.at"
+"account_tag_external_code_7321","7321","accounts","base.at"
+"account_tag_external_code_7322","7322","accounts","base.at"
+"account_tag_external_code_7323","7323","accounts","base.at"
+"account_tag_external_code_7324","7324","accounts","base.at"
+"account_tag_external_code_7325","7325","accounts","base.at"
+"account_tag_external_code_7326","7326","accounts","base.at"
+"account_tag_external_code_7330","7330","accounts","base.at"
+"account_tag_external_code_7332","7332","accounts","base.at"
+"account_tag_external_code_7334","7334","accounts","base.at"
+"account_tag_external_code_7335","7335","accounts","base.at"
+"account_tag_external_code_7336","7336","accounts","base.at"
+"account_tag_external_code_7340","7340","accounts","base.at"
+"account_tag_external_code_7345","7345","accounts","base.at"
+"account_tag_external_code_7350","7350","accounts","base.at"
+"account_tag_external_code_7355","7355","accounts","base.at"
+"account_tag_external_code_7360","7360","accounts","base.at"
+"account_tag_external_code_7370","7370","accounts","base.at"
+"account_tag_external_code_7380","7380","accounts","base.at"
+"account_tag_external_code_7381","7381","accounts","base.at"
+"account_tag_external_code_7382","7382","accounts","base.at"
+"account_tag_external_code_7385","7385","accounts","base.at"
+"account_tag_external_code_7390","7390","accounts","base.at"
+"account_tag_external_code_7400","7400","accounts","base.at"
+"account_tag_external_code_7401","7401","accounts","base.at"
+"account_tag_external_code_7402","7402","accounts","base.at"
+"account_tag_external_code_7410","7410","accounts","base.at"
+"account_tag_external_code_7411","7411","accounts","base.at"
+"account_tag_external_code_7412","7412","accounts","base.at"
+"account_tag_external_code_7440","7440","accounts","base.at"
+"account_tag_external_code_7480","7480","accounts","base.at"
+"account_tag_external_code_7490","7490","accounts","base.at"
+"account_tag_external_code_7500","7500","accounts","base.at"
+"account_tag_external_code_7540","7540","accounts","base.at"
+"account_tag_external_code_7580","7580","accounts","base.at"
+"account_tag_external_code_7585","7585","accounts","base.at"
+"account_tag_external_code_7600","7600","accounts","base.at"
+"account_tag_external_code_7601","7601","accounts","base.at"
+"account_tag_external_code_7610","7610","accounts","base.at"
+"account_tag_external_code_7611","7611","accounts","base.at"
+"account_tag_external_code_7630","7630","accounts","base.at"
+"account_tag_external_code_7631","7631","accounts","base.at"
+"account_tag_external_code_7650","7650","accounts","base.at"
+"account_tag_external_code_7651","7651","accounts","base.at"
+"account_tag_external_code_7652","7652","accounts","base.at"
+"account_tag_external_code_7653","7653","accounts","base.at"
+"account_tag_external_code_7654","7654","accounts","base.at"
+"account_tag_external_code_7660","7660","accounts","base.at"
+"account_tag_external_code_7661","7661","accounts","base.at"
+"account_tag_external_code_7685","7685","accounts","base.at"
+"account_tag_external_code_7690","7690","accounts","base.at"
+"account_tag_external_code_7695","7695","accounts","base.at"
+"account_tag_external_code_7696","7696","accounts","base.at"
+"account_tag_external_code_7700","7700","accounts","base.at"
+"account_tag_external_code_7710","7710","accounts","base.at"
+"account_tag_external_code_7720","7720","accounts","base.at"
+"account_tag_external_code_7740","7740","accounts","base.at"
+"account_tag_external_code_7750","7750","accounts","base.at"
+"account_tag_external_code_7755","7755","accounts","base.at"
+"account_tag_external_code_7758","7758","accounts","base.at"
+"account_tag_external_code_7760","7760","accounts","base.at"
+"account_tag_external_code_7765","7765","accounts","base.at"
+"account_tag_external_code_7770","7770","accounts","base.at"
+"account_tag_external_code_7775","7775","accounts","base.at"
+"account_tag_external_code_7780","7780","accounts","base.at"
+"account_tag_external_code_7782","7782","accounts","base.at"
+"account_tag_external_code_7785","7785","accounts","base.at"
+"account_tag_external_code_7790","7790","accounts","base.at"
+"account_tag_external_code_7800","7800","accounts","base.at"
+"account_tag_external_code_7801","7801","accounts","base.at"
+"account_tag_external_code_7804","7804","accounts","base.at"
+"account_tag_external_code_7805","7805","accounts","base.at"
+"account_tag_external_code_7806","7806","accounts","base.at"
+"account_tag_external_code_7807","7807","accounts","base.at"
+"account_tag_external_code_7808","7808","accounts","base.at"
+"account_tag_external_code_7809","7809","accounts","base.at"
+"account_tag_external_code_7810","7810","accounts","base.at"
+"account_tag_external_code_7811","7811","accounts","base.at"
+"account_tag_external_code_7815","7815","accounts","base.at"
+"account_tag_external_code_7816","7816","accounts","base.at"
+"account_tag_external_code_7820","7820","accounts","base.at"
+"account_tag_external_code_7825","7825","accounts","base.at"
+"account_tag_external_code_7830","7830","accounts","base.at"
+"account_tag_external_code_7840","7840","accounts","base.at"
+"account_tag_external_code_7841","7841","accounts","base.at"
+"account_tag_external_code_7850","7850","accounts","base.at"
+"account_tag_external_code_7860","7860","accounts","base.at"
+"account_tag_external_code_7870","7870","accounts","base.at"
+"account_tag_external_code_7890","7890","accounts","base.at"
+"account_tag_external_code_7900","7900","accounts","base.at"
+"account_tag_external_code_7910","7910","accounts","base.at"
+"account_tag_external_code_7960","7960","accounts","base.at"
+"account_tag_external_code_7970","7970","accounts","base.at"
+"account_tag_external_code_7980","7980","accounts","base.at"
+"account_tag_external_code_7990","7990","accounts","base.at"
+"account_tag_external_code_7999","7999","accounts","base.at"
+"account_tag_external_code_8000","8000","accounts","base.at"
+"account_tag_external_code_8010","8010","accounts","base.at"
+"account_tag_external_code_8020","8020","accounts","base.at"
+"account_tag_external_code_8030","8030","accounts","base.at"
+"account_tag_external_code_8040","8040","accounts","base.at"
+"account_tag_external_code_8045","8045","accounts","base.at"
+"account_tag_external_code_8050","8050","accounts","base.at"
+"account_tag_external_code_8052","8052","accounts","base.at"
+"account_tag_external_code_8055","8055","accounts","base.at"
+"account_tag_external_code_8060","8060","accounts","base.at"
+"account_tag_external_code_8070","8070","accounts","base.at"
+"account_tag_external_code_8080","8080","accounts","base.at"
+"account_tag_external_code_8100","8100","accounts","base.at"
+"account_tag_external_code_8101","8101","accounts","base.at"
+"account_tag_external_code_8110","8110","accounts","base.at"
+"account_tag_external_code_8120","8120","accounts","base.at"
+"account_tag_external_code_8121","8121","accounts","base.at"
+"account_tag_external_code_8122","8122","accounts","base.at"
+"account_tag_external_code_8125","8125","accounts","base.at"
+"account_tag_external_code_8140","8140","accounts","base.at"
+"account_tag_external_code_8150","8150","accounts","base.at"
+"account_tag_external_code_8160","8160","accounts","base.at"
+"account_tag_external_code_8170","8170","accounts","base.at"
+"account_tag_external_code_8171","8171","accounts","base.at"
+"account_tag_external_code_8180","8180","accounts","base.at"
+"account_tag_external_code_8181","8181","accounts","base.at"
+"account_tag_external_code_8190","8190","accounts","base.at"
+"account_tag_external_code_8191","8191","accounts","base.at"
+"account_tag_external_code_8200","8200","accounts","base.at"
+"account_tag_external_code_8201","8201","accounts","base.at"
+"account_tag_external_code_8205","8205","accounts","base.at"
+"account_tag_external_code_8206","8206","accounts","base.at"
+"account_tag_external_code_8210","8210","accounts","base.at"
+"account_tag_external_code_8211","8211","accounts","base.at"
+"account_tag_external_code_8220","8220","accounts","base.at"
+"account_tag_external_code_8230","8230","accounts","base.at"
+"account_tag_external_code_8231","8231","accounts","base.at"
+"account_tag_external_code_8232","8232","accounts","base.at"
+"account_tag_external_code_8260","8260","accounts","base.at"
+"account_tag_external_code_8261","8261","accounts","base.at"
+"account_tag_external_code_8270","8270","accounts","base.at"
+"account_tag_external_code_8271","8271","accounts","base.at"
+"account_tag_external_code_8280","8280","accounts","base.at"
+"account_tag_external_code_8281","8281","accounts","base.at"
+"account_tag_external_code_8290","8290","accounts","base.at"
+"account_tag_external_code_8300","8300","accounts","base.at"
+"account_tag_external_code_8310","8310","accounts","base.at"
+"account_tag_external_code_8320","8320","accounts","base.at"
+"account_tag_external_code_8340","8340","accounts","base.at"
+"account_tag_external_code_8350","8350","accounts","base.at"
+"account_tag_external_code_8360","8360","accounts","base.at"
+"account_tag_external_code_8400","8400","accounts","base.at"
+"account_tag_external_code_8410","8410","accounts","base.at"
+"account_tag_external_code_8420","8420","accounts","base.at"
+"account_tag_external_code_8440","8440","accounts","base.at"
+"account_tag_external_code_8445","8445","accounts","base.at"
+"account_tag_external_code_8450","8450","accounts","base.at"
+"account_tag_external_code_8460","8460","accounts","base.at"
+"account_tag_external_code_8470","8470","accounts","base.at"
+"account_tag_external_code_8480","8480","accounts","base.at"
+"account_tag_external_code_8490","8490","accounts","base.at"
+"account_tag_external_code_8500","8500","accounts","base.at"
+"account_tag_external_code_8510","8510","accounts","base.at"
+"account_tag_external_code_8520","8520","accounts","base.at"
+"account_tag_external_code_8530","8530","accounts","base.at"
+"account_tag_external_code_8540","8540","accounts","base.at"
+"account_tag_external_code_8550","8550","accounts","base.at"
+"account_tag_external_code_8560","8560","accounts","base.at"
+"account_tag_external_code_8600","8600","accounts","base.at"
+"account_tag_external_code_8610","8610","accounts","base.at"
+"account_tag_external_code_8700","8700","accounts","base.at"
+"account_tag_external_code_8710","8710","accounts","base.at"
+"account_tag_external_code_8720","8720","accounts","base.at"
+"account_tag_external_code_8750","8750","accounts","base.at"
+"account_tag_external_code_8760","8760","accounts","base.at"
+"account_tag_external_code_8770","8770","accounts","base.at"
+"account_tag_external_code_8800","8800","accounts","base.at"
+"account_tag_external_code_8810","8810","accounts","base.at"
+"account_tag_external_code_8900","8900","accounts","base.at"
+"account_tag_external_code_8910","8910","accounts","base.at"
+"account_tag_external_code_8920","8920","accounts","base.at"
+"account_tag_external_code_8990","8990","accounts","base.at"
+"account_tag_external_code_8991","8991","accounts","base.at"
+"account_tag_external_code_9000","9000","accounts","base.at"
+"account_tag_external_code_9001","9001","accounts","base.at"
+"account_tag_external_code_9009","9009","accounts","base.at"
+"account_tag_external_code_9010","9010","accounts","base.at"
+"account_tag_external_code_9011","9011","accounts","base.at"
+"account_tag_external_code_9030","9030","accounts","base.at"
+"account_tag_external_code_9031","9031","accounts","base.at"
+"account_tag_external_code_9040","9040","accounts","base.at"
+"account_tag_external_code_9050","9050","accounts","base.at"
+"account_tag_external_code_9060","9060","accounts","base.at"
+"account_tag_external_code_9070","9070","accounts","base.at"
+"account_tag_external_code_9080","9080","accounts","base.at"
+"account_tag_external_code_9090","9090","accounts","base.at"
+"account_tag_external_code_9130","9130","accounts","base.at"
+"account_tag_external_code_9140","9140","accounts","base.at"
+"account_tag_external_code_9150","9150","accounts","base.at"
+"account_tag_external_code_9160","9160","accounts","base.at"
+"account_tag_external_code_9161","9161","accounts","base.at"
+"account_tag_external_code_9162","9162","accounts","base.at"
+"account_tag_external_code_9163","9163","accounts","base.at"
+"account_tag_external_code_9190","9190","accounts","base.at"
+"account_tag_external_code_9191","9191","accounts","base.at"
+"account_tag_external_code_9192","9192","accounts","base.at"
+"account_tag_external_code_9200","9200","accounts","base.at"
+"account_tag_external_code_9210","9210","accounts","base.at"
+"account_tag_external_code_9220","9220","accounts","base.at"
+"account_tag_external_code_9240","9240","accounts","base.at"
+"account_tag_external_code_9300","9300","accounts","base.at"
+"account_tag_external_code_9310","9310","accounts","base.at"
+"account_tag_external_code_9320","9320","accounts","base.at"
+"account_tag_external_code_9330","9330","accounts","base.at"
+"account_tag_external_code_9340","9340","accounts","base.at"
+"account_tag_external_code_9345","9345","accounts","base.at"
+"account_tag_external_code_9350","9350","accounts","base.at"
+"account_tag_external_code_9351","9351","accounts","base.at"
+"account_tag_external_code_9360","9360","accounts","base.at"
+"account_tag_external_code_9361","9361","accounts","base.at"
+"account_tag_external_code_9370","9370","accounts","base.at"
+"account_tag_external_code_9371","9371","accounts","base.at"
+"account_tag_external_code_9380","9380","accounts","base.at"
+"account_tag_external_code_9381","9381","accounts","base.at"
+"account_tag_external_code_9385","9385","accounts","base.at"
+"account_tag_external_code_9389","9389","accounts","base.at"
+"account_tag_external_code_9390","9390","accounts","base.at"
+"account_tag_external_code_9392","9392","accounts","base.at"
+"account_tag_external_code_9393","9393","accounts","base.at"
+"account_tag_external_code_9396","9396","accounts","base.at"
+"account_tag_external_code_9397","9397","accounts","base.at"
+"account_tag_external_code_9400","9400","accounts","base.at"
+"account_tag_external_code_9410","9410","accounts","base.at"
+"account_tag_external_code_9420","9420","accounts","base.at"
+"account_tag_external_code_9430","9430","accounts","base.at"
+"account_tag_external_code_9450","9450","accounts","base.at"
+"account_tag_external_code_9501","9501","accounts","base.at"
+"account_tag_external_code_9502","9502","accounts","base.at"
+"account_tag_external_code_9550","9550","accounts","base.at"
+"account_tag_external_code_9570","9570","accounts","base.at"
+"account_tag_external_code_9580","9580","accounts","base.at"
+"account_tag_external_code_9581","9581","accounts","base.at"
+"account_tag_external_code_9600","9600","accounts","base.at"
+"account_tag_external_code_9601","9601","accounts","base.at"
+"account_tag_external_code_9610","9610","accounts","base.at"
+"account_tag_external_code_9611","9611","accounts","base.at"
+"account_tag_external_code_9612","9612","accounts","base.at"
+"account_tag_external_code_9613","9613","accounts","base.at"
+"account_tag_external_code_9614","9614","accounts","base.at"
+"account_tag_external_code_9618","9618","accounts","base.at"
+"account_tag_external_code_9620","9620","accounts","base.at"
+"account_tag_external_code_9630","9630","accounts","base.at"
+"account_tag_external_code_9640","9640","accounts","base.at"
+"account_tag_external_code_9641","9641","accounts","base.at"
+"account_tag_external_code_9644","9644","accounts","base.at"
+"account_tag_external_code_9700","9700","accounts","base.at"
+"account_tag_external_code_9710","9710","accounts","base.at"
+"account_tag_external_code_9720","9720","accounts","base.at"
+"account_tag_external_code_9730","9730","accounts","base.at"
+"account_tag_external_code_9800","9800","accounts","base.at"
+"account_tag_external_code_9810","9810","accounts","base.at"
+"account_tag_external_code_9850","9850","accounts","base.at"
+"account_tag_external_code_9880","9880","accounts","base.at"
+"account_tag_external_code_9881","9881","accounts","base.at"
+"account_tag_external_code_9882","9882","accounts","base.at"
+"account_tag_external_code_9883","9883","accounts","base.at"
+"account_tag_external_code_9884","9884","accounts","base.at"
+"account_tag_external_code_9890","9890","accounts","base.at"
+"account_tag_external_code_9891","9891","accounts","base.at"
+"account_tag_external_code_9990","9990","accounts","base.at"
+"account_tag_external_code_9991","9991","accounts","base.at"
+"account_tag_external_code_9992","9992","accounts","base.at"
+"account_tag_external_code_9993","9993","accounts","base.at"
+"account_tag_external_code_9994","9994","accounts","base.at"

odoo-bringout-oca-ocb-l10n_at/l10n_at/data/account_account_tag.xml

@@ -7,6 +7,7 @@
             <field name="name">Bilanz AAI1</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_AAI2"
@@ -14,6 +15,7 @@
             <field name="name">Bilanz AAI2</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_AAI3"
@@ -21,6 +23,7 @@
             <field name="name">Bilanz AAI3</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_AAII1"
@@ -28,6 +31,7 @@
             <field name="name">Bilanz AAII1</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_AAII2"
@@ -35,6 +39,7 @@
             <field name="name">Bilanz AAII2</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_AAII3"
@@ -42,6 +47,7 @@
             <field name="name">Bilanz AAII3</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_AAII4"
@@ -49,6 +55,7 @@
             <field name="name">Bilanz AAII4</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_AAIII"
@@ -56,6 +63,7 @@
             <field name="name">Bilanz AAIII</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_AAIII1"
@@ -63,6 +71,7 @@
             <field name="name">Bilanz AAIII1</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_AAIII2"
@@ -70,6 +79,7 @@
             <field name="name">Bilanz AAIII2</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_AAIII3"
@@ -77,6 +87,7 @@
             <field name="name">Bilanz AAIII3</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_AAIII4"
@@ -84,6 +95,7 @@
             <field name="name">Bilanz AAIII4</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_AAIII5"
@@ -91,6 +103,7 @@
             <field name="name">Bilanz AAIII5</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_AAIII6"
@@ -98,6 +111,7 @@
             <field name="name">Bilanz AAIII6</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_ABI1"
@@ -105,6 +119,7 @@
             <field name="name">Bilanz ABI1</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_ABI2"
@@ -112,6 +127,7 @@
             <field name="name">Bilanz ABI2</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_ABI3"
@@ -119,6 +135,7 @@
             <field name="name">Bilanz ABI3</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_ABI4"
@@ -126,6 +143,7 @@
             <field name="name">Bilanz ABI4</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_ABI5"
@@ -133,6 +151,7 @@
             <field name="name">Bilanz ABI5</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_ABII1"
@@ -140,6 +159,7 @@
             <field name="name">Bilanz ABII1</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_ABII2"
@@ -147,6 +167,7 @@
             <field name="name">Bilanz ABII2</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_ABII3"
@@ -154,6 +175,7 @@
             <field name="name">Bilanz ABII3</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_ABII4"
@@ -161,6 +183,7 @@
             <field name="name">Bilanz ABII4</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_ABIII"
@@ -168,6 +191,7 @@
             <field name="name">Bilanz ABIII</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_ABIII1"
@@ -175,6 +199,7 @@
             <field name="name">Bilanz ABIII1</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_ABIII2"
@@ -182,6 +207,7 @@
             <field name="name">Bilanz ABIII2</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_ABIV"
@@ -189,6 +215,7 @@
             <field name="name">Bilanz ABIV</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_AC"
@@ -196,6 +223,7 @@
             <field name="name">Bilanz AC</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_AD"
@@ -203,6 +231,7 @@
             <field name="name">Bilanz AD</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_PAI"
@@ -210,6 +239,7 @@
             <field name="name">Bilanz PAI</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_PAII"
@@ -217,6 +247,7 @@
             <field name="name">Bilanz PAII</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_PAII1"
@@ -224,6 +255,7 @@
             <field name="name">Bilanz PAII1</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_PAII2"
@@ -231,6 +263,7 @@
             <field name="name">Bilanz PAII2</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_PAIII"
@@ -238,6 +271,7 @@
             <field name="name">Bilanz PAIII</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_PAIII1"
@@ -245,6 +279,7 @@
             <field name="name">Bilanz PAIII1</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_PAIII2"
@@ -252,6 +287,7 @@
             <field name="name">Bilanz PAIII2</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_PAIII3"
@@ -259,6 +295,7 @@
             <field name="name">Bilanz PAIII3</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_PAIV"
@@ -266,6 +303,7 @@
             <field name="name">Bilanz PAIV</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_PBI"
@@ -273,6 +311,7 @@
             <field name="name">Bilanz PBI</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_PBII"
@@ -280,6 +319,7 @@
             <field name="name">Bilanz PBII</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_PBIII"
@@ -287,6 +327,7 @@
             <field name="name">Bilanz PBIII</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_PBIV"
@@ -294,6 +335,7 @@
             <field name="name">Bilanz PBIV</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_PCI"
@@ -301,6 +343,7 @@
             <field name="name">Bilanz PCI</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_PCII"
@@ -308,6 +351,7 @@
             <field name="name">Bilanz PCII</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_PCIII"
@@ -315,6 +359,7 @@
             <field name="name">Bilanz PCIII</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_PCIV"
@@ -322,6 +367,7 @@
             <field name="name">Bilanz PCIV</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_PCV"
@@ -329,6 +375,7 @@
             <field name="name">Bilanz PCV</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_PCVI"
@@ -336,6 +383,7 @@
             <field name="name">Bilanz PCVI</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_PCVII"
@@ -343,13 +391,15 @@
             <field name="name">Bilanz PCVII</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_PCVIII"
             model="account.account.tag">
-            <field name="name">Bilanz PCVIII</field>
+            <field name="name">Bilanz PCVIII (deprecated)</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_PCVIII1"
@@ -357,6 +407,7 @@
             <field name="name">Bilanz PCVIII1</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_PCVIII2"
@@ -364,6 +415,7 @@
             <field name="name">Bilanz PCVIII2</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_PCVIII3"
@@ -385,6 +437,7 @@
             <field name="name">Bilanz PD</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
 
         <record
@@ -393,6 +446,7 @@
             <field name="name">GuV EBIT1</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_EBIT2"
@@ -400,6 +454,7 @@
             <field name="name">GuV EBIT2</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_EBIT3"
@@ -407,6 +462,7 @@
             <field name="name">GuV EBIT3</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_EBIT4"
@@ -414,6 +470,7 @@
             <field name="name">GuV EBIT4</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_EBIT4I"
@@ -421,6 +478,7 @@
             <field name="name">GuV EBIT4I</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_EBIT4II"
@@ -428,6 +486,7 @@
             <field name="name">GuV EBIT4II</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_EBIT4III"
@@ -435,6 +494,7 @@
             <field name="name">GuV EBIT4III</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_EBIT5I"
@@ -442,6 +502,7 @@
             <field name="name">GuV EBIT5I</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_EBIT5II"
@@ -449,6 +510,7 @@
             <field name="name">GuV EBIT5II</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_EBIT6I"
@@ -456,6 +518,7 @@
             <field name="name">GuV EBIT6I</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_EBIT6II"
@@ -463,6 +526,7 @@
             <field name="name">GuV EBIT6II</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_EBIT7I"
@@ -470,6 +534,7 @@
             <field name="name">GuV EBIT7I</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_EBIT7II"
@@ -477,6 +542,7 @@
             <field name="name">GuV EBIT7II</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_EBIT8"
@@ -484,6 +550,7 @@
             <field name="name">GuV EBIT8</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_FIN10"
@@ -491,6 +558,7 @@
             <field name="name">GuV FIN10</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_FIN11"
@@ -498,6 +566,7 @@
             <field name="name">GuV FIN11</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_FIN12"
@@ -505,6 +574,7 @@
             <field name="name">GuV FIN12</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_FIN13"
@@ -512,6 +582,7 @@
             <field name="name">GuV FIN13</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_FIN14"
@@ -519,6 +590,7 @@
             <field name="name">GuV FIN14</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_FIN15"
@@ -526,6 +598,7 @@
             <field name="name">GuV FIN15</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_TAX"
@@ -533,6 +606,7 @@
             <field name="name">GuV TAX</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_MTAX"
@@ -540,6 +614,7 @@
             <field name="name">GuV MTAX</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
         <record
             id="account_tag_l10n_at_RCR"
@@ -568,6 +643,7 @@
             <field name="name">GuV RL</field>
             <field name="applicability">accounts</field>
             <field name="color" eval="1" />
+            <field name="country_id" ref="base.at"/>
         </record>
     </data>
 </odoo>

odoo-bringout-oca-ocb-l10n_at/l10n_at/data/account_chart_template.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<odoo>
-    <data>
-        <!-- Vorlagen: Kontenplan -->
-        <record id="l10n_at_chart_template" model="account.chart.template">
-            <field name="name">Einheitskontenrahmen Österreich 2010</field>
-            <field name="visible" eval="True" />
-
-            <field name="property_account_receivable_id" ref="chart_at_template_2000" />
-            <field name="property_account_payable_id" ref="chart_at_template_3300" />
-
-            <field name="default_pos_receivable_account_id" ref="chart_at_template_2099" />
-
-            <field name="property_account_income_categ_id" ref="chart_at_template_4000" />
-            <field name="property_account_expense_categ_id" ref="chart_at_template_5000" />
-
-            <!--<field name="property_account_income_id" ref="chart_at_template_4000" />
-            <field name="property_account_expense_id" ref="chart_at_template_5000" />-->
-
-            <field name="property_stock_account_input_categ_id" ref="chart_at_template_3740" />
-            <field name="property_stock_account_output_categ_id" ref="chart_at_template_5000" />
-
-            <field name="property_stock_valuation_account_id" ref="chart_at_template_1600" />
-
-            <field name="income_currency_exchange_account_id" ref="chart_at_template_4860" />
-            <field name="expense_currency_exchange_account_id" ref="chart_at_template_7860" />
-
-            <field name="account_journal_early_pay_discount_loss_account_id" ref="chart_at_template_5800"/>
-            <field name="account_journal_early_pay_discount_gain_account_id" ref="chart_at_template_8350"/>
-
-            <field name="property_tax_payable_account_id" ref="chart_at_template_2600"/>
-            <field name="property_tax_receivable_account_id" ref="chart_at_template_2600"/>
-        </record>
-    </data>
-</odoo>

odoo-bringout-oca-ocb-l10n_at/l10n_at/data/account_chart_template_configure_data.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
-        <function model="account.chart.template" name="try_loading">
-            <value eval="[ref('l10n_at.l10n_at_chart_template')]"/>
-        </function>
-    </data>
-</odoo>

odoo-bringout-oca-ocb-l10n_at/l10n_at/data/account_fiscal_position_template.xml

@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<odoo>
-    <data>
-        <!-- Vorlagen: Steuerliche Positionen -->
-
-        <record id="fiscal_position_template_national" model="account.fiscal.position.template">
-            <field name="name">National + EU (ohne UID)</field>
-            <field name="auto_apply" eval="True" />
-            <field name="vat_required" eval="False" />
-            <field name="country_group_id" ref="base.europe" />
-            <field name="chart_template_id" ref="l10n_at_chart_template"/>
-        </record>
-        <record id="fiscal_position_template_national_w_uid" model="account.fiscal.position.template">
-            <field name="name">National</field>
-            <field name="auto_apply" eval="True" />
-            <field name="vat_required" eval="True" />
-            <field name="country_id" ref="base.at" />
-            <field name="chart_template_id" ref="l10n_at_chart_template"/>
-        </record>
-        <record id="fiscal_position_template_eu" model="account.fiscal.position.template">
-            <field name="name">Europäische Union</field>
-            <field name="auto_apply" eval="True" />
-            <field name="vat_required" eval="True" />
-            <field name="country_group_id" ref="base.europe" />
-            <field name="chart_template_id" ref="l10n_at_chart_template"/>
-        </record>
-        <record id="fiscal_position_template_non_eu" model="account.fiscal.position.template">
-            <field name="name">Drittstaaten</field>
-            <field name="auto_apply" eval="True" />
-            <field name="chart_template_id" ref="l10n_at_chart_template"/>
-        </record>
-
-        <!-- Vorlagen: Steuerliche Positionen (Steuerzuordnung) -->
-
-        <!-- Eurpäische Union (Binnenmarkt)) -->
-
-        <record id="fiscal_position_tax_template_eu_code022" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_eu" />
-            <field name="tax_src_id" ref="account_tax_template_sales_20_code022" />
-            <field name="tax_dest_id" ref="account_tax_template_sales_eu_0_code017" />
-        </record>
-        <record id="fiscal_position_tax_template_eu_katalog022" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_eu" />
-            <field name="tax_src_id" ref="account_tax_template_sales_20_katalog022" />
-            <field name="tax_dest_id" ref="account_tax_template_sales_eu_0_services" />
-        </record>
-        <record id="fiscal_position_tax_template_eu_code029" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_eu" />
-            <field name="tax_src_id" ref="account_tax_template_sales_10_code029" />
-            <field name="tax_dest_id" ref="account_tax_template_sales_eu_0_code017" />
-        </record>
-        <record id="fiscal_position_tax_template_eu_code007" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_eu" />
-            <field name="tax_src_id" ref="account_tax_template_sales_add7_code007" />
-            <field name="tax_dest_id" ref="account_tax_template_sales_eu_0_code017" />
-        </record>
-
-        <record id="fiscal_position_tax_template_eu_vst_20_code060" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_eu" />
-            <field name="tax_src_id" ref="account_tax_template_purchase_20_code060" />
-            <field name="tax_dest_id" ref="account_tax_template_purchase_eu_20" />
-        </record>
-        <record id="fiscal_position_tax_template_eu_vst_20_code060K" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_eu" />
-            <field name="tax_src_id" ref="account_tax_template_purchase_20_misc_code060" />
-            <field name="tax_dest_id" ref="account_tax_template_purchase_rev_charge_19_2_25_5" />
-        </record>
-        <record id="fiscal_position_tax_template_eu_vst_10_code060" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_eu" />
-            <field name="tax_src_id" ref="account_tax_template_purchase_10_code060" />
-            <field name="tax_dest_id" ref="account_tax_template_purchase_eu_10" />
-        </record>
-        <record id="fiscal_position_tax_template_eu_vst_19_code060" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_eu" />
-            <field name="tax_src_id" ref="account_tax_template_purchase_19_code060" />
-            <field name="tax_dest_id" ref="account_tax_template_purchase_eu_19" />
-        </record>
-
-        <!-- Drittstaaten -->
-
-        <record id="fiscal_position_tax_template_non_eu_code022" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_non_eu" />
-            <field name="tax_src_id" ref="account_tax_template_sales_20_code022" />
-            <field name="tax_dest_id" ref="account_tax_template_sales_non_eu_0_code011" />
-        </record>
-        <record id="fiscal_position_tax_template_non_eu_code029" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_non_eu" />
-            <field name="tax_src_id" ref="account_tax_template_sales_10_code029" />
-            <field name="tax_dest_id" ref="account_tax_template_sales_non_eu_0_services" />
-        </record>
-        <record id="fiscal_position_tax_template_non_eu_code007" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_non_eu" />
-            <field name="tax_src_id" ref="account_tax_template_sales_add7_code007" />
-            <field name="tax_dest_id" ref="account_tax_template_sales_non_eu_0_code011" />
-        </record>
-
-        <!-- Vorlagen: Steuerliche Positionen (Finanzkontenzuordnung) -->
-
-        <!-- Europäische Union (Binnenmarkt)) -->
-
-        <record id="fiscal_position_account_template_eu_1" model="account.fiscal.position.account.template">
-            <field name="position_id" ref="fiscal_position_template_eu" />
-            <field name="account_src_id" ref="chart_at_template_4000" />
-            <field name="account_dest_id" ref="chart_at_template_4100" />
-        </record>
-        <record id="fiscal_position_account_template_eu_11" model="account.fiscal.position.account.template">
-            <field name="position_id" ref="fiscal_position_template_eu" />
-            <field name="account_src_id" ref="chart_at_template_4001" />
-            <field name="account_dest_id" ref="chart_at_template_4110" />
-        </record>
-        <record id="fiscal_position_account_template_eu_2" model="account.fiscal.position.account.template">
-            <field name="position_id" ref="fiscal_position_template_eu" />
-            <field name="account_src_id" ref="chart_at_template_2000" />
-            <field name="account_dest_id" ref="chart_at_template_2100" />
-        </record>
-        <record id="fiscal_position_account_template_eu_3" model="account.fiscal.position.account.template">
-            <field name="position_id" ref="fiscal_position_template_eu" />
-            <field name="account_src_id" ref="chart_at_template_5000" />
-            <field name="account_dest_id" ref="chart_at_template_5050" />
-        </record>
-
-        <!-- Drittstaaten -->
-
-        <record id="fiscal_position_account_template_non_eu_1" model="account.fiscal.position.account.template">
-            <field name="position_id" ref="fiscal_position_template_non_eu" />
-            <field name="account_src_id" ref="chart_at_template_4000" />
-            <field name="account_dest_id" ref="chart_at_template_4200" />
-        </record>
-        <record id="fiscal_position_account_template_non_eu_2" model="account.fiscal.position.account.template">
-            <field name="position_id" ref="fiscal_position_template_non_eu" />
-            <field name="account_src_id" ref="chart_at_template_2000" />
-            <field name="account_dest_id" ref="chart_at_template_2150" />
-        </record>
-        <record id="fiscal_position_account_template_non_eu_3" model="account.fiscal.position.account.template">
-            <field name="position_id" ref="fiscal_position_template_non_eu" />
-            <field name="account_src_id" ref="chart_at_template_5000" />
-            <field name="account_dest_id" ref="chart_at_template_5090" />
-        </record>
-    </data>
-</odoo>

odoo-bringout-oca-ocb-l10n_at/l10n_at/data/account_tax_group_data.xml

@@ -1,29 +0,0 @@
-<odoo>
-    <data noupdate="1">
-        <!-- Account Tax Group -->
-        <record id="tax_group_0" model="account.tax.group">
-            <field name="name">0%</field>
-            <field name="country_id" ref="base.at"/>
-        </record>
-        <record id="tax_group_10" model="account.tax.group">
-            <field name="name">10%</field>
-            <field name="country_id" ref="base.at"/>
-        </record>
-        <record id="tax_group_12" model="account.tax.group">
-            <field name="name">12%</field>
-            <field name="country_id" ref="base.at"/>
-        </record>
-        <record id="tax_group_13" model="account.tax.group">
-            <field name="name">13%</field>
-            <field name="country_id" ref="base.at"/>
-        </record>
-        <record id="tax_group_19" model="account.tax.group">
-            <field name="name">19%</field>
-            <field name="country_id" ref="base.at"/>
-        </record>
-        <record id="tax_group_20" model="account.tax.group">
-            <field name="name">20%</field>
-            <field name="country_id" ref="base.at"/>
-        </record>
-    </data>
-</odoo>

odoo-bringout-oca-ocb-l10n_at/l10n_at/data/res.country.state.csv

@@ -1,10 +0,0 @@
-"id","country_id:id","name","code"
-state_at_1,base.at,"Burgenland","1"
-state_at_2,base.at,"Kärnten","2"
-state_at_3,base.at,"Niederösterreich","3"
-state_at_4,base.at,"Oberösterreich","4"
-state_at_5,base.at,"Salzburg","5"
-state_at_6,base.at,"Steiermark","6"
-state_at_7,base.at,"Tirol","7"
-state_at_8,base.at,"Vorarlberg","8"
-state_at_9,base.at,"Wien","9"

odoo-bringout-oca-ocb-l10n_at/l10n_at/data/template/account.account-at.csv

@@ -0,0 +1,234 @@
+"id","name","code","reconcile","non_trade","account_type","tag_ids","name@de"
+"chart_at_template_transfer_288","Money in transit","2880","True","","asset_current","l10n_at.account_tag_l10n_at_ABII4,l10n_at.account_tag_external_code_2885","Schwebende Geldbewegungen"
+"chart_at_template_0010","Start-up expenses","0010","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAI1,l10n_at.account_tag_external_code_0010","Aufwendungen für das Ingangsetzen eines Betriebes"
+"chart_at_template_0019","Accumulated depreciation of start-up expenses","0019","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAI1,l10n_at.account_tag_external_code_0019","Kumulierte Abschreibungen für das Ingangsetzen eines Betriebes"
+"chart_at_template_0020","Expansion expenses","0020","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAI1,l10n_at.account_tag_external_code_0020","Aufwendungen für das Erweitern eines Betriebes"
+"chart_at_template_0029","Accumulated depreciation of expansion expenses","0029","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAI1,l10n_at.account_tag_external_code_0029","Kumulierte Abschreibungen für das Erweitern eines Betriebes"
+"chart_at_template_0100","Concessions","0100","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAI1,l10n_at.account_tag_external_code_0100","Konzessionen"
+"chart_at_template_0110","Patent rights","0110","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAI1,l10n_at.account_tag_external_code_0110","Patentrechte"
+"chart_at_template_0112","Licensing rights","0112","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAI1,l10n_at.account_tag_external_code_0112","Lizenzen"
+"chart_at_template_0119","Accumulated deprecation of licensing and patent rights","0119","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAI1,l10n_at.account_tag_external_code_0119","Kumulierte Abschreibungen für Lizenzen und Patentrechte"
+"chart_at_template_0120","Software","0120","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAI1,l10n_at.account_tag_external_code_0120","Software"
+"chart_at_template_0129","Accumulated depreciation of software","0129","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAI1,l10n_at.account_tag_external_code_0129","Kumulierte Abschreibungen für Software"
+"chart_at_template_0130","Brands","0130","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAI1,l10n_at.account_tag_external_code_0130","Marken"
+"chart_at_template_0131","Trademarks","0131","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAI1,l10n_at.account_tag_external_code_0131","Warenzeichen"
+"chart_at_template_0132","Design rights","0132","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAI1,l10n_at.account_tag_external_code_0132","Musterschutzrechte"
+"chart_at_template_0133","Other copyrights","0133","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAI1,l10n_at.account_tag_external_code_0133","Sonstige Urheberrechte"
+"chart_at_template_0140","Leasing and rental rights","0140","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAI1,l10n_at.account_tag_external_code_0140","Pacht- und Mietrechte"
+"chart_at_template_0149","Accumlated depreciation of industrial property rights, similar","0149","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAI1,l10n_at.account_tag_external_code_0149","Kumulierte Abschreibungen für gewerbliche Schutzrechte, ähnlich"
+"chart_at_template_0150","Goodwill","0150","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAI2,l10n_at.account_tag_external_code_0150","Geschäfts(Firmen)wert"
+"chart_at_template_0159","Accumulated depreciation of goodwill","0159","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAI2,l10n_at.account_tag_external_code_0159","Kumulierte Abschreibungen für Geschäfts(Firmen)wert"
+"chart_at_template_0180","Prepayments for intangible fixed assets","0180","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAI3,l10n_at.account_tag_external_code_0180","Geleistete Anzahlungen für immaterielles Vermögen"
+"chart_at_template_0200","Undeveloped land","0200","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII1,l10n_at.account_tag_external_code_0200","Unbebaute Grundstücke"
+"chart_at_template_0210","Developed land (Land value)","0210","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII1,l10n_at.account_tag_external_code_0210","Bebaute Grundstücke (Grundwert)"
+"chart_at_template_022","Land rights","0220","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII1,l10n_at.account_tag_external_code_0220","Grundstücksgleiche Rechte"
+"chart_at_template_0300","Operating, commercial buildings on own land","0300","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII1,l10n_at.account_tag_external_code_0300","Betriebs- und Geschäftsgebäude auf eigenem Grund"
+"chart_at_template_0310","Residential, social buildings on own land","0310","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII1,l10n_at.account_tag_external_code_0310","Wohn- und Sozialgebäude auf eigenem Grund"
+"chart_at_template_0320","Operating, commercial buildings on third-party land","0320","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII1,l10n_at.account_tag_external_code_0320","Betriebs- und Geschäftsgebäude auf fremdem Grund"
+"chart_at_template_0330","Residential, social buildings on third-party land","0330","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII1,l10n_at.account_tag_external_code_0330","Wohn- und Sozialgebäude auf fremdem Grund"
+"chart_at_template_0340","Site improvements on own land","0340","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII1,l10n_at.account_tag_external_code_0340","Grundstückseinrichtungen auf eigenem Grund"
+"chart_at_template_0349","Accumulated depreciation of buildings on own land","0349","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII1,l10n_at.account_tag_external_code_0349","Kumulierte Abschreibungen für Gebäude auf eigenem Grund"
+"chart_at_template_0350","Site improvements on third-part land","0350","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII1,l10n_at.account_tag_external_code_0350","Grundstückseinrichtungen auf fremdem Grund"
+"chart_at_template_0359","Accumulated depreciation of buildings on third-party land","0359","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII1,l10n_at.account_tag_external_code_0359","Kumulierte Abschreibungen für Gebäude auf fremden Grund"
+"chart_at_template_0360","Structural improvements to third-party (leased) operating and commercial buildings","0360","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII1,l10n_at.account_tag_external_code_0360","Bauliche Investitionen in fremden (gepachteten) Betriebs- und Geschäftsgebäuden"
+"chart_at_template_0370","Structural improvements to third-party (leased) residential and social buildings","0370","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII1,l10n_at.account_tag_external_code_0370","Bauliche Investitionen in fremden (gepachteten) Wohn- und Sozialgebäuden"
+"chart_at_template_0379","Accumulated depreciation for fixtures in third-party buildings","0379","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII1,l10n_at.account_tag_external_code_0379","Kumulierte Abschreibungen für Einbauten in fremden Gebäuden"
+"chart_at_template_0400","Production machinery","0400","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII2,l10n_at.account_tag_external_code_0400","Fertigungsmaschinen"
+"chart_at_template_0410","Drive machinery","0410","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII2,l10n_at.account_tag_external_code_0410","Antriebsmaschinen"
+"chart_at_template_0420","Power supply systems","0420","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII2,l10n_at.account_tag_external_code_0420","Energieversorgungsanlagen"
+"chart_at_template_0430","Transportation systems","0430","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII2,l10n_at.account_tag_external_code_0430","Transportanlagen"
+"chart_at_template_0500","Machine tools","0500","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII2,l10n_at.account_tag_external_code_0500","Maschinenwerkzeuge"
+"chart_at_template_0510","General and hand tools","0510","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII2,l10n_at.account_tag_external_code_0510","Allgemeine Werkzeuge und Handwerkzeuge"
+"chart_at_template_0520","Devices, dies and models","0520","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII2,l10n_at.account_tag_external_code_0520","Vorrichtungen, Formen und Modelle"
+"chart_at_template_0530","Other manufacturing resources","0530","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII2,l10n_at.account_tag_external_code_0530","Andere Erzeugungshilfsmittel"
+"chart_at_template_0540","Lifting devices and assembly systems","0540","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII2,l10n_at.account_tag_external_code_0540","Hebezeuge und Montageanlagen"
+"chart_at_template_0550","Low-value assets used in the production process (machinery)","0550","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII2,l10n_at.account_tag_external_code_0550","Geringwertige Vermögensgegenstände, soweit im Erzeugungsprozeß verwendet (Maschinen)"
+"chart_at_template_0600","Heating and lighting systems","0600","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII3,l10n_at.account_tag_external_code_0600","Beheizungs- und Beleuchtungsanlagen"
+"chart_at_template_0610","Messaging and control devices","0610","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII3,l10n_at.account_tag_external_code_0610","Nachrichten- und Kontrollanlagen"
+"chart_at_template_0620","Office machines, IT systems","0620","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII3,l10n_at.account_tag_external_code_0620","Büromaschinen, EDV-Anlagen"
+"chart_at_template_0630","Cars","0630","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII3,l10n_at.account_tag_external_code_0630","PKW"
+"chart_at_template_0640","Commercial vehicles","0640","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII3,l10n_at.account_tag_external_code_0640","LKW"
+"chart_at_template_0650","Other transportation resources","0650","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII3,l10n_at.account_tag_external_code_0650","Andere Beförderungsmittel"
+"chart_at_template_0660","Other operating and office equipment","0660","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII3,l10n_at.account_tag_external_code_0660","Andere Betriebs- und Geschäftsausstattung"
+"chart_at_template_0670","Containers","0670","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII3,l10n_at.account_tag_external_code_0670","Gebinde"
+"chart_at_template_0680","Low value office machines, IT systems","0680","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII3,l10n_at.account_tag_external_code_0680","Geringwertige Büromaschinen, EDV-Anlagen"
+"chart_at_template_0681","Low value operating and office equipment","0681","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII3,l10n_at.account_tag_external_code_0680","Geringwertige Betriebs- und Geschäftsausstattung"
+"chart_at_template_0692","Accumulated depreciation of office machines, IT systems","0692","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII3,l10n_at.account_tag_external_code_0659","Kumulierte Abschreibungen zu Büromaschinen, EDV-Anlagen"
+"chart_at_template_0693","Accumulated depreciation of cars","0693","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII3,l10n_at.account_tag_external_code_0655","Kumulierte Abschreibungen zu PKW"
+"chart_at_template_0694","Accumulated depreciation of commercial vehicles","0694","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII3,l10n_at.account_tag_external_code_0655","Kumulierte Abschreibungen zu LKW"
+"chart_at_template_0696","Accumulated depreciation of operating and office equipment","0696","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII3,l10n_at.account_tag_external_code_0689","Kumulierte Abschreibungen zur Betriebs- und Geschäftsausstattung"
+"chart_at_template_0700","Prepayments for tangible fixed assets 20 %","0700","False","","asset_prepayments","l10n_at.account_tag_l10n_at_AAII4,l10n_at.account_tag_external_code_0700","Anzahlungen für Sachanlagen 20%"
+"chart_at_template_0701","Prepayments for tangible fixed assets 10 %","0701","False","","asset_prepayments","l10n_at.account_tag_l10n_at_AAII4,l10n_at.account_tag_external_code_0701","Anzahlungen für Sachanlagen 10%"
+"chart_at_template_0702","Prepayments for tangible fixed assets 0 %","0702","False","","asset_prepayments","l10n_at.account_tag_l10n_at_AAII4,l10n_at.account_tag_external_code_0702","Anzahlungen für Sachanlagen 0%"
+"chart_at_template_0710","Assets under construction","0710","False","","asset_fixed","l10n_at.account_tag_l10n_at_AAII4,l10n_at.account_tag_external_code_0710","Anlagen in Bau"
+"chart_at_template_0800","Shares in affiliated companies","0800","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAIII1,l10n_at.account_tag_external_code_0800","Anteile an verbundenen Unternehmen"
+"chart_at_template_0810","Investments in joint ventures","0810","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAIII1,l10n_at.account_tag_external_code_0810","Beteiligungen an Gemeinschaftsunternehmen"
+"chart_at_template_0820","Investments in associates","0820","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAIII1,l10n_at.account_tag_external_code_0820","Beteiligungen an angeschlossenen (assoziierten) Unternehmen"
+"chart_at_template_0830","Other investments","0830","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAIII1,l10n_at.account_tag_external_code_0830","Sonstige Beteiligungen"
+"chart_at_template_0840","Loans to affiliated companies","0840","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAIII2,l10n_at.account_tag_external_code_0840","Ausleihungen an verbundene Unternehmen"
+"chart_at_template_0850","Loans to other long-term investees and investors","0850","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAIII4,l10n_at.account_tag_external_code_0850","Ausleihungen an Unternehmen, mit denen ein Beteiligungsverhältnis besteht"
+"chart_at_template_0860","Other Loans","0860","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAIII6,l10n_at.account_tag_external_code_0860","Sonstige Ausleihungen"
+"chart_at_template_0870","Shares in corporations of a non-participating nature","0870","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAIII5,l10n_at.account_tag_external_code_0870","Anteile an Kapitalgesellschaften ohne Beteiligungscharakter"
+"chart_at_template_0880","Shares in partnerships of a non-participating nature","0880","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAIII5,l10n_at.account_tag_external_code_0880","Anteile an Personengesellschaften ohne Beteiligungscharakter"
+"chart_at_template_0900","Cooperative shares of a non-participating nature","0900","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAIII5,l10n_at.account_tag_external_code_0900","Genossenschaftsanteile ohne Beteiligungscharakter"
+"chart_at_template_0910","Shares in investment funds","0910","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAIII5,l10n_at.account_tag_external_code_0910","Anteile an Investmentfonds"
+"chart_at_template_0980","Prepayments for financial assets","0980","False","","asset_prepayments","l10n_at.account_tag_l10n_at_AAIII5,l10n_at.account_tag_external_code_0980","Geleistete Anzahlungen für Finanzanlagen"
+"chart_at_template_0990","Accumulated Depreciation","0990","False","","asset_non_current","l10n_at.account_tag_l10n_at_AAIII5,l10n_at.account_tag_external_code_0990","Kumulierte Abschreibungen"
+"chart_at_template_1600","Merchandise","1600","False","","asset_current","l10n_at.account_tag_l10n_at_ABI3,l10n_at.account_tag_external_code_1600","Handelswaren"
+"chart_at_template_1800","Prepayments for inventories 20%","1800","False","","asset_prepayments","l10n_at.account_tag_l10n_at_ABI5,l10n_at.account_tag_external_code_1800","Geleistete Anzahlungen auf Vorräte 20 %"
+"chart_at_template_1801","Prepayments for inventories 10%","1801","False","","asset_prepayments","l10n_at.account_tag_l10n_at_ABI5,l10n_at.account_tag_external_code_1801","Geleistete Anzahlungen auf Vorräte 10 %"
+"chart_at_template_1803","Prepayments for inventories 0%","1803","False","","asset_prepayments","l10n_at.account_tag_l10n_at_ABI5,l10n_at.account_tag_external_code_1803","Geleistete Anzahlungen auf Vorräte 0 %"
+"chart_at_template_2000","Trade receivables, domestic","2000","True","","asset_receivable","l10n_at.account_tag_l10n_at_ABII1,l10n_at.account_tag_external_code_2000","Forderungen aus Lieferungen und Leistungen Inland"
+"chart_at_template_2099","Trade receivables, domestic (point of sale)","2099","True","","asset_receivable","l10n_at.account_tag_l10n_at_ABII1,l10n_at.account_tag_external_code_2000","Forderungen aus Lieferungen und Leistungen Inland (Point Of Sale)"
+"chart_at_template_2080","Specific valuation allowances on trade receivables, domestic","2080","False","","asset_current","l10n_at.account_tag_l10n_at_ABII1,l10n_at.account_tag_external_code_2080","Einzelwertberichtigungen zu Forderungen aus Lieferungen und Leistungen Inland"
+"chart_at_template_2090","Global valuation allowances on trade receivables, domestic","2090","False","","asset_current","l10n_at.account_tag_l10n_at_ABII1,l10n_at.account_tag_external_code_2090","Pauschalwertberichtigungen zu Forderungen aus Lieferungen und Leistungen Inland"
+"chart_at_template_2100","Trade receivables, EU area","2100","True","","asset_receivable","l10n_at.account_tag_l10n_at_ABII1,l10n_at.account_tag_external_code_2100","Forderungen aus Lieferungen und Leistungen EU-Raum"
+"chart_at_template_2130","Specific valuation allowances on trade receivables, EU area","2130","False","","asset_current","l10n_at.account_tag_l10n_at_ABII1,l10n_at.account_tag_external_code_2130","Einzelwertberichtigungen zu Forderungen aus Lieferungen und Leistungen EU-Raum"
+"chart_at_template_2140","Global valuation allowances on trade receivables, EU area","2140","False","","asset_current","l10n_at.account_tag_l10n_at_ABII1,l10n_at.account_tag_external_code_2140","Pauschalwertberichtigungen zu Forderungen aus Lieferungen und Leistungen EU-Raum"
+"chart_at_template_2150","Trade receivables, international","2150","True","","asset_receivable","l10n_at.account_tag_l10n_at_ABII1,l10n_at.account_tag_external_code_2150","Forderungen aus Lieferungen und Leistungen sonstiges Ausland"
+"chart_at_template_2180","Specific valuation allowances on trade receivables, international","2180","False","","asset_current","l10n_at.account_tag_l10n_at_ABII1,l10n_at.account_tag_external_code_2180","Einzelwertberichtigungen zu Forderungen aus Lieferungen und Leistungen sonstiges Ausland"
+"chart_at_template_2190","Global valuation allowances on trade receivables, international","2190","False","","asset_current","l10n_at.account_tag_l10n_at_ABII1,l10n_at.account_tag_external_code_2190","Pauschalwertberichtigungen zu Forderungen aus Lieferungen und Leistungen sonstiges Ausland"
+"chart_at_template_2230","Specific valuation allowances on receivables from affiliated companies","2230","False","","asset_current","l10n_at.account_tag_l10n_at_ABII2,l10n_at.account_tag_external_code_2230","Einzelwertberichtigungen zu Forderungen gegenüber verbundenen Unternehmen"
+"chart_at_template_2240","Global valuation allowances on receivables from affiliated companies","2240","False","","asset_current","l10n_at.account_tag_l10n_at_ABII2,l10n_at.account_tag_external_code_2240","Pauschalwertberichtigungen zu Forderungen gegenüber verbundenen Unternehmen"
+"chart_at_template_2280","Specific valuation allowances on receivables from other long-term investees and investors","2280","False","","asset_current","l10n_at.account_tag_l10n_at_ABII3,l10n_at.account_tag_external_code_2280","Einzelwertberichtigungen zu Forderungen gegenüber Unternehmen, mit denen ein Beteiligungsverhältnis besteht"
+"chart_at_template_2290","Global valuation allowances on receivables from other long-term investees and investors","2290","False","","asset_current","l10n_at.account_tag_l10n_at_ABII3,l10n_at.account_tag_external_code_2290","Pauschalwertberichtigungen zu Forderungen gegenüber Unternehmen, mit denen ein Beteiligungsverhältnis besteht"
+"chart_at_template_2300","Other receivables and other assets","2300","False","","asset_current","l10n_at.account_tag_l10n_at_ABII4,l10n_at.account_tag_external_code_2300","Sonstige Forderungen und Vermögensgegenstände"
+"chart_at_template_2470","Unpaid called capital contributions","2470","False","","asset_current","l10n_at.account_tag_l10n_at_ABII3,l10n_at.account_tag_external_code_2470","Eingeforderte, aber noch nicht eingezahlte Einlagen"
+"chart_at_template_2480","Specific valuation allowances on other receivables and other assets","2480","False","","asset_current","l10n_at.account_tag_l10n_at_ABII4,l10n_at.account_tag_external_code_2480","Einzelwertberichtigungen zu sonstigen Forderungen und Vermögensgegenständen"
+"chart_at_template_2490","Global valuation allowances on other receivables and other assets","2490","False","","asset_current","l10n_at.account_tag_l10n_at_ABII4,l10n_at.account_tag_external_code_2490","Pauschalwertberichtigungen zu sonstigen Forderungen und Vermögensgegenständen"
+"chart_at_template_2500","Input tax 20%","2500","False","","asset_current","l10n_at.account_tag_l10n_at_ABII4,l10n_at.account_tag_external_code_2500","Vorsteuern 20%"
+"chart_at_template_2501","Input tax 10%","2501","False","","asset_current","l10n_at.account_tag_l10n_at_ABII4,l10n_at.account_tag_external_code_2500","Vorsteuern 10%"
+"chart_at_template_2502","Input tax 13%","2502","False","","asset_current","l10n_at.account_tag_l10n_at_ABII4,l10n_at.account_tag_external_code_2500","Vorsteuern 13%"
+"chart_at_template_2505","Other tax 13%","2505","False","","asset_current","l10n_at.account_tag_l10n_at_ABII4,l10n_at.account_tag_external_code_2500","Sonstige Vorsteuern"
+"chart_at_template_2506","Input tax RC 20%","2506","False","","asset_current","l10n_at.account_tag_l10n_at_ABII4,l10n_at.account_tag_external_code_2502","Vorsteuern RC 20%"
+"chart_at_template_2507","Input tax RC 10%","2507","False","","asset_current","l10n_at.account_tag_l10n_at_ABII4,l10n_at.account_tag_external_code_2502","Vorsteuern RC 10%"
+"chart_at_template_2510","Input tax RC EU 20%","2510","False","","asset_current","l10n_at.account_tag_l10n_at_ABII4,l10n_at.account_tag_external_code_2502","Vorsteuern RC EU-Raum 20%"
+"chart_at_template_2511","Input tax on intra-Community acquisitions 20%","2511","False","","asset_current","l10n_at.account_tag_l10n_at_ABII4,l10n_at.account_tag_external_code_2501","Vorsteuern IGE 20%"
+"chart_at_template_2512","Input tax on intra-Community acquisitions 10%","2512","False","","asset_current","l10n_at.account_tag_l10n_at_ABII4,l10n_at.account_tag_external_code_2501","Vorsteuern IGE 10%"
+"chart_at_template_2513","Input tax on intra-Community acquisitions 13%","2513","False","","asset_current","l10n_at.account_tag_l10n_at_ABII4,l10n_at.account_tag_external_code_2501","Vorsteuern IGE 13%"
+"chart_at_template_2515","Input tax 20% (from import VAT)","2515","False","","asset_current","l10n_at.account_tag_l10n_at_ABII4,l10n_at.account_tag_external_code_2509","Vorsteuern 20% (aus EUSt.)"
+"chart_at_template_2610","Shares in affiliated companies","2610","False","","asset_current","l10n_at.account_tag_l10n_at_ABIII1,l10n_at.account_tag_external_code_2610","Anteile an verbundenen Unternehmen"
+"chart_at_template_2620","Other shares","2620","False","","asset_current","l10n_at.account_tag_l10n_at_ABIII2,l10n_at.account_tag_external_code_2620","Sonstige Anteile"
+"chart_at_template_2680","Bills of exchange where the entity is entitled to the underlying receivables","2680","False","","asset_current","l10n_at.account_tag_l10n_at_ABIII2,l10n_at.account_tag_external_code_2680","Besitzwechsel, soweit dem Unternehmen nicht die der Ausstellung zugrundeliegenden Forderungen zustehen"
+"chart_at_template_2690","Valuation allowances on long-term securities","2690","False","","asset_current","l10n_at.account_tag_l10n_at_ABIII2,l10n_at.account_tag_external_code_2690","Wertberichtigungen Wertpapiere des Umlaufvermögens"
+"chart_at_template_2730","Postage stamps","2730","False","","asset_current","l10n_at.account_tag_l10n_at_ABIV,l10n_at.account_tag_external_code_2730","Postwertzeichen"
+"chart_at_template_2740","Stamps","2740","False","","asset_current","l10n_at.account_tag_l10n_at_ABIV,l10n_at.account_tag_external_code_2740","Stempelmarken"
+"chart_at_template_2780","Cheques in foreign currency","2780","False","","asset_current","l10n_at.account_tag_l10n_at_ABIV,l10n_at.account_tag_external_code_2780","Schecks in Inlandswährung"
+"chart_at_template_2890","Valuation allowances","2890","False","","asset_current","l10n_at.account_tag_l10n_at_ABIV,l10n_at.account_tag_external_code_2890","Wertberichtigungen"
+"chart_at_template_2900","Prepaid Expenses","2900","False","","asset_current","l10n_at.account_tag_l10n_at_AC,l10n_at.account_tag_external_code_2900","Aktive Rechnungsabgrenzungsposten"
+"chart_at_template_2950","Discount","2950","False","","asset_current","l10n_at.account_tag_l10n_at_AC,l10n_at.account_tag_external_code_2950","Disagio"
+"chart_at_template_2960","Difference to required pension provisions","2960","False","","asset_current","l10n_at.account_tag_l10n_at_PBI,l10n_at.account_tag_external_code_2960","Unterschiedsbetrag zur gebotenen Pensionsrückstellung"
+"chart_at_template_2970","Difference under section XII Pensionskassengesetz","2970","False","","asset_current","l10n_at.account_tag_l10n_at_PBII,l10n_at.account_tag_external_code_2970","Unterschiedsbetrag gem. Abschnitt XII Pensionskassengesetz"
+"chart_at_template_2980","Deferred tax assets","2980","False","","asset_current","l10n_at.account_tag_l10n_at_AC,l10n_at.account_tag_external_code_2980","Steuerabgrenzung"
+"chart_at_template_3000","Provisions for termination benefits","3000","False","","liability_non_current","l10n_at.account_tag_l10n_at_PBI,l10n_at.account_tag_external_code_3000","Rückstellungen für Abfertigungen"
+"chart_at_template_3010","Provisions for pensions","3010","False","","liability_non_current","l10n_at.account_tag_l10n_at_PBII,l10n_at.account_tag_external_code_3010","Rückstellungen für Pensionen"
+"chart_at_template_3100","Bonds (including convertible ones)","3100","True","","liability_current","l10n_at.account_tag_l10n_at_PCI,l10n_at.account_tag_external_code_3100","Anleihen (einschließlich konvertibler)"
+"chart_at_template_3200","Payments received on account of orders 20%","3200","False","","liability_current","l10n_at.account_tag_l10n_at_PCIII,l10n_at.account_tag_external_code_3200","Erhaltene Anzahlungen auf Bestellungen 20 %"
+"chart_at_template_3201","Payments received on account of orders 10%","3201","False","","liability_current","l10n_at.account_tag_l10n_at_PCIII,l10n_at.account_tag_external_code_3201","Erhaltene Anzahlungen auf Bestellungen 10 %"
+"chart_at_template_3202","Payments received on account of orders 0%","3202","False","","liability_current","l10n_at.account_tag_l10n_at_PCIII,l10n_at.account_tag_external_code_3202","Erhaltene Anzahlungen auf Bestellungen 0 %"
+"chart_at_template_3210","VAT contingent/unrecognised transaction account for payments received on account of orders","3210","True","","liability_current","l10n_at.account_tag_l10n_at_PCVIII1,l10n_at.account_tag_l10n_at_PCVIII3,l10n_at.account_tag_external_code_3210","Umsatzsteuer-Evidenzkonto für erhaltene Anzahlungen auf Bestellungen"
+"chart_at_template_3300","Trade payables, domestic","3300","True","","liability_payable","l10n_at.account_tag_l10n_at_PCIV,l10n_at.account_tag_external_code_3300","Lieferverbindlichkeiten Inland"
+"chart_at_template_3360","Trade payables, EU area","3360","True","","liability_payable","l10n_at.account_tag_l10n_at_PCIV,l10n_at.account_tag_external_code_3360","Lieferverbindlichkeiten EU-Raum"
+"chart_at_template_3370","Trade payables, other countries","3370","True","","liability_payable","l10n_at.account_tag_l10n_at_PCIV,l10n_at.account_tag_external_code_3370","Lieferverbindlichkeiten sonstiges Ausland"
+"chart_at_template_3480","Liabilities to partners/shareholders","3480","False","","liability_current","l10n_at.account_tag_l10n_at_PCVIII3,l10n_at.account_tag_external_code_3480","Verbindlichkeiten gegenüber Gesellschaftern"
+"chart_at_template_3500","VAT 20%","3500","False","","liability_current","l10n_at.account_tag_l10n_at_PCVIII1,l10n_at.account_tag_l10n_at_PCVIII3,l10n_at.account_tag_external_code_3500","Umsatzsteuer 20%"
+"chart_at_template_3501","VAT 10%","3501","False","","liability_current","l10n_at.account_tag_l10n_at_PCVIII1,l10n_at.account_tag_l10n_at_PCVIII3,l10n_at.account_tag_external_code_3500","Umsatzsteuer 10%"
+"chart_at_template_3502","VAT 13%","3502","False","","liability_current","l10n_at.account_tag_l10n_at_PCVIII1,l10n_at.account_tag_l10n_at_PCVIII3,l10n_at.account_tag_external_code_3500","Umsatzsteuer 13%"
+"chart_at_template_3505","VAT, other","3505","False","","liability_current","l10n_at.account_tag_l10n_at_PCVIII1,l10n_at.account_tag_l10n_at_PCVIII3,l10n_at.account_tag_external_code_3500","Sonstige Umsatzsteuer"
+"chart_at_template_3510","VAT RC EU 20%","3510","False","","liability_current","l10n_at.account_tag_l10n_at_PCVIII1,l10n_at.account_tag_l10n_at_PCVIII3,l10n_at.account_tag_external_code_3502","Umsatzsteuer RC EU-Raum 20%"
+"chart_at_template_3511","VAT on intra-Community acquisitions 20%","3511","False","","liability_current","l10n_at.account_tag_l10n_at_PCVIII1,l10n_at.account_tag_l10n_at_PCVIII3,l10n_at.account_tag_external_code_3501","Umsatzsteuer IGE 20%"
+"chart_at_template_3512","VAT on intra-Community acquisitions 10%","3512","False","","liability_current","l10n_at.account_tag_l10n_at_PCVIII1,l10n_at.account_tag_l10n_at_PCVIII3,l10n_at.account_tag_external_code_3501","Umsatzsteuer IGE 10%"
+"chart_at_template_3513","VAT on intra-Community acquisitions 13%","3513","False","","liability_current","l10n_at.account_tag_l10n_at_PCVIII1,l10n_at.account_tag_l10n_at_PCVIII3,l10n_at.account_tag_external_code_3501","Umsatzsteuer IGE 13%"
+"chart_at_template_3515","Import VAT 20%","3515","False","","liability_current","l10n_at.account_tag_l10n_at_PCVIII1,l10n_at.account_tag_l10n_at_PCVIII3,l10n_at.account_tag_external_code_3509","Einfuhrumsatzsteuer 20%"
+"chart_at_template_3520","VAT payable","3520","False","","liability_current","l10n_at.account_tag_l10n_at_PCVIII1,l10n_at.account_tag_l10n_at_PCVIII3,l10n_at.account_tag_external_code_3520","Ust. Zahllast"
+"chart_at_template_3530","Allocation account for tax authorities","3530","True","True","liability_payable","l10n_at.account_tag_l10n_at_PCVIII1,l10n_at.account_tag_l10n_at_PCVIII3,l10n_at.account_tag_external_code_3530","Verrechnungskonto Finanzamt"
+"chart_at_template_3540","Allocation for wage tax","3540","True","","liability_current","l10n_at.account_tag_l10n_at_PCVIII1,l10n_at.account_tag_l10n_at_PCVIII3,l10n_at.account_tag_external_code_3540","Verrechnung Lohnsteuer"
+"chart_at_template_3541","Allocation for employer contributions","3541","True","","liability_current","l10n_at.account_tag_l10n_at_PCVIII1,l10n_at.account_tag_l10n_at_PCVIII3,l10n_at.account_tag_external_code_3541","Verrechnung Dienstgeberbeitrag"
+"chart_at_template_3542","Allocation for supplement to employer contributions","3542","True","","liability_current","l10n_at.account_tag_l10n_at_PCVIII1,l10n_at.account_tag_l10n_at_PCVIII3,l10n_at.account_tag_external_code_3542","Verrechnung Dienstgeberzuschlag"
+"chart_at_template_3550","Allocation for municipal taxes","3550","False","","liability_current","l10n_at.account_tag_l10n_at_PCVIII1,l10n_at.account_tag_l10n_at_PCVIII3,l10n_at.account_tag_external_code_3550","Verrechnung Kommunalsteuer"
+"chart_at_template_3551","Allocation for Vienna employers' tax","3551","False","","liability_current","l10n_at.account_tag_l10n_at_PCVIII1,l10n_at.account_tag_l10n_at_PCVIII3,l10n_at.account_tag_external_code_3551","Verrechnung Wiener Dienstgeberabgabe"
+"chart_at_template_3600","Allocation account for social security","3600","True","","liability_payable","l10n_at.account_tag_l10n_at_PCVIII2,l10n_at.account_tag_l10n_at_PCVIII3,l10n_at.account_tag_external_code_3600","Verrechnungskonto Sozialversicherung"
+"chart_at_template_3610","Allocation account for municipality","3610","True","","liability_payable","l10n_at.account_tag_l10n_at_PCVIII2,l10n_at.account_tag_l10n_at_PCVIII3,l10n_at.account_tag_external_code_3600","Verrechnungskonto Magistrat/Gemeinde (KoSt, U-Bahn, etc.)"
+"chart_at_template_3740","Allocation account for goods/invoice receipt","3740","True","","liability_payable","l10n_at.account_tag_l10n_at_PD,l10n_at.account_tag_external_code_3700","WERE Verrechnungskonto"
+"chart_at_template_4000","Revenue 20%","4000","False","","income","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT1,l10n_at.account_tag_external_code_4000","Brutto-Umsatzerlöse im Inland (20%)"
+"chart_at_template_4001","Revenue 10%","4001","False","","income","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT1,l10n_at.account_tag_external_code_4010","Brutto-Umsatzerlöse im Inland (10%)"
+"chart_at_template_4100","Revenue euro-zone RC 20%","4100","False","","income","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT1,l10n_at.account_tag_external_code_4100","Brutto-Umsatzerlöse im EU-Raum (RC 20%)"
+"chart_at_template_4110","Revenue euro-zone RC 10%","4110","False","","income","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT1,l10n_at.account_tag_external_code_4100","Brutto-Umsatzerlöse im EU-Raum (RC 10%)"
+"chart_at_template_4200","Revenue international 0%","4200","False","","income","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT1,l10n_at.account_tag_external_code_4050","Brutto-Umsatzerlöse in Drittstaaten (0%)"
+"chart_at_template_4860","Exchange rate gains from foreign currency transactions","4860","False","","income_other","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT1,l10n_at.account_tag_external_code_4860","Kursgewinne aus Fremdwährungstransaktionen"
+"chart_at_template_5000","Cost of goods sold","5000","False","","expense_direct_cost","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT5I,l10n_at.account_tag_external_code_5000","Wareneinsatz"
+"chart_at_template_5010","Purchased merchandise 20%","5010","False","","expense_direct_cost","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT5I,l10n_at.account_tag_external_code_5410","Wareneinkauf 20%"
+"chart_at_template_5011","Purchased merchandise 10%","5011","False","","expense_direct_cost","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT5I,l10n_at.account_tag_external_code_5411","Wareneinkauf 10%"
+"chart_at_template_5050","Purchased merchandise 20% (intra-Community acquisitions)","5050","False","","expense_direct_cost","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT5I,l10n_at.account_tag_external_code_5320","Wareneinkauf ig. Erwerb 20%"
+"chart_at_template_5051","Purchased merchandise 10% (intra-Community acquisitions)","5051","False","","expense_direct_cost","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT5I,l10n_at.account_tag_external_code_5310","Wareneinkauf ig. Erwerb 10%"
+"chart_at_template_5052","Purchased merchandise 0% (intra-Community acquisitions) according to article 6 (2)","5052","False","","expense_direct_cost","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT5I,l10n_at.account_tag_external_code_5330","Wareneinkauf ig. Erwerb 0% nach Art. 6 Abs. 2"
+"chart_at_template_5090","Purchased merchandise 0%","5090","False","","expense_direct_cost","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT5I,l10n_at.account_tag_external_code_5417","Wareneinkauf 0%"
+"chart_at_template_5800","Cash discount income 20%","5800","False","","expense_direct_cost","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT5I,l10n_at.account_tag_external_code_5800","Skontoertrag Materialaufwand 20 %"
+"chart_at_template_5801","Cash discount income 10%","5801","False","","expense_direct_cost","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT5I,l10n_at.account_tag_external_code_5801","Skontoertrag Materialaufwand 10 %"
+"chart_at_template_5805","Cash discount income 0%","5805","False","","expense_direct_cost","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT5I,l10n_at.account_tag_external_code_5805","Skontoertrag Materialaufwand 0%"
+"chart_at_template_5810","Cash discount income 20% purchased services","5810","False","","expense_direct_cost","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT5II,l10n_at.account_tag_external_code_5830","Skontoertrag bezogene Leistungen 20 %"
+"chart_at_template_5811","Cash discount income 10% purchased services","5811","False","","expense_direct_cost","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT5II,l10n_at.account_tag_external_code_5831","Skontoertrag bezogene Leistungen 10 %"
+"chart_at_template_5812","Cash discount income 0% purchased services","5812","False","","expense_direct_cost","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT5II,l10n_at.account_tag_external_code_5805","Skontoertrag bezogene Leistungen 0 %"
+"chart_at_template_5880","Change in Stock - Raw Materials","5880","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT5II,l10n_at.account_tag_external_code_5880","Bestandsveränderung - Rohstoffe"
+"chart_at_template_5900","Expense items list","5900","False","","expense_direct_cost","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT5I,l10n_at.account_tag_external_code_5900","Aufwandsstellenrechnung"
+"chart_at_template_6200","Salaries - salaried employees","6200","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT6I,l10n_at.account_tag_external_code_6200","Gehälter - Angestellte"
+"chart_at_template_6205","Salaries - managing directors","6205","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT6I,l10n_at.account_tag_external_code_6205","Geschäftsführerbezug"
+"chart_at_template_6220","Non-performance salaries","6220","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT6I,l10n_at.account_tag_external_code_6220","Nichtleistungsgehälter"
+"chart_at_template_6225","Additional allowances - salaried employees","6225","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT6I,l10n_at.account_tag_external_code_6225","Zulagen - Angestellte"
+"chart_at_template_6230","Bonuses and commissions - salaried employees","6230","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT6I,l10n_at.account_tag_external_code_6230","Prämien und Provisionen - Angestellte"
+"chart_at_template_6240","Special payments - salaried employees","6240","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT6I,l10n_at.account_tag_external_code_6240","Sonderzahlungen - Angestellte"
+"chart_at_template_6242","Vacation payments - salaried employees","6242","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT6I,l10n_at.account_tag_external_code_6290","Urlaubsabfindung - Angestellte"
+"chart_at_template_6255","Anniversary payments - salaried employees","6255","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT6I,l10n_at.account_tag_external_code_6250","Jubiläumsaufwendungen - Angestellte"
+"chart_at_template_6260","Voluntary travel and meal allowances","6260","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT6I,l10n_at.account_tag_external_code_6260","Freiwillige Fahrt- und Verpflegungszuschüsse - Angestellte"
+"chart_at_template_6270","Non-cash benefits - salaried employees","6270","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT6I,l10n_at.account_tag_external_code_6270","Sachbezug - Angestellte"
+"chart_at_template_6271","Non-cash benefits - managing directors","6271","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT6I,l10n_at.account_tag_external_code_7585","Sachbezug - Geschäftsführer"
+"chart_at_template_6310","Overtime - salaried employees","6310","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT6I,l10n_at.account_tag_external_code_6210","Überstunden - Angestellte"
+"chart_at_template_6340","Changes in provisions for vacations","6340","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT6I,l10n_at.account_tag_external_code_6421","Veränderung Urlaubsrückstellung - Angestellte"
+"chart_at_template_6400","Employees' occupational pension fund","6400","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT6II,l10n_at.account_tag_external_code_6400","Mitarbeitervorsorgekasse - Angestellte"
+"chart_at_template_6560","Statutory social welfare expenses - salaried employees","6560","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT6II,l10n_at.account_tag_external_code_6560","Gesetzlicher Sozialaufwand - Angestellte"
+"chart_at_template_6660","Municipal taxes","6660","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT6II,l10n_at.account_tag_external_code_6662","Kommunalsteuer (KoSt) - Angestellte"
+"chart_at_template_6661","Employer contributions","6661","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT6II,l10n_at.account_tag_external_code_6660","Dienstgeberbeitrag zum Familienlastenausgleichsfonds (DB) - Angestellte"
+"chart_at_template_6662","Supplement to employer contributions","6662","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT6II,l10n_at.account_tag_external_code_6661","Zuschlag zum Dienstnehmerbeitrag (DZ) - Angestellte"
+"chart_at_template_6640","Vienna employers' tax","6663","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT6II,l10n_at.account_tag_external_code_6663","Dienstgeberabgabe der Gemeinde Wien (U-Bahn Steuer) - Angestellte"
+"chart_at_template_6700","Voluntary social welfare expenses","6700","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT6II,l10n_at.account_tag_external_code_6790","Sonstiger freiwilliger Sozialaufwand"
+"chart_at_template_6900","Expense items list","6900","False","","expense","l10n_at.account_tag_l10n_at_EBIT6I,l10n_at.account_tag_external_code_7990","Aufwandsstellenrechnung"
+"chart_at_template_7000","Amortization of capitalised business start-up and expansion expenses","7000","False","","expense_depreciation","l10n_at.account_tag_l10n_at_EBIT7I,l10n_at.account_tag_external_code_7000","Abschreibungen auf aktivierte Aufwendungen für das Ingangsetzen und Erweitern eines Betriebes"
+"chart_at_template_7090","Write-downs of capitalised business start-up and expansion expenses","7090","False","","expense_depreciation","l10n_at.account_tag_l10n_at_EBIT7II,l10n_at.account_tag_external_code_7090","Abschreibungen vom Umlaufvermögen, soweit diese die im Unternehmen üblichen Abschreibungen übersteigen"
+"chart_at_template_7600","Office supplies and printed forms","7600","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT8,l10n_at.account_tag_external_code_7600","Büromaterial und Drucksorten"
+"chart_at_template_763","Specialist literature and newspapers","7630","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT8,l10n_at.account_tag_external_code_7630","Fachliteratur und Zeitungen"
+"chart_at_template_7690","Donations and tips","7690","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT8,l10n_at.account_tag_external_code_7690","Spenden und Trinkgelder"
+"chart_at_template_7770","Vocational training and continuing professional development","7770","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT8,l10n_at.account_tag_external_code_7770","Aus- und Fortbildung"
+"chart_at_template_7780","Membership contributions","7780","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT8,l10n_at.account_tag_external_code_7780","Mitgliedsbeiträge"
+"chart_at_template_7790","Money transfer charges","7790","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT8,l10n_at.account_tag_external_code_7790","Spesen des Geldverkehrs"
+"chart_at_template_7820","Carrying amount of disposed assets, excluding financial assets","7820","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT8,l10n_at.account_tag_external_code_7820","Buchwert abgegangener Anlagen, ausgenommen Finanzanlagen"
+"chart_at_template_7830","Loss on disposal of fixed assets, excluding financial assets (Carrying amount of sold assets (-))","7830","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT8,l10n_at.account_tag_external_code_7830","Verlust aus dem Abgang von Anlagevermögen, ausgenommen Finanzanlagen (Buchwert verkaufter Anlagen (-))"
+"chart_at_template_7860","Exchange rate loss from foreign currency transactions","7860","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT8,l10n_at.account_tag_external_code_7860","Kursverluste aus Fremdwährungstransaktionen"
+"chart_at_template_7890","Cash discount income on other operating expenses","7890","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT8,l10n_at.account_tag_external_code_7890","Skontoerträge auf sonstige betriebliche Aufwendungen"
+"chart_at_template_7900","Expense items list","7900","False","","expense","l10n_at.account_tag_l10n_at_EBIT8,l10n_at.account_tag_external_code_7900","Aufwandsstellenrechnung"
+"chart_at_template_7960","Cost of sales","7960","False","","expense","l10n_at.account_tag_l10n_at_EBIT8,l10n_at.account_tag_external_code_7960","Herstellungskosten der zur Erzielung der Umsatzerlöse erbrachten Leistungen"
+"chart_at_template_7970","Selling expenses","7970","False","","expense","l10n_at.account_tag_l10n_at_EBIT8,l10n_at.account_tag_external_code_7970","Vertriebskosten"
+"chart_at_template_7980","Administrative expenses","7980","False","","expense","l10n_at.account_tag_l10n_at_EBIT8,l10n_at.account_tag_external_code_7980","Verwaltungskosten"
+"chart_at_template_7990","Other operating expenses","7990","False","","expense","account.account_tag_operating,l10n_at.account_tag_l10n_at_EBIT8,l10n_at.account_tag_external_code_7990","Sonstige betriebliche Aufwendungen"
+"chart_at_template_8140","Revenue from disposal of long-term equity investments (-)","8140","False","","income_other","account.account_tag_financing,l10n_at.account_tag_l10n_at_FIN10,l10n_at.account_tag_external_code_8140","Erlöse aus dem Abgang von Beteiligungen (-)"
+"chart_at_template_8150","Revenue from disposal of other long-term financial assets (-)","8150","False","","income_other","account.account_tag_financing,l10n_at.account_tag_l10n_at_FIN10,l10n_at.account_tag_external_code_8150","Erlöse aus dem Abgang von sonstigen Finanzanlagen (-)"
+"chart_at_template_8160","Revenue from disposal of long-term securities (-)","8160","False","","income_other","account.account_tag_financing,l10n_at.account_tag_l10n_at_FIN10,l10n_at.account_tag_external_code_8160","Erlöse aus dem Abgang von Wertpapieren des Umlaufvermögens (-)"
+"chart_at_template_8170","Carrying amount of disposed long-term equity investments (+)","8170","False","","income_other","account.account_tag_financing,l10n_at.account_tag_l10n_at_FIN10,l10n_at.account_tag_external_code_8170","Buchwert abgegangener Beteiligungen (+)"
+"chart_at_template_8171","Carrying amount of disposed long-term equity investments (-)","8171","False","","income_other","account.account_tag_financing,l10n_at.account_tag_l10n_at_FIN10,l10n_at.account_tag_external_code_8171","Buchwert abgegangener Beteiligungen (-)"
+"chart_at_template_8180","Carrying amount of disposed other long-term financial assets (+)","8180","False","","income_other","account.account_tag_financing,l10n_at.account_tag_l10n_at_FIN11,l10n_at.account_tag_external_code_8180","Buchwert abgegangener sonstiger Finanzanlagen (+)"
+"chart_at_template_8181","Carrying amount of disposed other long-term financial assets (-)","8181","False","","income_other","account.account_tag_financing,l10n_at.account_tag_l10n_at_FIN11,l10n_at.account_tag_external_code_8181","Buchwert abgegangener sonstiger Finanzanlagen (-)"
+"chart_at_template_8190","Carrying amount of disposed long-term securities (+)","8190","False","","income_other","account.account_tag_financing,l10n_at.account_tag_l10n_at_FIN11,l10n_at.account_tag_external_code_8190","Buchwert abgegangener Wertpapiere des Umlaufvermögens (+)"
+"chart_at_template_8191","Carrying amount of disposed long-term securities (-)","8191","False","","income_other","account.account_tag_financing,l10n_at.account_tag_l10n_at_FIN11,l10n_at.account_tag_external_code_8191","Buchwert abgegangener Wertpapiere des Umlaufvermögens (-)"
+"chart_at_template_8200","Revenue from disposal of long-term equity investments (+)","8200","False","","income_other","account.account_tag_financing,l10n_at.account_tag_l10n_at_FIN10,l10n_at.account_tag_external_code_8200","Erlöse aus dem Abgang von Beteiligungen (+)"
+"chart_at_template_8205","Revenue from disposal of other long-term financial assets (+)","8205","False","","income_other","account.account_tag_financing,l10n_at.account_tag_l10n_at_FIN10,l10n_at.account_tag_external_code_8205","Erlöse aus dem Abgang von sonstigen Finanzanlagen (+)"
+"chart_at_template_8206","Revenue from appreciation of other long-term financial assets","8206","False","","income_other","account.account_tag_financing,l10n_at.account_tag_l10n_at_FIN10,l10n_at.account_tag_external_code_8206","Erlöse aus Zuschreibung sonstige Finanzanlagen"
+"chart_at_template_8210","Revenue from disposal of long-term securities (+)","8210","False","","income_other","account.account_tag_financing,l10n_at.account_tag_l10n_at_FIN11,l10n_at.account_tag_external_code_8210","Erlöse aus dem Abgang von Wertpapieren des Umlaufvermögens (+)"
+"chart_at_template_8211","Appreciation of other long-term securities","8211","False","","income_other","account.account_tag_financing,l10n_at.account_tag_l10n_at_FIN11,l10n_at.account_tag_external_code_8211","Zuschreibung Wertpapiere des Umlaufvermögens"
+"chart_at_template_8350","Unused supplier cash discount","8350","False","","income_other","account.account_tag_financing,l10n_at.account_tag_l10n_at_FIN12,l10n_at.account_tag_external_code_8350","Nicht ausgenützte Lieferantenskonti"
+"chart_at_template_8900","Profit transfer from profit and loss transfer","8990","False","","income_other","account.account_tag_financing,l10n_at.account_tag_l10n_at_RL,l10n_at.account_tag_external_code_8030","Gewinnüberrechnung Ergebnisabführung"
+"chart_at_template_8901","Loss transfer from profit and loss transfer","8901","False","","income_other","account.account_tag_financing,l10n_at.account_tag_l10n_at_RL,l10n_at.account_tag_external_code_8230","Verlustübernahme Ergebnisabführung"
+"chart_at_template_9190","Unpaid uncalled contributions","9190","False","","equity","account.account_tag_financing,l10n_at.account_tag_l10n_at_PAI,l10n_at.account_tag_external_code_9190","Nicht eingeforderte ausstehende Einlagen"
+"chart_at_template_9260","Treasury shares","9260","False","","equity","l10n_at.account_tag_l10n_at_PAI,l10n_at.account_tag_external_code_2600","Eigene Anteile"
+"chart_at_template_9390","Balance sheet profit (loss)","9390","False","","equity","account.account_tag_financing,l10n_at.account_tag_l10n_at_PAIV,l10n_at.account_tag_external_code_9390","Bilanzgewinn (-verlust)"
+"chart_at_template_9800","Opening balance","9800","False","","equity","l10n_at.account_tag_external_code_9800","Eröffnungsbilanz"
+"chart_at_template_9850","Closing balance","9850","False","","equity","l10n_at.account_tag_external_code_9850","Schlussbilanz"
+"chart_at_template_9890","Profit and loss statement","9890","False","","equity_unaffected","l10n_at.account_tag_l10n_at_RL,l10n_at.account_tag_external_code_9350","Gewinn- und Verlustrechnung"

odoo-bringout-oca-ocb-l10n_at/l10n_at/data/template/account.fiscal.position-at.csv

@@ -0,0 +1,14 @@
+"id","name","auto_apply","country_id","vat_required","country_group_id","sequence","account_ids/account_src_id","account_ids/account_dest_id"
+"fiscal_position_template_national_w_uid","National","1","base.at","","","10","",""
+"fiscal_position_template_national","National + EU (ohne UID)","1","","","account.europe_vat","30","",""
+"fiscal_position_template_eu","Europäische Union","1","","1","account.europe_vat","20","",""
+"","","","","","","","chart_at_template_4000","chart_at_template_4100"
+"","","","","","","","chart_at_template_4001","chart_at_template_4110"
+"","","","","","","","chart_at_template_2000","chart_at_template_2100"
+"","","","","","","","chart_at_template_5010","chart_at_template_5050"
+"","","","","","","","chart_at_template_5011","chart_at_template_5051"
+"fiscal_position_template_non_eu","Drittstaaten","1","","","","40","",""
+"","","","","","","","chart_at_template_4000","chart_at_template_4200"
+"","","","","","","","chart_at_template_2000","chart_at_template_2150"
+"","","","","","","","chart_at_template_5010","chart_at_template_5090"
+"","","","","","","","chart_at_template_5011","chart_at_template_5090"

odoo-bringout-oca-ocb-l10n_at/l10n_at/data/template/account.tax-at.csv

@@ -0,0 +1,247 @@
+"id","name","description","invoice_label","sequence","type_tax_use","tax_scope","amount","amount_type","active","tax_group_id","repartition_line_ids/repartition_type","repartition_line_ids/document_type","repartition_line_ids/tag_ids","repartition_line_ids/account_id","repartition_line_ids/factor_percent","description@de","fiscal_position_ids","original_tax_ids","invoice_legal_notes"
+"account_tax_template_sales_rev_charge_0_code021","0% Ust L","UST_021 Section 19 (1) second sentence (Tax liability concerns service recipient)","0%","400","sale","","0.0","percent","","tax_group_0","base","invoice","KZ 000||KZ 021","","","UST_021 § 19 Abs. 1 zweiter Satz (Steuerschuld betrifft Leistungsempfänger)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 021","chart_at_template_3505","","","","",""
+"","","","","","","","","","","","base","refund","KZ 000||KZ 021","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 021","chart_at_template_3505","","","","",""
+"account_tax_template_sales_rev_charge_0_code021_1a","0% Ust L 1a","UST_021 Section 19 (1a) (Tax liability concerns service recipient)","0%","400","sale","","0.0","percent","","tax_group_0","base","invoice","KZ 000||KZ 021","","","UST_021 § 19 Abs. 1a (Steuerschuld betrifft Leistungsempfänger)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 021","chart_at_template_3505","","","","",""
+"","","","","","","","","","","","base","refund","KZ 000||KZ 021","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 021","chart_at_template_3505","","","","",""
+"account_tax_template_sales_rev_charge_0_code021_1b","0% Ust L 1b","UST_021 Section 19 (1b) (Tax liability concerns service recipient)","0%","400","sale","","0.0","percent","","tax_group_0","base","invoice","KZ 000||KZ 021","","","UST_021 § 19 Abs. 1b (Steuerschuld betrifft Leistungsempfänger)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 021","chart_at_template_3505","","","","",""
+"","","","","","","","","","","","base","refund","KZ 000||KZ 021","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 021","chart_at_template_3505","","","","",""
+"account_tax_template_sales_rev_charge_0_code021_1c","0% Ust L 1c","UST_021 Section 19 (1c) (Tax liability concerns service recipient)","0%","400","sale","","0.0","percent","","tax_group_0","base","invoice","KZ 000||KZ 021","","","UST_021 § 19 Abs. 1c (Steuerschuld betrifft Leistungsempfänger)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 021","chart_at_template_3505","","","","",""
+"","","","","","","","","","","","base","refund","KZ 000||KZ 021","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 021","chart_at_template_3505","","","","",""
+"account_tax_template_sales_rev_charge_0_code021_1d","0% Ust L 1d","UST_021 Section 19 (1d) (Tax liability concerns service recipient)","0%","400","sale","","0.0","percent","","tax_group_0","base","invoice","KZ 000||KZ 021","","","UST_021 § 19 Abs. 1d (Steuerschuld betrifft Leistungsempfänger)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 021","chart_at_template_3505","","","","",""
+"","","","","","","","","","","","base","refund","KZ 000||KZ 021","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 021","chart_at_template_3505","","","","",""
+"account_tax_template_sales_rev_charge_0_code021_1e","0% Ust L 1e","UST_021 Section 19 (1e) (Tax liability concerns service recipient)","0%","400","sale","","0.0","percent","False","","base","invoice","KZ 000||KZ 021","","","UST_021 § 19 Abs. 1e (Steuerschuld betrifft Leistungsempfänger)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 021","chart_at_template_3505","","","","",""
+"","","","","","","","","","","","base","refund","KZ 000||KZ 021","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 021","chart_at_template_3505","","","","",""
+"account_tax_template_sales_non_eu_0_code011","0% USt EX","UST_011 Export 0%","0%","300","sale","consu","0.0","percent","","tax_group_0","base","invoice","KZ 011||KZ 000","","","UST_011 Export 0%","fiscal_position_template_non_eu","account_tax_template_sales_add7_code007,account_tax_template_sales_20_code022",""
+"","","","","","","","","","","","tax","invoice","","chart_at_template_3505","","","","",""
+"","","","","","","","","","","","base","refund","KZ 011||KZ 000","","","","","",""
+"","","","","","","","","","","","tax","refund","","chart_at_template_3505","","","","",""
+"account_tax_template_sales_non_eu_0_code012","0% Ust Sub","UST_012 Subcontracting 0%","0%","200","sale","","0.0","percent","","tax_group_0","base","invoice","KZ 012||KZ 000","","","UST_012 Lohnveredelung 0%","fiscal_position_template_non_eu","",""
+"","","","","","","","","","","","tax","invoice","","chart_at_template_3505","","","","",""
+"","","","","","","","","","","","base","refund","KZ 012||KZ 000","","","","","",""
+"","","","","","","","","","","","tax","refund","","chart_at_template_3505","","","","",""
+"account_tax_template_sales_non_eu_0_code015","0% Ust EX art6","UST_015 Export 0% (§ 6 Abs. 1 Z 2 bis 6)","0%","300","sale","","0.0","percent","","tax_group_0","base","invoice","KZ 015||KZ 000","","","UST_015 Export 0% (§ 6 Abs. 1 Z 2 bis 6)","fiscal_position_template_non_eu","",""
+"","","","","","","","","","","","tax","invoice","","chart_at_template_3505","","","","",""
+"","","","","","","","","","","","base","refund","KZ 015||KZ 000","","","","","",""
+"","","","","","","","","","","","tax","refund","","chart_at_template_3505","","","","",""
+"account_tax_template_sales_eu_0_code017","0% Ust IGL Nart6","UST_017 IGL 0% (without art. 6 par. 1)","0%","200","sale","consu","0.0","percent","","tax_group_0","base","invoice","KZ 017||KZ 000||AT_ZM_IGL","","","UST_017 IGL 0% (ohne Art. 6 Abs. 1)","fiscal_position_template_eu","account_tax_template_sales_add7_code007,account_tax_template_sales_10_code029,account_tax_template_sales_20_code022",""
+"","","","","","","","","","","","tax","invoice","","chart_at_template_3505","","","","",""
+"","","","","","","","","","","","base","refund","KZ 017||KZ 000||AT_ZM_IGL","","","","","",""
+"","","","","","","","","","","","tax","refund","","chart_at_template_3505","","","","",""
+"account_tax_template_sales_eu_0_code018","0% Ust IGL art6","UST_018 IGL 0% (Art. 6 Abs. 1)","0%","200","sale","consu","0.0","percent","","tax_group_0","base","invoice","KZ 018||KZ 000||AT_ZM_IGL","","","UST_018 IGL 0% (Art. 6 Abs. 1)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","","chart_at_template_3505","","","","",""
+"","","","","","","","","","","","base","refund","KZ 018||KZ 000||AT_ZM_IGL","","","","","",""
+"","","","","","","","","","","","tax","refund","","chart_at_template_3505","","","","",""
+"account_tax_template_sales_0_code019","0% Ust R E","UST_019 Real estate sales 0% (§ 6 Abs. 1 Z 9 lit. a)","0%","100","sale","","0.0","percent","","tax_group_0","base","invoice","KZ 019||KZ 000","","","UST_019 Grundstücksumsätze 0% (§ 6 Abs. 1 Z 9 lit. a)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","","chart_at_template_3505","","","","",""
+"","","","","","","","","","","","base","refund","KZ 019||KZ 000","","","","","",""
+"","","","","","","","","","","","tax","refund","","chart_at_template_3505","","","","",""
+"account_tax_template_sales_0_code016","0% Ust S B","UST_016 Small business 0% (§ 6 Abs. 1 Z 27)","0%","100","sale","","0.0","percent","","tax_group_0","base","invoice","KZ 016||KZ 000","","","UST_016 Kleinunternehmer 0% (§ 6 Abs. 1 Z 27)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","","chart_at_template_3505","","","","",""
+"","","","","","","","","","","","base","refund","KZ 016||KZ 000","","","","","",""
+"","","","","","","","","","","","tax","refund","","chart_at_template_3505","","","","",""
+"account_tax_template_sales_0_code020","0% Ust O Exempt","UST_020 Other tax-exempt sales 0%","0%","100","sale","","0.0","percent","","tax_group_0","base","invoice","KZ 020||KZ 000","","","UST_020 Übrige steuerfreie Umsätze 0%","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","","chart_at_template_3505","","","","",""
+"","","","","","","","","","","","base","refund","KZ 020||KZ 000","","","","","",""
+"","","","","","","","","","","","tax","refund","","chart_at_template_3505","","","","",""
+"account_tax_template_sales_20_code022","20% Ust","UST_022 Normal tax rate 20%","20%","50","sale","consu","20.0","percent","","tax_group_20","base","invoice","KZ 000||KZ 022 Bemessungsgrundlage","","","UST_022 Normalsteuersatz 20%","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 022 Umsatzsteuer","chart_at_template_3500","","","","",""
+"","","","","","","","","","","","base","refund","KZ 000||KZ 022 Bemessungsgrundlage","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 022 Umsatzsteuer","chart_at_template_3500","","","","",""
+"account_tax_template_sales_20_katalog022","20% Ust O S","UST_022 Normal tax rate 20% (Other services)","20%","100","sale","service","20.0","percent","","tax_group_20","base","invoice","KZ 000||KZ 022 Bemessungsgrundlage","","","UST_022 Normalsteuersatz 20% (Sonstige Leistungen)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 022 Umsatzsteuer","chart_at_template_3500","","","","",""
+"","","","","","","","","","","","base","refund","KZ 000||KZ 022 Bemessungsgrundlage","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 022 Umsatzsteuer","chart_at_template_3500","","","","",""
+"account_tax_template_sales_10_code029","10% Ust R","UST_029 reduced tax rate 10%","10%","100","sale","consu","10.0","percent","","tax_group_10","base","invoice","KZ 000||KZ 029 Bemessungsgrundlage","","","UST_029 ermäßigter Steuersatz 10%","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 029 Umsatzsteuer","chart_at_template_3501","","","","",""
+"","","","","","","","","","","","base","refund","KZ 000||KZ 029 Bemessungsgrundlage","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 029 Umsatzsteuer","chart_at_template_3501","","","","",""
+"account_tax_template_sales_13_code006","13% Ust R","UST_006 reduced tax rate 13%","13%","100","sale","","13.0","percent","","tax_group_13","base","invoice","KZ 000||KZ 006 Bemessungsgrundlage","","","UST_006 ermäßigter Steuersatz 13%","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 006 Umsatzsteuer","chart_at_template_3502","","","","",""
+"","","","","","","","","","","","base","refund","KZ 000||KZ 006 Bemessungsgrundlage","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 006 Umsatzsteuer","chart_at_template_3502","","","","",""
+"account_tax_template_sales_19_code037","19% Ust","UST_037 Tax rate 19%","19%","100","sale","","19.0","percent","","tax_group_19","base","invoice","KZ 000||KZ 037 Bemessungsgrundlage","","","UST_037 Steuersatz 19%","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 037 Umsatzsteuer","chart_at_template_3505","","","","",""
+"","","","","","","","","","","","base","refund","KZ 000||KZ 037 Bemessungsgrundlage","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 037 Umsatzsteuer","chart_at_template_3505","","","","",""
+"account_tax_template_sales_add10_code052","10% Ust Add","UST_052 Additional tax rate 10% (LWB/FWB)","10%","100","sale","","10.0","percent","","tax_group_10","base","invoice","KZ 000||KZ 052 Bemessungsgrundlage","","","UST_052 Zusatzsteuersatz 10% (LWB/FWB)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 052 Umsatzsteuer","chart_at_template_3505","","","","",""
+"","","","","","","","","","","","base","refund","KZ 000||KZ 052 Bemessungsgrundlage","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 052 Umsatzsteuer","chart_at_template_3505","","","","",""
+"account_tax_template_sales_add7_code007","7% Ust Add","UST_007 Additional tax rate 7% (LWB/FWB)","7%","100","sale","","7.0","percent","False","","base","invoice","KZ 000||KZ 007 Bemessungsgrundlage","","","UST_007 Zusatzsteuersatz 7% (LWB/FWB)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 007 Umsatzsteuer","chart_at_template_3505","","","","",""
+"","","","","","","","","","","","base","refund","KZ 000||KZ 007 Bemessungsgrundlage","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 007 Umsatzsteuer","chart_at_template_3505","","","","",""
+"account_tax_template_sales_self_20_code022","20% Ust C","UST_022 Normal tax rate 20% (own consumption)","20%","100","sale","","20.0","percent","","tax_group_20","base","invoice","KZ 001||KZ 022 Bemessungsgrundlage","","","UST_022 Normalsteuersatz 20% (Eigenverbrauch)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 022 Umsatzsteuer","chart_at_template_3500","","","","",""
+"","","","","","","","","","","","base","refund","KZ 001||KZ 022 Bemessungsgrundlage","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 022 Umsatzsteuer","chart_at_template_3500","","","","",""
+"account_tax_template_sales_self_10_code029","10% Ust R O C","UST_029 reduced tax rate 10% (own consumption)","10%","100","sale","","10.0","percent","","tax_group_10","base","invoice","KZ 001||KZ 029 Bemessungsgrundlage","","","UST_029 ermäßigter Steuersatz 10% (Eigenverbrauch)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 029 Umsatzsteuer","chart_at_template_3501","","","","",""
+"","","","","","","","","","","","base","refund","KZ 001||KZ 029 Bemessungsgrundlage","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 029 Umsatzsteuer","chart_at_template_3501","","","","",""
+"account_tax_template_sales_self_19_code037","19% Ust O C","UST_037 Tax rate 19% (own consumption)","19%","100","sale","","19.0","percent","","tax_group_19","base","invoice","KZ 001||KZ 037 Bemessungsgrundlage","","","UST_037 Steuersatz 19% (Eigenverbrauch)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 037 Umsatzsteuer","chart_at_template_3505","","","","",""
+"","","","","","","","","","","","base","refund","KZ 001||KZ 037 Bemessungsgrundlage","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 037 Umsatzsteuer","chart_at_template_3505","","","","",""
+"account_tax_template_sales_self_add10_code052","10% Ust Add C","UST_052 Additional tax rate 10% (LWB/FWB - own consumption)","10%","100","sale","","10.0","percent","","tax_group_10","base","invoice","KZ 001||KZ 052 Bemessungsgrundlage","","","UST_052 Zusatzsteuersatz 10% (LWB/FWB - Eigenverbrauch)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 052 Umsatzsteuer","chart_at_template_3505","","","","",""
+"","","","","","","","","","","","base","refund","KZ 001||KZ 052 Bemessungsgrundlage","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 052 Umsatzsteuer","chart_at_template_3505","","","","",""
+"account_tax_template_sales_self_add7_code007","7% Ust Add O C","UST_007 Additional tax rate 7% (LWB/FWB - own consumption)","7%","100","sale","","7.0","percent","","","base","invoice","KZ 001||KZ 007 Bemessungsgrundlage","","","UST_007 Zusatzsteuersatz 7% (LWB/FWB - Eigenverbrauch)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 007 Umsatzsteuer","chart_at_template_3505","","","","",""
+"","","","","","","","","","","","base","refund","KZ 001||KZ 007 Bemessungsgrundlage","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 007 Umsatzsteuer","chart_at_template_3505","","","","",""
+"account_tax_template_purchase_tax_invoiced_accepted_code056","20% Ust T I","UST_056 Tax invoiced accepted (§ 11 par. 12 and 14 § 16 par. 2 and according to Art. 7 par. 4)","20%","100","purchase","","20.0","percent","","tax_group_20","base","invoice","","","","UST_056 Tax invoiced accepted (§ 11 Abs. 12 und 14, § 16 Abs. 2 sowie gemäß Art. 7 Abs. 4)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 056","chart_at_template_3505","","","","",""
+"","","","","","","","","","","","base","refund","","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 056","chart_at_template_3505","","","","",""
+"account_tax_template_sales_eu_0_services","0% Ust EU S","UST_EU Service (other services) 0%","0%","200","sale","service","0.0","percent","","tax_group_0","base","invoice","AT_ZM_DL","","","UST_EU Dienstleistung (Sonstige Leistungen) 0%","fiscal_position_template_eu","account_tax_template_sales_20_katalog022","VAT Reverse charge - Article 196 of the Directive 2006/112/EC"
+"","","","","","","","","","","","tax","invoice","","chart_at_template_3505","","","","",""
+"","","","","","","","","","","","base","refund","AT_ZM_DL","","","","","",""
+"","","","","","","","","","","","tax","refund","","chart_at_template_3505","","","","",""
+"account_tax_template_sales_non_eu_0_services","0% Ust EX S","UST_NON_EU Service (third countries) 0%","0%","300","sale","service","0.0","percent","","tax_group_0","base","invoice","","","","UST_NON_EU Dienstleistung (Drittstaaten) 0%","fiscal_position_template_non_eu","account_tax_template_sales_10_code029",""
+"","","","","","","","","","","","tax","invoice","","chart_at_template_3505","","","","",""
+"","","","","","","","","","","","base","refund","","","","","","",""
+"","","","","","","","","","","","tax","refund","","chart_at_template_3505","","","","",""
+"account_tax_template_purchase_eu_0_code071","0% Ust","UST_071 IGE 0% (Art. 6 para. 2)","0%","200","purchase","","0.0","percent","","tax_group_0","base","invoice","KZ 070||KZ 071","","","UST_071 IGE 0% (Art. 6 Abs. 2)","fiscal_position_template_eu","",""
+"","","","","","","","","","","","tax","invoice","","chart_at_template_3505","","","","",""
+"","","","","","","","","","","","base","refund","KZ 070||KZ 071","","","","","",""
+"","","","","","","","","","","","tax","refund","","chart_at_template_3505","","","","",""
+"account_tax_template_purchase_eu_20","20%","IGE 20%","IGE 20%","500","purchase","","20.0","percent","","tax_group_0","base","invoice","KZ 070||KZ 072 Bemessungsgrundlage","","","IGE 20%","fiscal_position_template_eu","account_tax_template_purchase_20_code060",""
+"","","","","","","","","","","","tax","invoice","KZ 072 Umsatzsteuer","chart_at_template_3511","-100","","","",""
+"","","","","","","","","","","","tax","invoice","KZ 065","chart_at_template_2511","","","","",""
+"","","","","","","","","","","","base","refund","KZ 070||KZ 072 Bemessungsgrundlage","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 072 Umsatzsteuer","chart_at_template_3511","-100","","","",""
+"","","","","","","","","","","","tax","refund","KZ 065","chart_at_template_2511","","","","",""
+"account_tax_template_purchase_eu_10","10%","IGE 10%","IGE 10%","500","purchase","","10.0","percent","","tax_group_0","base","invoice","KZ 070||KZ 073 Bemessungsgrundlage","","","IGE 10%","fiscal_position_template_eu","account_tax_template_purchase_10_code060",""
+"","","","","","","","","","","","tax","invoice","KZ 073 Umsatzsteuer","chart_at_template_3512","-100","","","",""
+"","","","","","","","","","","","tax","invoice","KZ 065","chart_at_template_2512","","","","",""
+"","","","","","","","","","","","base","refund","KZ 070||KZ 073 Bemessungsgrundlage","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 073 Umsatzsteuer","chart_at_template_3512","-100","","","",""
+"","","","","","","","","","","","tax","refund","KZ 065","chart_at_template_2512","","","","",""
+"account_tax_template_purchase_eu_13","13%","IGE 13%","IGE 13%","500","purchase","","13.0","percent","","tax_group_0","base","invoice","KZ 070||KZ 008 Bemessungsgrundlage","","","IGE 13%","fiscal_position_template_eu","",""
+"","","","","","","","","","","","tax","invoice","KZ 008 Umsatzsteuer","chart_at_template_3513","-100","","","",""
+"","","","","","","","","","","","tax","invoice","KZ 065","chart_at_template_2513","","","","",""
+"","","","","","","","","","","","base","refund","KZ 070||KZ 008 Bemessungsgrundlage","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 008 Umsatzsteuer","chart_at_template_3513","-100","","","",""
+"","","","","","","","","","","","tax","refund","KZ 065","chart_at_template_2513","","","","",""
+"account_tax_template_purchase_eu_19","19%","IGE 19%","IGE 19%","500","purchase","","19.0","percent","False","tax_group_0","base","invoice","KZ 070||KZ 088 Bemessungsgrundlage","","","IGE 19%","fiscal_position_template_eu","account_tax_template_purchase_19_code060",""
+"","","","","","","","","","","","tax","invoice","KZ 088 Umsatzsteuer","chart_at_template_3511","-100","","","",""
+"","","","","","","","","","","","tax","invoice","KZ 065","","","","","",""
+"","","","","","","","","","","","base","refund","KZ 070||KZ 088 Bemessungsgrundlage","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 088 Umsatzsteuer","chart_at_template_3511","-100","","","",""
+"","","","","","","","","","","","tax","refund","KZ 065","","","","","",""
+"account_tax_template_purchase_rev_charge_1a","20% RC C S","Reverse charge 20% (§ 19 para 1a - construction services)","RC 20% § 19 Abs. 1a","550","purchase","","20.0","percent","","tax_group_0","base","invoice","","","","Reverse Charge 20% (§ 19 Abs. 1a - Bauleistungen)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 048","chart_at_template_3510","-100","","","",""
+"","","","","","","","","","","","tax","invoice","KZ 082","chart_at_template_2510","","","","",""
+"","","","","","","","","","","","base","refund","","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 048","chart_at_template_3510","-100","","","",""
+"","","","","","","","","","","","tax","refund","KZ 082","chart_at_template_2510","","","","",""
+"account_tax_template_purchase_rev_charge_1b","20% RC Secu","Reverse charge 20% (§ 19 para. 1b - security ownership, reserved property and properties in compulsory auction proceedings)","RC 20% § 19 Abs. 1b","550","purchase","","20.0","percent","","tax_group_0","base","invoice","","","","Reverse Charge 20% (§ 19 Abs. 1b - Sicherungseigentum, Vorbehaltseigentum und Grundstücke im Zwangsversteigerungsverfahren)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 044","chart_at_template_3510","-100","","","",""
+"","","","","","","","","","","","tax","invoice","KZ 087","chart_at_template_2510","","","","",""
+"","","","","","","","","","","","base","refund","","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 044","chart_at_template_3510","-100","","","",""
+"","","","","","","","","","","","tax","refund","KZ 087","chart_at_template_2510","","","","",""
+"account_tax_template_purchase_rev_charge_19_2_25_5","20% RC O S T T","Reverse Charge 20% (§ 19 Abs. 1 second sentence - other services, Art. 25 Abs. 5 - triangular trade","RC 20% §19 Sonstige Leistungen, Dreiecksgeschäft","550","purchase","","20.0","percent","","tax_group_0","base","invoice","","","","Reverse Charge 20% (§ 19 Abs. 1 zweiter Satz - Sonstige Leistungen, Art. 25 Abs. 5 - Dreiecksgeschäft","fiscal_position_template_eu","account_tax_template_purchase_20_misc_code060",""
+"","","","","","","","","","","","tax","invoice","KZ 057","chart_at_template_3510","-100","","","",""
+"","","","","","","","","","","","tax","invoice","KZ 066","chart_at_template_2510","","","","",""
+"","","","","","","","","","","","base","refund","","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 057","chart_at_template_3510","-100","","","",""
+"","","","","","","","","","","","tax","refund","KZ 066","chart_at_template_2510","","","","",""
+"account_tax_template_purchase_rev_charge_1c","20% RC 19(1c)","Reverse charge 20% (§ 19 para. 1c - gas, electricity, heat, cold)","RC 20% § 19 Abs. 1c","550","purchase","","20.0","percent","","tax_group_0","base","invoice","","","","Reverse Charge 20% (§ 19 Abs. 1c - Gas, Strom, Wärme, Kälte)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 057","chart_at_template_3510","-100","","","",""
+"","","","","","","","","","","","tax","invoice","KZ 066","chart_at_template_2510","","","","",""
+"","","","","","","","","","","","base","refund","","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 057","chart_at_template_3510","-100","","","",""
+"","","","","","","","","","","","tax","refund","KZ 066","chart_at_template_2510","","","","",""
+"account_tax_template_purchase_rev_charge_1d","20% RC 19(1d)","Reverse charge 20% (§ 19 par. 1d - scrap and waste materials, game consoles, laptops, tablet computers >= EUR 5,000, gas and electricity, gas and electricity certificates, metals, investment gold)","RC 20% § 19 Abs. 1d","550","purchase","","20.0","percent","","tax_group_0","base","invoice","","","","Reverse Charge 20% (§ 19 Abs. 1d - Schrott und Abfallstoffe, Spielekonsolen, Laptops, Tablet-Computer >= EUR 5.000,-, Gas und Elektrizität, Gas- und Elektrizitätszertifikate, Metalle, Anlagegold)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 032","chart_at_template_3510","-100","","","",""
+"","","","","","","","","","","","tax","invoice","KZ 089","chart_at_template_2510","","","","",""
+"","","","","","","","","","","","base","refund","","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 032","chart_at_template_3510","-100","","","",""
+"","","","","","","","","","","","tax","refund","KZ 089","chart_at_template_2510","","","","",""
+"account_tax_template_purchase_rev_charge_1e","20% RC 19(1e)","Reverse Charge 20% (§ 19 Abs. 1e - Greenhouse gas emission certificates, mobile devices >= EUR 5.000,-)","RC 20% § 19 Abs. 1e","550","purchase","","20.0","percent","","tax_group_0","base","invoice","","","","Reverse Charge 20% (§ 19 Abs. 1e - Treibhausgasemissionszertifikaten, Mobilfunkgeräte >= EUR 5.000,-)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 032","chart_at_template_3510","-100","","","",""
+"","","","","","","","","","","","tax","invoice","KZ 089","chart_at_template_2510","","","","",""
+"","","","","","","","","","","","base","refund","","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 032","chart_at_template_3510","-100","","","",""
+"","","","","","","","","","","","tax","refund","KZ 089","chart_at_template_2510","","","","",""
+"account_tax_template_purchase_eu_xx_code076","0% EU A","Acquisitions pursuant to Art. 3(8), second sentence, which have been taxed in the Member State of destination (IGE-UST)","UST_076 IGE (im Bestimmungsland besteuert)","200","purchase","","0.0","percent","","tax_group_0","base","invoice","KZ 076||KZ 077","","","Erwerbe gemäß Art. 3 Abs. 8 zweiter Satz, die im Mitgliedstaat des Bestimmungslandes besteuert worden sind (IGE-UST)","fiscal_position_template_eu","",""
+"","","","","","","","","","","","tax","invoice","","chart_at_template_2505","","","","",""
+"","","","","","","","","","","","base","refund","KZ 076||KZ 077","","","","","",""
+"","","","","","","","","","","","tax","refund","","chart_at_template_2505","","","","",""
+"account_tax_template_purchase_eu_xx_code077","0% A","Acquisitions under the second sentence of Art. 3(8) that are deemed to be taxed domestically under Art. 25(2) (IGE-UST)","UST_077 IGE (im Inland besteuert)","200","purchase","","0.0","percent","False","","base","invoice","KZ 077||KZ 037 Bemessungsgrundlage RC","","","Erwerbe gemäß Art. 3 Abs. 8 zweiter Satz, die gemäß Art. 25 Abs. 2 im Inland als besteuert gelten (IGE-UST)","fiscal_position_template_eu","",""
+"","","","","","","","","","","","tax","invoice","","chart_at_template_3505","","","","",""
+"","","","","","","","","","","","base","refund","KZ 077||KZ 037 Bemessungsgrundlage RC","","100.0","","","",""
+"","","","","","","","","","","","tax","refund","","chart_at_template_3505","100.0","","","",""
+"account_tax_template_purchase_20_code060","20% Vst","VST_060 Normal tax rate 20%","20%","50","purchase","","20.0","percent","","tax_group_20","base","invoice","","","","VST_060 Normalsteuersatz 20%","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 060","chart_at_template_2500","","","","",""
+"","","","","","","","","","","","base","refund","","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 060","chart_at_template_2500","","","","",""
+"account_tax_template_purchase_20_misc_code060","20% Vst O S","VST_060 other services 20%","20%","400","purchase","","20.0","percent","","tax_group_20","base","invoice","","","","VST_060 sonstige Leistungen 20%","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 060","chart_at_template_2500","","","","",""
+"","","","","","","","","","","","base","refund","","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 060","chart_at_template_2500","","","","",""
+"account_tax_template_purchase_10_code060","10% Vst","VST_060 reduced tax rate 10%","10%","400","purchase","","10.0","percent","","tax_group_10","base","invoice","","","","VST_060 ermäßigter Steuersatz 10%","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 060","chart_at_template_2501","","","","",""
+"","","","","","","","","","","","base","refund","","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 060","chart_at_template_2501","","","","",""
+"account_tax_template_purchase_13_code060","13% Vst","VST_060 reduced tax rate 13%","13%","400","purchase","","13.0","percent","","tax_group_13","base","invoice","","","","VST_060 ermäßigter Steuersatz 13%","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 060","chart_at_template_2502","","","","",""
+"","","","","","","","","","","","base","refund","","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 060","chart_at_template_2502","","","","",""
+"account_tax_template_purchase_19_code060","19% Vst J M","VST_060 Jungholz and Mittelberg 19%","19%","400","purchase","","19.0","percent","","tax_group_19","base","invoice","","","","VST_060 Jungholz und Mittelberg 19%","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 060","chart_at_template_2505","","","","",""
+"","","","","","","","","","","","base","refund","","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 060","chart_at_template_2505","","","","",""
+"account_tax_template_purchase_12_code060","12% Vst W","VST_060 Wine purchase 12% (LWB)","12%","400","purchase","","12.0","percent","","tax_group_12","base","invoice","","","","VST_060 Weineinkauf 12% (LWB)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 060","chart_at_template_2505","","","","",""
+"","","","","","","","","","","","base","refund","","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 060","chart_at_template_2505","","","","",""
+"account_tax_template_purchase_xx_code061","20% Vst EU T","VST_061 EU tax paid (§ 12 par. 1 no. 2 lit. a)","","400","purchase","","","percent","","","","","","","","VST_061 entrichtete EUst (§ 12 Abs. 1 Z 2 lit. a)","fiscal_position_template_eu","",""
+"account_tax_template_purchase_xx_code083","20% Vst P","VST_083 Posted EUst. (§ 12 par. 1 line 2 lit. b)","","400","none","","","percent","","","","","","","","VST_083 verbuchte EUst. (§ 12 Abs. 1 Z 2 lit. b)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"account_tax_template_purchase_correct_code063","0% Vst C-12","VST_063 (§12 par. 10 and 11 - correction)","0%","400","purchase","","0.0","percent","","tax_group_0","base","invoice","","","","VST_063 (§12 Abs. 10 und 11 - Berichtigung)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","","chart_at_template_2505","","","","",""
+"","","","","","","","","","","","base","refund","","","","","","",""
+"","","","","","","","","","","","tax","refund","","chart_at_template_2505","","","","",""
+"account_tax_template_purchase_correct_code067","0% Vst C-16","VST_067 (§ 16 - correction)","0%","400","purchase","","0.0","percent","","tax_group_0","base","invoice","","","","VST_067 (§ 16 - Berichtigung)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 067","chart_at_template_2505","","","","",""
+"","","","","","","","","","","","base","refund","","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 067","chart_at_template_2505","","","","",""
+"account_tax_template_purchase_correct_code090","0% Vst O C","VST_090 (Other corrections)","0%","600","purchase","","0.0","percent","False","","base","invoice","","","","VST_090 (Sonstige Berichtigungen)","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","KZ 090","chart_at_template_2505","","","","",""
+"","","","","","","","","","","","base","refund","","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 090","chart_at_template_2505","","","","",""
+"account_tax_template_purchase_cars_buildings_code027","20% Vst Car","VST_027 concerning motor vehicles according to EKR 063, 064, 732-733 und 744-747","20%","400","purchase","","20.0","percent","","tax_group_20","base","invoice","","","","VST_027 betreffend KFZ nach EKR 063, 064, 732-733 und 744-747","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","","chart_at_template_2505","","","","",""
+"","","","","","","","","","","","base","refund","","","","","","",""
+"","","","","","","","","","","","tax","refund","","chart_at_template_2505","","","","",""
+"account_tax_template_purchase_cars_buildings_code028","20% Vst B","VST_028 concerning buildings according to EKR 030-037 and 070","20%","400","purchase","","20.0","percent","","tax_group_20","base","invoice","","","","VST_028 betreffend Gebäude nach EKR 030-037 und 070, 071","fiscal_position_template_national_w_uid,fiscal_position_template_national","",""
+"","","","","","","","","","","","tax","invoice","","chart_at_template_2505","","","","",""
+"","","","","","","","","","","","base","refund","","","","","","",""
+"","","","","","","","","","","","tax","refund","","chart_at_template_2505","","","","",""
+"account_tax_template_purchase_eu_0_vst_071","0% Vst","VST_071 IGE 0%","VST_071 IGE 0% (Art. 6 Abs. 2)","500","purchase","","0.0","percent","","tax_group_0","base","invoice","","","","VST_071 IGE 0%","fiscal_position_template_eu","",""
+"","","","","","","","","","","","tax","invoice","KZ 065","chart_at_template_2505","","","","",""
+"","","","","","","","","","","","base","refund","","","","","","",""
+"","","","","","","","","","","","tax","refund","KZ 065","chart_at_template_2505","","","","",""
+"account_tax_template_purchase_eu_xx_vst_076","20% Vst EU","VST_076 IGE (taxed in the country of destination)","20%","500","purchase","","20.0","percent","","tax_group_20","base","invoice","KZ 076||KZ 077","","","VST_076 IGE (im Bestimmungsland besteuert)","fiscal_position_template_eu","",""
+"","","","","","","","","","","","tax","invoice","","chart_at_template_2505","","","","",""
+"","","","","","","","","","","","base","refund","KZ 076||KZ 077","","","","","",""
+"","","","","","","","","","","","tax","refund","","chart_at_template_2505","","","","",""
+"account_tax_template_purchase_eu_xx_vst_077","20% Vst D","VST_077 IGE (taxed domestically)","20%","500","purchase","","20.0","percent","","tax_group_20","base","invoice","","","","VST_077 IGE (im Inland besteuert)","fiscal_position_template_eu","",""
+"","","","","","","","","","","","tax","invoice","","chart_at_template_2505","","","","",""
+"","","","","","","","","","","","base","refund","","","","","","",""
+"","","","","","","","","","","","tax","refund","","chart_at_template_2505","","","","",""

odoo-bringout-oca-ocb-l10n_at/l10n_at/data/template/account.tax.group-at.csv

@@ -0,0 +1,7 @@
+"id","name","country_id","tax_payable_account_id","tax_receivable_account_id"
+"tax_group_0","0%","base.at","chart_at_template_3530","chart_at_template_3530"
+"tax_group_10","10%","base.at","chart_at_template_3530","chart_at_template_3530"
+"tax_group_12","12%","base.at","chart_at_template_3530","chart_at_template_3530"
+"tax_group_13","13%","base.at","chart_at_template_3530","chart_at_template_3530"
+"tax_group_19","19%","base.at","chart_at_template_3530","chart_at_template_3530"
+"tax_group_20","20%","base.at","chart_at_template_3530","chart_at_template_3530"

odoo-bringout-oca-ocb-l10n_at/l10n_at/demo/demo_company.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-  <record id="partner_demo_company_at" model="res.partner">
+  <record id="base.partner_demo_company_at" model="res.partner" forcecreate="1">
     <field name="name">AT Company</field>
     <field name="vat">ATU12345675</field>
     <field name="street">Sternwartestraße</field>
@@ -11,24 +11,34 @@
     <field name="phone">+43 512 321 54 76</field>
     <field name="email">info@company.atexample.com</field>
     <field name="website">www.atexample.com</field>
+    <field name="is_company" eval="True"/>
   </record>
 
-  <record id="demo_company_at" model="res.company">
+  <record id="base.demo_company_at" model="res.company" forcecreate="1">
     <field name="name">AT Company</field>
-    <field name="partner_id" ref="partner_demo_company_at"/>
+    <field name="partner_id" ref="base.partner_demo_company_at"/>
+  </record>
+
+  <record id="base.demo_bank_at" model="res.partner.bank" forcecreate="1">
+    <field name="acc_number">AT285400035566419993</field>
+    <field name="partner_id" ref="base.partner_demo_company_at"/>
+    <field name="company_id" ref="base.demo_company_at"/>
+    <field name="allow_out_payment" eval="True"/>
   </record>
 
   <function model="res.company" name="_onchange_country_id">
-    <value eval="[ref('demo_company_at')]"/>
+    <value eval="[ref('base.demo_company_at')]"/>
   </function>
 
   <function model="res.users" name="write">
     <value eval="[ref('base.user_root'), ref('base.user_admin'), ref('base.user_demo')]"/>
-    <value eval="{'company_ids':[(4, ref('l10n_at.demo_company_at'))]}"/>
+    <value eval="{'company_ids':[(4, ref('base.demo_company_at'))]}"/>
   </function>
 
   <function model="account.chart.template" name="try_loading">
-    <value eval="[ref('l10n_at.l10n_at_chart_template')]"/>
-    <value model="res.company" eval="obj().env.ref('l10n_at.demo_company_at')"/>
+        <value eval="[]"/>
+        <value>at</value>
+        <value model="res.company" eval="obj().env.ref('base.demo_company_at')"/>
+        <value name="install_demo" eval="True"/>
     </function>
 </odoo>

odoo-bringout-oca-ocb-l10n_at/l10n_at/migrations/3.1/end-migrate_update_taxes.py

@@ -1,5 +0,0 @@
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-from odoo.addons.account.models.chart_template import update_taxes_from_templates
-
-def migrate(cr, version):
-    update_taxes_from_templates(cr, 'l10n_at.l10n_at_chart_template')

odoo-bringout-oca-ocb-l10n_at/l10n_at/migrations/3.2/post-migrate.py

@@ -0,0 +1,14 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+from odoo import api, SUPERUSER_ID, Command
+
+
+def migrate(cr, version):
+    env = api.Environment(cr, SUPERUSER_ID, {})
+    # Tag PCVIII is no longer referenced in the Balance Sheet: users should use PCVIII3 instead.
+    if (
+        (tag_pcviii := env.ref('l10n_at.account_tag_l10n_at_PCVIII', raise_if_not_found=False))
+        and (tag_pcviii3 := env.ref('l10n_at.account_tag_l10n_at_PCVIII3', raise_if_not_found=False))
+    ):
+        env['account.account'].search([('tag_ids', '=', tag_pcviii.id)]).write({
+            'tag_ids': [Command.unlink(tag_pcviii.id), Command.link(tag_pcviii3.id)],
+        })

odoo-bringout-oca-ocb-l10n_at/l10n_at/models/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from . import chart_template
+from . import account_journal
+from . import template_at