Merge branch 'backport/831' into fix/upgradeSchema_multiple_connections

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_view.xml

@@ -88,6 +88,7 @@
                         <string>my_source_function</string>
                         <string>my_source_funding</string>
                         <string>my_source_project_title</string>
+                        <string>my_source_payment_request_title</string>
                         <string>my_source_payment</string>
                         <string>my_payment_mode</string>
                         <string>my_aggregate_title_list</string>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_viewDestination.xml

@@ -88,6 +88,7 @@
                         <string>my_destination_function</string>
                         <string>my_destination_funding</string>
                         <string>my_destination_project_title</string>
+                        <string>my_destination_payment_request_title</string>
                         <string>my_destination_payment</string>
                         <string>my_payment_mode</string>
                         <string>my_aggregate_title_list</string>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_viewProfile.xml

@@ -80,6 +80,7 @@
                         <string>my_destination_project_title</string>
                         <string>my_destination_reference</string>
                         <string>my_destination_carrier_title</string>
+                        <string>my_destination_payment_request_title</string>
                       </list>
                     </value>
                 </item>
@@ -95,6 +96,7 @@
                         <string>my_source_project_title</string>
                         <string>my_source_reference</string>
                         <string>my_source_carrier_title</string>
+                        <string>my_source_payment_request_title</string>
                       </list>
                     </value>
                 </item>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewProfile.xml

@@ -80,6 +80,7 @@
                         <string>my_source_project_title</string>
                         <string>my_source_reference</string>
                         <string>my_source_carrier_title</string>
+                        <string>my_source_payment_request_title</string>
                       </list>
                     </value>
                 </item>
@@ -95,6 +96,7 @@
                         <string>my_destination_project_title</string>
                         <string>my_destination_reference</string>
                         <string>my_destination_carrier_title</string>
+                        <string>my_destination_payment_request_title</string>
                       </list>
                     </value>
                 </item>

product/ERP5/ERP5Site.py

@@ -1580,6 +1580,14 @@ class ERP5Site(FolderMixIn, CMFSite, CacheCookieMixin):
     return self._getPortalGroupedTypeList('device_configuration') or\
            self._getPortalConfiguration('portal_device_configuration_type_list')
 
+  security.declareProtected(Permissions.AccessContentsInformation,
+                            'getPortalPaymentRequestTypeList')
+  def getPortalPaymentRequestTypeList(self):
+    """
+    Returns Payment Request types.
+    """
+    return self._getPortalGroupedTypeList('payment_request')
+
   security.declareProtected(Permissions.AccessContentsInformation,
                             'getDefaultModuleId')
   def getDefaultModuleId(self, portal_type, default=MARKER, only_visible=False):

product/ERP5Type/ERP5Type.py

@@ -282,7 +282,8 @@ class ERP5TypeInformation(XMLObject,
       'invoice', 'invoice_movement', 'balance_transaction_line',
       # CRM
       'event', 'ticket',
-      # DMS
+      'payment_request',
+       # DMS
       'document', 'web_document', 'file_document', 'embedded_document',
       'recent_document', 'my_document', 'template_document',
       'crawler_index',