[Koha-cvs] koha acqui/lateorders.pl koha-tmpl/intranet-tmp... [rel_2_2]

[Henri-Damien LAURENT]

CVSROOT:        /cvsroot/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     Henri-Damien LAURENT <address@hidden>   05/12/13 10:44:42

Added files:
        acqui          : lateorders.pl 
        koha-tmpl/intranet-tmpl/default/en/acqui: lateorders.tmpl 

Log message:
        Adding lateorders view for 2.2 release.
        getting it from HEAD.
        ADDING doNotPrint features for columns that shouldnot be printed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/acqui/lateorders.pl?only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/lateorders.tmpl?only_with_tag=rel_2_2&rev=1.3.2.1

Patches:
Index: koha/acqui/lateorders.pl
diff -u /dev/null koha/acqui/lateorders.pl:1.1.2.1
--- /dev/null   Tue Dec 13 10:44:42 2005
+++ koha/acqui/lateorders.pl    Tue Dec 13 10:44:42 2005
@@ -0,0 +1,74 @@
+#!/usr/bin/perl
+
+use strict;
+use CGI;
+use C4::Acquisition;
+use C4::Auth;
+use C4::Output;
+use C4::Interface::CGI::Output;
+use C4::Context;
+use HTML::Template;
+
+my $query = new CGI;
+my ($template, $loggedinuser, $cookie)
+= get_template_and_user({template_name => "acqui/lateorders.tmpl",
+                               query => $query,
+                               type => "intranet",
+                               authnotrequired => 0,
+                               flagsrequired => {acquisition => 1},
+                               debug => 1,
+                               });
+# my $title = $query->param('title');
+# my $ISSN = $query->param('ISSN');
+# my @subscriptions = getsubscriptions($title,$ISSN);
+
+my $supplierid = $query->param('supplierid');
+my $delay = $query->param('delay');
+my $branch = $query->param('branch');
+
+$delay =($delay?$delay:30);
+
+my %supplierlist = getsupplierlistwithlateorders($delay,$branch);
+my @select_supplier;
+push @select_supplier,"";
+foreach my $supplierid (keys %supplierlist){
+       push @select_supplier, $supplierid;
+}
+my $CGIsupplier=CGI::scrolling_list( -name     => 'supplierid',
+                       -values   => address@hidden,
+                       -default  => $supplierid,
+                       -labels   => \%supplierlist,
+                       -size     => 1,
+                       -multiple => 0 );
+
+$template->param(Supplier=>$supplierlist{$supplierid}) if ($supplierid);
+
+my @select_branches;
+my %select_branches;
+push @select_branches,"";
+$select_branches{""}="";
+my ($count, @branches) = branches(); 
+#branches is IndependantBranches aware
+foreach my $branch (@branches){
+       push @select_branches, $branch->{branchcode};
+       $select_branches{$branch->{branchcode}}=$branch->{branchname};
+}
+my $CGIbranch=CGI::scrolling_list( -name     => 'branch',
+                               -values   => address@hidden,
+                               -labels   => \%select_branches,
+                               -size     => 1,
+                               -multiple => 0 );
+
+my ($count, @lateorders) = getlateorders($delay,$supplierid,$branch);
+my $total;
+foreach my $lateorder (@lateorders){
+       $total+=$lateorder->{subtotal};
+}
+$template->param(delay=>$delay) if ($delay);
+$template->param(
+       CGIbranch => $CGIbranch,
+       CGIsupplier => $CGIsupplier,
+       lateorders => address@hidden,
+       total=>$total,
+       );
+output_html_with_http_headers $query, $cookie, $template->output;
Index: koha/koha-tmpl/intranet-tmpl/default/en/acqui/lateorders.tmpl
diff -u /dev/null 
koha/koha-tmpl/intranet-tmpl/default/en/acqui/lateorders.tmpl:1.3.2.1
--- /dev/null   Tue Dec 13 10:44:42 2005
+++ koha/koha-tmpl/intranet-tmpl/default/en/acqui/lateorders.tmpl       Tue Dec 
13 10:44:42 2005
@@ -0,0 +1,105 @@
+<!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
+<!--------------------------MAIN BODY OF PAGE-------------------------->
+<div id="mainbloc">
+       <h1 class="acquisition"><!-- TMPL_IF name="Supplier" --><!-- TMPL_VAR 
name="Supplier" --> : <!--/TMPL_IF -->Late issues</h1>
+       <table>
+               <tr>
+                       <th class="acquisition doNotPrint">Supplier</th>
+                       <th class="acquisition">Order Date</th>
+                       <th class="acquisition">Ordered for</th>
+                       <th class="acquisition doNotPrint">Including Basket</th>
+                       <th class="acquisition">Book information</th>
+                       <th class="acquisition doNotPrint">Branch</th>
+                       <th class="acquisition doNotPrint">Estimated Unit 
Price</th>
+                       <th class="acquisition">Retailer Catalogue Unit 
Price</th>
+                       <th class="acquisition">Quantity</th>
+                       <th class="acquisition">Total cost</th>
+                       <th class="acquisition doNotPrint">Budget</th>
+                       <th class="acquisition doNotPrint">&nbsp;</th>
+               </tr>
+               <tr class="doNotPrint">
+                       <form action="lateorders.pl" method="post">
+                               <td class="doNotPrint">
+                                       <!-- TMPL_VAR name="CGIsupplier" -->
+                               </td>
+                               <td> &nbsp;</td>
+                               <td align="center" class="doNotPrint">
+                                       <input align="right" size="4" 
maxlength="3" type="text" name="delay" value="<!--TMPL_VAR Name="delay" -->" > 
days
+                               </td>
+                               <td colspan="2">
+                                       &nbsp;
+                               </td>
+                               <td class="doNotPrint">
+                                       <!-- TMPL_VAR name="CGIbranch" -->
+                               </td>
+                               <td colspan="5">
+                                       &nbsp;
+                               </td>
+                               
+                               <td class="doNotPrint">
+                                       <input type="submit" value="filter" 
class="button acquisition">
+                               </td>
+                       </form>
+               </tr>
+               <!-- TMPL_LOOP name="lateorders" -->
+                       <!--TMPL_IF Name="hilighted" --> <tr class="hilighted"> 
<!--TMPL_ELSE--> <tr> <!-- /TMPL_IF -->
+                               <td class="doNotPrint">
+                                       <!-- TMPL_VAR name="supplier" -->
+                               </td>
+                               <td>
+                                       <!-- TMPL_VAR name="orderdate" -->
+                               </td>
+                               <td class="number" align="right">
+                                       <!-- TMPL_VAR name="latesince" -->
+                               </td>
+                               <td align="center" class="doNotPrint">
+                                       <!-- TMPL_VAR name="basketno" -->
+                               </td>
+                               <td >
+                                       <b><!-- TMPL_VAR name="title" --></b>
+                               <!-- TMPL_IF name="author" 
--><br/><i>Author:</i> <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
+                               <!-- TMPL_IF name="publisher" 
--><br/><i>Published by:</i> <!-- TMPL_VAR NAME="publisher" --><!-- TMPL_IF 
name="publicationyear" --><i> in </i><!-- TMPL_VAR name="publicationyear" 
--><!-- /TMPL_IF --><!-- /TMPL_IF -->
+                               </td>
+                               <td class="doNotPrint">
+                                       <!-- TMPL_VAR name="branch" -->
+                               </td>
+                               <td align="right" class="doNotPrint">
+                                       <!-- TMPL_VAR name="unitpricelib" -->
+                               </td>
+                               <td align="right">
+                                       <!-- TMPL_VAR name="unitpricesupplier" 
-->
+                               </td>
+                               <td align="right">
+                                       <!-- TMPL_VAR name="quantity" -->
+                               </td>
+                               <td align="right">
+                                       <!-- TMPL_VAR name="subtotal" -->
+                               </td>
+                               <td class="doNotPrint">
+                                       <!-- TMPL_VAR name="budget" -->
+                               </td>
+                               <td class="doNotPrint">
+                                       &nbsp;
+                               </td>
+                       </tr>
+               <!-- /TMPL_LOOP -->
+               <tr> 
+                               <th class="acquisition">
+                                       Total
+                               </th>
+                               <th class="acquisition" colspan="2">
+                                       &nbsp;
+                               </th>
+                               <th class="acquisition" class="doNotPrint"> 
&nbsp;</th>
+                               <th class="acquisition"  colspan="5">
+                                       &nbsp;
+                               </th>
+                               
+                               <th class="acquisition">
+                                       <!-- TMPL_VAR name="total" -->
+                               </th>
+               </tr>
+       </table>
+</div>
+<!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
+