Commit 3017d0ab authored by Romain Courteaud's avatar Romain Courteaud 🐙

slapos_crm:

* add virtual master contraint to tickets and events portal types
* propagate project from Regularisation Request to event
* delivery/movement must use source_project instead of follow_up
* set source_project on event
* stop setting person as source_project
parent 5659cbd5
<property_sheet_list>
<portal_type id="Acknowledgement">
<item>SlapOSVirtualMasterSourceProjectConstraint</item>
</portal_type>
<portal_type id="Fax Message">
<item>SlapOSVirtualMasterSourceProjectConstraint</item>
</portal_type>
<portal_type id="Incident Response">
<item>SlapOSVirtualMasterSourceProjectConstraint</item>
</portal_type>
<portal_type id="Letter">
<item>SlapOSVirtualMasterSourceProjectConstraint</item>
</portal_type>
<portal_type id="Mail Message">
<item>SlapOSEventConstraint</item>
<item>SlapOSVirtualMasterSourceProjectConstraint</item>
</portal_type>
<portal_type id="Note">
<item>SlapOSVirtualMasterSourceProjectConstraint</item>
</portal_type>
<portal_type id="Phone Call">
<item>SlapOSVirtualMasterSourceProjectConstraint</item>
</portal_type>
<portal_type id="Regularisation Request">
<item>Codification</item>
<item>SlapOSVirtualMasterSourceProjectConstraint</item>
</portal_type>
<portal_type id="Short Message">
<item>SlapOSVirtualMasterSourceProjectConstraint</item>
</portal_type>
<portal_type id="Site Message">
<item>SlapOSEventConstraint</item>
<item>SlapOSVirtualMasterSourceProjectConstraint</item>
</portal_type>
<portal_type id="Support Request">
<item>SlapOSSupportRequestConstraint</item>
<item>SlapOSVirtualMasterSourceProjectConstraint</item>
</portal_type>
<portal_type id="Visit">
<item>SlapOSVirtualMasterSourceProjectConstraint</item>
</portal_type>
<portal_type id="Web Message">
<item>SlapOSEventConstraint</item>
<item>SlapOSVirtualMasterSourceProjectConstraint</item>
</portal_type>
</property_sheet_list>
......@@ -16,7 +16,7 @@ ticket_portal_type = "Regularisation Request"
ticket = portal.portal_catalog.getResultValue(
portal_type=ticket_portal_type,
default_source_project_uid=person.getUid(),
default_destination_uid=person.getUid(),
simulation_state=['suspended', 'validated'],
)
......@@ -51,7 +51,6 @@ if int(outstanding_amount) > 0:
portal.portal_preferences.getPreferredRegularisationRequestTemplate())
ticket = regularisation_request_template.Base_createCloneDocument(batch_mode=1)
ticket.edit(
source_project_value=context,
title='Account regularisation expected for "%s"' % context.getTitle(),
destination_decision_value=context,
destination_value=context,
......
......@@ -40,6 +40,7 @@ if (event is None) and (ticket.getSimulationState() == 'suspended'):
title=title,
resource=service_relative_url,
text_content=text_content,
source_project_value=ticket.getSourceProjectValue(),
)
event.start(send_mail=True, comment=comment)
......
......@@ -4,7 +4,7 @@ if REQUEST is not None:
ticket = context
state = ticket.getSimulationState()
person = ticket.getSourceProjectValue(portal_type="Person")
person = ticket.getDestinationDecisionValue(portal_type="Person")
if (state == 'suspended') and \
(person is not None) and \
(ticket.getResource() == 'service_module/slapos_crm_delete_acknowledgement'):
......
......@@ -3,7 +3,7 @@ if REQUEST is not None:
raise Unauthorized
state = context.getSimulationState()
person = context.getSourceProjectValue(portal_type="Person")
person = context.getDestinationDecisionValue(portal_type="Person")
if (state not in ('suspended', 'validated')) or \
(person is None):
return
......
......@@ -4,7 +4,7 @@ if REQUEST is not None:
ticket = context
state = ticket.getSimulationState()
person = ticket.getSourceProjectValue(portal_type="Person")
person = ticket.getDestinationDecisionValue(portal_type="Person")
if (state == 'suspended') and \
(person is not None) and \
(ticket.getResource() in ['service_module/slapos_crm_stop_acknowledgement', 'service_module/slapos_crm_delete_reminder', 'service_module/slapos_crm_delete_acknowledgement']):
......
Acknowledgement | SlapOSVirtualMasterSourceProjectConstraint
Fax Message | SlapOSVirtualMasterSourceProjectConstraint
Incident Response | SlapOSVirtualMasterSourceProjectConstraint
Letter | SlapOSVirtualMasterSourceProjectConstraint
Mail Message | SlapOSEventConstraint
Mail Message | SlapOSVirtualMasterSourceProjectConstraint
Note | SlapOSVirtualMasterSourceProjectConstraint
Phone Call | SlapOSVirtualMasterSourceProjectConstraint
Regularisation Request | Codification
Regularisation Request | SlapOSVirtualMasterSourceProjectConstraint
Short Message | SlapOSVirtualMasterSourceProjectConstraint
Site Message | SlapOSEventConstraint
Site Message | SlapOSVirtualMasterSourceProjectConstraint
Support Request | SlapOSSupportRequestConstraint
Support Request | SlapOSVirtualMasterSourceProjectConstraint
Visit | SlapOSVirtualMasterSourceProjectConstraint
Web Message | SlapOSEventConstraint
Web Message | SlapOSVirtualMasterSourceProjectConstraint
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment