diff --git a/product/ERP5/tests/testDeliveryBuilderToSupportMultipleLines.py b/product/ERP5/tests/testDeliveryBuilderToSupportMultipleLines.py index 604ed5d781ac429617dac2ec06233167d3b88364..a3d50505416af9ef2f03ee617594a3b2e7bc4fa4 100644 --- a/product/ERP5/tests/testDeliveryBuilderToSupportMultipleLines.py +++ b/product/ERP5/tests/testDeliveryBuilderToSupportMultipleLines.py @@ -200,21 +200,17 @@ return context.getPortalObject().portal_catalog(portal_type='Sale Invoice Transa delivery_builder = getattr(self.portal.portal_deliveries, self.delivery_builder_id) delivery_builder.delivery_cell_separate_order = ('calculateAddQuantity',) - def stepAdoptPrevisionPackingListQuantity(self,sequence=None, sequence_list=None): - document = sequence.get('packing_list') - self._solveDivergence(document, 'quantity', 'adopt') + stepAdoptPrevisionPackingListQuantity = \ + TestSaleInvoiceMixin.stepAdoptPrevisionQuantity - def stepAcceptDecisionPackingListQuantity(self,sequence=None, sequence_list=None): - document = sequence.get('packing_list') - self._solveDivergence(document, 'quantity', 'accept') + stepAcceptDecisionPackingListQuantity = \ + TestSaleInvoiceMixin.stepAcceptDecisionQuantity - def stepAdoptPrevisionInvoiceQuantity(self,sequence=None, sequence_list=None): - document = sequence.get('invoice') - self._solveDivergence(document, 'quantity', 'adopt') + stepAdoptPrevisionInvoiceQuantity = \ + TestSaleInvoiceMixin.stepAdoptPrevisionQuantityInvoice - def stepAcceptDecisionInvoiceQuantity(self,sequence=None, sequence_list=None): - document = sequence.get('invoice') - self._solveDivergence(document, 'quantity', 'accept') + stepAcceptDecisionInvoiceQuantity = \ + TestSaleInvoiceMixin.stepAcceptDecisionQuantityInvoice class TestNestedLine(TestNestedLineMixin, ERP5TypeTestCase): diff --git a/product/ERP5/tests/testInvoice.py b/product/ERP5/tests/testInvoice.py index 14191d3f6c530ab8469e7f6e9e61dbde9d1e21ae..8f3ba3cf80ace246680e072a763b9d45b3e06e2b 100644 --- a/product/ERP5/tests/testInvoice.py +++ b/product/ERP5/tests/testInvoice.py @@ -938,6 +938,11 @@ class TestInvoiceMixin(TestPackingListMixin): self._solveDivergence(invoice, 'start_date', 'Unify Solver', value=invoice.getStartDate()) + def stepAdoptPrevisionQuantityInvoice(self,sequence=None, sequence_list=None): + invoice = sequence.get('invoice') + self.portal.pdb() + self._solveDivergence(invoice, 'quantity', 'Adopt Solver') + def stepAcceptDecisionQuantityInvoice(self,sequence=None, sequence_list=None): invoice = sequence.get('invoice') self._solveDivergence(invoice, 'quantity', 'Accept Solver')