diff --git a/setup.py b/setup.py index 67eaa7af04..82edc801f5 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ minor_version = int(minor_version) requires = [] for dep in info.get('depends', []): - if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep): + if not re.match(r'(ir|res|webdav)(\W|$)', dep): requires.append('trytond_%s >= %s.%s, < %s.%s' % (dep, major_version, minor_version, major_version, minor_version + 1)) diff --git a/tests/scenario_account_stock_continental.rst b/tests/scenario_account_stock_continental.rst index e28461b2a0..5c8c0c1e12 100644 --- a/tests/scenario_account_stock_continental.rst +++ b/tests/scenario_account_stock_continental.rst @@ -26,7 +26,7 @@ Install account_stock_continental, sale and purchase:: ... ('name', 'in', ('account_stock_continental', ... 'sale', 'purchase')), ... ]) - >>> Module.button_install([x.id for x in modules], config.context) + >>> Module.install([x.id for x in modules], config.context) >>> Wizard('ir.module.module.install_upgrade').execute('upgrade') Create company:: @@ -187,10 +187,8 @@ Purchase 12 products:: >>> purchase_line.quantity = 7.0 >>> purchase_line.unit_price = Decimal(6) >>> purchase.save() - >>> Purchase.workflow_trigger_validate(purchase.id, 'quotation', - ... config.context) - >>> Purchase.workflow_trigger_validate(purchase.id, 'confirm', - ... config.context) + >>> Purchase.quote([purchase.id], config.context) + >>> Purchase.confirm([purchase.id], config.context) >>> purchase.state u'confirmed' @@ -206,10 +204,8 @@ Receive 9 products:: >>> shipment.incoming_moves.append(move) >>> move.quantity = 5.0 >>> shipment.save() - >>> ShipmentIn.workflow_trigger_validate(shipment.id, 'received', - ... config.context) - >>> ShipmentIn.workflow_trigger_validate(shipment.id, 'done', - ... config.context) + >>> ShipmentIn.receive([shipment.id], config.context) + >>> ShipmentIn.done([shipment.id], config.context) >>> shipment.state u'done' >>> stock_supplier.reload() @@ -231,7 +227,7 @@ Open supplier invoice:: >>> invoice_line = invoice.lines[1] >>> invoice_line.unit_price = Decimal('4') >>> invoice.save() - >>> Invoice.workflow_trigger_validate(invoice.id, 'open', config.context) + >>> Invoice.open([invoice.id], config.context) >>> invoice.state u'open' >>> payable.reload() @@ -260,9 +256,9 @@ Sale 5 products:: >>> sale_line.product = product_average >>> sale_line.quantity = 3.0 >>> sale.save() - >>> Sale.workflow_trigger_validate(sale.id, 'quotation', config.context) - >>> Sale.workflow_trigger_validate(sale.id, 'confirm', config.context) - >>> Sale.workflow_trigger_validate(sale.id, 'process', config.context) + >>> Sale.quote([sale.id], config.context) + >>> Sale.confirm([sale.id], config.context) + >>> Sale.process([sale.id], config.context) >>> sale.state u'processing' @@ -270,18 +266,16 @@ Send 5 products:: >>> ShipmentOut = Model.get('stock.shipment.out') >>> shipment, = sale.shipments - >>> ShipmentOut.workflow_trigger_validate(shipment.id, 'assign', - ... config.context) + >>> ShipmentOut.assign_try([shipment.id], config.context) + True >>> shipment.state u'assigned' >>> shipment.reload() - >>> ShipmentOut.workflow_trigger_validate(shipment.id, 'packed', - ... config.context) + >>> ShipmentOut.pack([shipment.id], config.context) >>> shipment.state u'packed' >>> shipment.reload() - >>> ShipmentOut.workflow_trigger_validate(shipment.id, 'done', - ... config.context) + >>> ShipmentOut.done([shipment.id], config.context) >>> shipment.state u'done' >>> stock_customer.reload() @@ -297,7 +291,7 @@ Open customer invoice:: >>> sale.reload() >>> invoice, = sale.invoices - >>> Invoice.workflow_trigger_validate(invoice.id, 'open', config.context) + >>> Invoice.open([invoice.id], config.context) >>> invoice.state u'open' >>> receivable.reload() @@ -325,7 +319,7 @@ Create an Inventory:: >>> inventory_line = inventory.lines[1] >>> inventory_line.quantity = 1.0 >>> inventory.save() - >>> Inventory.workflow_trigger_validate(inventory.id, 'done', config.context) + >>> Inventory.confirm([inventory.id], config.context) >>> inventory.state u'done' >>> stock_lost_found.reload()