slapos_subscription_request:

* ensure Subscription Request is consistent
* allow to choose the currency when creating a Subscription Request

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

@@ -49,12 +49,17 @@ tmp_sale_order = module.newContent(
   source_project_value=source_project_value,
   ledger_value=portal.portal_categories.ledger.automated,
   # XXX XXX destination_project_value=instance_tree.getFollowUpValue(),
+  price_currency_value=currency_value
 )
 tmp_sale_order.SaleOrder_applySaleTradeCondition(batch_mode=1, force=1)
 
 if tmp_sale_order.getSpecialise(None) is None:
   raise AssertionError('Can not find a trade condition to generate the Subscription Request')
 
+if currency_value is not None:
+  if currency_value.getRelativeUrl() != tmp_sale_order.getPriceCurrency():
+    raise AssertionError('Unexpected different currency: %s %s' % (currency_value.getRelativeUrl(), tmp_sale_order.getPriceCurrency()))
+
 # If no accounting is needed, no need to check the price
 if (tmp_sale_order.getSourceSection(None) == tmp_sale_order.getDestinationSection(None)) or \
   (tmp_sale_order.getSourceSection(None) is None):
@@ -118,10 +123,9 @@ subscription_request = portal.subscription_request_module.newContent(
   price=price,
   # XXX activate_kw=activate_kw
 )
-"""
 if len(subscription_request.checkConsistency()) != 0:
-  raise NotImplementedError(subscription_request.checkConsistency())
-"""
+  raise AssertionError(subscription_request.checkConsistency())
+
 subscription_request.submit()
 
 return subscription_request

master/bt5/slapos_subscription_request/SkinTemplateItem/portal_skins/slapos_subscription_request/Resource_createSubscriptionRequest.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>subscriber_person_value, variation_category_list, project_value</string> </value>
+            <value> <string>subscriber_person_value, variation_category_list, project_value, currency_value=None</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>