Capital gain ITR 2

Sir,

if a person have Capital gain from Mutual fund and Stock also. so while filling ITR short term seclud 111A he show total sales value of MF +total sales of stock and disclose the ITR column Full value of Consideration and same as total purchase value of MF +total purchase value of stocks and disclose the colum cost of acquisition without indexation and Capital gain loss reflect.
please suggest it's correct way or not