From 068f3b0e28386181972f753d5f5bf7e685a633a6 Mon Sep 17 00:00:00 2001 From: hienitaupegui Date: Fri, 6 Jun 2025 19:35:44 -0500 Subject: [PATCH] Fix: partial fix of test scenario, fixed model buttons, update 7.6 --- device.xml | 2 +- sale.py | 2 +- sale.xml | 4 ++-- statement.xml | 12 ++++++------ tests/scenario_sale_payment.rst | 6 +++--- tryton.cfg | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/device.xml b/device.xml index bb8b2ac..77d73b2 100644 --- a/device.xml +++ b/device.xml @@ -32,7 +32,7 @@ copyright notices and license terms. --> User in company - + sale.device diff --git a/sale.py b/sale.py index 06b3d78..9e8cbd2 100644 --- a/sale.py +++ b/sale.py @@ -164,7 +164,7 @@ class Sale(metaclass=PoolMeta): ).select( sale.id, where=(And([ - sale.total_amount_cache != None, + sale.total_amount_cache is not None, sale.state.in_([ 'draft', 'quotation', diff --git a/sale.xml b/sale.xml index e1c245b..96b5561 100644 --- a/sale.xml +++ b/sale.xml @@ -56,13 +56,13 @@ copyright notices and license terms. --> wizard_change_payment_method Change Payment Method - + sale.sale wizard_sale_payment Pay - + sale.sale diff --git a/statement.xml b/statement.xml index 4e7911b..fcd36bd 100644 --- a/statement.xml +++ b/statement.xml @@ -145,7 +145,7 @@ copyright notices and license terms. --> action="act_configuration_closures_form"/> - + account.statement @@ -153,7 +153,7 @@ copyright notices and license terms. --> - + account.statement.line @@ -161,7 +161,7 @@ copyright notices and license terms. --> - + account.statement @@ -169,7 +169,7 @@ copyright notices and license terms. --> - + account.statement.line @@ -178,7 +178,7 @@ copyright notices and license terms. --> - + account.move @@ -186,7 +186,7 @@ copyright notices and license terms. --> - + account.move.line diff --git a/tests/scenario_sale_payment.rst b/tests/scenario_sale_payment.rst index 8753d1a..2a52c36 100644 --- a/tests/scenario_sale_payment.rst +++ b/tests/scenario_sale_payment.rst @@ -116,7 +116,7 @@ Create journals:: >>> StatementJournal = Model.get('account.statement.journal') >>> Journal = Model.get('account.journal') >>> SequenceType = Model.get('ir.sequence.type') - >>> sequence_type, = SequenceType.find([('name', '=', 'Account Journal')]) + >>> sequence_type, = SequenceType.find([('name', '=', 'Account Move')]) >>> sequence = Sequence(name='Statement', ... sequence_type=sequence_type, ... company=company, @@ -124,7 +124,6 @@ Create journals:: >>> sequence.save() >>> account_journal = Journal(name='Statement', ... type='statement', - ... sequence=sequence, ... ) >>> account_journal.save() >>> statement_journal = StatementJournal(name='Default', @@ -174,7 +173,7 @@ Create account user:: >>> account_user = User() >>> account_user.name = 'Account' >>> account_user.login = 'account' - >>> account_group, = Group.find([('name', '=', 'Account')]) + >>> account_group, = Group.find([('name', '=', 'Accounting')]) >>> account_user.groups.append(account_group) >>> account_user.shops.append(shop) >>> account_user.shop = shop @@ -191,6 +190,7 @@ Sale services:: >>> sale_line = sale.lines.new() >>> sale_line.product = product >>> sale_line.quantity = 2.0 + >>> sale_line.unit_price = Decimal('10.00') >>> sale.save() >>> len(sale.shipments), len(sale.invoices), len(sale.payments) (0, 0, 0) diff --git a/tryton.cfg b/tryton.cfg index d406979..7a0a687 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=6.8.0 +version=7.6.0 depends: account_statement sale_shop