Fix inventory counting for batch items

When updating the quantity of a batch item, we should use the quantity for
that batch, not the total quantity

Change-Id: I0287d6542e95c494d59581c8ca9029d7f56fde18
Merge "Fix inventory counting for batch items"