Subversion Repositories SmartDukaan

Rev

Rev 30055 | Rev 30581 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 30055 Rev 30225
Line 15... Line 15...
15
            <th>Sale Date</th>
15
            <th>Sale Date</th>
16
            #foreach($sale in $saleList)
16
            #foreach($sale in $saleList)
17
            <th>$sale</th>
17
            <th>$sale</th>
18
            #end
18
            #end
19
            <th>(Selling Price) - (DP)</th>
19
            <th>(Selling Price) - (DP)</th>
-
 
20
            <th>Pending Sale Margin</th>
20
             <th>Total Income</th>
21
             <th>Total Income</th>
21
            
22
            
22
            </tr>
23
            </tr>
23
       </thead>
24
       </thead>
24
            <tbody>
25
            <tbody>
Line 63... Line 64...
63
            	#if($imeiWiseIncome.getFrontMargin())
64
            	#if($imeiWiseIncome.getFrontMargin())
64
            	<td>$nf.format($imeiWiseIncome.getFrontMargin())</td>
65
            	<td>$nf.format($imeiWiseIncome.getFrontMargin())</td>
65
            	#else
66
            	#else
66
            	<td>--</td>
67
            	<td>--</td>
67
            	#end
68
            	#end
-
 
69
            	
-
 
70
            	#if($imeiWisePendingSaleAmount.get($entry.getKey().getImei()))
-
 
71
            	<td>$imeiWisePendingSaleAmount.get($entry.getKey().getImei())</td>
-
 
72
            	#else
-
 
73
            	<td>--</td>
-
 
74
            	#end
68
               #if($imeiWiseIncome.getTotalIncome())
75
               #if($imeiWiseIncome.getTotalIncome())
69
                <td>$nf.format($imeiWiseIncome.getTotalIncome())</td>
76
                <td>$nf.format($imeiWiseIncome.getTotalIncome())</td>
70
            	#else
77
            	#else
71
            	<td>--</td>
78
            	<td>--</td>
72
            	#end
79
            	#end