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
1
Merge Requests
1
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
Boxiang Sun
erp5
Commits
720bd5c9
Commit
720bd5c9
authored
Feb 04, 2013
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Stop using movement table in crm reports
tickets are also in delivery table
parent
89cfd319
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
28 additions
and
32 deletions
+28
-32
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/CampaignModule_getCampaignDetailedEventsLineList.xml
..._crm/CampaignModule_getCampaignDetailedEventsLineList.xml
+3
-3
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/CampaignModule_getCampaignStatusLineList.xml
...ins/erp5_crm/CampaignModule_getCampaignStatusLineList.xml
+3
-3
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_getMeetingDetailedEventsLineList.xml
...p5_crm/MeetingModule_getMeetingDetailedEventsLineList.xml
+3
-3
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_getMeetingStatusLineList.xml
...skins/erp5_crm/MeetingModule_getMeetingStatusLineList.xml
+4
-5
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunityModule_getSaleOpportunityDetailedEventsLineList.xml
...tunityModule_getSaleOpportunityDetailedEventsLineList.xml
+3
-4
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunityModule_getSaleOpportunityStatusLineList.xml
...aleOpportunityModule_getSaleOpportunityStatusLineList.xml
+4
-5
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequestModule_getSupportRequestDetailedEventsLineList.xml
...RequestModule_getSupportRequestDetailedEventsLineList.xml
+3
-4
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequestModule_getSupportRequestStatusLineList.xml
.../SupportRequestModule_getSupportRequestStatusLineList.xml
+4
-4
bt5/erp5_crm/bt/revision
bt5/erp5_crm/bt/revision
+1
-1
No files found.
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/CampaignModule_getCampaignDetailedEventsLineList.xml
View file @
720bd5c9
...
...
@@ -70,14 +70,14 @@ line_list = []\n
# Prepare the parameters to filter\n
query_dict = dict()\n
if request_start_date:\n
query_dict[\'
movement
.start_date\'] = dict(range=\'min\', query=request_start_date)\n
query_dict[\'
delivery
.start_date\'] = dict(range=\'min\', query=request_start_date)\n
if request_stop_date:\n
query_dict[\'
movement
.stop_date\'] = dict(range=\'ngt\', \n
query_dict[\'
delivery
.stop_date\'] = dict(range=\'ngt\', \n
query=request_stop_date.latestTime())\n
if request_validation_state:\n
query_dict[\'simulation_state\'] = request_validation_state\n
if request_ticket_type:\n
query_dict[\'
movement.
resource_uid\'] = [portal.restrictedTraverse(x).getUid() \n
query_dict[\'
default_
resource_uid\'] = [portal.restrictedTraverse(x).getUid() \n
for x in request_ticket_type]\n
section_uid = portal.Base_getSectionUidListForSectionCategory(request.get(\'section_category\',None))\n
\n
...
...
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/CampaignModule_getCampaignStatusLineList.xml
View file @
720bd5c9
...
...
@@ -70,14 +70,14 @@ line_list = []\n
# Prepare the parameters to filter\n
query_dict = dict()\n
if request_start_date:\n
query_dict[\'
movement
.start_date\'] = dict(range=\'min\', query=request_start_date)\n
query_dict[\'
delivery
.start_date\'] = dict(range=\'min\', query=request_start_date)\n
if request_stop_date:\n
query_dict[\'
movement
.stop_date\'] = dict(range=\'ngt\', \n
query_dict[\'
delivery
.stop_date\'] = dict(range=\'ngt\', \n
query=request_stop_date.latestTime())\n
if request_validation_state:\n
query_dict[\'simulation_state\'] = request_validation_state\n
if request_ticket_type:\n
query_dict[\'
movement.
resource_uid\'] = [portal.restrictedTraverse(x).getUid() \n
query_dict[\'
default_
resource_uid\'] = [portal.restrictedTraverse(x).getUid() \n
for x in request_ticket_type]\n
section_uid = context.Base_getSectionUidListForSectionCategory(request_section_category)\n
\n
...
...
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_getMeetingDetailedEventsLineList.xml
View file @
720bd5c9
...
...
@@ -69,14 +69,14 @@ line_list = []\n
# Prepare the parameters to filter\n
query_dict = dict()\n
if request_start_date:\n
query_dict[\'
movement
.start_date\'] = dict(range=\'min\', query=request_start_date)\n
query_dict[\'
delivery
.start_date\'] = dict(range=\'min\', query=request_start_date)\n
if request_stop_date:\n
query_dict[\'
movement
.stop_date\'] = dict(range=\'ngt\', \n
query_dict[\'
delivery
.stop_date\'] = dict(range=\'ngt\', \n
query=request_stop_date.latestTime())\n
if request_validation_state:\n
query_dict[\'simulation_state\'] = request_validation_state\n
if request_ticket_type:\n
query_dict[\'
movement.
resource_uid\'] = [portal.restrictedTraverse(x).getUid() \n
query_dict[\'
default_
resource_uid\'] = [portal.restrictedTraverse(x).getUid() \n
for x in request_ticket_type]\n
section_uid = context.Base_getSectionUidListForSectionCategory(request.get(\'section_category\',None))\n
\n
...
...
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_getMeetingStatusLineList.xml
View file @
720bd5c9
...
...
@@ -50,8 +50,7 @@
</item>
<item>
<key>
<string>
_body
</string>
</key>
<value>
<string>
# XXX uses movement table !\n
from Products.PythonScripts.standard import Object\n
<value>
<string>
from Products.PythonScripts.standard import Object\n
request = container.REQUEST\n
portal = context.getPortalObject()\n
\n
...
...
@@ -68,14 +67,14 @@ line_list = []\n
# Prepare the parameters to filter\n
query_dict = dict()\n
if request_start_date:\n
query_dict[\'
movement
.start_date\'] = dict(range=\'min\', query=request_start_date)\n
query_dict[\'
delivery
.start_date\'] = dict(range=\'min\', query=request_start_date)\n
if request_stop_date:\n
query_dict[\'
movement
.stop_date\'] = dict(range=\'ngt\', \n
query_dict[\'
delivery
.stop_date\'] = dict(range=\'ngt\', \n
query=request_stop_date.latestTime())\n
if request_validation_state:\n
query_dict[\'simulation_state\'] = request_validation_state\n
if request_ticket_type:\n
query_dict[\'
movement.
resource_uid\'] = [portal.restrictedTraverse(x).getUid() \n
query_dict[\'
default_
resource_uid\'] = [portal.restrictedTraverse(x).getUid() \n
for x in request_ticket_type]\n
section_uid = context.Base_getSectionUidListForSectionCategory(request.get(\'section_category\',None))\n
\n
...
...
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunityModule_getSaleOpportunityDetailedEventsLineList.xml
View file @
720bd5c9
...
...
@@ -52,7 +52,6 @@
<key>
<string>
_body
</string>
</key>
<value>
<string
encoding=
"cdata"
>
<![CDATA[
# XXX uses movement table !\n
from Products.PythonScripts.standard import Object\n
request = container.REQUEST\n
portal = context.getPortalObject()\n
...
...
@@ -70,14 +69,14 @@ line_list = []\n
# Prepare the parameters to filter\n
query_dict = dict()\n
if request_start_date:\n
query_dict[\'
movement
.start_date\'] = dict(range=\'min\', query=request_start_date)\n
query_dict[\'
delivery
.start_date\'] = dict(range=\'min\', query=request_start_date)\n
if request_stop_date:\n
query_dict[\'
movement
.stop_date\'] = dict(range=\'ngt\', \n
query_dict[\'
delivery
.stop_date\'] = dict(range=\'ngt\', \n
query=request_stop_date.latestTime())\n
if request_validation_state:\n
query_dict[\'simulation_state\'] = request_validation_state\n
if request_ticket_type:\n
query_dict[\'
movement.
resource_uid\'] = [portal.restrictedTraverse(x).getUid() \n
query_dict[\'
default_
resource_uid\'] = [portal.restrictedTraverse(x).getUid() \n
for x in request_ticket_type]\n
section_uid = context.Base_getSectionUidListForSectionCategory(request.get(\'section_category\',None))\n
\n
...
...
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunityModule_getSaleOpportunityStatusLineList.xml
View file @
720bd5c9
...
...
@@ -50,8 +50,7 @@
</item>
<item>
<key>
<string>
_body
</string>
</key>
<value>
<string>
# XXX uses movement table !\n
from Products.PythonScripts.standard import Object\n
<value>
<string>
from Products.PythonScripts.standard import Object\n
request = container.REQUEST\n
portal = context.getPortalObject()\n
\n
...
...
@@ -68,14 +67,14 @@ line_list = []\n
# Prepare the parameters to filter\n
query_dict = dict()\n
if request_start_date:\n
query_dict[\'
movement
.start_date\'] = dict(range=\'min\', query=request_start_date)\n
query_dict[\'
delivery
.start_date\'] = dict(range=\'min\', query=request_start_date)\n
if request_stop_date:\n
query_dict[\'
movement
.stop_date\'] = dict(range=\'ngt\', \n
query_dict[\'
delivery
.stop_date\'] = dict(range=\'ngt\', \n
query=request_stop_date.latestTime())\n
if request_validation_state:\n
query_dict[\'simulation_state\'] = request_validation_state\n
if request_ticket_type:\n
query_dict[\'
movement.
resource_uid\'] = [portal.restrictedTraverse(x).getUid() \n
query_dict[\'
default_
resource_uid\'] = [portal.restrictedTraverse(x).getUid() \n
for x in request_ticket_type]\n
section_uid = context.Base_getSectionUidListForSectionCategory(request.get(\'section_category\',None))\n
\n
...
...
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequestModule_getSupportRequestDetailedEventsLineList.xml
View file @
720bd5c9
...
...
@@ -52,7 +52,6 @@
<key>
<string>
_body
</string>
</key>
<value>
<string
encoding=
"cdata"
>
<![CDATA[
# XXX uses movement table\n
from Products.PythonScripts.standard import Object\n
request = container.REQUEST\n
portal = context.getPortalObject()\n
...
...
@@ -70,14 +69,14 @@ line_list = []\n
# Prepare the parameters to filter\n
query_dict = dict()\n
if request_start_date:\n
query_dict[\'
movement
.start_date\'] = dict(range=\'min\', query=request_start_date)\n
query_dict[\'
delivery
.start_date\'] = dict(range=\'min\', query=request_start_date)\n
if request_stop_date:\n
query_dict[\'
movement
.stop_date\'] = dict(range=\'ngt\', \n
query_dict[\'
delivery
.stop_date\'] = dict(range=\'ngt\', \n
query=request_stop_date.latestTime())\n
if request_validation_state:\n
query_dict[\'simulation_state\'] = request_validation_state\n
if request_ticket_type:\n
query_dict[\'
movement.
resource_uid\'] = [portal.portal_categories.restrictedTraverse(x).getUid() \n
query_dict[\'
default_
resource_uid\'] = [portal.portal_categories.restrictedTraverse(x).getUid() \n
for x in request_ticket_type]\n
section_uid = context.Base_getSectionUidListForSectionCategory(request.get(\'section_category\',None))\n
\n
...
...
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequestModule_getSupportRequestStatusLineList.xml
View file @
720bd5c9
...
...
@@ -50,7 +50,7 @@
</item>
<item>
<key>
<string>
_body
</string>
</key>
<value>
<string>
# XXX uses movement table !
\n
<value>
<string>
\n
from Products.PythonScripts.standard import Object\n
request = container.REQUEST\n
portal = context.getPortalObject()\n
...
...
@@ -68,14 +68,14 @@ line_list = []\n
# Prepare the parameters to filter\n
query_dict = dict()\n
if request_start_date:\n
query_dict[\'
movement
.start_date\'] = dict(range=\'min\', query=request_start_date)\n
query_dict[\'
delivery
.start_date\'] = dict(range=\'min\', query=request_start_date)\n
if request_stop_date:\n
query_dict[\'
movement
.stop_date\'] = dict(range=\'ngt\', \n
query_dict[\'
delivery
.stop_date\'] = dict(range=\'ngt\', \n
query=request_stop_date.latestTime())\n
if request_validation_state:\n
query_dict[\'simulation_state\'] = request_validation_state\n
if request_ticket_type:\n
query_dict[\'
movement.
resource_uid\'] = [portal.portal_categories.restrictedTraverse(x).getUid() \n
query_dict[\'
default_
resource_uid\'] = [portal.portal_categories.restrictedTraverse(x).getUid() \n
for x in request_ticket_type]\n
section_uid = context.Base_getSectionUidListForSectionCategory(request.get(\'section_category\',None))\n
\n
...
...
bt5/erp5_crm/bt/revision
View file @
720bd5c9
601
\ No newline at end of file
602
\ No newline at end of file
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