Conflicts:
	bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_listbox_price.xml
	products/ERP5/Document/SimulationMovement.py
	products/ERP5/mixin/composition.py

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