customer & supplier bug fix