Commit e1d6b846 authored by Jean-Paul Smets's avatar Jean-Paul Smets

conflict solved


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@431 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent a62aa2e4
...@@ -191,7 +191,7 @@ An ERP5 Rule...""" ...@@ -191,7 +191,7 @@ An ERP5 Rule..."""
production_section = my_context_movement.getSourceSection() production_section = my_context_movement.getSourceSection()
# Generate production and consumption lines # Generate production and consumption lines
my_quantity = my_context_movement.getTargetQuantity() my_quantity = my_context_movement.getTargetQuantity()
# LOG('Transformation', 0, str(my_transformation)) #LOG('Transformation', 0, str(my_transformation))
# We used to call this with context = my_context_movement # We used to call this with context = my_context_movement
# but it still has some issue which need to be fixed XXX As # but it still has some issue which need to be fixed XXX As
# a temp solution, we use the dict based API, but it is not general enough # a temp solution, we use the dict based API, but it is not general enough
...@@ -330,4 +330,4 @@ An ERP5 Rule...""" ...@@ -330,4 +330,4 @@ An ERP5 Rule..."""
def getSolverList(self, applied_rule): def getSolverList(self, applied_rule):
""" """
Returns a list Divergence solvers Returns a list Divergence solvers
""" """
\ No newline at end of file
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment