Attachment #111431 for bug #26503

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




  budget
  orderstatus (note that orderstatus '' will retrieve orders
               of any status except cancelled)
  is_standing
  managing_library
  biblionumber
  get_canceled_order (if set to a true value, cancelled orders will

                'quantityreceived' => undef,
                'title'            => 'The Adventures of Huckleberry Finn',
                'managing_library' => 'CPL'
                'is_standing'      => '1'
            }

=cut

    my $basketgroupname = $params{basketgroupname};
    my $budget = $params{budget};
    my $orderstatus = $params{orderstatus};
    my $is_standing = $params{is_standing};
    my $biblionumber = $params{biblionumber};
    my $get_canceled_order = $params{get_canceled_order} || 0;
    my $ordernumber = $params{ordernumber};

            aqbasket.basketname,
            aqbasket.basketgroupid,
            aqbasket.authorisedby,
            aqbasket.is_standing,
            concat( borrowers.firstname,' ',borrowers.surname) AS authorisedbyname,
            branch as managing_library,
            aqbasketgroups.name as groupname,

        push @query_params, "$orderstatus";
    }

    if ( $is_standing ) {
        $query .= " AND is_standing = ? ";
        push @query_params, $is_standing;
    }

    if ($basket) {
        if ($basket =~ m/^\d+$/) {
            $query .= " AND aqorders.basketno = ? ";

Lines 85-90 my $filters = { Link Here

(-)a/acqui/histsearch.pl (+1 lines)
85	booksellerinvoicenumber => scalar $input->param('booksellerinvoicenumber'),	85	booksellerinvoicenumber => scalar $input->param('booksellerinvoicenumber'),
86	budget => scalar $input->param('budget'),	86	budget => scalar $input->param('budget'),
87	orderstatus => scalar $input->param('orderstatus'),	87	orderstatus => scalar $input->param('orderstatus'),
		88	is_standing => scalar $input->param('is_standing'),
88	ordernumber => scalar $input->param('ordernumber'),	89	ordernumber => scalar $input->param('ordernumber'),
89	search_children_too => scalar $input->param('search_children_too'),	90	search_children_too => scalar $input->param('search_children_too'),
90	created_by => [ $input->multi_param('created_by') ],	91	created_by => [ $input->multi_param('created_by') ],

Lines 75-80 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/filter-orders.inc (+6 lines)
75	<option value="cancelled">Cancelled</option>	75	<option value="cancelled">Cancelled</option>
76	[% END %]	76	[% END %]
77	</select>	77	</select>
		78	[% IF filters.is_standing %]
		79	<input type="checkbox" name="is_standing" id="is_standing" value="1" checked="checked" />
		80	[% ELSE %]
		81	<input type="checkbox" name="is_standing" id="is_standing" value="1" />
		82	[% END %]
		83	<label class="yesno" for="search_children_too">Standing order</label>
78	</li>	84	</li>
79	<li>	85	<li>
80	<label for="fund">Fund: </label>	86	<label for="fund">Fund: </label>

Lines 67-72 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (-1 / +1 lines)
67	[% CASE 'complete' %]Received	67	[% CASE 'complete' %]Received
68	[% CASE 'cancelled' %]Cancelled	68	[% CASE 'cancelled' %]Cancelled
69	[% END %]	69	[% END %]
		70	[% IF order.is_standing %](standing order)[% END %]
70	</td>	71	</td>
71	<td><a href="basket.pl?basketno=[% order.basketno \| uri %]">[% order.basketname \| html %] ([% order.basketno \| html %])</a></td>	72	<td><a href="basket.pl?basketno=[% order.basketno \| uri %]">[% order.basketname \| html %] ([% order.basketno \| html %])</a></td>
72	<td>[% order.authorisedbyname \| html %]</td>	73	<td>[% order.authorisedbyname \| html %]</td>
73	-

Return to bug 26503

Lines 2093-2098 params: Link Here

(-)a/C4/Acquisition.pm (+9 lines)
2093	budget	2093	budget
2094	orderstatus (note that orderstatus '' will retrieve orders	2094	orderstatus (note that orderstatus '' will retrieve orders
2095	of any status except cancelled)	2095	of any status except cancelled)
		2096	is_standing
2096	managing_library	2097	managing_library
2097	biblionumber	2098	biblionumber
2098	get_canceled_order (if set to a true value, cancelled orders will	2099	get_canceled_order (if set to a true value, cancelled orders will
Lines 2116-2121 returns: Link Here
2116	'quantityreceived' => undef,	2117	'quantityreceived' => undef,
2117	'title' => 'The Adventures of Huckleberry Finn',	2118	'title' => 'The Adventures of Huckleberry Finn',
2118	'managing_library' => 'CPL'	2119	'managing_library' => 'CPL'
		2120	'is_standing' => '1'
2119	}	2121	}
2120		2122
2121	=cut	2123	=cut
Lines 2136-2141 sub GetHistory { Link Here
2136	my $basketgroupname = $params{basketgroupname};	2138	my $basketgroupname = $params{basketgroupname};
2137	my $budget = $params{budget};	2139	my $budget = $params{budget};
2138	my $orderstatus = $params{orderstatus};	2140	my $orderstatus = $params{orderstatus};
		2141	my $is_standing = $params{is_standing};
2139	my $biblionumber = $params{biblionumber};	2142	my $biblionumber = $params{biblionumber};
2140	my $get_canceled_order = $params{get_canceled_order} \|\| 0;	2143	my $get_canceled_order = $params{get_canceled_order} \|\| 0;
2141	my $ordernumber = $params{ordernumber};	2144	my $ordernumber = $params{ordernumber};
Lines 2176-2181 sub GetHistory { Link Here
2176	aqbasket.basketname,	2179	aqbasket.basketname,
2177	aqbasket.basketgroupid,	2180	aqbasket.basketgroupid,
2178	aqbasket.authorisedby,	2181	aqbasket.authorisedby,
		2182	aqbasket.is_standing,
2179	concat( borrowers.firstname,' ',borrowers.surname) AS authorisedbyname,	2183	concat( borrowers.firstname,' ',borrowers.surname) AS authorisedbyname,
2180	branch as managing_library,	2184	branch as managing_library,
2181	aqbasketgroups.name as groupname,	2185	aqbasketgroups.name as groupname,
Lines 2269-2274 sub GetHistory { Link Here
2269	push @query_params, "$orderstatus";	2273	push @query_params, "$orderstatus";
2270	}	2274	}
2271		2275
		2276	if ( $is_standing ) {
		2277	$query .= " AND is_standing = ? ";
		2278	push @query_params, $is_standing;
		2279	}
		2280
2272	if ($basket) {	2281	if ($basket) {
2273	if ($basket =~ m/^\d+$/) {	2282	if ($basket =~ m/^\d+$/) {
2274	$query .= " AND aqorders.basketno = ? ";	2283	$query .= " AND aqorders.basketno = ? ";