Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
erp5_rtl_support
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
Romain Courteaud
erp5_rtl_support
Commits
9e13bf04
Commit
9e13bf04
authored
Jun 18, 2013
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix wrong SQL join in BudgetCell_getEngagedBudget
parent
1f964741
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
9 deletions
+13
-9
bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_getEngagedBudget.xml
.../portal_skins/erp5_budget/BudgetCell_getEngagedBudget.xml
+12
-8
bt5/erp5_budget/bt/revision
bt5/erp5_budget/bt/revision
+1
-1
No files found.
bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_getEngagedBudget.xml
View file @
9e13bf04
...
@@ -50,10 +50,12 @@
...
@@ -50,10 +50,12 @@
</item>
</item>
<item>
<item>
<key>
<string>
_body
</string>
</key>
<key>
<string>
_body
</string>
</key>
<value>
<string>
kw = dict
()\n
<value>
<string>
line = context.getParentValue
()\n
budget =
context.getParentValue()
.getParentValue()\n
budget =
line
.getParentValue()\n
budget_model = budget.getSpecialiseValue(portal_type=\'Budget Model\')\n
budget_model = budget.getSpecialiseValue(portal_type=\'Budget Model\')\n
if budget_model is not None:\n
if budget_model is None:\n
kw = {}\n
else:\n
kw = budget_model.getInventoryQueryDict(context)\n
kw = budget_model.getInventoryQueryDict(context)\n
\n
\n
if from_date:\n
if from_date:\n
...
@@ -61,14 +63,16 @@ if from_date:\n
...
@@ -61,14 +63,16 @@ if from_date:\n
if at_date:\n
if at_date:\n
kw[\'at_date\'] = at_date\n
kw[\'at_date\'] = at_date\n
\n
\n
kw.setdefault(\'explanation_simulation_state\', context.getPortalReservedInventoryStateList() \\\n
portal = budget.getPortalObject()\n
+ context.getPortalCurrentInventoryStateList() \\\n
kw.setdefault(\'stock_explanation_simulation_state\',\n
+ context.getPortalTransitInventoryStateList())\n
portal.getPortalReservedInventoryStateList() +\n
portal.getPortalCurrentInventoryStateList() +\n
portal.getPortalTransitInventoryStateList())\n
\n
\n
# XXX use getBudgetConsumptionMethod ?\n
# XXX use getBudgetConsumptionMethod ?\n
if src__:\n
if src__:\n
return \'-- %s\\n%s\' % (kw,
context
.portal_simulation.getCurrentInventoryAssetPrice(src__=src__, **kw))\n
return \'-- %s\\n%s\' % (kw,
portal
.portal_simulation.getCurrentInventoryAssetPrice(src__=src__, **kw))\n
return (
context.portal_simulation.getInventoryAssetPrice(**kw) or 0) * context.getParentValue()
.BudgetLine_getConsumptionSign()\n
return (
portal.portal_simulation.getInventoryAssetPrice(**kw) or 0) * line
.BudgetLine_getConsumptionSign()\n
</string>
</value>
</string>
</value>
</item>
</item>
<item>
<item>
...
...
bt5/erp5_budget/bt/revision
View file @
9e13bf04
364
365
\ 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