Acquisition & Suggestion :
authortipaul <tipaul>
Thu, 15 Jul 2004 09:46:31 +0000 (09:46 +0000)
committertipaul <tipaul>
Thu, 15 Jul 2004 09:46:31 +0000 (09:46 +0000)
* acquisition rewritte : create a aqbasket table to deal with "bookseller order header".
* add "close basket" feature : a closed basket can't be modified
* suggestion feature : manage suggestions in acquisition (after suggestion filled in OPAC)

koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl
koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl
koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl [new file with mode: 0644]
koha-tmpl/opac-tmpl/css/en/opac-main.tmpl
koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl
updater/updatedatabase

index 9eb4367..d8f37f7 100644 (file)
        <input type=submit value="Save" class="button acquisition">
 </div>
 
+<!-- suggestions -->
+<div id="bloc25">
+       <h2 class="acquisition">Suggestions to check</h2>
+               <!-- TMPL_IF name="suggestion">
+                       <!--TMPL_VAR name="suggestion" --> suggestions waiting <a href="/cgi-bin/koha/suggestion/acceptorreject.pl" class="button acquisition">Manage</a>
+               <!-- TMPL_ELSE -->
+                       No suggestions waiting
+               <!-- /TMPL_IF -->
+</div>
+
 <!-- showbudget-->
 <div id="bloc25">
        <form action="/cgi-bin/koha/search.pl">
index 8efd6b5..31c294d 100644 (file)
@@ -1,62 +1,81 @@
 <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 
 <div id="mainbloc">
-       <h1 class="acquisition">Shopping Basket <b><!-- TMPL_VAR name="basket" --> </b>for <a href=supplier.pl?id=<!-- TMPL_VAR name="booksellerid" -->></a> <!-- TMPL_VAR name="name" --></h1><br />
-       Our Reference: <b><!-- TMPL_VAR name="entrydate" --></b>, #<b><!-- TMPL_VAR name="basket" --></b> authorised by <b><!-- TMPL_VAR name="loggedinusername" --></b><br />
-       <p>
-       <table>
-               <tr valign=top bgcolor="#ffdf61">
-                       <th class="acquisition" width="5%">Order</th>
-                       <th class="acquisition" width="10%">Publisher</th>
-                       <th class="acquisition" width="10%">Isbn</th>
-                       <th class="acquisition" width="30%">Title</th>
-                       <th class="acquisition" width="20%">Author</th>
-                       <th class="acquisition" width="5%">$ rrp</th>
-                       <th class="acquisition" width="7%">$est</th>
-                       <th class="acquisition" width="7%">Qty</th>
-                       <th class="acquisition" width="7%">Total</th>
-               </tr>
-               <!-- TMPL_LOOP name="books_loop" -->
-                       <tr valign=top bgcolor="<!-- TMPL_VAR name="color" -->">
-                               <td><!-- TMPL_VAR name="ordernumber" --></td>
-                               <td><!-- TMPL_VAR name="publishercode" --></td>
-                               <td><!-- TMPL_VAR name="isbn" --></td>
-                               <td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR name="ordernumber" -->&id=<!-- TMPL_VAR name="booksellerid" -->&basket=<!-- TMPL_VAR name="basket" -->"><!-- TMPL_VAR name="title" --></a></td>
-                               <td><!-- TMPL_VAR name="author" --></td>
-                               <td><!-- TMPL_VAR name="rrp" --></td>
-                               <td><!-- TMPL_VAR name="ecost" --></td>
-                               <td><!-- TMPL_VAR name="quantity" --></td>
-                               <td><!-- TMPL_VAR name="line_total" --></td>
+       <h1 class="acquisition"><!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->shopping Basket <b><!-- TMPL_VAR name="basketno" --> </b>for <a href=supplier.pl?id=<!-- TMPL_VAR name="booksellerid" -->><!-- TMPL_VAR name="name" --></a></h1><br />
+       <div id="bloc25">
+               <h2 class="acquisition">Basket info</h2>
+                       <p><label class="label100">Basket number<label> <!-- TMPL_VAR name="basketno" --></p>
+                       <p><label class="label100">Managed by<label><!-- TMPL_VAR name="authorisedbyname" --></p>
+                       <p><label class="label100">open on<label> <!-- TMPL_VAR name="creationdate" --></p>
+                       <p><label class="label100">for<label> <!-- TMPL_VAR name="booksellerid" --></p>
+                       <p><label class="label100">Invoice number </label><!-- TMPL_VAR name="booksellerinvoicenumber" --></p>
+                       <a href="/cgi-bin/koha/acqui/order.pl?op=close&basket=<!-- TMPL_VAR name="basketno" -->" class="button acquisition">Close</a>
+       </div>
+       <div id="bloc100">
+       <h2 class="acquisition">Order</h2>
+       <!-- TMPL_IF name="books_loop" -->
+               <table>
+                       <tr valign=top bgcolor="#ffdf61">
+                               <th class="acquisition" width="5%">Order</th>
+                               <th class="acquisition" width="10%">Publisher</th>
+                               <th class="acquisition" width="10%">Isbn</th>
+                               <th class="acquisition" width="30%">Title</th>
+                               <th class="acquisition" width="20%">Author</th>
+                               <th class="acquisition" width="5%">$ rrp</th>
+                               <th class="acquisition" width="7%">$est</th>
+                               <th class="acquisition" width="7%">Qty</th>
+                               <th class="acquisition" width="7%">Total</th>
                        </tr>
