projects / koha_ffzg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e817f5d)
Re-adding the link to the spent budget breakdown
authorChris Cormack <crc@liblime.com>
Sat, 8 Sep 2007 02:58:58 +0000 (21:58 -0500)
committerChris Cormack <crc@liblime.com>
Sat, 8 Sep 2007 03:06:22 +0000 (22:06 -0500)
Signed-off-by: Chris Cormack <crc@liblime.com>
acqui/acqui-home.pl patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl [new file with mode: 0755] patch | blob

diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl
index a2ffe2e..7b35c3f 100755 (executable)
--- a/acqui/acqui-home.pl
+++ b/acqui/acqui-home.pl
@@ -83,6 +83,10 @@ for (my $i=0; $i<$count; $i++){
        my %line;
        $line{bookfundname} = $results[$i]->{'bookfundname'};
        $line{budgetamount} = $results[$i]->{'budgetamount'};
+       $line{aqbudgetid} = $results[$i]->{'aqbudgetid'};
+       $line{bookfundid} = $results[$i]->{'bookfundid'};
+       $line{sdate} = $results[$i]->{'startdate'};
+       $line{edate} = $results[$i]->{'enddate'};
        $line{spent} = sprintf  ("%.2f", $spent);
        $line{comtd} = sprintf  ("%.2f",$comtd);
        $line{avail}  = sprintf  ("%.2f",$avail);
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
index ac8c356..2ebe421 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
@@ -94,8 +94,8 @@
         <!-- TMPL_LOOP name="loop_budget" -->
             <tr>
                 <td><!-- TMPL_VAR name="bookfundname" --></td>
-                <td><!-- TMPL_VAR name="budgetamount" --></td>
-                <td><!-- TMPL_VAR name="spent" --></td>
+                <td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&aqbudgetid=<!--TMPL_VAR NAME="aqbudgetid"-->"><!-- TMPL_VAR name="budgetamount" --></a></td>
+                <td><a href="/cgi-bin/koha/acqui/spent.pl?bookfund=<!--TMPL_VAR NAME="bookfundid"-->&start=<!--TMPL_VAR NAME="sdate"-->&end=<!-- TMPL_VAR NAME="edate"-->"><!-- TMPL_VAR name="spent" --></a></td>
                 <td><!-- TMPL_VAR name="comtd" --></td>
                 <td><!-- TMPL_VAR name="avail" --></td>
             </tr>
@@ -129,4 +129,4 @@
 </div>
 
 <!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl
new file mode 100755 (executable)
index 0000000..73bf473
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl
@@ -0,0 +1,132 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->         
+<title>Koha &rsaquo; Acquisitions</title>                                     
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->           
+</head>   
+<body>  
+<!-- TMPL_INCLUDE NAME="header.inc" -->                                   
+<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
+
+<div id="doc3" class="yui-t2">
+<div id="bd">            
+<div id="yui-main">                         
+<div class="yui-b">
+<div class="yui-g">
+
+
+
+
+<h1>Budgets &amp; Bookfunds</h1>
+<h2>Spent</h2>
+
+<br /><br />
+
+
+<table cellspacing="0" cellpadding="0" border="0" id="spent" class="collapse">
+<tr valign="top">
+   <td class="cell-header">
+               Title
+       </td>
+       <td class="cell-header">
+               Order
+       </td>
+       <td class="cell-header">
+               Supplier
+       </td>
+       <td class="cell-header">
+               Invoice
+       </td>
+       <td class="cell-header">
+               Itemtype
+       </td>
+       <td class="cell-header">
+               Receieved
+       </td>
+       <td class="cell-header">
+               Unit Price
+       </td>
+       <td class="cell-header">
+               Date Received
+       </td>
+       <td class="cell-header">
+               Subtotal
+       </td>
+</tr>
+
+<!--TMPL_LOOP NAME="SPENTLOOP"-->
+       <!--TMPL_IF name="toggle"-->
+               <tr valign="top" class="hilighted">
+       <!--TMPL_ELSE-->
+               <tr valign="top" class="hilighted2">
+       <!--/TMPL_IF-->
+       
+               <td class="cell">
+                       <!--TMPL_VAR NAME="title"-->    
+               </td>
+               <td class="cell">
+                  <a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<!--TMPL_VAR NAME="ordnum"-->&biblio=<!--TMPL_VAR NAME="biblionumber"-->&invoice=<!--TMPL_VAR NAME="booksellerinvoicenumber"-->&supplierid=<!--TMPL_VAR NAME="booksellerid"-->&catview=yes"><TMPL_VAR NAME="ordnum"--></a>
+               </td>
+               <td class="cell">
+                       <!--TMPL_VAR NAME="booksellerid"-->     
+               </td>
+               <td class="cell">
+                               <a href=/cgi-bin/koha/acqui/receive.pl?invoice=<!--TMPL_VAR NAME="booksellerinvoicenumber"-->&supplierid=<!--TMPL_VAR NAME="booksellerid"-->><!--TMPL_VAR NAME="booksellerinvoicenumber"--></a>
+               </td>
+               <td class="cell">
+                       <!--TMPL_VAR NAME="itemtype"--> 
+               </td>
+               <td class="cell">
+                       <!--TMPL_VAR NAME="qrev"-->     
+               </td>
+               <td class="cell">
+                       <!--TMPL_VAR NAME="unitprice"-->                
+               </td>
+               <td class="cell">
+                       <!--TMPL_VAR NAME="datereceived"-->             
+               </td>
+               <td class="cell">
+                       <!--TMPL_VAR NAME="subtotal"-->         
+               </td>
+</tr>
+<!--/TMPL_LOOP-->
+
+<tr valign="top">
+   <td class="cell-header">
+               Total
+       </td>
+       <td class="cell-header">
+               
+       </td>
+       <td class="cell-header">
+               
+       </td>
+       <td class="cell-header">
+               
+       </td>
+       <td class="cell-header">
+               
+       </td>
+       <td class="cell-header">
+               
+       </td>
+       <td class="cell-header">
+               
+       </td>
+       <td class="cell-header">
+               
+       </td>
+       <td class="cell-header">
+               <!--TMPL_VAR NAME="total"-->
+       </td>
+</tr>
+
+</table>
+
+
+</div>
+</div>
+</div>
+</div>
+</div>
+
+<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->                                     
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Unnamed repository; edit this file 'description' to name the repository.