diff --git a/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/PaymentTransaction_postOrderBuild.xml b/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/PaymentTransaction_postOrderBuild.xml index 93899d50a4418d0a26048de1c683c09303de4177..2d18472052c3a9be216e728e02a784f25d2da3d9 100644 --- a/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/PaymentTransaction_postOrderBuild.xml +++ b/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/PaymentTransaction_postOrderBuild.xml @@ -54,7 +54,7 @@ payment_transaction = context\n payment_transaction.immediateReindexObject() # in order to avoid selection in OrderBuilder_getAccountingTransactionLineListSlapOS\n comment = translateString("Initialised by Order Builder.")\n -payment_transaction.autoPlan(comment=comment)\n +payment_transaction.confirm(comment=comment)\n </string> </value> </item> <item> diff --git a/master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingBuilder.py b/master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingBuilder.py index fc5b9dc8daed45d08f1e1b8403deb42e72c873bc..46a1e1e64afedfb2e4edc094840c26075577c16d 100644 --- a/master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingBuilder.py +++ b/master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingBuilder.py @@ -1224,7 +1224,7 @@ class TestSlapOSPaymentTransactionOrderBuilder(testSlapOSMixin): def assertPayment(self, payment, invoice): self.assertEqual(self.sumReceivable(invoice), payment\ .PaymentTransaction_getTotalPayablePrice()) - self.assertEqual('auto_planned', payment.getSimulationState()) + self.assertEqual('confirmed', payment.getSimulationState()) self.assertSameSet([], payment.checkConsistency()) self.assertSameSet([invoice], payment.getCausalityValueList()) self.assertSameSet([], payment.getCausalityRelatedValueList( diff --git a/master/bt5/slapos_accounting/bt/revision b/master/bt5/slapos_accounting/bt/revision index 05cf25896dd490bcd4fab7bf941de67c6b30edee..252b382b33c6c1706b6e9085ce7414f58bf00943 100644 --- a/master/bt5/slapos_accounting/bt/revision +++ b/master/bt5/slapos_accounting/bt/revision @@ -1 +1 @@ -201 \ No newline at end of file +202 \ No newline at end of file