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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
erp5
Commits
55f2fd4d
Commit
55f2fd4d
authored
Aug 30, 2012
by
Romain Courteaud
Committed by
Alain Takoudjou
Feb 19, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reduce number of JOIN
parent
21c51eb3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
25 deletions
+30
-25
product/ERP5/Tool/AcknowledgementTool.py
product/ERP5/Tool/AcknowledgementTool.py
+30
-25
No files found.
product/ERP5/Tool/AcknowledgementTool.py
View file @
55f2fd4d
...
...
@@ -116,14 +116,19 @@ class AcknowledgementTool(BaseTool):
document_list
=
[]
if
user_name
is
not
None
:
portal
=
self
.
getPortalObject
()
person_value
=
portal
.
ERP5Site_getAuthenticatedMemberPersonValue
(
user_name
=
user_name
)
if
person_value
is
None
:
raise
ValueError
(
'No user found'
)
else
:
now
=
DateTime
()
# First look at all event that define the current user as destination
all_document_list
=
[
x
for
x
in
\
self
.
portal_catalog
(
portal_type
=
portal_type
,
simulation_state
=
self
.
getPortalTransitInventoryStateList
(),
#
start_date = {'query':now,'range':'max'},
#
stop_date = {'query':now,'range':'min'},
default_destination_reference
=
user_name
)]
#
start_date = {'query':now,'range':'max'},
#
stop_date = {'query':now,'range':'min'},
default_destination_uid
=
person_value
.
getUid
()
)]
# Now we can look directly at acknowledgement document not approved yet
# so not in a final state
final_state_list
=
self
.
getPortalCurrentInventoryStateList
()
...
...
@@ -131,9 +136,9 @@ class AcknowledgementTool(BaseTool):
all_document_list
.
extend
([
x
for
x
in
\
self
.
portal_catalog
(
portal_type
=
portal_type
,
query
=
query
,
#
start_date = {'query':now,'range':'max'},
#
stop_date = {'query':now,'range':'min'},
destination_reference
=
user_name
)])
#
start_date = {'query':now,'range':'max'},
#
stop_date = {'query':now,'range':'min'},
default_destination_uid
=
person_value
.
getUid
()
)])
for
document
in
all_document_list
:
# We filter manually on dates until a good solution is found for
# searching by dates on the catalog
...
...
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