Conflicts:
	bt5/erp5_payroll/bt/revision
	products/ERP5/Document/AppliedRule.py
	products/ERP5/Document/BusinessTemplate.py
	products/ERP5Type/tests/ERP5TypeLiveTestCase.py

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