Attachment #35753 for bug #11708

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




        foreach my $basketgroup (@{ $bookseller->{basketgroups} }) {
            my $baskets = GetBasketsByBasketgroup($basketgroup->{id});
            $basketgroup->{basketsqty} = 0;
            $basketgroup->{ordered_amount} = 0.0;
            $basketgroup->{charged_amount} = 0.0;
            my (@ordered_biblionumbers, @received_biblionumbers);
            foreach my $basket (@$baskets) {
                $basketgroup->{basketsqty} += 1;
                my @orders = GetOrders($basket->{basketno});
                foreach my $order (@orders) {
                    push @ordered_biblionumbers, $order->{biblionumber};
                    $basketgroup->{ordered_amount} += $order->{ecost} * $order->{quantity};
                    if ($order->{datereceived}) {
                        push @received_biblionumbers, $order->{biblionumber};
                        $basketgroup->{charged_amount} += $order->{ecost} * $order->{quantity};
                    }
                }
            }




          { type: "text" },
          { type: "text" },
          { type: "text" },
          null,
          null,
          null
        ]
      };

                                                <th>Search no. of ordered titles</th>
                                                <th>Search no. of received titles</th>
                                                <th></th>
                                                <th></th>
                                                <th></th>
                                            </tr>
                                            <tr>
                                                <th>Name</th>

                                                <th>No. of baskets</th>
                                                <th>No. of ordered titles</th>
                                                <th>No. of received titles</th>
                                                <th>Amount ordered</th>
                                                <th>Amount spent</th>
                                                <th>Action</th>
                                            </tr>
                                        </thead>

                                                        <td>[% basketgroup.basketsqty %]</td>
                                                        <td>[% basketgroup.ordered_titles_count %]</td>
                                                        <td>[% basketgroup.received_titles_count %]</td>
                                                        <td>[% basketgroup.ordered_amount %]</td>
                                                        <td>[% basketgroup.charged_amount %]</td>
                                                        <td>
                                                            <input type="button" onclick="closeandprint('[% basketgroup.id %]');" value="Close and print" />
                                                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Edit" /></form>

                                                <th>Search no. of ordered titles</th>
                                                <th>Search no. of received titles</th>
                                                <th></th>
                                                <th></th>
                                                <th></th>
                                            </tr>
                                            <tr>
                                                <th>Name</th>

                                                <th>No. of baskets</th>
                                                <th>No. of ordered titles</th>
                                                <th>No. of received titles</th>
                                                <th>Amount ordered</th>
                                                <th>Amount spent</th>
                                                <th>Action</th>
                                            </tr>
                                        </thead>

                                                        <td>[% basketgroup.basketsqty %]</td>
                                                        <td>[% basketgroup.ordered_titles_count %]</td>
                                                        <td>[% basketgroup.received_titles_count %]</td>
                                                        <td>[% basketgroup.ordered_amount %]</td>
                                                        <td>[% basketgroup.charged_amount %]</td>
                                                        <td>
                                                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="View" /></form>
                                                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Reopen" /></form>
- 

Return to bug 11708

