diff --git a/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_generateSlapOSAggregatedMovementList.py b/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_generateSlapOSAggregatedMovementList.py index eb9b58d6d7c3d7fc685c84453bf2121f3e930ad4..636795b51eb96d26a6c18c5a0683faa716dae24d 100644 --- a/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_generateSlapOSAggregatedMovementList.py +++ b/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_generateSlapOSAggregatedMovementList.py @@ -1,10 +1,11 @@ select_kw = kwargs.copy() select_kw.pop('portal_type', None) select_kw.pop('delivery_relative_url_list', None) -from Products.ERP5Type.Document import newTempSimulationMovement from Products.ZSQLCatalog.SQLCatalog import Query, NegatedQuery, ComplexQuery portal = context.getPortalObject() +newTempSimulationMovement = portal.portal_trash.newContent + business_process_uid_list = [ portal.business_process_module.slapos_reservation_refound_business_process.getUid(), portal.business_process_module.slapos_subscription_business_process.getUid()] @@ -50,7 +51,8 @@ for movement in movement_list: if movement.getGroupingReference() is not None: continue temp_movement = newTempSimulationMovement( - portal, movement.getRelativeUrl(), + temp_object=True, id=movement.getRelativeUrl(), + portal_type="Simulation Movement", quantity=movement.getQuantity(), resource=movement.getResource(), source=movement.getDestination(), diff --git a/master/bt5/slapos_payzen/SkinTemplateItem/portal_skins/slapos_payzen/OrderBuilder_generateUnrelatedInvoiceList.py b/master/bt5/slapos_payzen/SkinTemplateItem/portal_skins/slapos_payzen/OrderBuilder_generateUnrelatedInvoiceList.py index cbdc23161f043bf2db0a3a4e20bfb0655c6a5378..ea999127be21e7703db5e72f169ceb055e2817ef 100644 --- a/master/bt5/slapos_payzen/SkinTemplateItem/portal_skins/slapos_payzen/OrderBuilder_generateUnrelatedInvoiceList.py +++ b/master/bt5/slapos_payzen/SkinTemplateItem/portal_skins/slapos_payzen/OrderBuilder_generateUnrelatedInvoiceList.py @@ -1,6 +1,6 @@ -from Products.ERP5Type.Document import newTempSimulationMovement - portal = context.getPortalObject() +newTempSimulationMovement = portal.portal_trash.newContent + select_dict = { 'causality_payment_transaction_related_uid': None, 'causality_subscription_request_related_uid': None, @@ -38,6 +38,7 @@ for invoice in portal.portal_catalog(**select_kw): default_source_uid=default_source_uid): quantity += movement.getQuantity() temp_movement_kw = dict( + portal_type="Simulation Movement", causality=invoice.getRelativeUrl(), source_section=invoice.getSourceSection(), destination_section=invoice.getDestinationSection(), @@ -50,7 +51,7 @@ for invoice in portal.portal_catalog(**select_kw): source_payment='organisation_module/slapos/bank_account', # the other place defnied: business process ) temp_movement_rec = newTempSimulationMovement( - portal, str(id), + temp_object=True, id=str(id), quantity=-1 * quantity, source='account_module/receivable', destination='account_module/payable', @@ -58,7 +59,7 @@ for invoice in portal.portal_catalog(**select_kw): ) id += 1 temp_movement_bank = newTempSimulationMovement( - portal, str(id), + temp_object=True, id=str(id), quantity=1 * quantity, source='account_module/bank', destination='account_module/bank',