-               <!-- /TMPL_LOOP -->
-               <input type=hidden name=number value=<!-- TMPL_VAR name="count" -->>
-               <input type=hidden name=basketno value="<!-- TMPL_VAR name="basket" -->">
-               <tr>
-                       <td colspan=6 rowspan=3>
-                               &nbsp;
-                       </td>
-                       <td><b>SubTotal</b></td>
-                       <td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="sub_total" --></td>
-               </tr>
-               <tr>
-                       <td><b>GST</b></td>
-                       <td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="gist" --></td>
-               </tr>
-               <tr>
-                       <td><b>TOTAL</b></td>
-                       <td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="grand_total" --></td>
-               </tr>
-               <tr>
-                       <td colspan=9>
-                               <FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl" method=post>
-                                       <input type=hidden name=id value="<!-- TMPL_VAR name="id" -->">
-                                       <input type=hidden name=basket value="<!-- TMPL_VAR name="basket" -->">
-                                       <b> Add order : enter keyword or title: </b><INPUT TYPE="text"  SIZE="25"   NAME="search">
-                               </form>
-                       </td>
-               </tr>
-       
-       </table>
-       </CENTER>
+                       <!-- TMPL_LOOP name="books_loop" -->
+                               <tr valign=top bgcolor="<!-- TMPL_VAR name="color" -->">
+                                       <td><!-- TMPL_VAR name="ordernumber" --></td>
+                                       <td><!-- TMPL_VAR name="publishercode" --></td>
+                                       <td><!-- TMPL_VAR name="isbn" --></td>
+                                       <td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR name="ordernumber" -->&booksellerid=<!-- TMPL_VAR name="booksellerid" -->&basketno=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR name="title" --></a></td>
+                                       <td><!-- TMPL_VAR name="author" --></td>
+                                       <td><!-- TMPL_VAR name="rrp" --></td>
+                                       <td><!-- TMPL_VAR name="ecost" --></td>
+                                       <td><!-- TMPL_VAR name="quantity" --></td>
+                                       <td><!-- TMPL_VAR name="line_total" --></td>
+                               </tr>
+                       <!-- /TMPL_LOOP -->
+                       <input type=hidden name=number value=<!-- TMPL_VAR name="count" -->>
+                       <input type=hidden name=basketno value="<!-- TMPL_VAR name="basketno" -->">
+                       <tr>
+                               <td colspan=6 rowspan=3>
+                                       &nbsp;
+                               </td>
+                               <td><b>SubTotal</b></td>
+                               <td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="sub_total" --></td>
+                       </tr>
+                       <tr>
+                               <td><b>GST</b></td>
+                               <td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="gist" --></td>
+                       </tr>
+                       <tr>
+                               <td><b>TOTAL</b></td>
+                               <td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="grand_total" --></td>
+                       </tr>
+               </table>
+       <!-- TMPL_ELSE -->
+               <p>Basket empty</p>
+       <!-- /TMPL_IF -->
+       </div>
+       <div id="bloc25">
+               <h2 class="acquisition">Add order line</h2>
+               <form action="/cgi-bin/koha/acqui/newbasket2.pl" method=post>
+                       <input type=hidden name=booksellerid value="<!-- TMPL_VAR name="booksellerid" -->">
+                       <input type=hidden name=basketno value="<!-- TMPL_VAR name="basketno" -->">
+                       <p>from an existing biblio: </b><input type="text"  size="25"   name="search"><input type="submit" class="button acquisition" value="Search"></p>
+                       <p>or
+                               <a href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR name="booksellerid" -->&basketno=<!-- TMPL_VAR name="basketno" -->" class="button acquisition">
+                                       from a suggestion
+                               </a>
+                               <a href="/cgi-bin/koha/acqui/newbiblio.pl?booksellerid=<!-- TMPL_VAR name="booksellerid" -->&basketno=<!-- TMPL_VAR name="basketno" -->" class="button acquisition">
+                                       New biblio
+                               </a>
+                       </p>
+               </form>
+       </div>
 </div>
 <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
