erp5_free_subscription: Fix skin layer priority and substitution mapping dict for events

bt5/erp5_free_subscription/SkinTemplateItem/portal_skins/erp5_free_subscription.xml

@@ -6,12 +6,33 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>business_template_skin_layer_priority</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>float</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
         <item>
             <key> <string>_objects</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>business_template_skin_layer_priority</string> </key>
+            <value> <float>50.0</float> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>erp5_free_subscription</string> </value>

bt5/erp5_free_subscription/SkinTemplateItem/portal_skins/erp5_free_subscription/NotificationMessage_getSubstitutionMappingDictFromEvent.xml

@@ -54,7 +54,6 @@
 
 from Products.ERP5Type.Message import translateString\n
 portal = context.getPortalObject()\n
-format_address = portal.ERP5Site_formatFrenchAddressText\n
 \n
 def getSubstitutionMappingDict():\n
   destination = event_value.getDestinationValue()\n
@@ -67,7 +66,7 @@ def getSubstitutionMappingDict():\n
     kw[\'telephone\'] = destination.getDefaultTelephoneText() or \'\'\n
     kw[\'mobile\'] = destination.getMobileTelephoneText() or \'\'\n
     kw[\'creation_date\'] = destination.getCreationDate()\n
-    kw[\'origin_campaign\'] = destination.getOriginReference()\n
+    #kw[\'origin_campaign\'] = destination.getOriginReference()\n
 \n
     if destination.getPortalType() == \'Person\':\n
       kw[\'first_name\'] = destination.getFirstName()\n