Conflicts:
	bt5/erp5_base/bt/template_action_path_list
	bt5/erp5_base/bt/template_portal_type_id_list
	bt5/erp5_trade/bt/change_log
	products/ERP5/Document/BPMBuilder.py
	products/ERP5/Document/DeliveryBuilder.py
	products/ERP5/Document/OrderBuilder.py
	products/ERP5/Document/SimulationMovement.py
	products/ERP5/tests/testERP5Simulation.py
	products/ERP5/tests/testPackingList.py

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