[Fixes#83838370] expenditures counts in vendor and merge conflict fix for expenditures