select     convert(char(10), i.NEWDATE, 101) as Transdate,
           i.TicketNo as TicketNo,
           i.Tank as Tank,
           p.petroEXcode as PetroExCode, 
           cast(sum(i.gross) as decimal(15, 2)) AS Gross,
           cast(sum(i.net) as decimal(15,2)) as Net,
           SUM(CASE WHEN i.mode = 'J' and p.petroEXcode = 'Y2' THEN convert(decimal(15,2),i.gross) ELSE convert(decimal(15,2),i.gross) * 42 END) as Gross,
           SUM(CASE WHEN i.mode = 'J' and p.petroEXcode = 'Y2'THEN convert(decimal(15,2),i.net) ELSE convert(decimal(15,2),i.net) * 42 END) as Net
from       [VESPTP6000-1].TP6000.dbo.Product as p
inner join [VESPTP6000-1].TP6000.dbo.TankArchive as t on t.basecode = p.base 
inner join [VESPTP6000-1].TP6000.dbo.Inventory as i on (i.tank = t.tank and
                                                        i.period = t.period)
where      (@Petroex IS null or p.petroEXcode = @Petroex or p.petroEXcode like replace(@Petroex,'*','%')) and
            i.TicketNo <> ' ' and 
            i.Carrier <> ' '  and
            i.Type = '4' and
           (@DateFrom IS Null or i.NEWDATE >= @DateFrom) and
           (@DateTo IS Null or i.NEWDATE < dateadd(day, 1, @DateTo)) 
group by    i.NEWDATE,
            i.TicketNo,
            i.Tank,
	    p.PetroEXCode