[FIX] account_edi_ubl_cii: UBLVersionID should not be present for Bis 3
Tag UBLVersionID should not be present for UBL Bis 3 and its inheriting formats. The fonction infering the format from an xml etree needed to be apdated too, since we can no longer rely on the `UBLVersionID` node for UBL Bis 3 and its inheriting formats. The `CustomizationID` node is used. opw-3249153 closes odoo/odoo#118125 X-original-commit: 8b1fc42af5471872da4ff0b335d04e769e286628 Signed-off-by: Josse Colpaert <jco@odoo.com> Signed-off-by: Julien Van Roy <juvr@odoo.com>
This commit is contained in:
Julien Van Roy
@@ -227,6 +227,7 @@ class AccountEdiXmlUBLBIS3(models.AbstractModel):
|
||||
'customization_id': 'urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0',
|
||||
'profile_id': 'urn:fdc:peppol.eu:2017:poacc:billing:01:1.0',
|
||||
'currency_dp': 2,
|
||||
'ubl_version_id': None,
|
||||
})
|
||||
vals['vals']['legal_monetary_total_vals']['currency_dp'] = 2
|
||||
|
||||
|
||||
@@ -26,19 +26,23 @@ class AccountMove(models.Model):
|
||||
customization_id = tree.find('{*}CustomizationID')
|
||||
if tree.tag == '{urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100}CrossIndustryInvoice':
|
||||
return self.env['account.edi.xml.cii']
|
||||
if customization_id is not None:
|
||||
if 'xrechnung' in customization_id.text:
|
||||
return self.env['account.edi.xml.ubl_de']
|
||||
if customization_id.text == 'urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0':
|
||||
return self.env['account.edi.xml.ubl_bis3']
|
||||
if customization_id.text == 'urn:cen.eu:en16931:2017#compliant#urn:fdc:nen.nl:nlcius:v1.0':
|
||||
return self.env['account.edi.xml.ubl_nl']
|
||||
ubl_version = tree.find('{*}UBLVersionID')
|
||||
if ubl_version is not None:
|
||||
if ubl_version.text == '2.0':
|
||||
return self.env['account.edi.xml.ubl_20']
|
||||
if ubl_version.text == '2.1':
|
||||
return self.env['account.edi.xml.ubl_21']
|
||||
if customization_id is not None:
|
||||
if 'xrechnung' in customization_id.text:
|
||||
return self.env['account.edi.xml.ubl_de']
|
||||
if customization_id.text == 'urn:cen.eu:en16931:2017#compliant#urn:fdc:nen.nl:nlcius:v1.0':
|
||||
return self.env['account.edi.xml.ubl_nl']
|
||||
if customization_id.text == 'urn:cen.eu:en16931:2017#conformant#urn:fdc:peppol.eu:2017:poacc:billing:international:aunz:3.0':
|
||||
return self.env['account.edi.xml.ubl_a_nz']
|
||||
if customization_id.text == 'urn:cen.eu:en16931:2017#conformant#urn:fdc:peppol.eu:2017:poacc:billing:international:sg:3.0':
|
||||
return self.env['account.edi.xml.ubl_sg']
|
||||
if 'urn:cen.eu:en16931:2017' in customization_id.text:
|
||||
return self.env['account.edi.xml.ubl_bis3']
|
||||
|
||||
def _get_edi_decoder(self, file_data, new=False):
|
||||
# EXTENDS 'account'
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
<?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: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>INV/2017/00001</cbc:ID>
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<CreditNote 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:CreditNote-2">
|
||||
<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>RINV/2017/00001</cbc:ID>
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
<?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:UBLVersionID>2.1</cbc:UBLVersionID>
|
||||
<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>
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<CreditNote 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:CreditNote-2">
|
||||
<cbc:UBLVersionID>2.1</cbc:UBLVersionID>
|
||||
<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>RINV/2017/01/0001</cbc:ID>
|
||||
|
||||
-1
@@ -1,6 +1,5 @@
|
||||
<?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:UBLVersionID>2.1</cbc:UBLVersionID>
|
||||
<cbc:CustomizationID>urn:cen.eu:en16931:2017#compliant#urn:fdc:nen.nl:nlcius:v1.0</cbc:CustomizationID>
|
||||
<cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
|
||||
<cbc:ID>INV/2017/00002</cbc:ID>
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<CreditNote xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2">
|
||||
<cbc:UBLVersionID>2.1</cbc:UBLVersionID>
|
||||
<cbc:CustomizationID>urn:cen.eu:en16931:2017#compliant#urn:fdc:nen.nl:nlcius:v1.0</cbc:CustomizationID>
|
||||
<cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
|
||||
<cbc:ID>RINV/2017/00001</cbc:ID>
|
||||
|
||||
-1
@@ -1,6 +1,5 @@
|
||||
<?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:UBLVersionID>2.1</cbc:UBLVersionID>
|
||||
<cbc:CustomizationID>urn:cen.eu:en16931:2017#compliant#urn:xoev-de:kosit:standard:xrechnung_2.2#conformant#urn:xoev-de:kosit:extension:xrechnung_2.2</cbc:CustomizationID>
|
||||
<cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
|
||||
<cbc:ID>INV/2017/01/0002</cbc:ID>
|
||||
|
||||
-1
@@ -1,6 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<CreditNote xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2">
|
||||
<cbc:UBLVersionID>2.1</cbc:UBLVersionID>
|
||||
<cbc:CustomizationID>urn:cen.eu:en16931:2017#compliant#urn:xoev-de:kosit:standard:xrechnung_2.2#conformant#urn:xoev-de:kosit:extension:xrechnung_2.2</cbc:CustomizationID>
|
||||
<cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
|
||||
<cbc:ID>RINV/2017/01/0001</cbc:ID>
|
||||
|
||||
Reference in New Issue
Block a user