Julien Muchembled
authored
Conflicts: bt5/erp5_knowledge_pad/bt/revision bt5/erp5_payroll/bt/revision bt5/erp5_simulation/bt/revision bt5/erp5_trade/bt/comment products/ERP5/interfaces/simulation_movement.py git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@39299 20353a03-c40f-0410-a6d1-a30d3c3de9de