Fix bug on margin calculation (column price no more use) use subprice

instead.