X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fmodules%2Fadmin%2Faqbudgetperiods.tt;h=516115276d6ad5d5842731233af6d1a1764d86e1;hb=986b8c92620580166ab408362f72ce52d045d92c;hp=453da0e0211c45a2ffb1a7b72267d821b7910196;hpb=bef919d60da823117306ded112367fc2b6039df6;p=koha.git

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
index 453da0e021..516115276d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
@@ -4,6 +4,10 @@
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
 [% INCLUDE 'datatables.inc' %]
+[% IF close_form %]
+    <link href="[% interface %]/lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css" rel="stylesheet" type="text/css" />
+    <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/treetable/jquery.treetable.js"></script>
+[% END %]
 <script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
 <script type="text/javascript">
 // #################################################################################
@@ -72,32 +76,34 @@
             }
     }
 
-
-
-    [% IF ( dateformat == 'metric' ) %]
-        dt_add_type_uk_date();
-    [% END %]
     $(document).ready(function() {
         var tabs = $('#budgetsTabs').tabs();
         [% IF ( tab ) %]
-            tabs.tabs('select', [% tab %]);
+            tabs.tabs("option", "active", [% tab %]);
         [% END %]
         $("#activeperiodst,#inactiveperiodst").dataTable($.extend(true, {}, dataTablesDefaults, {
+            "sDom": 't',
+            "aaSorting": [],
             "aoColumnDefs": [
-                {
-                    [% IF ( dateformat == 'metric' ) %]
-                        "aTargets": [ 1, 2 ], "sType": "uk_date",
-                    [% END %]
-                    "bSortable": false, 'aTargets':['_all'],
-                },
+                { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
+                { "sType": "title-string", "aTargets" : [ "title-string" ] }
             ],
-            "sPaginationType": "four_button",
-            "sDom": 't',
-            "bAutoWidth": false,
             "bPaginate": false,
-            "bInfo": false,
-            "bFilter": false,
+            'bAutoWidth': false
         } ) );
+
+        [% IF close_form %]
+          $("#budgeth").dataTable($.extend(true, {}, dataTablesDefaults, {
+            sDom: "t"
+          }));
+          $("#move_form").submit(function(){
+            var budget_from = "[% budget_period_description %]";
+            var budget_to = $("#budget_period").find("option:selected").html();
+            var alert_message = _("You have chosen to move all unreceived orders from '%s' to '%s'.").format(budget_from, budget_to);
+            alert_message += _("\nThis action cannot be reversed. Do you wish to continue?");
+            return confirm ( alert_message );
+          });
+        [% END %]
     });
 </script>
 
@@ -118,6 +124,9 @@
     [% IF ( delete_confirmed ) %]&rsaquo;
         Data deleted
     [% END %]
+    [% IF close_form %]&rsaquo;
+      Close budget [% budget_period_description %]
+    [% END %]
 </title>
 
 
@@ -162,6 +171,12 @@
     [% IF ( duplicate_form ) %]
         <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> &rsaquo; Duplicate budget
     [% END %]
+
+    <!-- close a budget -->
+    [% IF close_form %]
+        <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> &rsaquo;
+        Close budget <a href="cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]">[% budget_period_description %]</a>
+    [% END %]
     <!-- display budget periods list -->
     <!-- ########################################## -->
     [% IF ( else ) %]
@@ -174,7 +189,9 @@
 <div id="yui-main">
 <div class="yui-b">
 
-[% INCLUDE 'budgets-admin-toolbar.inc' %]
+[% UNLESS close_form %]
+  [% INCLUDE 'budgets-admin-toolbar.inc' %]
+[% END %]
 
 [% IF ( duplicate_form ) %]
 <h3>Duplicate budget</h3>
@@ -197,6 +214,16 @@
 				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
     </li>
 
+    <li>
+      <label for="mark_as_inactive">Mark the original budget as inactive</label>
+      <input type="checkbox" id="mark_as_inactive" name="mark_original_budget_as_inactive" />
+    </li>
+
+    <li>
+      <label for="reset_all_budgets">Set all funds to zero</label>
+      <input type="checkbox" id="reset_all_budgets" name="reset_all_budgets" />
+    </li>
+
     </ol>
     </fieldset>
 
@@ -311,6 +338,66 @@
 
     </div>
 [% END %]
+
+[% IF close_form %]
+  [% IF budget_periods.size == 0 %]
+    You cannot move funds of this budget, there is no active budget.
+    Please create a new active budget and retry.
+    <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a>
+  [% ELSIF number_of_unreceived_orders == 0 %]
+    There is no unreceived orders for this budget.
+    <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a>
+  [% ELSE %]
+    <h3>Choose the funds you want to move unreceived orders:</h3>
+      Fund list of budget <a href="cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]">[% budget_period_description %]</a>:
+    <table id="budgeth">
+      <thead>
+        <tr>
+            <th>Fund id</th>
+            <th>Fund code</th>
+            <th>Fund name</th>
+            <th>Unreceived orders</th>
+        </tr>
+      </thead>
+      <tbody>
+        [% FOREACH budget IN budgets_to_move %]
+          <tr>
+            <td>[% budget.budget_id %]</td>
+            <td>[% budget.budget_code_indent %]</td>
+            <td>[% budget.budget_name %]</td>
+            <td>[% budget.unreceived_orders.size %]</td>
+          </tr>
+        [% END %]
+      </tbody>
+    </table>
+    <form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" name="f" method="post" id="move_form">
+      <fieldset class="rows">
+        <ol>
+          <li>
+            <label class="required" for="to_budget_period_id">Select a budget</label>
+            <select name="to_budget_period_id" id="to_budget_period_id" required="required">
+              <option value=""></option>
+              [% FOR budget_period IN budget_periods %]
+                <option value="[% budget_period.budget_period_id %]">[% budget_period.budget_period_description %]</option>
+              [% END %]
+            </select>
+          </li>
+          <li>
+          <label for="move_remaining_unspent">Move remaining unspent funds</label>
+            <input type="checkbox" name="move_remaining_unspent" id="move_remaining_unspent" />
+          </li>
+        </ol>
+      </fieldset>
+      <fieldset class="action">
+          <input type="hidden" name="op" value="close_confirmed" />
+          <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
+          <input type="submit" value="Move unreceive orders" />
+          <a class="cancel" href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Cancel</a>
+      </fieldset>
+    </form>
+  [% END %]
+[% END %]
+
 <!--  DEFAULT  display budget periods list -->
 [% IF ( else ) %]
   <h2>Budgets administration</h2>
@@ -329,8 +416,8 @@
           <thead>
             <tr>
               <th>Budget name</th>
-              <th>Start date</th>
-              <th>End date</th>
+              <th class="title-string">Start date</th>
+              <th class="title-string">End date</th>
               <th>Locked</th>
               <th>Total</th>
               <th>Actions</th>
@@ -340,17 +427,19 @@
               [% FOREACH period_active IN period_active_loop %]
                 <tr>
                 <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_active.budget_period_id %]" title="View funds for [% period_active.budget_period_description %]">[% period_active.budget_period_description %]</a></td>
