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
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
074462d9
Commit
074462d9
authored
Jul 11, 2012
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
support funding and function to be passed as a document, not a category
Signed-off-by:
Aurélien Calonne
<
aurel@nexedi.com
>
parent
243a4bed
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
5 deletions
+26
-5
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountListForTrialBalance.xml
...ccounting/AccountModule_getAccountListForTrialBalance.xml
+10
-2
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountStatementReportSectionList.xml
...ng/AccountModule_getAccountStatementReportSectionList.xml
+10
-2
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml
...nting/AccountModule_getGeneralLedgerReportSectionList.xml
+1
-0
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerSummary.xml
...erp5_accounting/AccountModule_getGeneralLedgerSummary.xml
+5
-1
No files found.
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountListForTrialBalance.xml
View file @
074462d9
...
@@ -91,12 +91,20 @@ if function:\n
...
@@ -91,12 +91,20 @@ if function:\n
if function == \'None\':\n
if function == \'None\':\n
inventory_params[\'function_uid\'] = Query(function_uid=None)\n
inventory_params[\'function_uid\'] = Query(function_uid=None)\n
else:\n
else:\n
inventory_params[\'function_category\'] = function\n
function_value = portal.restrictedTraverse(function, None)\n
if function_value is not None and function_value.getPortalType() != \'Category\':\n
inventory_params[\'function_uid\'] = function_value.getUid()\n
else:\n
inventory_params[\'function_category\'] = function\n
if funding:\n
if funding:\n
if funding == \'None\':\n
if funding == \'None\':\n
inventory_params[\'funding_uid\'] = Query(funding_uid=None)\n
inventory_params[\'funding_uid\'] = Query(funding_uid=None)\n
else:\n
else:\n
inventory_params[\'funding_category\'] = funding\n
funding_value = portal.restrictedTraverse(funding, None)\n
if funding_value is not None and funding_value.getPortalType() != \'Category\':\n
inventory_params[\'funding_uid\'] = funding_value.getUid()\n
else:\n
inventory_params[\'funding_category\'] = funding\n
if project:\n
if project:\n
if project == \'None\':\n
if project == \'None\':\n
inventory_params[\'project_uid\'] = Query(project_uid=None)\n
inventory_params[\'project_uid\'] = Query(project_uid=None)\n
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountStatementReportSectionList.xml
View file @
074462d9
...
@@ -120,9 +120,17 @@ if project:\n
...
@@ -120,9 +120,17 @@ if project:\n
else:\n
else:\n
params[\'project_uid\'] = traverse(project).getUid()\n
params[\'project_uid\'] = traverse(project).getUid()\n
if function:\n
if function:\n
params[\'function_category\'] = function\n
function_value = traverse(function, None)\n
if function_value is not None and function_value.getPortalType() != \'Category\':\n
params[\'function_uid\'] = function_value.getUid()\n
else:\n
params[\'function_category\'] = function\n
if funding:\n
if funding:\n
params[\'funding_category\'] = funding\n
funding_value = traverse(funding, None)\n
if funding_value is not None and funding_value.getPortalType() != \'Category\':\n
params[\'funding_uid\'] = funding_value.getUid()\n
else:\n
params[\'funding_category\'] = funding\n
if mirror_section:\n
if mirror_section:\n
params[\'mirror_section_uid\'] = traverse(mirror_section).getUid()\n
params[\'mirror_section_uid\'] = traverse(mirror_section).getUid()\n
if parent_portal_type:\n
if parent_portal_type:\n
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml
View file @
074462d9
...
@@ -104,6 +104,7 @@ if project:\n
...
@@ -104,6 +104,7 @@ if project:\n
params[\'project_uid\'] = Query(project_uid=None)\n
params[\'project_uid\'] = Query(project_uid=None)\n
else:\n
else:\n
params[\'project_uid\'] = portal.portal_categories.restrictedTraverse(project).getUid()\n
params[\'project_uid\'] = portal.portal_categories.restrictedTraverse(project).getUid()\n
\n
funding_category = request.get(\'funding\')\n
funding_category = request.get(\'funding\')\n
if funding_category:\n
if funding_category:\n
if funding_category == \'None\':\n
if funding_category == \'None\':\n
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerSummary.xml
View file @
074462d9
...
@@ -60,8 +60,12 @@ inventory_kw = dict(section_uid=section_uid,\n
...
@@ -60,8 +60,12 @@ inventory_kw = dict(section_uid=section_uid,\n
)\n
)\n
if function_category:\n
if function_category:\n
inventory_kw[\'function_category\'] = function_category\n
inventory_kw[\'function_category\'] = function_category\n
if function_uid:\n
inventory_kw[\'function_uid\'] = function_uid\n
if funding_category:\n
if funding_category:\n
inventory_kw[\'funding_category\'] = funding_category\n
inventory_kw[\'funding_category\'] = funding_category\n
if funding_uid:\n
inventory_kw[\'funding_uid\'] = funding_uid\n
if project_uid:\n
if project_uid:\n
inventory_kw[\'project_uid\'] = project_uid\n
inventory_kw[\'project_uid\'] = project_uid\n
if mirror_section_category:\n
if mirror_section_category:\n
...
@@ -114,7 +118,7 @@ return [Object(debit_price=debit, credit_price=credit)]\n
...
@@ -114,7 +118,7 @@ return [Object(debit_price=debit, credit_price=credit)]\n
</item>
</item>
<item>
<item>
<key>
<string>
_params
</string>
</key>
<key>
<string>
_params
</string>
</key>
<value>
<string>
section_uid, simulation_state, at_date, period_start_date, precision, node_category=None, function_category=None, fun
ding_category
=None, project_uid=None, from_date=\'ignored\', mirror_section_category=None, mirror_section_uid=None, **kw
</string>
</value>
<value>
<string>
section_uid, simulation_state, at_date, period_start_date, precision, node_category=None, function_category=None, fun
ction_uid=None, funding_category=None, funding_uid
=None, project_uid=None, from_date=\'ignored\', mirror_section_category=None, mirror_section_uid=None, **kw
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
...
...
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