pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] account_edi_ubl_cii, l10n_account_edi_ubl_cii_tests: add partner email to factur_x XML

Browse Source 
Currently, when creating an invoice from factur_x XML, the vendor is
identified by sequentially checking (in this order) the following
information :
- VAT number
- name
- email
However, when we generate a factur_x XML, we do not include
the partner's email address. This means that in some cases, two odoo
databases are not able to communicate bills/invoices properly.
This commit brings back a behavior that was unintentionally removed in
https://github.com/odoo/odoo/commit/d25fdafcd8eb4cfef14c2ef7ed8ad7785dd01b55

opw-2909408

closes odoo/odoo#99263

X-original-commit: 51609d19177c080835116f0ad9c04c33536d926a
Signed-off-by: William André (wan) <wan@odoo.com>
Signed-off-by: Nshimiyimana Serge Séna (sesn) <sesn@odoo.com>
This commit is contained in:
Nshimiyimana Séna
2022-09-02 10:15:58 +02:00
parent 285d1c4a08
commit 128b961bdd
4 changed files with 45 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_edi_ubl_cii/data/cii_22_templates.xml
+12
View File
@@ -97,6 +97,17 @@
<ram:ID t-att-schemeID="str('0002')"
t-out="specified_legal_organization_val"/>
</ram:SpecifiedLegalOrganization>
<ram:DefinedTradeContact t-if="not hide_dtc">
<ram:PersonName t-esc="partner.name"/>
<ram:TelephoneUniversalCommunication t-if="partner.phone or partner.mobile">
<ram:CompleteNumber t-esc="partner.phone or partner.mobile"/>
</ram:TelephoneUniversalCommunication>
<ram:EmailURIUniversalCommunication t-if="partner.email">
<ram:URIID schemeID='SMTP' t-esc="partner.email"/>
</ram:EmailURIUniversalCommunication>
</ram:DefinedTradeContact>
<!-- Address. -->
<t t-call="account_edi_ubl_cii.account_invoice_address_facturx_export_22"/>
</t>
@@ -201,6 +212,7 @@
<t t-call="account_edi_ubl_cii.account_invoice_partner_facturx_export_22">
<t t-set="partner"
t-value="ship_to_trade_party"/>
<t t-set="hide_dtc" t-value="document_context_id == 'urn:cen.eu:en16931:2017#compliant#urn:xoev-de:kosit:standard:xrechnung_2.2'"/>
</t>
</ram:ShipToTradeParty>
addons/account_edi_ubl_cii/models/account_edi_xml_cii_facturx.py
+1 -1
View File
@@ -189,7 +189,7 @@ class AccountEdiXmlCII(models.AbstractModel):
if supplier.country_id.code == 'DE':
template_values['document_context_id'] = "urn:cen.eu:en16931:2017#compliant#urn:xoev-de:kosit:standard:xrechnung_2.2"
else:
template_values['document_context_id'] = "urn:cen.eu:en16931:2017"
template_values['document_context_id'] = "urn:cen.eu:en16931:2017#conformant#urn:factur-x.eu:1p0:extended"
return template_values
addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/facturx_out_invoice.xml
+16 -1
View File
@@ -1,7 +1,7 @@
<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</ram:ID>
<ram:ID>urn:cen.eu:en16931:2017#conformant#urn:factur-x.eu:1p0:extended</ram:ID>
</ram:GuidelineSpecifiedDocumentContextParameter>
</rsm:ExchangedDocumentContext>
<rsm:ExchangedDocument>
@@ -118,6 +118,15 @@
<ram:ApplicableHeaderTradeAgreement>
<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 schemeID="SMTP">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>
@@ -130,6 +139,9 @@
</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>
@@ -147,6 +159,9 @@
<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>
addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/facturx_out_refund.xml
+16 -1
View File
@@ -1,7 +1,7 @@
<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</ram:ID>
<ram:ID>urn:cen.eu:en16931:2017#conformant#urn:factur-x.eu:1p0:extended</ram:ID>
</ram:GuidelineSpecifiedDocumentContextParameter>
</rsm:ExchangedDocumentContext>
<rsm:ExchangedDocument>
@@ -118,6 +118,15 @@
<ram:ApplicableHeaderTradeAgreement>
<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 schemeID="SMTP">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>
@@ -130,6 +139,9 @@
</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>
@@ -147,6 +159,9 @@
<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>