CLSN-169 fix the condition display of all allocation & billing screens
Merge branch 'saleosys' of https://github.com/algosystech/collosys into saleosys