Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Levin Zimmermann
erp5
Commits
a4c33bde
Commit
a4c33bde
authored
Jun 12, 2023
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Plain Diff
Update upstream/master
parents
0cf19127
da7a6e26
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
37 additions
and
3 deletions
+37
-3
bt5/erp5_accounting/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
...rtalTypePropertySheetTemplateItem/property_sheet_list.xml
+6
-0
bt5/erp5_accounting/bt/template_portal_type_property_sheet_list
...p5_accounting/bt/template_portal_type_property_sheet_list
+2
-0
bt5/erp5_administration/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
...rtalTypePropertySheetTemplateItem/property_sheet_list.xml
+5
-0
bt5/erp5_administration/bt/template_portal_type_property_sheet_list
...dministration/bt/template_portal_type_property_sheet_list
+1
-0
bt5/erp5_oauth_google_login/ExtensionTemplateItem/portal_components/extension.erp5.GoogleLoginUtility.py
...em/portal_components/extension.erp5.GoogleLoginUtility.py
+8
-2
bt5/erp5_pdm/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
...rtalTypePropertySheetTemplateItem/property_sheet_list.xml
+3
-0
bt5/erp5_pdm/bt/template_portal_type_property_sheet_list
bt5/erp5_pdm/bt/template_portal_type_property_sheet_list
+1
-0
bt5/erp5_trade/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
...rtalTypePropertySheetTemplateItem/property_sheet_list.xml
+6
-0
bt5/erp5_trade/bt/template_portal_type_property_sheet_list
bt5/erp5_trade/bt/template_portal_type_property_sheet_list
+2
-0
product/CMFActivity/Activity/SQLBase.py
product/CMFActivity/Activity/SQLBase.py
+3
-1
No files found.
bt5/erp5_accounting/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
View file @
a4c33bde
<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
View file @
a4c33bde
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
0 → 100644
View file @
a4c33bde
<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
0 → 100644
View file @
a4c33bde
Missing Category Document Constraint | ConstraintType
\ No newline at end of file
bt5/erp5_oauth_google_login/ExtensionTemplateItem/portal_components/extension.erp5.GoogleLoginUtility.py
View file @
a4c33bde
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
View file @
a4c33bde
...
...
@@ -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
View file @
a4c33bde
...
...
@@ -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
View file @
a4c33bde
...
...
@@ -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
View file @
a4c33bde
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
View file @
a4c33bde
...
...
@@ -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 *"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment