revert a part of r36960. test_05d_SimulationChangeResourceOnOneSimulationMovementForMergedLine still will not pass.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@37301 20353a03-c40f-0410-a6d1-a30d3c3de9de