Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5_fork
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Eteri
erp5_fork
Commits
f535c1b9
Commit
f535c1b9
authored
Feb 13, 2014
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Budget consumption report: support filtering on multiple budget types & budget models
parent
709f2b5a
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
181 deletions
+26
-181
bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_budget_type.xml
...le_viewBudgetConsumptionReportDialog/your_budget_type.xml
+1
-1
bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_specialise.xml
...ule_viewBudgetConsumptionReportDialog/your_specialise.xml
+22
-177
bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_getBudgetConsumptionReportData.xml
...ins/erp5_budget/Budget_getBudgetConsumptionReportData.xml
+2
-2
bt5/erp5_budget/bt/revision
bt5/erp5_budget/bt/revision
+1
-1
No files found.
bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_budget_type.xml
View file @
f535c1b9
...
@@ -73,7 +73,7 @@
...
@@ -73,7 +73,7 @@
<dictionary>
<dictionary>
<item>
<item>
<key>
<string>
field_id
</string>
</key>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
your_category
</string>
</value>
<value>
<string>
your_category
_list
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
form_id
</string>
</key>
<key>
<string>
form_id
</string>
</key>
...
...
bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_specialise.xml
View file @
f535c1b9
This diff is collapsed.
Click to expand it.
bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_getBudgetConsumptionReportData.xml
View file @
f535c1b9
...
@@ -81,10 +81,10 @@ else:\n
...
@@ -81,10 +81,10 @@ else:\n
validation_state=validation_state)\n
validation_state=validation_state)\n
budget_type = request.get(\'budget_type\')\n
budget_type = request.get(\'budget_type\')\n
if budget_type:\n
if budget_type:\n
search_kw[\'default_budget_type_uid\'] =
portal.portal_categories.budget_type.restrictedTraverse(budget_type).getUid()
\n
search_kw[\'default_budget_type_uid\'] =
[portal.portal_categories.budget_type.restrictedTraverse(x).getUid() for x in budget_type]
\n
specialise = request.get(\'specialise\')\n
specialise = request.get(\'specialise\')\n
if specialise:\n
if specialise:\n
search_kw[\'default_specialise_uid\'] =
portal.restrictedTraverse(specialise).getUid()
\n
search_kw[\'default_specialise_uid\'] =
[portal.restrictedTraverse(x).getUid() for x in specialise]
\n
\n
\n
budget_list = portal.portal_catalog.searchResults(**search_kw)\n
budget_list = portal.portal_catalog.searchResults(**search_kw)\n
group_filtered_budget_list = []\n
group_filtered_budget_list = []\n
...
...
bt5/erp5_budget/bt/revision
View file @
f535c1b9
372
373
\ No newline at end of file
\ 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