Conflicts:
	bt5/erp5_accounting/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
	bt5/erp5_accounting/bt/revision
	bt5/erp5_accounting/bt/template_portal_type_allowed_content_type_list
	bt5/erp5_base/bt/revision
	bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
	bt5/erp5_invoicing/bt/template_portal_type_allowed_content_type_list
	bt5/erp5_trade/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
	bt5/erp5_trade/bt/change_log
	bt5/erp5_trade/bt/revision
	bt5/erp5_trade/bt/template_portal_type_allowed_content_type_list
	products/ERP5/Document/SimulationMovement.py
	products/ERP5Legacy/Document/BusinessPath.py

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