index b7fad3a..e4d31a7 100644 (file)
@@ -53,106 +53,113 @@ win.document.write("</font></body></html>");
        <form action="/cgi-bin/koha/acqui/addorder.pl" method=post name=frusin>
        <!-- TMPL_UNLESS name="existing" --><input type=hidden name=existing value=no><!-- /TMPL_UNLESS -->
        <!-- <!-- TMPL_VAR name="title" --> -->
-       <input type=hidden name=ordnum value="<!-- TMPL_VAR name="ordnum" -->">
-       <input type=hidden name=basket value="<!-- TMPL_VAR name="basket" -->">
-       <input type=hidden name=supplier value="<!-- TMPL_VAR name="id" -->">
-       <input type=hidden name=biblio value="<!-- TMPL_VAR name="biblio" -->">
-       <input type=hidden name=bibitemnum value="<!-- TMPL_VAR name="biblioitemnumber" -->">
-       <input type=hidden name=oldtype value="<!-- TMPL_VAR name="itemtype" -->">
-       <input type=hidden name=discount value="<!-- TMPL_VAR name="discount" -->">
-       <input type=hidden name=listinc value="<!-- TMPL_VAR name="listincgst" -->">
-       <input type=hidden name=currency value="<!-- TMPL_VAR name="currency" -->">
-       <input type=hidden name=applygst value="<!-- TMPL_VAR name="gstreg" -->">
+       <input type="hidden" name="ordnum" value="<!-- TMPL_VAR name="ordnum" -->">
+       <input type="hidden" name="basketno" value="<!-- TMPL_VAR name="basketno" -->">
+       <input type="hidden" name="booksellerid" value="<!-- TMPL_VAR name="booksellerid" -->">
+       <input type="hidden" name="biblio" value="<!-- TMPL_VAR name="biblio" -->">
+       <input type="hidden" name="bibitemnum" value="<!-- TMPL_VAR name="biblioitemnumber" -->">
+       <input type="hidden" name="oldtype" value="<!-- TMPL_VAR name="itemtype" -->">
+       <input type="hidden" name="discount" value="<!-- TMPL_VAR name="discount" -->">
+       <input type="hidden" name="listinc" value="<!-- TMPL_VAR name="listincgst" -->">
+       <input type="hidden" name="currency" value="<!-- TMPL_VAR name="currency" -->">
+       <input type="hidden" name="applygst" value="<!-- TMPL_VAR name="gstreg" -->">
+       <input type="hidden" name="suggestionid" value="<!-- TMPL_VAR name="suggestionid" -->">
        <!-- TMPL_LOOP name="loop_currencies" -->
                <input type=hidden name="<!-- TMPL_VAR name="currency" -->" value="<!-- TMPL_VAR name="rate" -->">
        <!-- /TMPL_LOOP -->
