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
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
Paul Graydon
erp5
Commits
c68e815f
Commit
c68e815f
authored
Jun 22, 2011
by
Yusei Tahara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix material consumption tab. Sort result as user can easily understand.
parent
19a1ca78
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
1 deletion
+12
-1
bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_getMaterialFutureInventoryList.xml
...p5_mrp/ProductionOrder_getMaterialFutureInventoryList.xml
+8
-0
bt5/erp5_mrp/bt/change_log
bt5/erp5_mrp/bt/change_log
+3
-0
bt5/erp5_mrp/bt/revision
bt5/erp5_mrp/bt/revision
+1
-1
No files found.
bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_getMaterialFutureInventoryList.xml
View file @
c68e815f
...
@@ -113,6 +113,14 @@ for movement in movement_list:\n
...
@@ -113,6 +113,14 @@ for movement in movement_list:\n
if quantity:\n
if quantity:\n
consumption_dict[obj.getUid()] = quantity * (movement.getQuantity() or 0)\n
consumption_dict[obj.getUid()] = quantity * (movement.getQuantity() or 0)\n
\n
\n
# sort result_list\n
transformation_allowed_content_type_list = context.portal_types[\'Transformation\'].getTypeAllowedContentTypeList()\n
def compare(a, b):\n
return cmp((consumption_dict.has_key(a.getUid()), a.portal_type in transformation_allowed_content_type_list),\n
(consumption_dict.has_key(b.getUid()), b.portal_type in transformation_allowed_content_type_list),\n
)\n
result_list.sort(cmp=compare, reverse=True)\n
\n
context.REQUEST.set(\'consumption_dict\', consumption_dict)\n
context.REQUEST.set(\'consumption_dict\', consumption_dict)\n
return result_list\n
return result_list\n
</string>
</value>
</string>
</value>
...
...
bt5/erp5_mrp/bt/change_log
View file @
c68e815f
2011-06-22 yusei
* Fix material consumption tab. Sort result as user can easily understand.
2011-06-22 yusei
2011-06-22 yusei
* Fix bug on production order material consumption tab.
* Fix bug on production order material consumption tab.
...
...
bt5/erp5_mrp/bt/revision
View file @
c68e815f
464
465
\ 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