fix merge

locale/en.po

@@ -14,10 +14,6 @@ msgctxt "model:ir.message,text:msg_tax_code_missing"
 msgid "The UNECE tax code is not configured for tax '%(taxname)s'."
 msgstr "The UNECE tax code is not configured for tax '%(taxname)s'."
 
-msgctxt "model:ir.message,text:msg_tax_code_missing"
-msgid "The UNECE tax code is not configured for tax '%(taxname)s'."
-msgstr "The UNECE tax code is not configured for tax '%(taxname)s'."
-
 msgctxt "model:ir.message,text:msg_uom_code_missing"
 msgid "The UNECE uom code is not configured for unit '%(uomname)s'."
 msgstr "The UNECE uom code is not configured for unit '%(uomname)s'."
@@ -54,10 +50,6 @@ msgctxt "field:party.party,xrechnung_routeid:"
 msgid "X-Rechnung Route-ID"
 msgstr "X-Rechnung Route-ID"
 
-msgctxt "help:party.party,xrechnung_routeid:"
-msgid "Enables the need for an XRechnung route ID at the party for exporting the XRechnung."
-msgstr "Enables the need for an XRechnung route ID at the party for exporting the XRechnung."
-
 msgctxt "field:account.tax,xrtax_category:"
 msgid "Tax Category"
 msgstr "Tax Category"
@@ -122,26 +114,3 @@ msgctxt "field:edocument_xrechnung.bank_rel,config:"
 msgid "Configuration"
 msgstr "Configuration"
 
-msgctxt "selection:account.tax,xrtax_category:"
-msgid "Tax on production; services and imports in Ceuta and Melilla"
-msgstr "Tax on production; services and imports in Ceuta and Melilla"
-
-msgctxt "field:account.configuration,edocument_bank:"
-msgid "Bank accounts"
-msgstr "Bank accounts"
-
-msgctxt "help:account.configuration,edocument_bank:"
-msgid "The bank accounts listed here are output in the invoice XML."
-msgstr "The bank accounts listed here are output in the invoice XML."
-
-msgctxt "model:edocument_xrechnung.bank_rel,name:"
-msgid "Bank - eDocument - Relation"
-msgstr "Bank - eDocument - Relation"
-
-msgctxt "field:edocument_xrechnung.bank_rel,bankaccount:"
-msgid "Account"
-msgstr "Account"
-
-msgctxt "field:edocument_xrechnung.bank_rel,config:"
-msgid "Configuration"
-msgstr "Configuration"

mixin.py

@@ -7,8 +7,8 @@
 from decimal import Decimal, ROUND_HALF_EVEN
 import html
 from trytond.exceptions import UserError
-from trytond.i18n import gettext
+from trytond.modules.tryton6_backport.i18n import gettext
-from trytond.tools import cached_property
+from cached_property import cached_property
 from trytond.pool import Pool
 from trytond.modules.product import price_digits
 

tests/test_edocument.py

@@ -17,15 +17,10 @@ from trytond.exceptions import UserError
 def set_invoice_sequences(fiscalyear):
     pool = Pool()
     Sequence = pool.get('ir.sequence.strict')
-    SequenceType = pool.get('ir.sequence.type')
     InvoiceSequence = pool.get('account.fiscalyear.invoice_sequence')
-    ModelData = pool.get('ir.model.data')
 
-    sequence = Sequence(
+    sequence = Sequence(name=fiscalyear.name, code='account.invoice')
-        name=fiscalyear.name,
+    sequence.company = fiscalyear.company
-        sequence_type=SequenceType(ModelData.get_id(
-            'account_invoice', 'sequence_type_account_invoice')),
-        company=fiscalyear.company)
     sequence.save()
     fiscalyear.invoice_sequences = []
     invoice_sequence = InvoiceSequence()
@@ -105,7 +100,7 @@ class EdocTestCase(ModuleTestCase):
             'addresses': [('create', [{
                 'invoice': True,
                 'street': 'Customer Street 1',
-                'postal_code': '12345',
+                'zip': '12345',
                 'city': 'Usertown',
                 'country': country_de.id,
                 }])],