Merge branch 'main' into 6.8

This commit is contained in:
Frederik Jaeckel 2025-01-27 13:08:22 +01:00
commit ca29e8eeec
3 changed files with 14 additions and 2 deletions

View file

@ -34,7 +34,7 @@ class Configuration(metaclass=PoolMeta):
product_category = fields.Many2Many( product_category = fields.Many2Many(
string='Categories', origin='config', target='category', string='Categories', origin='config', target='category',
help='Categories used to determine tax and accounts for a product ' + help='Categories used to determine tax and accounts for a product ' +
'on an invoice line.', 'on an invoice line.', filter=[('accounting', '=', True)],
relation_name='document.incoming.confprodcat_rel') relation_name='document.incoming.confprodcat_rel')
@classmethod @classmethod

View file

@ -4,7 +4,7 @@
# this repository contains the full copyright notices and license terms. # this repository contains the full copyright notices and license terms.
from trytond.tests.test_tryton import ModuleTestCase from trytond.tests.test_tryton import ModuleTestCase, activate_module
from .document import DocumentTestCase from .document import DocumentTestCase
@ -14,6 +14,16 @@ class XmlIncomingTestCase(
'Test document incoming xml converter module' 'Test document incoming xml converter module'
module = 'document_incoming_invoice_xml' module = 'document_incoming_invoice_xml'
@classmethod
def setUpClass(cls):
""" add modelues
"""
super(XmlIncomingTestCase, cls).setUpClass()
try:
activate_module(['sale_point_invoice'])
except Exception as e1:
print('- skipped install of "sale_point_invoice"', str(e1))
# end XmlIncomingTestCase # end XmlIncomingTestCase

View file

@ -3,6 +3,8 @@ version=6.8.2
depends: depends:
document_incoming_invoice document_incoming_invoice
edocument_unece edocument_unece
extras_depend:
sale_point_invoice
xml: xml:
message.xml message.xml
configuration.xml configuration.xml