Lines 388-405 if ( $op eq "add" ) { Link Here

(-)a/acqui/basketgroup.pl (-4 lines)
388	foreach my $basketgroup (@{ $bookseller->{basketgroups} }) {	388	foreach my $basketgroup (@{ $bookseller->{basketgroups} }) {
389	my $baskets = GetBasketsByBasketgroup($basketgroup->{id});	389	my $baskets = GetBasketsByBasketgroup($basketgroup->{id});
390	$basketgroup->{basketsqty} = 0;	390	$basketgroup->{basketsqty} = 0;
391	$basketgroup->{ordered_amount} = 0.0;
392	$basketgroup->{charged_amount} = 0.0;
393	my (@ordered_biblionumbers, @received_biblionumbers);	391	my (@ordered_biblionumbers, @received_biblionumbers);
394	foreach my $basket (@$baskets) {	392	foreach my $basket (@$baskets) {
395	$basketgroup->{basketsqty} += 1;	393	$basketgroup->{basketsqty} += 1;
396	my @orders = GetOrders($basket->{basketno});	394	my @orders = GetOrders($basket->{basketno});
397	foreach my $order (@orders) {	395	foreach my $order (@orders) {
398	push @ordered_biblionumbers, $order->{biblionumber};	396	push @ordered_biblionumbers, $order->{biblionumber};
399	$basketgroup->{ordered_amount} += $order->{ecost} * $order->{quantity};
400	if ($order->{datereceived}) {	397	if ($order->{datereceived}) {
401	push @received_biblionumbers, $order->{biblionumber};	398	push @received_biblionumbers, $order->{biblionumber};
402	$basketgroup->{charged_amount} += $order->{ecost} * $order->{quantity};
403	}	399	}
404	}	400	}
405	}	401	}

Lines 126-133 function submitForm(form) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt (-15 lines)
126	{ type: "text" },	126	{ type: "text" },
127	{ type: "text" },	127	{ type: "text" },
128	{ type: "text" },	128	{ type: "text" },
129	null,
130	null,
131	null	129	null
132	]	130	]
133	};	131	};
Lines 359-366 function submitForm(form) { Link Here
359	<th>Search no. of ordered titles</th>	357	<th>Search no. of ordered titles</th>
360	<th>Search no. of received titles</th>	358	<th>Search no. of received titles</th>
361	<th></th>	359	<th></th>
362	<th></th>
363	<th></th>
364	</tr>	360	</tr>
365	<tr>	361	<tr>
366	<th>Name</th>	362	<th>Name</th>
Lines 370-377 function submitForm(form) { Link Here
370	<th>No. of baskets</th>	366	<th>No. of baskets</th>
371	<th>No. of ordered titles</th>	367	<th>No. of ordered titles</th>
372	<th>No. of received titles</th>	368	<th>No. of received titles</th>
373	<th>Amount ordered</th>
374	<th>Amount spent</th>
375	<th>Action</th>	369	<th>Action</th>
376	</tr>	370	</tr>
377	</thead>	371	</thead>
Lines 392-399 function submitForm(form) { Link Here
392	<td>[% basketgroup.basketsqty %]</td>	386	<td>[% basketgroup.basketsqty %]</td>
393	<td>[% basketgroup.ordered_titles_count %]</td>	387	<td>[% basketgroup.ordered_titles_count %]</td>
394	<td>[% basketgroup.received_titles_count %]</td>	388	<td>[% basketgroup.received_titles_count %]</td>
395	<td>[% basketgroup.ordered_amount %]</td>
396	<td>[% basketgroup.charged_amount %]</td>
397	<td>	389	<td>
398	<input type="button" onclick="closeandprint('[% basketgroup.id %]');" value="Close and print" />	390	<input type="button" onclick="closeandprint('[% basketgroup.id %]');" value="Close and print" />
399	<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Edit" /></form>	391	<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Edit" /></form>
Lines 418-425 function submitForm(form) { Link Here
418	<th>Search no. of ordered titles</th>	410	<th>Search no. of ordered titles</th>
419	<th>Search no. of received titles</th>	411	<th>Search no. of received titles</th>
420	<th></th>	412	<th></th>
421	<th></th>
422	<th></th>
423	</tr>	413	</tr>
424	<tr>	414	<tr>
425	<th>Name</th>	415	<th>Name</th>
Lines 430-437 function submitForm(form) { Link Here
430	<th>No. of baskets</th>	420	<th>No. of baskets</th>
431	<th>No. of ordered titles</th>	421	<th>No. of ordered titles</th>
432	<th>No. of received titles</th>	422	<th>No. of received titles</th>
433	<th>Amount ordered</th>
434	<th>Amount spent</th>
435	<th>Action</th>	423	<th>Action</th>
436	</tr>	424	</tr>
437	</thead>	425	</thead>
Lines 453-460 function submitForm(form) { Link Here
453	<td>[% basketgroup.basketsqty %]</td>	441	<td>[% basketgroup.basketsqty %]</td>
454	<td>[% basketgroup.ordered_titles_count %]</td>	442	<td>[% basketgroup.ordered_titles_count %]</td>
455	<td>[% basketgroup.received_titles_count %]</td>	443	<td>[% basketgroup.received_titles_count %]</td>
456	<td>[% basketgroup.ordered_amount %]</td>
457	<td>[% basketgroup.charged_amount %]</td>
458	<td>	444	<td>
459	<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="View" /></form>	445	<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="View" /></form>
460	<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Reopen" /></form>	446	<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Reopen" /></form>
461	-