Update upstream/master

bt5/erp5_accounting/PortalTypePropertySheetTemplateItem/property_sheet_list.xml

 <property_sheet_list>
+ <portal_type id="Account Type Constraint">
+  <item>ConstraintType</item>
+ </portal_type>
  <portal_type id="Accounting Transaction">
   <item>AccountingTransactionConstraint</item>
  </portal_type>
+ <portal_type id="Accounting Transaction Balance Constraint">
+  <item>ConstraintType</item>
+ </portal_type>
  <portal_type id="Accounting Transaction Line">
   <item>AccountingTransactionLineConstraint</item>
  </portal_type>

bt5/erp5_accounting/bt/template_portal_type_property_sheet_list

+Account Type Constraint | ConstraintType
+Accounting Transaction Balance Constraint | ConstraintType
 Accounting Transaction Line | AccountingTransactionLineConstraint
 Accounting Transaction | AccountingTransactionConstraint
 Balance Transaction Line | AccountingTransactionLineConstraint

bt5/erp5_administration/PortalTypePropertySheetTemplateItem/property_sheet_list.xml

+<property_sheet_list>
+ <portal_type id="Missing Category Document Constraint">
+  <item>ConstraintType</item>
+ </portal_type>
+</property_sheet_list>
\ No newline at end of file

bt5/erp5_administration/bt/template_portal_type_property_sheet_list

+Missing Category Document Constraint | ConstraintType
\ No newline at end of file

bt5/erp5_oauth_google_login/ExtensionTemplateItem/portal_components/extension.erp5.GoogleLoginUtility.py

 import json
 import oauth2client.client
+import oauth2client.transport
 from Products.ERP5Security.ERP5ExternalOauth2ExtractionPlugin import getGoogleUserEntry
 from zExceptions import Unauthorized
 
 
 SCOPE_LIST = ['https://www.googleapis.com/auth/userinfo.profile',
               'https://www.googleapis.com/auth/userinfo.email']
+# Default timeout (in seconds) for the HTTP request made to google servers to
+# exchange the authorization code for a token.
+DEFAULT_HTTP_TIMEOUT = 10
 
 
 def _getGoogleClientIdAndSecretKey(portal, reference="default"):
@@ -33,7 +37,7 @@ def redirectToGoogleLoginPage(self):
     include_granted_scopes="true")
   self.REQUEST.RESPONSE.redirect(flow.step1_get_authorize_url())
 
-def getAccessTokenFromCode(self, code, redirect_uri):
+def getAccessTokenFromCode(self, code, redirect_uri, timeout=DEFAULT_HTTP_TIMEOUT):
   client_id, secret_key = _getGoogleClientIdAndSecretKey(self.getPortalObject())
   flow = oauth2client.client.OAuth2WebServerFlow(
     client_id=client_id,
@@ -42,7 +46,9 @@ def getAccessTokenFromCode(self, code, redirect_uri):
     redirect_uri=redirect_uri,
     access_type="offline",
     include_granted_scopes="true")
-  credential = flow.step2_exchange(code)
+  credential = flow.step2_exchange(
+    code,
+    http=oauth2client.transport.get_http_object(timeout=timeout))
   credential_data = json.loads(credential.to_json())
   return credential_data
 

bt5/erp5_pdm/PortalTypePropertySheetTemplateItem/property_sheet_list.xml

@@ -15,6 +15,9 @@
   <item>DefaultImage</item>
   <item>Reference</item>
  </portal_type>
+ <portal_type id="Resource Measures Consistency Constraint">
+  <item>ConstraintType</item>
+ </portal_type>
  <portal_type id="Service Individual Variation">
   <item>DefaultImage</item>
  </portal_type>

bt5/erp5_pdm/bt/template_portal_type_property_sheet_list

@@ -4,5 +4,6 @@ Measure Cell | Amount
 Product Individual Variation | DefaultImage
 Product Individual Variation | Reference
 Product | DefaultImage
+Resource Measures Consistency Constraint | ConstraintType
 Service Individual Variation | DefaultImage
 Supply Cell | Reference
\ No newline at end of file

bt5/erp5_trade/PortalTypePropertySheetTemplateItem/property_sheet_list.xml

@@ -6,6 +6,9 @@
  <portal_type id="Delivery Node">
   <item>DeliveryNode</item>
  </portal_type>
+ <portal_type id="Duplicate Inventory Constraint">
+  <item>ConstraintType</item>
+ </portal_type>
  <portal_type id="Internal Packing List">
   <item>DeliveryCausalityStateConstraint</item>
  </portal_type>
@@ -31,6 +34,9 @@
  <portal_type id="Sale Trade Condition">
   <item>PaymentCondition</item>
  </portal_type>
+ <portal_type id="Trade Model Line Cell Consistency Constraint">
+  <item>ConstraintType</item>
+ </portal_type>
  <portal_type id="Trade Model Path">
   <item>PaymentCondition</item>
  </portal_type>

bt5/erp5_trade/bt/template_portal_type_property_sheet_list

 Business Process | Reference
 Business Process | Version
 Delivery Node | DeliveryNode
+Duplicate Inventory Constraint | ConstraintType
 Internal Packing List | DeliveryCausalityStateConstraint
 Inventory Report | Arrow
 Inventory Report | InventoryReport
@@ -10,4 +11,5 @@ Returned Sale Packing List | DeliveryCausalityStateConstraint
 Sale Order | PaymentCondition
 Sale Packing List | DeliveryCausalityStateConstraint
 Sale Trade Condition | PaymentCondition
+Trade Model Line Cell Consistency Constraint | ConstraintType
 Trade Model Path | PaymentCondition
\ No newline at end of file

product/CMFActivity/Activity/SQLBase.py

@@ -774,7 +774,8 @@ CREATE TABLE %s (
           b"  processing_node=0 AND"
           b"  %s%s"
           b" ORDER BY priority, date"
-          b" LIMIT %i" % args,
+          b" LIMIT %i"
+          b" FOR UPDATE" % args,
           0,
         ))
       else:
@@ -787,6 +788,7 @@ CREATE TABLE %s (
           b"  %s%s"
           b" ORDER BY priority, date"
           b" LIMIT %i"
+          b" FOR UPDATE"
         b")" % args).format
         result = Results(query(
           b"SELECT *"