diff --git a/__init__.py b/__init__.py index b944d85..4a8df4f 100644 --- a/__init__.py +++ b/__init__.py @@ -1,18 +1,18 @@ # The COPYRIGHT file at the top level of this repository contains the full # copyright notices and license terms. from trytond.pool import Pool -from .product import * -from .sale import * +from . import product +from . import sale def register(): Pool.register( - Template, - Sale, - SaleLine, - SetQuantitiesStart, - SetQuantitiesStartLine, + product.Template, + sale.Sale, + sale.SaleLine, + sale.SetQuantitiesStart, + sale.SetQuantitiesStartLine, module='sale_pos_template_quantities', type_='model') Pool.register( - SetQuantities, + sale.SetQuantities, module='sale_pos_template_quantities', type_='wizard') diff --git a/sale.py b/sale.py index 25416e9..02ad639 100644 --- a/sale.py +++ b/sale.py @@ -100,7 +100,7 @@ class SaleLine: }, }) - @fields.depends('template', 'quantity', 'unit', 'description', + @fields.depends('template', 'quantity', 'unit', 'description', 'sale', '_parent_sale.party') def on_change_template(self): Template = Pool().get('product.template') diff --git a/sale.xml b/sale.xml index 84dbeb8..35b621d 100644 --- a/sale.xml +++ b/sale.xml @@ -26,6 +26,12 @@ sale_line_form + + set_quantities_wizard + Set Quantities + + + Set Quantities sale_pos.set_quantities diff --git a/tests/scenario_sale_pos_template_quantities.rst b/tests/scenario_sale_pos_template_quantities.rst index f52ff40..478ce6b 100644 --- a/tests/scenario_sale_pos_template_quantities.rst +++ b/tests/scenario_sale_pos_template_quantities.rst @@ -8,7 +8,8 @@ Imports:: >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal >>> from operator import attrgetter - >>> from proteus import config, Model, Wizard, Report + >>> from proteus import config, Model, Wizard + >>> from trytond.tests.tools import activate_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ @@ -18,17 +19,9 @@ Imports:: >>> from trytond.modules.product_variant.tests.tools import create_attributes >>> today = datetime.date.today() -Create database:: +Install account_invoice:: - >>> config = config.set_trytond() - >>> config.pool.test = True - -Install sale:: - - >>> Module = Model.get('ir.module') - >>> sale_module, = Module.find([('name', '=', 'sale_pos_template_quantities')]) - >>> sale_module.click('install') - >>> Wizard('ir.module.install_upgrade').execute('upgrade') + >>> config = activate_modules('sale_pos_template_quantities') Create company:: diff --git a/tryton.cfg b/tryton.cfg index 769659b..7f2513b 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=4.1.0 +version=4.8.0 depends: product_variant sale_pos diff --git a/view/sale_line_list.xml b/view/sale_line_list.xml index 7f3c71b..84109e9 100644 --- a/view/sale_line_list.xml +++ b/view/sale_line_list.xml @@ -7,6 +7,6 @@ -