Subversion Repositories SmartDukaan

Rev

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

Rev 36132 Rev 36133
Line 16... Line 16...
16
                    <tr>
16
                    <tr>
17
                        <th>Request Id</th>
17
                        <th>Request Id</th>
18
                        <th>Invoice Id</th>
18
                        <th>Invoice Id</th>
19
                        <th>Invoice #</th>
19
                        <th>Invoice #</th>
20
                        <th>Invoice Date</th>
20
                        <th>Invoice Date</th>
-
 
21
                        <th>GRN By</th>
21
                        <th>Requested By</th>
22
                        <th>Requested By</th>
22
                        <th>Requested At</th>
23
                        <th>Requested At</th>
23
                        <th>Remarks</th>
24
                        <th>Remarks</th>
24
                    </tr>
25
                    </tr>
25
                </thead>
26
                </thead>
Line 37... Line 38...
37
                            #if($invoiceMap.get($req.getInvoiceId()) && $invoiceMap.get($req.getInvoiceId()).getInvoiceDate())
38
                            #if($invoiceMap.get($req.getInvoiceId()) && $invoiceMap.get($req.getInvoiceId()).getInvoiceDate())
38
                            $invoiceMap.get($req.getInvoiceId()).getInvoiceDate().toLocalDate()
39
                            $invoiceMap.get($req.getInvoiceId()).getInvoiceDate().toLocalDate()
39
                            #end
40
                            #end
40
                        </td>
41
                        </td>
41
                        <td>
42
                        <td>
-
 
43
                            #if($invoiceMap.get($req.getInvoiceId()))
-
 
44
                            $!invoiceMap.get($req.getInvoiceId()).getReceivedFrom()
-
 
45
                            #end
-
 
46
                        </td>
-
 
47
                        <td>
42
                            #if($requesterMap.get($req.getRequestedBy()))
48
                            #if($requesterMap.get($req.getRequestedBy()))
43
                                $requesterMap.get($req.getRequestedBy()).getFullName()
49
                                $requesterMap.get($req.getRequestedBy()).getFullName()
44
                            #end
50
                            #end
45
                        </td>
51
                        </td>
46
                        <td>$req.getRequestedAt().toLocalDate()</td>
52
                        <td>$req.getRequestedAt().toLocalDate()</td>