View | Details | Raw Unified | Return to bug 3414
Collapse All | Expand All

(-)a/acqui/parcels.pl (-3 lines)
Lines 133-139 if ($count>$resultsperpage){ Link Here
133
}
133
}
134
my @loopres;
134
my @loopres;
135
135
136
my $hilighted=0;
137
for (my $i=$startfrom;$i<=($startfrom+$resultsperpage-1<$count-1?$startfrom+$resultsperpage-1:$count-1);$i++){
136
for (my $i=$startfrom;$i<=($startfrom+$resultsperpage-1<$count-1?$startfrom+$resultsperpage-1:$count-1);$i++){
138
137
139
    my %cell;
138
    my %cell;
Lines 146-153 for (my $i=$startfrom;$i<=($startfrom+$resultsperpage-1<$count-1?$startfrom+$res Link Here
146
    $cell{bibcount}=$results[$i]->{biblio};
145
    $cell{bibcount}=$results[$i]->{biblio};
147
    $cell{reccount}=$results[$i]->{itemsreceived};
146
    $cell{reccount}=$results[$i]->{itemsreceived};
148
    $cell{itemcount}=$results[$i]->{itemsexpected};
147
    $cell{itemcount}=$results[$i]->{itemsexpected};
149
    $cell{hilighted} = $hilighted%2;
150
    $hilighted++;
151
    push @loopres, \%cell;
148
    push @loopres, \%cell;
152
}
149
}
153
$template->param(searchresults=>\@loopres, count=>$count) if ($count);
150
$template->param(searchresults=>\@loopres, count=>$count) if ($count);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl (-12 / +13 lines)
Lines 42-57 Link Here
42
    <table class="small">
42
    <table class="small">
43
        <tr>
43
        <tr>
44
            <th> <input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->" /></th>
44
            <th> <input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->" /></th>
45
            <th><label for="filter">Invoice / Code:</label><input type="text" size="20" name="filter" value="<!-- TMPL_VAR NAME="filter" -->" /></th>
45
            <th><label for="filter">Invoice / Code:</label><input type="text" size="20" name="filter" id="filter" value="<!-- TMPL_VAR NAME="filter" -->" /></th>
46
            <th><label for="datefrom">From:</label><input type="text" size="9" id="datefrom" name="datefrom" value="<!-- TMPL_VAR NAME="datefrom" -->" /> 
46
            <th><label for="datefrom">From:</label><input type="text" size="9" id="datefrom" name="datefrom" value="<!-- TMPL_VAR NAME="datefrom" -->" /> 
47
                <p><label for="dateto">To:</label><input type="text" size="9" id="dateto" name="dateto" value="<!-- TMPL_VAR NAME="dateto" -->" /></th>
47
                <p><label for="dateto">To:</label><input type="text" size="9" id="dateto" name="dateto" value="<!-- TMPL_VAR NAME="dateto" -->" /></p></th>
48
            <th><label for="orderby">Sort by :</label><select name="orderby" id="orderby">
48
            <th><label for="orderby">Sort by :</label><select name="orderby" id="orderby">
49
                <option value="aqorders.booksellerinvoicenumber"> Code</option>
49
                <option value="aqorders.booksellerinvoicenumber"> Code</option>
50
                <option value="datereceived"> Date Received</option>
50
                <option value="datereceived"> Date Received</option>
51
                <option value="datereceived desc"> Date Received reverse</option>
51
                <option value="datereceived desc"> Date Received reverse</option>
52
                <option value="aqorders.booksellerinvoicenumber desc"> Code reverse</option>
52
                <option value="aqorders.booksellerinvoicenumber desc"> Code reverse</option>
53
                </select><br />
53
                </select><br />
54
                <label for="resultsperpage">Results per page :</label><select name="resultsperpage" value ="<!--TMPL_VAR Name="resultsperpage"-->" id="resultsperpage">
54
                <label for="resultsperpage">Results per page :</label><select name="resultsperpage" id="resultsperpage">
55
                <option value="20">20</option>
55
                <option value="20">20</option>
56
                <option value="30">30</option>
56
                <option value="30">30</option>
57
                <option value="50">50</option>
57
                <option value="50">50</option>
Lines 71-97 Link Here
71
        </tr>
71
        </tr>
72
<!-- Actual Search Results -->
72
<!-- Actual Search Results -->
73
<!-- TMPL_LOOP NAME="searchresults" -->
73
<!-- TMPL_LOOP NAME="searchresults" -->
74
    <!-- TMPL_UNLESS NAME="__odd__" -->
75
    <tr class="highlight">
76
    <!-- TMPL_ELSE -->
74
    <tr>
77
    <tr>
75
        <!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
78
    <!-- /TMPL_UNLESS -->
79
        <td>
76
            <!-- TMPL_VAR NAME="number" -->
80
            <!-- TMPL_VAR NAME="number" -->
77
        </td>
81
        </td>
78
        <!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number">
82
        <td>
79
        <!-- /TMPL_IF -->
80
            <a href="/cgi-bin/koha/acqui/parcel.pl?type=intra&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" ESCAPE="URL" -->&amp;datereceived=<!-- TMPL_VAR NAME="raw_datereceived" ESCAPE="URL" --><!--TMPL_IF Name="code"-->&amp;invoice=<!--TMPL_VAR Name="code" ESCAPE="URL" --><!--/TMPL_IF-->">
83
            <a href="/cgi-bin/koha/acqui/parcel.pl?type=intra&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" ESCAPE="URL" -->&amp;datereceived=<!-- TMPL_VAR NAME="raw_datereceived" ESCAPE="URL" --><!--TMPL_IF Name="code"-->&amp;invoice=<!--TMPL_VAR Name="code" ESCAPE="URL" --><!--/TMPL_IF-->">
81
                <!-- TMPL_VAR NAME="datereceived" -->
84
                <!-- TMPL_VAR NAME="datereceived" -->
82
            </a>
85
            </a>
83
        </td>
86
        </td>
84
        <!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
87
        <td>
85
            <!--TMPL_IF Name="code"--><!--TMPL_VAR Name="code" --><!--/TMPL_IF-->
88
            <!--TMPL_IF Name="code"--><!--TMPL_VAR Name="code" --><!--/TMPL_IF-->
86
        </td>
89
        </td>
87
        <!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number">
90
        <td>
88
        <!-- /TMPL_IF -->
89
            <!-- TMPL_VAR NAME="reccount" --> 
91
            <!-- TMPL_VAR NAME="reccount" --> 
90
        </td>
92
        </td>
91
        <!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
93
        <td>
92
            <!-- TMPL_VAR NAME="bibcount" -->
94
            <!-- TMPL_VAR NAME="bibcount" -->
93
        </td>
95
        </td>
94
        <!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
96
        <td>
95
            <!-- TMPL_VAR NAME="itemcount" -->
97
            <!-- TMPL_VAR NAME="itemcount" -->
96
        </td>
98
        </td>
97
    </tr>
99
    </tr>
98
- 

Return to bug 3414