[Koha-patches] [PATCH] fix for 3612 (bookseller improvements)
paul.poulain at biblibre.com
paul.poulain at biblibre.com
Wed Sep 16 10:31:32 CEST 2009
From: Paul Poulain <paul.poulain at biblibre.com>
- removing useless fields from aqbooksellers table: specialty, deliverydays,followupdays,followupscancel,nocalc, invoicedisc They were in the DB schema, but unused for years
- reworked bookseller and contract gui
- no warning thrown
NOTE : updatedatabase not done for field removal in aqbooksellers table. Should have:
ALTER TABLE `aqbooksellers`
DROP `deliverydays`,
DROP `followupdays`,
DROP `followupscancel`,
DROP `specialty`,
DROP `nocalc`;
---
C4/Bookseller.pm | 15 +-
acqui/supplier.pl | 8 +-
admin/aqcontract.pl | 31 +++--
installer/data/mysql/kohastructure.sql | 6 -
.../prog/en/includes/acquisitions-toolbar.inc | 67 ++++----
.../prog/en/modules/acqui/booksellers.tmpl | 162 ++++++++++----------
.../prog/en/modules/acqui/supplier.tmpl | 86 +++++------
.../prog/en/modules/admin/aqcontract.tmpl | 106 +++++++------
8 files changed, 241 insertions(+), 240 deletions(-)
diff --git a/C4/Bookseller.pm b/C4/Bookseller.pm
index c18769a..655d25e 100644
--- a/C4/Bookseller.pm
+++ b/C4/Bookseller.pm
@@ -172,10 +172,10 @@ sub AddBookseller {
postal, phone, fax, url, contact,
contpos, contphone, contfax, contaltphone, contemail,
contnotes, active, listprice, invoiceprice, gstreg,
- listincgst,invoiceincgst, specialty, discount, invoicedisc,
- nocalc, notes
+ listincgst,invoiceincgst, discount,
+ notes
)
- VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+ VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
";
my $sth = $dbh->prepare($query);
$sth->execute(
@@ -190,9 +190,7 @@ sub AddBookseller {
$data->{'active'}, $data->{'listprice'},
$data->{'invoiceprice'}, $data->{'gstreg'},
$data->{'listincgst'}, $data->{'invoiceincgst'},
- $data->{'specialty'}, $data->{'discount'},
- $data->{'invoicedisc'}, $data->{'nocalc'},
- $data->{'notes'}
+ $data->{'discount'}, $data->{'notes'}
);
# return the id of this new supplier
@@ -233,7 +231,7 @@ sub ModBookseller {
contphone=?,contfax=?,contaltphone=?,contemail=?,
contnotes=?,active=?,listprice=?, invoiceprice=?,
gstreg=?,listincgst=?,invoiceincgst=?,
- specialty=?,discount=?,invoicedisc=?,nocalc=?,notes=?,gstrate=?
+ discount=?, notes=?, gstrate=?
WHERE id=?
";
my $sth = $dbh->prepare($query);
@@ -249,8 +247,7 @@ sub ModBookseller {
$data->{'active'}, $data->{'listprice'},
$data->{'invoiceprice'}, $data->{'gstreg'},
$data->{'listincgst'}, $data->{'invoiceincgst'},
- $data->{'specialty'}, $data->{'discount'},
- $data->{'invoicedisc'}, $data->{'nocalc'},
+ $data->{'discount'},
$data->{'notes'}, $data->{'gstrate'},
$data->{'id'}
);
diff --git a/acqui/supplier.pl b/acqui/supplier.pl
index b3ed949..3934da3 100755
--- a/acqui/supplier.pl
+++ b/acqui/supplier.pl
@@ -88,11 +88,10 @@ if ($op eq "display") {
contnotes => $booksellers[0]->{'contnotes'},
notes => $booksellers[0]->{'notes'},
active => $booksellers[0]->{'active'},
- specialty => $booksellers[0]->{'specialty'},
gstreg => $booksellers[0]->{'gstreg'},
listincgst => $booksellers[0]->{'listincgst'},
invoiceincgst => $booksellers[0]->{'invoiceincgst'},
- gstrate => $booksellers[0]->{'gstrate'},
+ gstrate => $booksellers[0]->{'gstrate'}*100,
discount => $booksellers[0]->{'discount'},
invoiceprice => $booksellers[0]->{'invoiceprice'},
listprice => $booksellers[0]->{'listprice'},
@@ -143,12 +142,11 @@ elsif ($op eq 'delete') {
contemail => $booksellers[0]->{'contemail'},
contnotes => $booksellers[0]->{'contnotes'},
notes => $booksellers[0]->{'notes'},
- active => $booksellers[0]->{'active'},
- specialty => $booksellers[0]->{'specialty'},
+ active => $id?$booksellers[0]->{'active'}:1, # set active ON by default for supplier add (id empty for add)
gstreg => $booksellers[0]->{'gstreg'},
listincgst => $booksellers[0]->{'listincgst'},
invoiceincgst => $booksellers[0]->{'invoiceincgst'},
- gstrate => $booksellers[0]->{'gstrate'},
+ gstrate => $booksellers[0]->{'gstrate'}*100,
discount => $booksellers[0]->{'discount'},
loop_pricescurrency => \@loop_pricescurrency,
loop_invoicecurrency => \@loop_invoicecurrency,
diff --git a/admin/aqcontract.pl b/admin/aqcontract.pl
index 37a7600..eea782d 100755
--- a/admin/aqcontract.pl
+++ b/admin/aqcontract.pl
@@ -27,13 +27,14 @@ use C4::Context;
use C4::Auth;
use C4::Output;
use C4::Dates qw/format_date format_date_in_iso/;
-use C4::Bookseller qw/GetBookSeller/;
+use C4::Bookseller qw/GetBookSellerFromId/;
sub StringSearch {
my ($searchstring)=@_;
my $dbh = C4::Context->dbh;
$searchstring=~ s/\'/\\\'/g;
my @data=split(' ',$searchstring);
+ $data[0]='' unless $data[0];
my $sth=$dbh->prepare("Select * from aqcontract where (contractdescription like ? or contractname like ?) order by contractnumber");
$sth->execute("%$data[0]%","%$data[0]%");
my @results;
@@ -45,10 +46,13 @@ sub StringSearch {
}
my $input = new CGI;
-my $searchfield = $input->param('searchfield');
+my $searchfield = $input->param('searchfield') || '';
my $script_name = "/cgi-bin/koha/admin/aqcontract.pl";
my $contractnumber = $input->param('contractnumber');
-my $op = $input->param('op');
+my $booksellerid = $input->param('booksellerid');
+my $op = $input->param('op') || '';
+my @bookseller = GetBookSellerFromId("$booksellerid");
+
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{ template_name => "admin/aqcontract.tmpl",
@@ -63,15 +67,16 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
$template->param(
script_name => $script_name,
contractnumber => $contractnumber,
- searchfield => $searchfield
+ searchfield => $searchfield,
+ booksellerid => $booksellerid,
+ name => $bookseller[0]->{name},
+ DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
);
-
#ADD_FORM: called if $op is 'add_form'. Used to create form to add or modify a record
if ( $op eq 'add_form' ) {
$template->param( add_form => 1 );
my $data;
- my @booksellerloop = GetBookSeller("");
#---- if primkey exists, it's a modify action, so read values to modify...
if ($contractnumber) {
@@ -81,11 +86,17 @@ if ( $op eq 'add_form' ) {
$data = $sth->fetchrow_hashref;
$sth->finish;
- for my $bookseller (@booksellerloop) {
+ for my $bookseller (@bookseller) {
if ( $bookseller->{'id'} eq $data->{'booksellerid'} ) {
$bookseller->{'selected'} = 1;
}
}
+ } else {
+ for my $bookseller (@bookseller) {
+ if ( $bookseller->{'id'} eq $booksellerid ) {
+ $bookseller->{'selected'} = 1;
+ }
+ }
}
$template->param(
contractnumber => $data->{'contractnumber'},
@@ -93,7 +104,7 @@ if ( $op eq 'add_form' ) {
contractdescription => $data->{'contractdescription'},
contractstartdate => format_date( $data->{'contractstartdate'} ),
contractenddate => format_date( $data->{'contractenddate'} ),
- booksellerloop => \@booksellerloop,
+ booksellerloop => \@bookseller,
booksellerid => $data->{'booksellerid'},
DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
);
@@ -135,7 +146,7 @@ elsif ( $op eq 'add_validate' ) {
);
$sth->finish;
}
- print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=aqcontract.pl\"></html>";
+ print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=aqcontract.pl?booksellerid=$booksellerid\"></html>";
exit;
# END $OP eq ADD_VALIDATE
@@ -180,7 +191,7 @@ elsif ( $op eq 'delete_confirmed' ) {
my $sth = $dbh->prepare("delete from aqcontract where contractnumber=?");
$sth->execute($contractnumber);
$sth->finish;
- print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=aqcontract.pl\"></html>";
+ print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=aqcontract.pl?booksellerid=$booksellerid\"></html>";
exit;
# END $OP eq DELETE_CONFIRMED
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 4ca2969..5cbea1e 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -2259,10 +2259,6 @@ CREATE TABLE `aqbooksellers` (
`accountnumber` mediumtext,
`othersupplier` mediumtext,
`currency` varchar(3) NOT NULL default '',
- `deliverydays` smallint(6) default NULL,
- `followupdays` smallint(6) default NULL,
- `followupscancel` smallint(6) default NULL,
- `specialty` mediumtext,
`booksellerfax` mediumtext,
`notes` mediumtext,
`bookselleremail` mediumtext,
@@ -2285,8 +2281,6 @@ CREATE TABLE `aqbooksellers` (
`gstrate` decimal(6,4) default NULL,
`discount` float(6,4) default NULL,
`fax` varchar(50) default NULL,
- `nocalc` int(11) default NULL,
- `invoicedisc` float(6,4) default NULL,
PRIMARY KEY (`id`),
KEY `listprice` (`listprice`),
KEY `invoiceprice` (`invoiceprice`),
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
index 28cfd1a..ce8b289 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
@@ -1,46 +1,47 @@
<div id="toolbar"><script type="text/javascript">
- //<![CDATA[
+ //<![CDATA[
- // prepare DOM for YUI Toolbar
+ // prepare DOM for YUI Toolbar
- $(document).ready(function() {
- yuiToolbar();
- });
+ $(document).ready(function() {
+ yuiToolbar();
+ });
- // YUI Toolbar Functions
+ // YUI Toolbar Functions
- function yuiToolbar() {
-
- new YAHOO.widget.Button("newperiod");
- new YAHOO.widget.Button("newbudget");
- new YAHOO.widget.Button("newsupplier");
+ function yuiToolbar() {
+
+ new YAHOO.widget.Button("newperiod");
+ new YAHOO.widget.Button("newbudget");
+ new YAHOO.widget.Button("newsupplier");
- var manageorders = [
- { text: _("Baskets"), url: "/cgi-bin/koha/acqui/booksellers.pl?supplierid=<!--TMPL_VAR Name="id"-->"},
- { text: _("Basket grouping"), url: "/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=<!-- TMPL_VAR NAME="id" -->"},
- { text: _("Receive shipments"), url: "/cgi-bin/koha/acqui/parcels.pl?supplierid=<!--TMPL_VAR Name="id"-->" },
+ var manageorders = [
+ { text: _("New basket"), url: "/cgi-bin/koha/acqui/basketheader.pl?booksellerid=<!-- TMPL_VAR NAME="id" -->&op=add_form"},
+ { text: _("Baskets"), url: "/cgi-bin/koha/acqui/booksellers.pl?supplierid=<!--TMPL_VAR Name="id"-->"},
+ { text: _("Basket grouping"), url: "/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=<!-- TMPL_VAR NAME="id" -->"},
+ { text: _("Receive shipments"), url: "/cgi-bin/koha/acqui/parcels.pl?supplierid=<!--TMPL_VAR Name="id"-->" },
<!-- TMPL_IF name="basketno" -->
{ text: _("Uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=<!-- TMPL_VAR NAME="id" -->&basketno=<!--TMPL_VAR name="basketno" -->&owner=1"}
<!-- TMPL_ELSE -->
{ text: _("Uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=<!-- TMPL_VAR NAME="id" -->&owner=1"}
<!-- /TMPL_IF -->
- ]
- <!-- TMPL_IF NAME="id" -->new YAHOO.widget.Button("newbasket");
- new YAHOO.widget.Button("editsupplier");
- new YAHOO.widget.Button("receive");
- new YAHOO.widget.Button("editcontracts");
- new YAHOO.widget.Button({type: "menu", label: _("Manage orders"), name: "manageorders", menu: manageorders, container: "toolbar-list"});
- <!-- /TMPL_IF -->
- }
+ ]
+ <!-- TMPL_IF NAME="id" -->new YAHOO.widget.Button("newbasket");
+ new YAHOO.widget.Button("editsupplier");
+ new YAHOO.widget.Button("receive");
+ new YAHOO.widget.Button("editcontracts");
+ new YAHOO.widget.Button({type: "menu", label: _("Manage orders"), name: "manageorders", menu: manageorders, container: "toolbar-list"});
+ <!-- /TMPL_IF -->
+ }
- //]]>
- </script>
- <ul id="toolbar-list" class="toolbar">
- <li><a id="newbudget" href="/cgi-bin/koha/acqui/supplier.pl?op=enter">New vendor</a></li>
- <!-- TMPL_IF NAME="id" -->
- <li><a id="newbasket" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=<!-- TMPL_VAR NAME="id" -->&op=add_form">New Basket</a></li>
- <li><a id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->&op=enter">Edit Vendor</a></li>
- <li><a id="editcontracts" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=<!-- TMPL_VAR name="id" -->">Edit contracts</a></li>
- <!-- /TMPL_IF -->
- </ul>
+ //]]>
+ </script>
+ <ul id="toolbar-list" class="toolbar">
+ <!-- TMPL_IF NAME="id" -->
+ <li><a id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->&op=enter">Edit</a></li>
+ <li><a id="editcontracts" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=<!-- TMPL_VAR name="id" -->">Contracts</a></li>
+ <!-- TMPL_ELSE -->
+ <li><a id="newbudget" href="/cgi-bin/koha/acqui/supplier.pl?op=enter">New</a></li>
+ <!-- /TMPL_IF -->
+ </ul>
</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl
index 72e1cd0..fd93909 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl
@@ -10,92 +10,94 @@
<div id="doc3" class="yui-t2">
- <div id="bd">
- <div id="yui-main">
- <div class="yui-b">
-
+ <div id="bd">
+ <div id="yui-main">
+ <div class="yui-b">
+
<!-- TMPL_INCLUDE NAME="acquisitions-toolbar.inc" -->
<!-- TMPL_IF EXPR="count == 1" -->
<h1> <!-- TMPL_VAR NAME="supplier_name" --> </h1>
<!-- TMPL_ELSE -->
<h1>You searched on <b>vendor <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h1>
<!-- /TMPL_IF -->
-<div id="acqui_order_supplierlist">
- <table>
- <tr>
- <th>Order</th>
- <th>Order receive</th>
- <th>Vendor</th>
- <th> </th>
- </tr>
-
- <!-- TMPL_LOOP name="loop_suppliers" -->
- <!-- TMPL_UNLESS name="__odd__" -->
- <tr class="highlight">
- <!-- TMPL_ELSE -->
- <tr>
- <!-- /TMPL_UNLESS -->
- <td> <!-- TMPL_IF name="active" -->
- <a href="basketheader.pl?booksellerid=<!-- TMPL_VAR name="supplierid" -->&op=add_form">Add basket</a>
- <!-- TMPL_ELSE -->
- Inactive
- <!-- /TMPL_IF -->
- </td>
- <td> <a href="parcels.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->">Receive shipment</a>
- </td>
- <!-- TMPL_IF NAME="name"-->
- <td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->"><!-- TMPL_VAR name="name" --></a></td>
- <!-- TMPL_ELSE -->
- <td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->">NO NAME</a></td>
- <!-- /TMPL_IF -->
- <td> <table>
- <!-- TMPL_IF NAME="loop_basket"-->
- <tr>
- <th>Basket</th>
- <th>Items</th>
- <th>Created by</th>
- <th>Date</th>
- <th> </th>
- </tr>
- <!-- TMPL_LOOP NAME="loop_basket" -->
- <!--TMPL_IF Name="uncertainprices"-->
- <tr class="problem">
- <!--TMPL_ELSE-->
- <!-- TMPL_UNLESS NAME="__odd__" -->
- <tr class="highlight">
- <!-- TMPL_ELSE -->
- <tr>
- <!-- /TMPL_UNLESS -->
- <!--/TMPL_IF-->
- <td><!-- TMPL_VAR NAME="basketno" --></td>
- <td><!-- TMPL_VAR NAME="basketname" --></td>
- <td><TMPL_VAR NAME="total"></td>
- <td> <!-- TMPL_VAR name="firstname" -->
- <!-- TMPL_VAR name="surname" -->
- </td>
- <td><!-- TMPL_VAR NAME="creationdate" --></td>
- <td> <!-- TMPL_IF name="closedate" -->
- closed on <!-- TMPL_VAR NAME="closedate" -->
- <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">View</a>
- <!-- TMPL_ELSE -->
- <!-- TMPL_IF name="active" -->
- <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">modify</a>
- <!-- TMPL_ELSE -->
- <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">View</a>
- <!-- /TMPL_IF -->
- <!-- /TMPL_IF -->
- </td>
- </tr>
- <!-- /TMPL_LOOP -->
- <!-- TMPL_ELSE -->
- <tr><td>No pending baskets</td></tr>
- <!-- /TMPL_IF -->
- </table>
- </td>
- </tr>
- <!-- /TMPL_LOOP -->
- </table>
-</div>
+<!-- TMPL_IF name="loop_suppliers" -->
+ <div id="acqui_order_supplierlist">
+ <table>
+ <tr>
+ <th>Order</th>
+ <th>Order receive</th>
+ <th>Vendor</th>
+ <th> </th>
+ </tr>
+
+ <!-- TMPL_LOOP name="loop_suppliers" -->
+ <!-- TMPL_UNLESS name="__odd__" -->
+ <tr class="highlight">
+ <!-- TMPL_ELSE -->
+ <tr>
+ <!-- /TMPL_UNLESS -->
+ <td> <!-- TMPL_IF name="active" -->
+ <a href="basketheader.pl?booksellerid=<!-- TMPL_VAR name="supplierid" -->&op=add_form">Add basket</a>
+ <!-- TMPL_ELSE -->
+ Inactive
+ <!-- /TMPL_IF -->
+ </td>
+ <td> <a href="parcels.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->">Receive shipment</a>
+ </td>
+ <!-- TMPL_IF NAME="name"-->
+ <td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->"><!-- TMPL_VAR name="name" --></a></td>
+ <!-- TMPL_ELSE -->
+ <td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->">NO NAME</a></td>
+ <!-- /TMPL_IF -->
+ <td> <table>
+ <!-- TMPL_IF NAME="loop_basket"-->
+ <tr>
+ <th>Basket</th>
+ <th>Items</th>
+ <th>Created by</th>
+ <th>Date</th>
+ <th> </th>
+ </tr>
+ <!-- TMPL_LOOP NAME="loop_basket" -->
+ <!--TMPL_IF Name="uncertainprices"-->
+ <tr class="problem">
+ <!--TMPL_ELSE-->
+ <!-- TMPL_UNLESS NAME="__odd__" -->
+ <tr class="highlight">
+ <!-- TMPL_ELSE -->
+ <tr>
+ <!-- /TMPL_UNLESS -->
+ <!--/TMPL_IF-->
+ <td><!-- TMPL_VAR NAME="basketno" --></td>
+ <td><!-- TMPL_VAR NAME="basketname" --></td>
+ <td><TMPL_VAR NAME="total"></td>
+ <td> <!-- TMPL_VAR name="firstname" -->
+ <!-- TMPL_VAR name="surname" -->
+ </td>
+ <td><!-- TMPL_VAR NAME="creationdate" --></td>
+ <td> <!-- TMPL_IF name="closedate" -->
+ closed on <!-- TMPL_VAR NAME="closedate" -->
+ <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">View</a>
+ <!-- TMPL_ELSE -->
+ <!-- TMPL_IF name="active" -->
+ <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">modify</a>
+ <!-- TMPL_ELSE -->
+ <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">View</a>
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_IF -->
+ </td>
+ </tr>
+ <!-- /TMPL_LOOP -->
+ <!-- TMPL_ELSE -->
+ <tr><td>No pending baskets</td></tr>
+ <!-- /TMPL_IF -->
+ </table>
+ </td>
+ </tr>
+ <!-- /TMPL_LOOP -->
+ </table>
+ </div>
+ <!-- /TMPL_IF -->
</div>
</div>
<div class="yui-b">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
index 62ed3b0..7b1778e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
@@ -4,13 +4,13 @@
<script type="text/javascript">
//<![CDATA[
function confirm_deletion() {
- if (confirm("Confirm deletion of this vendor ?")) {
+ if (confirm(_("Confirm deletion of this vendor ?"))) {
window.location="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->&op=delete";
}
}
function check(f) {
if (f.company.value == "") {
- alert("You must specify a name for this vendor.");
+ alert(_("You must specify a name for this vendor."));
return false;
}
f.submit();
@@ -25,11 +25,11 @@ if (f.company.value == "") {
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <!--TMPL_IF Name="enter"--><!-- TMPL_IF name="id" --> <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="name" --></a> › Update: <!-- TMPL_VAR NAME="name" --><!-- TMPL_ELSE -->Add vendor<!-- /TMPL_IF --> <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="name" --><!-- /TMPL_IF --></div>
<div id="doc" class="yui-t7">
-
- <div id="bd">
- <div id="yui-main">
- <!--TMPL_IF Name="enter"-->
- <!-- TMPL_IF name="id" -->
+
+<div id="bd">
+ <div id="yui-main">
+ <!--TMPL_IF Name="enter"-->
+ <!-- TMPL_IF name="id" -->
<h1>Update: <!-- TMPL_VAR NAME="name" --></h1>
<!-- TMPL_ELSE -->
<h1>Add vendor</h1>
@@ -38,16 +38,15 @@ if (f.company.value == "") {
<!-- TMPL_UNLESS NAME="enter" --><!-- TMPL_INCLUDE NAME="acquisitions-toolbar.inc" --><!-- /TMPL_UNLESS -->
<!--TMPL_IF Name="enter"-->
<form action="updatesupplier.pl" name="updatesupplier" method="post">
- <div class="yui-g">
- <div class="yui-u first">
+ <div class="yui-g">
<input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->" />
<fieldset class="rows">
<legend>Company details</legend>
- <ol><li><label for="company" class="required">Company Name * </label>
+ <ol><li><label for="company" class="required">Name * </label>
<input type="text" size="40" id="company" name="company" value="<!-- TMPL_VAR NAME="name" -->" /></li>
- <li><label for="company_postal">Postal Address</label>
+ <li><label for="company_postal">Postal address</label>
<textarea id="company_postal" name="company_postal" cols="40" rows="3"><!-- TMPL_VAR NAME="postal" --></textarea></li>
- <li><label for="physical">Physical Address</label>
+ <li><label for="physical">Physical address</label>
<textarea id="physical" name="physical" cols="40" rows="3"><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></textarea></li>
<li><label for="company_phone">Phone</label>
<input type="text" size="20" id="company_phone" name="company_phone" value="<!-- TMPL_VAR NAME="phone" -->" /></li>
@@ -56,11 +55,9 @@ if (f.company.value == "") {
<li><label for="website">Website</label>
<input type="text" size="40" id="website" name="website" value="<!-- TMPL_VAR NAME="url" -->" /></li></ol>
</fieldset>
- </div>
- <div class="yui-u">
<fieldset class="rows">
<legend>Contact details</legend>
- <ol> <li><label for="company_contact_name">Contact Name</label>
+ <ol> <li><label for="company_contact_name">Contact Name</label>
<input type="text" size="40" id="company_contact_name" name="company_contact_name" value="<!-- TMPL_VAR NAME="contact" -->" /></li>
<li><label for="company_contact_position">Position</label>
<input type="text" size="40" id="company_contact_position" name="company_contact_position" value="<!-- TMPL_VAR NAME="contpos" -->" /></li>
@@ -75,9 +72,8 @@ if (f.company.value == "") {
<li><label for="contact_notes">Notes</label>
<textarea id="contact_notes" name="contact_notes" cols="40" rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea></li></ol>
</fieldset>
- </div>
- </div>
- <div class="yui-g">
+ </div>
+ <div class="yui-g">
<fieldset class="rows">
<legend>Ordering information</legend>
<ol class="radio"><li><label for="activestatus" class="radio">Vendor is:</label>
@@ -88,10 +84,8 @@ if (f.company.value == "") {
<label for="activestatus">Active</label> <input type="radio" id="activestatus" name="status" value="1" />
<label for="inactivestatus">Inactive</label> <input type="radio" id="inactivestatus" name="status" value="0" checked="checked" />
<!-- /TMPL_IF --></li>
- </ol>
- <ol>
- <li><label for="publishers_imprints">Preferred publishers</label>
- <textarea id="publishers_imprints" name="publishers_imprints" cols="40" rows="3"><!-- TMPL_VAR NAME="specialty" --></textarea></li>
+ </ol>
+ <ol>
<li><label for="list_currency">List Prices are</label>
<select name="list_currency" id="list_currency">
<!-- TMPL_LOOP NAME="loop_pricescurrency" -->
@@ -105,48 +99,48 @@ if (f.company.value == "") {
<!-- /TMPL_LOOP -->
</select></li>
<!-- TMPL_IF NAME="GST" --><li>GST Registered
- <!-- TMPL_IF name="gstreg" -->
- <input type="radio" name="gst" id="gstyes" value="1" checked="checked" /><label for="gstyes">Yes</label>
+ <!-- TMPL_IF name="gstreg" -->
+ <input type="radio" name="gst" id="gstyes" value="1" checked="checked" /><label for="gstyes">Yes</label>
<input type="radio" name="gst" id="gstno" value="0" /><label for="gstno">No</label>
- <!-- TMPL_ELSE -->
+ <!-- TMPL_ELSE -->
<input type="radio" name="gst" id="gstyes" value="1" /><label for="gstyes">Yes</label>
<input type="radio" name="gst" id="gstno" value="0" checked="checked" /><label for="gstno">No</label>
- <!-- /TMPL_IF --></li><!-- /TMPL_IF -->
-
+ <!-- /TMPL_IF --></li><!-- /TMPL_IF -->
+
<!-- TMPL_IF NAME="GST" --><li>Ordering prices
- <!-- TMPL_IF name="listincgst" -->
- <input type="radio" id="list_gstyes" name="list_gst" value="1" checked="checked" /><label for="list_gstyes">include GST</label>
+ <!-- TMPL_IF name="listincgst" -->
+ <input type="radio" id="list_gstyes" name="list_gst" value="1" checked="checked" /><label for="list_gstyes">include GST</label>
<input type="radio" id="list_gstno" name="list_gst" value="0" /><label for="list_gstno">don't include GST</label>
- <!-- TMPL_ELSE -->
+ <!-- TMPL_ELSE -->
<input type="radio" id="list_gstyes" name="list_gst" value="1" /><label for="list_gstyes">include GST</label>
<input type="radio" id="list_gstno" name="list_gst" value="0" checked="checked" /><label for="list_gstno">don't include GST</label>
- <!-- /TMPL_IF --></li><!-- /TMPL_IF -->
-
+ <!-- /TMPL_IF --></li><!-- /TMPL_IF -->
+
<!-- TMPL_IF NAME="GST" --><li>Invoice prices
- <!-- TMPL_IF name= "invoiceincgst" -->
+ <!-- TMPL_IF name= "invoiceincgst" -->
<input type="radio" id="invoice_gstyes" name="invoice_gst" value="1" checked="checked" /><label for="invoice_gstyes">include GST</label>
<input type="radio" id="invoice_gstno" name="invoice_gst" value="0" /><label for="invoice_gstno">don't include GST</label>
- <!-- TMPL_ELSE -->
+ <!-- TMPL_ELSE -->
<input type="radio" id="invoice_gstyes" name="invoice_gst" value="1"><label for="invoice_gstyes">include GST</label>
<input type="radio" id="invoice_gstno" name="invoice_gst" value="0" checked="checked" /><label for="invoice_gstno">don't include GST</label>
- <!-- /TMPL_IF --></li><!-- /TMPL_IF -->
+ <!-- /TMPL_IF --></li><!-- /TMPL_IF -->
<li><label for="discount">Discount</label>
<input type="text" size="3" id="discount" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" /> %</li>
- <li><label for="gstrate">GST rate</label><input type="text" name="gstrate" id="gstrate" size="5" value="<!-- TMPL_VAR name="GST" -->"/>%</li>
+ <li><label for="gstrate">GST rate</label><input type="text" name="gstrate" id="gstrate" size="5" value="<!-- TMPL_VAR name="gstrate" -->"/>%</li>
<li><label for="notes">Notes</label>
<textarea cols="40" rows="4" id="notes" name="notes" ><!-- TMPL_VAR NAME="notes" --></textarea></li></ol>
- <!-- TMPL_UNLESS NAME="GST" -->
- <input type="hidden" name="gst" value="0" />
- <input type="hidden" name="list_gst" value="0" />
- <input type="hidden" name="invoice_gst" value="0" />
- <!-- /TMPL_UNLESS -->
+ <!-- TMPL_UNLESS NAME="GST" -->
+ <input type="hidden" name="gst" value="0" />
+ <input type="hidden" name="list_gst" value="0" />
+ <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>
- </div>
+ </div>
</form>
<!--TMPL_ELSE-->
<h1><!-- TMPL_VAR NAME="name" --></h1>
- <div class="yui-g">
+ <div class="yui-g">
<div id="supplier-company-details" class="yui-u first">
<p><strong>Company Name: </strong>
<!-- TMPL_VAR NAME="name" --></p>
@@ -158,7 +152,7 @@ if (f.company.value == "") {
<!-- TMPL_VAR NAME="phone" --></p>
<p><strong>Fax: </strong>
<!-- TMPL_VAR NAME="fax" --></p>
- <!-- TMPL_IF NAME="url" --> <p><strong>Web site: </strong>
+ <!-- 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">
@@ -179,7 +173,7 @@ if (f.company.value == "") {
<!-- TMPL_VAR NAME="contnotes" --></p><!-- /TMPL_IF -->
</div>
- </div>
+ </div>
<div id="supplier-ordering-information" class="yui-g">
<h3>Ordering information</h3>
<p><strong>Vendor is: </strong>
@@ -188,8 +182,6 @@ if (f.company.value == "") {
<!-- TMPL_ELSE -->
Inactive
<!-- /TMPL_IF --></p>
- <p><strong>Publishers and Imprints: </strong>
- <!-- TMPL_VAR NAME="specialty" --></p>
<p><strong>List Prices are: </strong><!--TMPL_VAR Name="listprice"--></p>
<p><strong>Invoice Prices are: </strong><!--TMPL_VAR Name="invoiceprice"--></p>
<!-- TMPL_IF NAME="GST" --><p><strong>GST Registered: </strong>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl
index e7b3352..628b049 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl
@@ -15,36 +15,28 @@
// to check if the data are correctly entered.
function Check(ff) {
var ok=0;
- var _alertString="Form not submitted because of the following problem(s)\n";
+ var _alertString=_("Form not submitted because of the following problem(s)\n");
_alertString +="-------------------------------------------------------------------\n\n";
- if (!(isNotNull(ff.booksellerid,0)) || !(isNum(ff.booksellerid,0))) {
- ok=1;
- _alertString += "- bookseller missing\n";
- }
if (!(isNotNull(ff.contractname,0))){
ok=1;
- _alertString += "- contract name missing\n";
- }
- if (!(isNotNull(ff.contractdescription,0))) {
- ok=1;
- _alertString += "- description missing\n";
+ _alertString += _("- Name missing\n");
}
if (!(CheckDate(ff.contractstartdate))){
ok=1;
- _alertString += "- contract start date missing\n";
+ _alertString += _("- Start date missing\n");
}
if (!(CheckDate(ff.contractenddate))){
ok=1;
- _alertString += "- contract end date missing\n";
+ _alertString += _("- End date missing\n");
}
if (!CompareDate(ff.contractstartdate.value, ff.contractenddate.value)) {
ok=1;
- _alertString += "Bad date! Contract start date can not be after end date.\n";
+ _alertString += _("Wrong date! start date can not be after end date.\n");
}
if (! CheckEndDate(ff.contractenddate.value)) {
ok=1;
- _alertString += "End date before today, Invalid end date!\n";
+ _alertString += _("End date before today, Invalid end date!\n");
}
if (ok) { // if there is a problem
alert(_alertString);
@@ -65,6 +57,8 @@ function Check(ff) {
›
<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
›
+ <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!--TMPL_VAR name="booksellerid" -->"><!-- TMPL_VAR name="name" --></a>
+ ›
<!-- TMPL_IF NAME="add_form" -->
<a href="/cgi-bin/koha/admin/aqcontract.pl">Contracts</a>
›
@@ -95,9 +89,29 @@ function Check(ff) {
<input type="hidden" name="op" value="add_validate" />
<input type="hidden" name="checked" value="0" />
<!-- TMPL_IF NAME="contractnumber" -->
- <h1>Modify contract <!-- TMPL_VAR NAME="contractname" --></h1>
+ <h1>Modify contract <!-- TMPL_VAR NAME="contractname" -->
+ <select id="booksellerid" name="booksellerid">
+ <!-- TMPL_LOOP NAME="booksellerloop" -->
+ <!-- TMPL_IF NAME="selected" -->
+ <option value="<!-- TMPL_VAR NAME="id" -->" selected="selected"><!-- TMPL_VAR NAME="name" --></option>
+ <!-- TMPL_ELSE -->
+ <option value="<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="name" --></option>
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_LOOP -->
+ </select>
+ </h1>
<!-- TMPL_ELSE -->
- <h1>New contract</h1>
+ <h1>New contract
+ <select id="booksellerid" name="booksellerid">
+ <!-- TMPL_LOOP NAME="booksellerloop" -->
+ <!-- TMPL_IF NAME="selected" -->
+ <option value="<!-- TMPL_VAR NAME="id" -->" selected="selected"><!-- TMPL_VAR NAME="name" --></option>
+ <!-- TMPL_ELSE -->
+ <option value="<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="name" --></option>
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_LOOP -->
+ </select>
+ </h1>
<!-- /TMPL_IF -->
<fieldset class="rows">
<ol>
@@ -107,25 +121,17 @@ function Check(ff) {
<input type="hidden" name="is_a_modif" value="1" />
</li>
<!-- /TMPL_IF -->
- <li><label for="contractname">Contract name</label>
+ <li><label for="contractname" class="required">Name *</label>
<input type="text" name="contractname" id="contractname" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="contractname" -->" />
</li>
- <li><label for="contractdescription">Contract description</label>
+ <li><label for="contractdescription">Description</label>
<input type="text" name="contractdescription" id="contractdescription" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="contractdescription" -->" />
</li>
- <li><label for="booksellerid">bookseller</label>
- <select id="booksellerid" name="booksellerid">
- <!-- TMPL_LOOP NAME="booksellerloop" -->
- <!-- TMPL_IF NAME="selected" -->
- <option value="<!-- TMPL_VAR NAME="id" -->" selected="selected"><!-- TMPL_VAR NAME="name" --></option>
- <!-- TMPL_ELSE -->
- <option value="<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="name" --></option>
- <!-- /TMPL_IF -->
- <!-- /TMPL_LOOP -->
- </select>
+ <li><label for="booksellerid">Bookseller</label>
+
</li>
- <li><label for="contractstartdate">contract start date</label>
- <input type="text" name="contractstartdate" id="contractstartdate" value="<!-- TMPL_VAR NAME="contractstartdate" -->"/>
+ <li><label for="contractstartdate" class="required">Start date *</label>
+ <input type="text" name="contractstartdate" id="contractstartdate" value="<!-- TMPL_VAR NAME="contractstartdate" -->" maxlength="10" size="10"/>
<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="contractstartdate_button" alt="Show Calendar" />
<script language="JavaScript" type="text/javascript">
Calendar.setup(
@@ -137,8 +143,8 @@ function Check(ff) {
);
</script>
</li>
- <li><label for="contractenddate">contract end date</label>
- <input type="text" name="contractenddate" id="contractenddate" value="<!-- TMPL_VAR NAME="contractenddate" -->" />
+ <li><label for="contractenddate" class="required">End date *</label>
+ <input type="text" name="contractenddate" id="contractenddate" value="<!-- TMPL_VAR NAME="contractenddate" -->" maxlength="10" size="10" />
<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="contractenddate_button" alt="Show Calendar" />
<script language="JavaScript" type="text/javascript">
Calendar.setup(
@@ -177,6 +183,7 @@ function Check(ff) {
</table>
<fieldset class="action">
<input type="hidden" name="op" value="delete_confirmed" />
+ <input type="hidden" name="booksellerid" value="<!-- TMPL_VAR name="booksellerid" -->" />
<input type="hidden" name="contractnumber" value="<!-- TMPL_VAR NAME="contractnumber" -->" />
<input type="submit" value="Delete this Contract" />
<a class="cancel" href="/cgi-bin/koha/admin/aqcontract.pl">Cancel</a>
@@ -187,6 +194,7 @@ function Check(ff) {
<!-- TMPL_IF NAME="delete_confirmed" -->
<h3>Contract Deleted</h3>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+ <input type="hidden" name="booksellerid" value="<!-- TMPL_VAR name="booksellerid" -->/>
<input type="submit" value="OK" />
</form>
<!-- /TMPL_IF -->
@@ -205,39 +213,37 @@ function Check(ff) {
//]]>
</script>
<ul class="toolbar">
- <li><a id="newcontract" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form">New Contract</a></li>
+ <li><a id="newcontract" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=<!-- TMPL_VAR name="booksellerid" -->">New Contract</a></li>
</ul>
</div>
- <h2>Contract Administration</h2>
- <table>
- <tr>
- <th scope="col">contract id</th>
- <th scope="col">Contract name</th>
- <th scope="col">Contract description</th>
- <th scope="col">contract start date</th>
- <th scope="col">contract end date</th>
- <th scope="col">bookseller</th>
- <th scope="col" colspan="2"> </th>
- </tr>
+ <h2>Contract(s) of <!-- TMPL_VAR name="name" --></h2>
+ <!-- TMPL_IF name="loop" -->
+ <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"> </th>
+ </tr>
<!-- TMPL_LOOP NAME="loop" -->
<!-- TMPL_IF NAME="toggle" -->
<tr class="highlight">
<!-- TMPL_ELSE -->
<tr>
<!-- /TMPL_IF -->
- <td><!-- TMPL_VAR NAME="contractnumber" --></td>
- <td>
- <a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&contractnumber=<!-- TMPL_VAR NAME="contractnumber" -->"><!-- TMPL_VAR NAME="contractname" --></a>
+ <td>
+ <a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&contractnumber=<!-- TMPL_VAR NAME="contractnumber" -->"><!-- 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><!-- TMPL_VAR NAME="booksellername" --></td>
- <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&contractnumber=<!-- TMPL_VAR NAME="contractnumber" -->">Edit</a></td>
- <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&contractnumber=<!-- TMPL_VAR NAME="contractnumber" -->">Delete</a></td>
+ <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&contractnumber=<!-- TMPL_VAR NAME="contractnumber" -->&booksellerid=<!-- TMPL_VAR name="booksellerid" -->">Edit</a></td>
+ <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&contractnumber=<!-- TMPL_VAR NAME="contractnumber" -->&booksellerid=<!-- TMPL_VAR name="booksellerid" -->">Delete</a></td>
</tr>
<!-- /TMPL_LOOP -->
</table>
+ <!-- /TMPL_IF -->
<!-- /TMPL_IF -->
</div>
</div>
--
1.6.0.4
More information about the Koha-patches
mailing list