-       <!-- TMPL_IF name="orderexists" --><input type=hidden name=orderexists value=yes><!-- /TMPL_IF -->
        <a href="basket.pl?basket=<!-- TMPL_VAR name=basket -->" class="button acquisition">View Basket</a>
-       <h1 class="acquisition"><!-- TMPL_VAR name="ordnum" --> - Order Details </h1>
+       <h1 class="acquisition">
+               <!-- TMPL_IF name="ordnum" -->
+                       Modify order details (line #<!-- TMPL_VAR name="ordnum" -->)
+               <!-- TMPL_ELSE -->
+                       New order
+               <!-- /TMPL_IF -->
+                <!-- TMPL_IF name="suggestionid" -->(defined from suggestion #<!-- TMPL_VAR name="suggestionid" -->)<!-- /TMPL_IF -->
+       </h1>
        Shopping Basket For <!-- TMPL_VAR name="name" -->
        <div id="bloc25">
                <h2 class="acquisition">catalogue details</h2>
                <p>
-                       <label><b>Title *</b></label>
+                       <label class="label100"><b>Title *</b></label>
                        <input type=text size=20 name=title value="<!-- TMPL_VAR name="title" -->">
                </p>
                <p>
-                       <label>Author</label>
+                       <label class="label100">Author</label>
                        <input type=text size=20 name=author value="<!-- TMPL_VAR name="author" -->" >
                </p>
                <p>
-                       <label> Publisher</label>
+                       <label class="label100"> Publisher</label>
                        <input type=text size=30 name=publishercode value="<!-- TMPL_VAR name="publishercode" -->" >
                </p>
                <p>
-                       <label>Copyright Date</label>
+                       <label class="label100">Copyright Date</label>
                        <input type=text size=20 name=copyrightdate value="<!-- TMPL_VAR name="copyrightdate" -->">
                </p>
                <p>
-                       <label>Format</label>
+                       <label class="label100">Format</label>
                        <!-- TMPL_VAR name="CGIitemtype" -->
                </p>
                <p>
-                       <label>ISBN</label>
+                       <label class="label100">ISBN</label>
                        <input type=text size=20 name=ISBN value="<!-- TMPL_VAR name="isbn" -->">
                </p>
                <p>
-                       <label>Series</label>
+                       <label class="label100">Series</label>
                        <input type=text size=20 name=Series value="<!-- TMPL_VAR name="seriestitle" -->">
                </p>
                <p>
-                       <label>Branch</label>
+                       <label class="label100">Branch</label>
                        <!-- TMPL_VAR name="CGIbranch" -->
                </p>
        </div>
        <div id="bloc25">
                <h2 class="acquisition">Accounting details</h2>
                <p>
-                       <label>Quantity</label>
+                       <label class="label100">Quantity</label>
                        <input type=text size=20 name=quantity value="<!-- TMPL_VAR name="quantity" -->" onchange='update(this.form)' >
                </p>
                <p>
-                       <label>Bookfund</label>
+                       <label class="label100">Bookfund</label>
                        <!-- TMPL_VAR name="CGIbookfund" -->
                </p>
                <p>
-                       <label>Suppliers List Price</label>
+                       <label class="label100">Suppliers List Price</label>
                        <input type=text size=20 name=list_price value="<!-- TMPL_VAR name="listprice" -->" onchange='update(this.form)'>
                </p>
                <p>
-                       <label>Replacement Cost </label>
+                       <label class="label100">Replacement Cost </label>
                        <input type=text size=20 name=rrp value="<!-- TMPL_VAR name="rrp" -->" onchange='update(this.form)'>
                </p>
                <p>
-                       <label>Budgeted Cost</label>
+                       <label class="label100">Budgeted Cost</label>
                        <input type=text size=20 name=ecost value="<!-- TMPL_VAR name="ecost" -->" onchange='update(this.form)'>
                </p>
                <p>
-                       <label>Budgeted GST</label>
+                       <label class="label100">Budgeted GST</label>
                        <input type=text size=20 name=GST value="" onchange='update(this.form)'>
                </p>
                <p>
-                       <label><B>BUDGETED TOTAL</B></label>
+                       <label class="label100"><B>BUDGETED TOTAL</B></label>
                        <input type=text size=20 name=total value="" onchange='update(this.form)'>
                </p>
                <p>
-                       <label>Actual Cost</label>
+                       <label class="label100">Actual Cost</label>
                        <input type=text size=20 name=cost>
                </p>
                <p>
-                       <label>Invoice Number *</label>
+                       <label class="label100">Invoice Number *</label>
                        <input type=text size=20 name=invoice >
                <p>
-                       <label>Notes</label>
+                       <label class="label100">Notes</label>
                        <input type=text size=20 name=notes value="<!-- TMPL_VAR name="notes" -->">
                </p>
                <p>The 2 following fields are available for your own usage. They can be useful for stat purposes</p>
                <p>
-                       <label>Sort field 1</label>
+                       <label class="label100">Sort field 1</label>
                        <input type=text size=20 name=sort1 value="<!-- TMPL_VAR name="sort1" -->">
                </p>
                <p>
-                       <label>Sort field 2</label>
+                       <label class="label100">Sort field 2</label>
                        <input type=text size=20 name=sort2 value="<!-- TMPL_VAR name="sort2" -->">
                </p>
                <p>
index ae54538..7547462 100644 (file)
@@ -1,53 +1,64 @@
 <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 <div id="mainbloc">
-<h1 class="acquisition">Supplier Search Results</h1>
-<div id="bloc100">
-<h2 class="acquisition">You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h2>
-<table>
-<tr>
-       <th class="acquisition">Order</th>
-       <th class="acquisition">Receive</th>
-       <th class="acquisition">Company</th>
-       <th class="acquisition">
-               <table class="noborder">
-                       <tr>
-                               <th class="acquisition">Basket</th>
-                               <th class="acquisition">Items</th>
-                               <th class="acquisition">Staff</th>
-                               <th class="acquisition">Date</th>
-                       </tr>
-               </table>
-       </td>
-</tr>
-
-<!-- TMPL_LOOP name="loop_suppliers" -->
-       <tr valign=top bgcolor=<!-- TMPL_VAR name="color" -->>
-               <td>
-                       <!-- TMPL_IF name="active" -->
-                               <a href="basket.pl?id=<!-- TMPL_VAR name=id -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/mail_send.png" title="Add order" ALT="Add" BORDER=0 ></a>
-                       <!-- TMPL_ELSE -->
-                               Inactive
-                       <!-- /TMPL_IF -->
-               </td>
-               <td>
-                       <a href="recieveorder.pl?id=<!-- TMPL_VAR name=id -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/mail_get.png" title="receive" ALT="Add" BORDER=0 ></a>
-               </td>
-               <td><a href="supplier.pl?id=<!-- TMPL_VAR name=id -->"><!-- TMPL_VAR name="name" --></a></td>
-               <td>
-                       <table width="100%" cellspacing=0 cellpadding=5 border=0>
-                               <!-- TMPL_LOOP name="loop_basket" -->
+       <h1 class="acquisition">Supplier Search Results</h1>
+       <div id="bloc100">
+       <h2 class="acquisition">You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h2>
+       <table>
+       <tr>
+               <th class="acquisition">Order</th>
+               <th class="acquisition">Receive</th>
+               <th class="acquisition">Supplier</th>
+               <th class="acquisition">
+                       &nbsp;
+               </th>
+       </tr>
+       
+       <!-- TMPL_LOOP name="loop_suppliers" -->
+               <!-- TMPL_IF name="even" -->
+               <tr bgcolor="#EEEEEE">
+               <!-- TMPL_ELSE -->
+               <tr>
+               <!-- /TMPL_IF -->
+                       <td>
+                               <!-- TMPL_IF name="active" -->
+                                       <a href="basket.pl?supplierid=<!-- TMPL_VAR name=supplierid -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/mail_send.png" title="Add order" ALT="Add" BORDER=0 ></a>
+                               <!-- TMPL_ELSE -->
+                                       Inactive
+                               <!-- /TMPL_IF -->
+                       </td>
+                       <td>
+                               <a href="recieveorder.pl?supplierid=<!-- TMPL_VAR name=supplierid -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/mail_get.png" title="receive" ALT="Add" BORDER=0 ></a>
+                       </td>
+                       <td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name=supplierid -->"><!-- TMPL_VAR name="name" --></a></td>
+                       <td>
+                               <table>
                                        <tr>
-                                               <td width="15%"><a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR name="basketno" --></a></td>
-                                               <td width="15%"><TMPl_VAR name="total"></td>
-                                               <td width="40%"><!-- TMPL_VAR name="authorisedby" --></td>
-                                               <td width="30%"><!-- TMPL_VAR name="entrydate" --></td>
+                                               <th class="acquisition">Basket</th>
+                                               <th class="acquisition">Items</th>
+                                               <th class="acquisition">Created by</th>
+                                               <th class="acquisition">Date</th>
+                                               <th class="acquisition">&nbsp;</th>
                                        </tr>
-                               <!-- /TMPL_LOOP -->
-                       </table>
-       </tr>
-<!-- /TMPL_LOOP -->
-</table>
-</CENTER>
-<br>
-<a class="button acquisition" href="supplier.pl?id=0">Add supplier</a>
+                                       <!-- TMPL_LOOP name="loop_basket" -->
+                                               <tr>
+                                                       <td><!-- TMPL_VAR name="basketno" --></a></td>
+                                                       <td><TMPl_VAR name="total"></td>
+                                                       <td><!-- TMPL_VAR name="authorisedby" --></td>
+                                                       <td><!-- TMPL_VAR name="creationdate" --></td>
+                                                       <td>
+                                                               <!-- TMPL_IF name="closedate" -->
+                                                                       closed on <!-- TMPL_VAR name="closedate" -->
+                                                               <!-- TMPL_ELSE -->
+                                                                       <a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR name="basketno" -->" class="button acquisition">modify</a>
+                                                               <!-- /TMPL_IF -->
+                                                       </td>
+                                               </tr>
+                                       <!-- /TMPL_LOOP -->
+                               </table>
+               </tr>
+       <!-- /TMPL_LOOP -->
+       </table>
+       </div>
+       <a class="button acquisition" href="supplier.pl?supplerid=0">Add supplier</a>
+</div>
 <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl
new file mode 100644 (file)
index 0000000..4fa8155
--- /dev/null
@@ -0,0 +1,61 @@
+<!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
+<div id="mainbloc">
+
+<!-- TMPL_IF name="op_else" -->
+       <h1 class="acquisition">Suggestions</h1>
+       <table>
+               <tr>
+                       <th class="acquisition">Suggestion</th>
+                       <th class="acquisition">Suggested by</th>
+                       <th class="acquisition">Accepted by</th>
+                       <th class="acquisition">&nbsp;</th>
+               </tr>
+               <tr>
+                       <form>
+                               <th class="acquisition">
+                                       <p>Filter on :
+                                       title: <input type="text" name="title" value="<!-- TMPL_VAR name="title"-->">
+                                       author: <input type="text" name="author" value="<!-- TMPL_VAR name="author" -->">
+                                       publisher: <input type="text" name="publishercode" value="<!-- TMPL_VAR name="publishercode"-->">
+                               </th>
+                               <th class="acquisition">
+                                       &nbsp;
+                               </th>
+                               <th class="acquisition">
+                                       &nbsp;
+                               </th>
+                               <th class="acquisition">
+                                       <input type="submit" class="button acquisition" value="Set Filter">
+                               </th>
+                       </form>
+               </tr>
+               <!-- TMPL_LOOP NAME="suggestions_loop" -->
+                       <tr>
+                               <td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+                                       <p><!-- TMPL_VAR NAME="title" --> - <!-- TMPL_VAR NAME="author" --></p>
+                                       <p>
+                                               <!-- TMPL_IF name="copyrightdate" -->copy. year:<!-- TMPL_VAR name="copyrightdate" --> <!-- /TMPL_IF -->
+                                               <!-- TMPL_IF name="volumedesc" -->volume:<i><!-- TMPL_VAR name="volumedesc" --></i> <!-- /TMPL_IF -->
+                                               <!-- TMPL_IF name="isbn" -->ISBN :<i><!-- TMPL_VAR name="isbn" --></i> <!-- /TMPL_IF -->
+                                               <!-- TMPL_IF name="publishercode" --><br/>published by:<!-- TMPL_VAR name="publishercode" --> <!-- /TMPL_IF -->
+                                               <!-- TMPL_IF name="publicationyear" --> in <i><!-- TMPL_VAR name="publicationyear" --></i> <!-- /TMPL_IF -->
+                                               <!-- TMPL_IF name="place" --> at <i><!-- TMPL_VAR name="place" --></i> <!-- /TMPL_IF -->
+                                               <!-- TMPL_IF name="note" --><p><i>(<!-- TMPL_VAR name="note" -->)</i></p> <!-- /TMPL_IF -->
+                               </td>
+                               <td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+                                       <!-- TMPL_VAR name="surnamesuggestedby" --><!-- TMPL_IF name="firstnamesuggestedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR name="firstnamesuggestedby" -->
+                               </td>
+                               <td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+                                       <!-- TMPL_VAR name="usermanagedby" --><!-- TMPL_IF name="firstnamemanagedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR name="firstnamemanagedby" -->
+                               </td>
+                               <td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+                                       <a href="newbiblio.pl??id=<!-- TMPL_VAR name="supplierid" -->&basket=<!-- TMPL_VAR name="basket" -->&suggestionid=<!-- TMPL_VAR name="suggestionid" -->" class="button acquisition">Order</a>
+                               </td>
+                       </tr>
+               <!-- /TMPL_LOOP -->
+       </table>
+       <form>
+
+<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
\ No newline at end of file
index 61db691..8a13f96 100644 (file)
@@ -9,7 +9,7 @@
 
 <body>
 <div id="leftbloc">
-       <img src="<!-- TMPL_VAR NAME='themelang' -->/images/front-background-med.gif" title="koha" alt="koha" />
+       <img class="relative" src="<!-- TMPL_VAR NAME='themelang' -->/images/front-background-med.gif" title="koha" alt="koha" />
 </div>
 
 <div id="homebloc">
index 9e5bfcd..e8c766c 100644 (file)
@@ -8,8 +8,12 @@
                <input type="hidden" name="op" value="add_confirm">
                <p><label>Title</label><input type="text" name="title" size=60 maxlentgh=80></p>
                <p><label>Author</label><input type="text" name="author" size=60 maxlength=80></p>
-               <p><label>Copyright date</label><input type="text" name="copyrightdate" size=6 maxlength=4></p>
-               <p><label>Publisher</label><input type="text" name="publishercode" size=60 maxlength=80></p>
+               <p><label>Copyright date</label><input type="text" name="copyrightdate" size="5" maxlength="4"></p>
+               <p><label>Publisher</label><input type="text" name="publishercode" size="60" maxlength="80"></p>
+               <p><label>Volume</label><input type="text" name="volumedesc" size="60" maxlength="80"></p>
+               <p><label>Publication year</label><input type="text" name="publicationyear" size="5" maxlength="4"></p>
+               <p><label>Publication place</label><input type="text" name="place" size="60" maxlength="80"></p>
+               <p><label>ISBN/ISSN</label><input type="text" name="isbn" size="14" maxlength="10"></p>
                <p><label>Note</label><textarea name="note" rows="10" cols="60"></textarea></p>
                <p><label>&nbsp;</label><input type="submit" value="Send suggestion to the library staff" class="button"></p>
        </form>
index 26d9aed..d712e43 100755 (executable)
@@ -286,7 +286,7 @@ my %requiretables = (
                                KEY sndx_word (sndx_word)
                        )",
        suggestions => "(
-                               suggestionnumber int(8) NOT NULL auto_increment,
+                               suggestionid int(8) NOT NULL auto_increment,
                                suggestedby int(11) NOT NULL default '0',
                                managedby int(11) default NULL,
                                status varchar(10) NOT NULL default '',
@@ -296,11 +296,23 @@ my %requiretables = (
                                copyrightdate smallint(6) default NULL,
                                publishercode varchar(255) default NULL,
                                date timestamp(8) NOT NULL,
+                               volumedesc char(255) default NULL,
+                               publicationyear smallint(6) default NULL,
+                               place char(255) default NULL,
+                               isbn char(10) default NULL,
                                mailoverseeing smallint(1) default 0,
                                PRIMARY KEY  (suggestionnumber),
                                KEY suggestedby (suggestedby),
                                KEY managedby (managedby)
                        )",
+       aqbasket => "(basketno int(11) NOT NULL auto_increment,
+                               creationdate date,
+                               closedate date,
+                               booksellerid varchar(10),
+                               authorisedby varchar(10),
+                               booksellerinvoicenumber text,
+                               PRIMARY KEY (basketno)
+                               )",
 );
 
 my %requirefields = (
@@ -369,6 +381,14 @@ my %dropable_table = (
     serialissues   => 'serialissues',
 );
 
+my %uselessfields = (
+       aqorders => "requisitionedby,authorisedby,booksellerid,
+                       deliverydays,followupdays,
+                       numberfollowupsallowed,numberfollowupssent,
+                       dateprinted,sourced,quantityreceiveddamaged,
+                       subscriptionfrom,subscriptionto
+                       "
+       );
 # the other hash contains other actions that can't be done elsewhere. they are done
 # either BEFORE of AFTER everything else, depending on "when" entry (default => AFTER)
 
@@ -1200,6 +1220,26 @@ if ($marc_word{subfieldid}) {
 }
 # Populate tables with required data
 
+# fill aqbasket if it's empty and aqorder is not
+# => it means it has just been created & must be filled
+$sth = $dbh->prepare("select count(*) from aqbasket");
+$sth->execute;
+if ($sth->fetchrow == 0) {
+       $sth = $dbh->prepare("select count(*) from aqorders");
+       $sth->execute;
+       if ($sth->fetchrow >0) {
+               print "Populating new table aqbasket\n";
+               print "IMPORTANT NOTE: error message \"Duplicate entry 'X' for key 1\" may appear. it should not be a real trouble\n";
+               $sth=$dbh->prepare("select distinct basketno,booksellerid,authorisedby,entrydate,booksellerinvoicenumber from aqorders");
+               $sth->execute;
+               my ($basketno,$booksellerid,$authorisedby,$entrydate,$booksellerinvoicenumber);
+               my $sth2 = $dbh->prepare("insert into aqbasket (basketno,creationdate,booksellerid,authorisedby,booksellerinvoicenumber) values (?,?,?,?,?)");
+               while (($basketno,$booksellerid,$authorisedby,$entrydate,$booksellerinvoicenumber) = $sth->fetchrow) {
+                       print "$basketno,$entrydate,$booksellerid,$authorisedby,$booksellerinvoicenumber\n";
+                       $sth2->execute($basketno,$entrydate,$booksellerid,$authorisedby,$booksellerinvoicenumber);
+               }
+       }
+}
 foreach my $table ( keys %tabledata ) {
     print "Checking for data required in table $table...\n" unless $silent;
     my $tablerows = $tabledata{$table};
@@ -1244,11 +1284,34 @@ foreach my $table ( keys %tabledata ) {
     }
 }
 
+# at last, remove useless fields
+foreach $table ( keys %uselessfields ) {
+       my @fields = split /,/,$uselessfields{$table};
+       foreach my $fieldtodrop (@fields) {
+               $fieldtodrop =~ s/\t//g;
+               $fieldtodrop =~ s/\n//g;
+               print "deleting $fieldtodrop field in $table...\n" unless $silent;
+               my $sth = $dbh->prepare("alter table $table drop $fieldtodrop");
+               $sth->execute;
+               if ( $sth->err ) {
+                       print "Error : $sth->errstr \n";
+                       $sth->finish;
+               }    # if error
+       }
+}    # foreach
+
+
 $sth->finish;
 
 exit;
 
 # $Log$
+# Revision 1.91  2004/07/15 09:52:28  tipaul
+# Acquisition & Suggestion :
+# * acquisition rewritte : create a aqbasket table to deal with "bookseller order header".
+# * add "close basket" feature : a closed basket can't be modified
+# * suggestion feature : manage suggestions in acquisition (after suggestion filled in OPAC)
+#
 # Revision 1.90  2004/07/06 08:24:18  tipaul
 # adding 2 free fields that can be used for sorting purposes
 #