Conflicts:
	bt5/erp5_base/bt/revision
	bt5/erp5_simulation/DocumentTemplateItem/InvoiceSimulationRule.py
	bt5/erp5_simulation/bt/revision
	bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary.xml
	bt5/erp5_trade/bt/change_log
	bt5/erp5_trade/bt/revision
	products/ERP5/Document/BusinessPath.py
	products/ERP5/Document/SimulationMovement.py
	products/ERP5/Document/TradeCondition.py
	products/ERP5/Document/TradeModelLine.py
	products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
	products/ERP5Type/ERP5Type.py

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