slapos_accounting: consider Software Product as a Service

master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_generateSlapOSAggregatedMovementList.py

@@ -18,7 +18,7 @@ consumption_specialise_uid_list = [q.getUid() for q in portal.ERP5Site_searchRel
   portal_type='Sale Trade Condition')]
 
 aggregateable_service_uid_list = [service.getUid() for service in \
-  portal.portal_categories.base_amount.invoicing.getBaseContributionRelatedValueList(portal_type=["Service", "Software Product"])]
+  portal.portal_categories.base_amount.invoicing.getBaseContributionRelatedValueList(portal_type=portal.getPortalServiceTypeList())]
 
 
 select_dict= {'default_aggregate_portal_type': None}