slapos_subscription_request: Do not overwrite source, use the defined value from the template

master/bt5/slapos_subscription_request/SkinTemplateItem/portal_skins/slapos_subscription_request/SubscriptionRequest_createRelatedSaleInvoiceTransaction.py

@@ -19,7 +19,6 @@ if current_invoice is None:
   payment_transaction = invoice_template = portal.restrictedTraverse(payment)
   current_invoice.edit(
         title="Reservation Fee",
-        source_value=context.getDestinationSection(),
         destination_value=context.getDestinationSection(),
         destination_section_value=context.getDestinationSection(),
         destination_decision_value=context.getDestinationSection(),

master/bt5/slapos_subscription_request/SkinTemplateItem/portal_skins/slapos_subscription_request/SubscriptionRequest_requestPaymentTransaction.py

@@ -16,7 +16,6 @@ if current_invoice is None:
 
   current_payment.edit(
         title="Payment for Reservation Fee",
-        source_value=context.getDestinationSection(),
         destination_value=context.getDestinationSection(),
         destination_section_value=context.getDestinationSection(),
         destination_decision_value=context.getDestinationSection(),

master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionSkins.py

@@ -511,7 +511,8 @@ class TestSubscriptionRequest_requestPaymentTransaction(TestSubscriptionSkinsMix
     self.tic()
     self.assertNotEqual(None, current_payment)
     self.assertEqual(current_payment.getTitle(), "Payment for Reservation Fee")
-    self.assertEqual(current_payment.getSourceValue(), person)
+    self.assertEqual(current_payment.getSourceValue(), self.slapos_organisation)
+    self.assertEqual(current_payment.getSourceSectionValue(), self.slapos_organisation)
     self.assertEqual(current_payment.getDestinationValue(), person)
     self.assertEqual(current_payment.getDestinationSectionValue(), person)
     self.assertEqual(current_payment.getDestinationDecisionValue(), person)
@@ -541,7 +542,8 @@ class TestSubscriptionRequest_requestPaymentTransaction(TestSubscriptionSkinsMix
     self.tic()
     self.assertNotEqual(None, current_payment)
     self.assertEqual(current_payment.getTitle(), "Payment for Reservation Fee")
-    self.assertEqual(current_payment.getSourceValue(), person)
+    self.assertEqual(current_payment.getSourceValue(), self.slapos_organisation)
+    self.assertEqual(current_payment.getSourceSectionValue(), self.slapos_organisation)
     self.assertEqual(current_payment.getDestinationValue(), person)
     self.assertEqual(current_payment.getDestinationSectionValue(), person)
     self.assertEqual(current_payment.getDestinationDecisionValue(), person)
@@ -643,7 +645,8 @@ class TestSubscriptionRequest_createRelatedSaleInvoiceTransaction(TestSubscripti
     self.assertEqual(current_invoice, subscription_invoice)
 
     self.assertEqual(current_invoice.getTitle(), "Reservation Fee")
-    self.assertEqual(current_invoice.getSourceValue(), person)
+    self.assertEqual(current_invoice.getSourceValue(), self.slapos_organisation)
+    self.assertEqual(current_invoice.getSourceSectionValue(), self.slapos_organisation)
     self.assertEqual(current_invoice.getDestinationValue(), person)
     self.assertEqual(current_invoice.getDestinationSectionValue(), person)
     self.assertEqual(current_invoice.getDestinationDecisionValue(), person)

master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionSkins.xml

@@ -100,25 +100,28 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
-        <list>
-          <dictionary>
-            <item>
-                <key> <string>action</string> </key>
-                <value> <string>validate</string> </value>
-            </item>
-            <item>
-                <key> <string>validation_state</string> </key>
-                <value> <string>validated</string> </value>
-            </item>
-          </dictionary>
-        </list>
-        <none/>
-      </tuple>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
 </ZopeData>