-                <td>[% period_active.budget_period_startdate | $KohaDates %]</td>
-                <td>[% period_active.budget_period_enddate | $KohaDates %]</td>
+                <td><span title="[% period_active.budget_period_startdate %]">[% period_active.budget_period_startdate | $KohaDates %]</span></td>
+                <td><span title="[% period_active.budget_period_enddate %]">[% period_active.budget_period_enddate | $KohaDates %]</span></td>
                 <td>
                   [% IF ( period_active.budget_period_locked ) %]
                     <span style="color:green;">Locked</span>&nbsp;
                   [% END %]
                 </td>
-                <td align='right'>[% period_active.budget_period_total %]</td>
+                <td class="data">[% period_active.budget_period_total %]</td>
                 <td>
                   <a href="[% script_name %]?op=add_form&amp;budget_period_id=[% period_active.budget_period_id |html %]">Edit</a>
                   <a href="[% script_name %]?op=delete_confirm&amp;budget_period_id=[% period_active.budget_period_id %]">Delete</a>
+                  <a href="[% script_name %]?op=duplicate_form&amp;budget_period_id=[% period_active.budget_period_id %]">Duplicate</a>
+                  <a href="[% script_name %]?op=close_form&amp;budget_period_id=[% period_active.budget_period_id %]">Close</a>
                   <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_period_id=[% period_active.budget_period_id %]">Add fund</a>
                 </td>
                 </tr>
@@ -368,8 +457,8 @@
           <thead>
               <tr>
                   <th>Budget name</th>
-                  <th>Start date</th>
-                  <th>End date</th>
+                  <th class="title-string">Start date</th>
+                  <th class="title-string">End date</th>
                   <th>Locked</th>
                   <th>Total</th>
                   <th>Actions</th>
@@ -383,13 +472,15 @@
                       <tr class="highlight">
                   [% END %]
                   <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_loo.budget_period_id %]" title="View funds for [% period_loo.budget_period_description %]">[% period_loo.budget_period_description %]</a></td>
-                  <td>[% period_loo.budget_period_startdate | $KohaDates %]</td>
-                  <td>[% period_loo.budget_period_enddate | $KohaDates %]</td>
+                  <td><span title="[% period_loo.budget_period_startdate %]">[% period_loo.budget_period_startdate | $KohaDates %]</span></td>
+                  <td><span title="[% period_loo.budget_period_enddate %]">[% period_loo.budget_period_enddate | $KohaDates %]</span></td>
                   <td> [% IF ( period_loo.budget_period_locked ) %]<span style="color:green;">Locked</span>&nbsp;[% ELSE %][% END %] </td>
-                  <td align='right'>[% period_loo.budget_period_total %]</td>
+                  <td class="data">[% period_loo.budget_period_total %]</td>
                   <td>
-                      <a href="[% period_loo.script_name %]?op=add_form&amp;budget_period_id=[% period_loo.budget_period_id |html %]">Edit</a>
-                      <a href="[% period_loo.script_name %]?op=delete_confirm&amp;budget_period_id=[% period_loo.budget_period_id %]">Delete</a>
+                      <a href="[% script_name %]?op=add_form&amp;budget_period_id=[% period_loo.budget_period_id |html %]">Edit</a>
+                      <a href="[% script_name %]?op=delete_confirm&amp;budget_period_id=[% period_loo.budget_period_id %]">Delete</a>
+                      <a href="[% script_name %]?op=duplicate_form&amp;budget_period_id=[% period_loo.budget_period_id %]">Duplicate</a>
+                      <a href="[% script_name %]?op=close_form&amp;budget_period_id=[% period_loo.budget_period_id %]">Close</a>
                   <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_period_id=[% period_loo.budget_period_id %]">Add fund</a>
                   </td>
                   </tr>