Merge commit 'kc/master'
[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / acqui / supplier.tmpl
index a97a818..83b8631 100644 (file)
@@ -88,16 +88,22 @@ if (f.company.value == "") {
             <ol>
             <li><label for="list_currency">List Prices are</label>
                     <select name="list_currency" id="list_currency">
-                    <!-- TMPL_LOOP NAME="loop_pricescurrency" -->
-                        <!-- TMPL_VAR NAME="currency" -->
+                    <!-- TMPL_LOOP NAME="loop_currency" -->
+                        <option value="<!-- TMPL_VAR  NAME="currency" -->"
+                            <!-- TMPL_IF NAME="listprice" -->selected="1"<!-- /TMPL_IF -->>
+                            <!--TMPL_VAR NAME="currency" --></option>
                     <!-- /TMPL_LOOP -->
-                    </select></li>
+                    </select>
+            </li>
             <li><label for="invoice_currency">Invoice Prices are</label>
                     <select name="invoice_currency" id="invoice_currency">
-                    <!-- TMPL_LOOP NAME="loop_invoicecurrency" -->
-                        <!-- TMPL_VAR NAME="currency" -->
+                    <!-- TMPL_LOOP NAME="loop_currency" -->
+                        <option value="<!-- TMPL_VAR  NAME="currency" -->"
+                            <!-- TMPL_IF NAME="invoiceprice" -->selected="1"<!-- /TMPL_IF -->>
+                            <!--TMPL_VAR NAME="currency" --></option>
                     <!-- /TMPL_LOOP -->
-                    </select></li>
+                    </select>
+            </li>
             </ol>
             <ol class="radio">
             <!-- TMPL_IF NAME="GST" --><li><label for="gstyes" class="radio">Tax Number Registered:</label>
@@ -123,13 +129,13 @@ if (f.company.value == "") {
                     <label for="invoice_gstyes">Include tax</label> <input type="radio" id="invoice_gstyes" name="invoice_gst" value="1" checked="checked" />
                     <label for="invoice_gstno">Don't include tax</label> <input type="radio" id="invoice_gstno" name="invoice_gst" value="0" />
                     <!-- TMPL_ELSE -->
-                    <label for="invoice_gstyes">Include tax</label> <input type="radio" id="invoice_gstyes" name="invoice_gst" value="1">
+                    <label for="invoice_gstyes">Include tax</label> <input type="radio" id="invoice_gstyes" name="invoice_gst" value="1" />
                     <label for="invoice_gstno">Don't include tax</label> <input type="radio" id="invoice_gstno" name="invoice_gst" value="0" checked="checked" />
                 <!-- /TMPL_IF --></li><!-- /TMPL_IF -->
             </ol>
             <ol>
             <li><label for="discount">Discount</label>
-                <input type="text" size="3" id="discount" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" /> %</li>
+                <input type="text" size="6" id="discount" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" /> %</li>
             <!-- TMPL_IF NAME="GST" --><li><label for="gstrate">Tax rate</label><input type="text" name="gstrate" id="gstrate" size="5" value="<!-- TMPL_VAR name="gstrate" -->"/>%</li><!-- /TMPL_IF -->
             <li><label for="notes">Notes</label>
                 <textarea cols="40" rows="4" id="notes" name="notes" ><!-- TMPL_VAR NAME="notes" --></textarea></li></ol>                      
@@ -139,44 +145,39 @@ if (f.company.value == "") {
                 <input type="hidden"  name="invoice_gst" value="0" />
             <!-- /TMPL_UNLESS -->
         </fieldset>
-        <fieldset class="action"><input type="button" value="Save" onclick="check(this.form);" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="id" -->">Cancel</a></fieldset>
+        <fieldset class="action"><input type="button" value="Save" onclick="check(this.form);" /> <!--TMPL_IF Name="id"-->
+        <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->"><!--TMPL_ELSE--><a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
+        <!--/TMPL_IF-->Cancel</a></fieldset>
         </div>
     </form>
 <!--TMPL_ELSE-->
     <h1><!-- TMPL_VAR NAME="name" --></h1>
         <div class="yui-g">
-        <div id="supplier-company-details" class="yui-u first">
-            <p><strong>Company Name: </strong>
-                <!-- TMPL_VAR NAME="name" --></p>
-            <p><strong>Postal Address: </strong>
-                    <!-- TMPL_VAR NAME="postal" --></p>
-            <p><strong>Physical Address: </strong>
-                <!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></p>
-            <p><strong>Phone: </strong>
-                <!-- TMPL_VAR NAME="phone" --></p>
-            <p><strong>Fax: </strong>
-                <!-- TMPL_VAR NAME="fax" --></p>
-        <!-- TMPL_IF NAME="url" --> <p><strong>Web site: </strong>
-                <a href="<!-- TMPL_VAR NAME="url" -->"><!-- TMPL_VAR NAME="url" --></a></p><!-- /TMPL_IF -->
-        </div>
-        <div id="supplier-contact-details" class="yui-u">
-            <h3>Contact details</h3>
-            <p><strong>Contact name: </strong>
-                <!-- TMPL_VAR NAME="contact" --></p>
-            <p><strong>Position: </strong>
-                <!-- TMPL_VAR NAME="contpos" --></p>
-            <p><strong>Phone: </strong>
-                <!-- TMPL_VAR NAME="contphone" --></p>
-            <p><strong>Alternative phone: </strong>
-                <!-- TMPL_VAR NAME="contaltphone" --></p>
-            <p><strong>Fax: </strong>
-                <!-- TMPL_VAR NAME="contfax" --></p>
-            <!-- TMPL_IF NAME="contemail" --><p><strong>Email: </strong>
-                <a href="mailto:<!-- TMPL_VAR NAME="contemail" -->"><!-- TMPL_VAR NAME="contemail" --></a></p><!-- /TMPL_IF -->
-            <!-- TMPL_IF NAME="contnotes" --><p><strong>Notes: </strong>
-                <!-- TMPL_VAR NAME="contnotes" --></p><!-- /TMPL_IF -->
-        
-        </div>
+            <div id="supplier-company-details" class="yui-u first">
+                <h2>Supplier details</h2>
+                <p><span class="label">Company Name: </span><!-- TMPL_VAR NAME="name" --></p>
+                <p><span class="label">Postal Address: </span><!-- TMPL_VAR NAME="postal" --></p>
+                <p><span class="label">Physical Address: </span><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></p>
+                <p><span class="label">Phone: </span><!-- TMPL_VAR NAME="phone" --></p>
+                <p><span class="label">Fax: </span><!-- TMPL_VAR NAME="fax" --></p>
+                <!-- TMPL_IF NAME="url" -->
+                    <p><span class="label">Web site: </span><a href="<!-- TMPL_VAR NAME="url" -->"><!-- TMPL_VAR NAME="url" --></a></p>
+                <!-- /TMPL_IF -->
+            </div>
+            <div id="supplier-contact-details" class="yui-u">
+                <h2>Contact details</h2>
+                <p><span class="label">Contact name: </span><!-- TMPL_VAR NAME="contact" --></p>
+                <p><span class="label">Position: </span><!-- TMPL_VAR NAME="contpos" --></p>
+                <p><span class="label">Phone: </span><!-- TMPL_VAR NAME="contphone" --></p>
+                <p><span class="label">Alternative phone: </span><!-- TMPL_VAR NAME="contaltphone" --></p>
+                <p><span class="label">Fax: </span><!-- TMPL_VAR NAME="contfax" --></p>
+                <!-- TMPL_IF NAME="contemail" -->
+                    <p><span class="label">Email: </span><a href="mailto:<!-- TMPL_VAR NAME="contemail" -->"><!-- TMPL_VAR NAME="contemail" --></a></p>
+                <!-- /TMPL_IF -->
+                <!-- TMPL_IF NAME="contnotes" -->
+                    <p><span class="label">Notes: </span><!-- TMPL_VAR NAME="contnotes" --></p>
+                <!-- /TMPL_IF -->
+            </div>
         </div>
         <div id="supplier-ordering-information" class="yui-g">
         <h3>Ordering information</h3>
@@ -196,11 +197,38 @@ if (f.company.value == "") {
                     <!-- TMPL_IF name= "invoiceincgst" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF --></p><!-- /TMPL_IF -->
             <p><strong>Discount: </strong>
                 <!-- TMPL_VAR NAME="discount" --> %</p>
-            <!-- TMPL_IF NAME="GST" --<p><strong>Tax rate: </strong>
+            <!-- TMPL_IF NAME="GST" --><p><strong>Tax rate: </strong>
                 <!-- TMPL_VAR name="GST" -->%</p><!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="notes" --><p><strong>Notes: </strong>
                 <!-- TMPL_VAR NAME="notes" --></p><!-- /TMPL_IF -->
         </div>
+        <!-- TMPL_IF name="contracts" -->
+            <div id="supplier-contracts" class="yui-g">
+                <h2>Contract(s)</h2>
+                <table>
+                    <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>
+                    </tr>
+                    <!-- TMPL_LOOP NAME="contracts" -->
+                        <!-- TMPL_IF NAME="__even__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+                        <td>
+                            <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;contractnumber=<!-- TMPL_VAR NAME="contractnumber" -->&amp;booksellerid=<!-- TMPL_VAR name="booksellerid" -->"><!-- TMPL_VAR NAME="contractname" --></a>
+                        </td>
+                        <td><!-- TMPL_VAR NAME="contractdescription" --></td>
+                        <td><!-- TMPL_VAR NAME="contractstartdate" --></td>
+                        <td><!-- TMPL_VAR NAME="contractenddate" --></td>
+                        <td><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;contractnumber=<!-- TMPL_VAR NAME="contractnumber" -->&amp;booksellerid=<!-- TMPL_VAR name="booksellerid" -->">Edit</a></td>
+                        <td><a href="/cgi-bin/koha/admin/aqcontract.pl?op=delete_confirm&amp;contractnumber=<!-- TMPL_VAR NAME="contractnumber" -->&amp;booksellerid=<!-- TMPL_VAR name="booksellerid" -->">Delete</a></td>
+                        </tr>
+                    <!-- /TMPL_LOOP -->
+                </table>
+            </div>
+        <!-- /TMPL_IF -->
+
 <!--/TMPL_IF-->
 
 </div>