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
Labels
Merge Requests
138
Merge Requests
138
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
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
583babf3
Commit
583babf3
authored
1 year ago
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
py2/py3: more six.moves.UserDict
parent
ae501207
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
8 deletions
+12
-8
bt5/erp5_accounting/DocumentTemplateItem/portal_components/document.erp5.BalanceTransaction.py
...tem/portal_components/document.erp5.BalanceTransaction.py
+1
-1
bt5/erp5_simplified_invoicing/TestTemplateItem/portal_components/test.erp5.testTradeModelLine.py
...ateItem/portal_components/test.erp5.testTradeModelLine.py
+5
-1
product/CMFActivity/Activity/SQLJoblib.py
product/CMFActivity/Activity/SQLJoblib.py
+6
-6
No files found.
bt5/erp5_accounting/DocumentTemplateItem/portal_components/document.erp5.BalanceTransaction.py
View file @
583babf3
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
#
#
##############################################################################
##############################################################################
from
UserDict
import
UserDict
from
six.moves
import
UserDict
from
AccessControl
import
ClassSecurityInfo
from
AccessControl
import
ClassSecurityInfo
from
Products.ERP5Type
import
Permissions
,
PropertySheet
from
Products.ERP5Type
import
Permissions
,
PropertySheet
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_simplified_invoicing/TestTemplateItem/portal_components/test.erp5.testTradeModelLine.py
View file @
583babf3
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
#
#
##############################################################################
##############################################################################
from
UserDict
import
UserDict
from
six.moves
import
UserDict
import
random
import
random
import
unittest
import
unittest
from
unittest
import
expectedFailure
from
unittest
import
expectedFailure
...
@@ -61,6 +61,10 @@ class TestTradeModelLineMixin(TestBPMMixin, UserDict):
...
@@ -61,6 +61,10 @@ class TestTradeModelLineMixin(TestBPMMixin, UserDict):
order_date
=
DateTime
()
order_date
=
DateTime
()
amount_generator_line_portal_type
=
'Trade Model Line'
amount_generator_line_portal_type
=
'Trade Model Line'
# XXX so that unittest.suite._isnotsuite return False
def
__iter__
(
self
):
raise
TypeError
()
def
setBaseAmountQuantityMethod
(
self
,
base_amount_id
,
text
):
def
setBaseAmountQuantityMethod
(
self
,
base_amount_id
,
text
):
"""Populate TradeModelLine_getBaseAmountQuantityMethod shared script
"""Populate TradeModelLine_getBaseAmountQuantityMethod shared script
...
...
This diff is collapsed.
Click to expand it.
product/CMFActivity/Activity/SQLJoblib.py
View file @
583babf3
...
@@ -114,13 +114,13 @@ CREATE TABLE %s (
...
@@ -114,13 +114,13 @@ CREATE TABLE %s (
active_process_uid
=
m
.
active_process_uid
active_process_uid
=
m
.
active_process_uid
date
=
m
.
activity_kw
.
get
(
'at_date'
)
date
=
m
.
activity_kw
.
get
(
'at_date'
)
row
=
','
.
join
((
row
=
','
.
join
((
'@uid+%s'
%
i
,
b
'@uid+%s'
%
i
,
quote
(
'/'
.
join
(
m
.
object_path
)),
quote
(
'/'
.
join
(
m
.
object_path
)),
'NULL'
if
active_process_uid
is
None
else
str
(
active_process_uid
),
b
'NULL'
if
active_process_uid
is
None
else
str
(
active_process_uid
),
"UTC_TIMESTAMP(6)"
if
date
is
None
else
quote
(
render_datetime
(
date
)),
b
"UTC_TIMESTAMP(6)"
if
date
is
None
else
quote
(
render_datetime
(
date
)),
quote
(
m
.
method_id
),
quote
(
m
.
method_id
),
'-1'
if
hasDependency
(
m
)
else
'0'
,
b'-1'
if
hasDependency
(
m
)
else
b
'0'
,
str
(
m
.
activity_kw
.
get
(
'priority'
,
1
)),
bytes
(
m
.
activity_kw
.
get
(
'priority'
,
1
)),
quote
(
m
.
getGroupId
()),
quote
(
m
.
getGroupId
()),
quote
(
m
.
activity_kw
.
get
(
'tag'
,
''
)),
quote
(
m
.
activity_kw
.
get
(
'tag'
,
''
)),
quote
(
m
.
activity_kw
.
get
(
'signature'
,
''
)),
quote
(
m
.
activity_kw
.
get
(
'signature'
,
''
)),
...
@@ -156,7 +156,7 @@ CREATE TABLE %s (
...
@@ -156,7 +156,7 @@ CREATE TABLE %s (
m
=
Message
.
load
(
line
.
message
,
uid
=
uid
,
line
=
line
)
m
=
Message
.
load
(
line
.
message
,
uid
=
uid
,
line
=
line
)
try
:
try
:
# Select duplicates.
# Select duplicates.
result
=
db
.
query
(
"SELECT uid FROM message_job"
result
=
db
.
query
(
b
"SELECT uid FROM message_job"
" WHERE processing_node = 0 AND path = %s AND signature = %s"
" WHERE processing_node = 0 AND path = %s AND signature = %s"
" AND method_id = %s AND group_method_id = %s FOR UPDATE"
%
(
" AND method_id = %s AND group_method_id = %s FOR UPDATE"
%
(
quote
(
path
),
quote
(
line
.
signature
),
quote
(
path
),
quote
(
line
.
signature
),
...
...
This diff is collapsed.
Click to expand it.
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