Conflicts:
	bt5/erp5_accounting/bt/revision
	bt5/erp5_accounting/bt/template_action_path_list
	bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_delivery_title_list.xml
	bt5/erp5_base/bt/revision
	bt5/erp5_dms/bt/revision
	bt5/erp5_simulation/bt/revision
	bt5/erp5_trade/bt/revision
	products/ERP5/Document/SolverProcess.py
	products/ERP5/Document/TradeCondition.py
	products/ERP5/tests/testERP5Simulation.py
	products/ERP5/tests/testOrder.py
	products/ERP5/tests/testTradeModelLine.py

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@38070 20353a03-c40f-0410-a6d1-a30d3c3de9de