projects / koha.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge remote-tracking branch 'origin/new/bug_6634'
[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / acqui / supplier.tt
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
index d4bfe72..b5b9df2 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
@@ -1,6 +1,12 @@
+[% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Vendor [% bookselname %]</title>
+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
+<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
+[% INCLUDE 'datatables-strings.inc' %]
+<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+
 <script type="text/javascript">
 //<![CDATA[
 function confirm_deletion() {
@@ -15,10 +21,27 @@ if (f.company.value == "") {
 }
     f.submit();
 }
+
+ $(document).ready(function() {
+    [% IF (dateformat == 'metric') %]
+        dt_add_type_uk_date();
+    [% END %]
+    var contractst = $("#contractst").dataTable($.extend(true, {}, dataTablesDefaults, {
+        "aoColumnDefs": [
+          { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
+          [% IF (dateformat == 'metric') %]
+            { "aTargets": [ 2, 3 ], "sType": "uk_date" },
+          [% END %]
+        ],
+        'bPaginate': false,
+        'bFilter': false,
+        'bInfo': false,
+    } ) );
+ });
 //]]>
 </script>
 </head>
-<body>
+<body id="acq_supplier" class="acq">
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'acquisitions-search.inc' %]
 
@@ -39,7 +62,7 @@ if (f.company.value == "") {
 [% IF ( enter ) %]
     <form action="updatesupplier.pl" name="updatesupplier" method="post">
     <div class="yui-g">
-        <input type="hidden" name="id" value="[% booksellerid %]" />
+        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
         <fieldset class="rows">
             <legend>Company details</legend>
             <ol><li><label for="company" class="required">Name * </label>
@@ -137,6 +160,10 @@ if (f.company.value == "") {
             <li><label for="discount">Discount</label>
                 <input type="text" size="6" id="discount" name="discount" value="[% discount %]" />%</li>
             <li><label for="gstrate">Tax rate</label><input type="text" name="gstrate" id="gstrate" size="6" value="[% gstrate %]"/>% (leave blank for default tax of [% default_gst_rate %]%)</li>
+            <li>
+                <label for="deliverytime">Delivery time</label>
+                <input type="text" size="2" id="deliverytime" name="deliverytime" value="[% deliverytime %]" /> days
+            </li>
             <li><label for="notes">Notes</label>
                 <textarea cols="40" rows="4" id="notes" name="notes" >[% notes %]</textarea></li></ol>
         </fieldset>
@@ -150,9 +177,9 @@ if (f.company.value == "") {
         <div class="yui-g">
             <div id="supplier-company-details" class="yui-u first">
                 <h2>Vendor details</h2>
-                <p><span class="label">Company Name: </span>[% name %]</p>
-                <p><span class="label">Postal Address: </span>[% postal %]</p>
-                <p><span class="label">Physical Address: </span>[% address1 %][% address2 %][% address3 %][% address4 %]</p>
+                <p><span class="label">Company name: </span>[% name %]</p>
+                <p><span class="label">Postal address: </span>[% postal %]</p>
+                <p><span class="label">Physical address: </span>[% address1 %][% address2 %][% address3 %][% address4 %]</p>
                 <p><span class="label">Phone: </span>[% phone %]</p>
                 <p><span class="label">Fax: </span>[% fax %]</p>
                 [% IF ( url ) %]
@@ -187,42 +214,51 @@ if (f.company.value == "") {
                     [% END %]</p>
             <p><strong>List prices are: </strong>[% listprice %]</p>
             <p><strong>Invoice prices are: </strong>[% invoiceprice %]</p>
-            [% IF ( GST ) %]<p><strong>Tax Number Registered: </strong>
+            [% IF ( GST ) %]<p><strong>Tax number registered: </strong>
                     [% IF ( gstreg ) %]Yes[% ELSE %]No[% END %]</p>
-            <p><strong>List Item Price Includes Tax: </strong>
+            <p><strong>List item price includes tax: </strong>
                     [% IF ( listincgst ) %]Yes[% ELSE %]No[% END %]</p>
-            <p><strong>Invoice Item Price Includes Tax: </strong>
+            <p><strong>Invoice item price includes tax: </strong>
                     [% IF ( invoiceincgst ) %]Yes[% ELSE %]No[% END %]</p>[% END %]
             <p><strong>Discount: </strong>
                 [% discount %] %</p>
             <p><strong>Tax rate: </strong>
                 [% GST %]%[% UNLESS ( default_tax ) %] (default)[% END %]</p>
+            [% IF deliverytime.defined %]
+                <p><strong>Delivery time: </strong>
+                    [% deliverytime %] days</p>
+            [% END %]
             [% IF ( notes ) %]<p><strong>Notes: </strong>
                 [% notes %]</p>[% END %]
         </div>
         [% IF ( contracts ) %]
             <div id="supplier-contracts" class="yui-g">
                 <h2>Contract(s)</h2>
-                <table>
+                <table id="contractst">
+                  <thead>
                     <tr>
                         <th scope="col">Name</th>
                         <th scope="col">Description</th>
                         <th scope="col">Start date</th>
                         <th scope="col">End date</th>
-                        <th scope="col" colspan="2">&nbsp; </th>
+                        <th scope="col">&nbsp; </th>
+                        <th scope="col">&nbsp; </th>
                     </tr>
+                  </thead>
+                  <tbody>
                     [% FOREACH contract IN contracts %]
                         [% IF ( loop.even ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
                         <td>
                             <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;contractnumber=[% contract.contractnumber %]&amp;booksellerid=[% contract.booksellerid %]">[% contract.contractname %]</a>
                         </td>
                         <td>[% contract.contractdescription %]</td>
-                        <td>[% contract.contractstartdate %]</td>
-                        <td>[% contract.contractenddate %]</td>
+                        <td>[% contract.contractstartdate | $KohaDates %]</td>
+                        <td>[% contract.contractenddate | $KohaDates %]</td>
                         <td><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;contractnumber=[% contract.contractnumber %]&amp;booksellerid=[% contract.booksellerid %]">Edit</a></td>
                         <td><a href="/cgi-bin/koha/admin/aqcontract.pl?op=delete_confirm&amp;contractnumber=[% contract.contractnumber %]&amp;booksellerid=[% contract.booksellerid %]">Delete</a></td>
                         </tr>
                     [% END %]
+                  </tbody>
                 </table>
             </div>
         [% END %]
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git