Hi, These pathes are an attempt to fix bug #3464. They definitely need some reviewing by someone with a good understanding of Koha, for both correctness and completeness.
Sébastien.
>From d02147827569bad9efc53fdea87fc471be789085 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?S=C3=A9bastien=20Hinderer?= <[email protected]> Date: Fri, 24 Jul 2009 11:00:07 +0200 Subject: [PATCH 1/3] Database structure modification. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Adds 5 columns to the `branches` table: `branchzip`, `branchcity`, `branchcountry`, `branchurlè` and `branchnote`. I/O operations for these fields are not included. --- installer/data/Pg/kohastructure.sql | 7 ++++++- installer/data/mysql/kohastructure.sql | 5 +++++ installer/data/mysql/updatedatabase.pl | 19 +++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletions(-) diff --git a/installer/data/Pg/kohastructure.sql b/installer/data/Pg/kohastructure.sql index 9243ad5..8c444fe 100644 --- a/installer/data/Pg/kohastructure.sql +++ b/installer/data/Pg/kohastructure.sql @@ -540,12 +540,17 @@ branchname text NOT NULL, branchaddress1 text, branchaddress2 text, branchaddress3 text, +branchzip varchar(25) default NULL, +branchcity mediumtext, +branchcountry text, branchphone text, branchfax text, branchemail text, +branchurl mediumtext, issuing int default NULL, branchip varchar(15) default NULL, -branchprinter varchar(100) default NULL +branchprinter varchar(100) default NULL, +branchnotes mediumtext ); -- diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 2b2e0c9..591ab58 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -569,12 +569,17 @@ CREATE TABLE `branches` ( `branchaddress1` mediumtext, `branchaddress2` mediumtext, `branchaddress3` mediumtext, + `branchzip` varchar(25) default NULL, + `branchcity` mediumtext, + `branchcountry` text, `branchphone` mediumtext, `branchfax` mediumtext, `branchemail` mediumtext, + `branchurl` mediumtext, `issuing` tinyint(4) default NULL, `branchip` varchar(15) default NULL, `branchprinter` varchar(100) default NULL, + `branchnotes` mediumtext, UNIQUE KEY `branchcode` (`branchcode`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 58497c8..ea126f8 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -2467,6 +2467,25 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { print "Upgrade to $DBversion done (added FilterBeforeOverdueReport syspref and new index on authorised_values)\n"; } +=item + + Deal with branches + +=cut + +my $DBversion = "3.01.00.038"; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + # update branches table + # + $dbh->do("ALTER TABLE branches ADD `branchzip` varchar(25) default NULL AFTER `branchaddress3`"); + $dbh->do("ALTER TABLE branches ADD `branchcity` mediumtext AFTER `branchzip`"); + $dbh->do("ALTER TABLE branches ADD `branchcountry` text AFTER `branchcity`"); + $dbh->do("ALTER TABLE branches ADD `branchurl` mediumtext AFTER `branchemail`"); + $dbh->do("ALTER TABLE branches ADD `branchnotes` mediumtext AFTER `branchprinter`"); + print "Upgrade to $DBversion done (branches)\n"; + SetVersion ($DBversion); +} + =item DropAllForeignKeys($table) Drop all foreign keys of the table $table -- 1.6.3.3
>From 434e9375128d129edf479d07ed486a3dec002d7c Mon Sep 17 00:00:00 2001 From: =?utf-8?q?S=C3=A9bastien=20Hinderer?= <[email protected]> Date: Mon, 27 Jul 2009 10:33:27 +0200 Subject: [PATCH 2/3] C4/Branch.pm: the branch{zip,city,country,url,notes} rows should be taken into account during Add and Mod operations. Content-Type: text/plain; charset="utf-8" --- C4/Branch.pm | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/C4/Branch.pm b/C4/Branch.pm index 7dfd737..a6ab59c 100644 --- a/C4/Branch.pm +++ b/C4/Branch.pm @@ -199,34 +199,43 @@ sub ModBranch { my $query = " INSERT INTO branches (branchcode,branchname,branchaddress1, - branchaddress2,branchaddress3,branchphone, - branchfax,branchemail,branchip,branchprinter) - VALUES (?,?,?,?,?,?,?,?,?,?) + branchaddress2,branchaddress3,branchzip,branchcity, + branchcountry,branchphone,branchfax,branchemail, + branchurl,branchip,branchprinter,branchnotes) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) "; my $sth = $dbh->prepare($query); $sth->execute( $data->{'branchcode'}, $data->{'branchname'}, $data->{'branchaddress1'}, $data->{'branchaddress2'}, - $data->{'branchaddress3'}, $data->{'branchphone'}, - $data->{'branchfax'}, $data->{'branchemail'}, + $data->{'branchaddress3'}, $data->{'branchzip'}, + $data->{'branchcity'}, $data->{'branchcountry'}, + $data->{'branchphone'}, $data->{'branchfax'}, + $data->{'branchemail'}, $data->{'branchurl'}, $data->{'branchip'}, $data->{'branchprinter'}, + $data->{'branchnotes'}, ); return 1 if $dbh->err; } else { my $query = " UPDATE branches SET branchname=?,branchaddress1=?, - branchaddress2=?,branchaddress3=?,branchphone=?, - branchfax=?,branchemail=?,branchip=?,branchprinter=? + branchaddress2=?,branchaddress3=?,branchzip=?, + branchcity=?,branchcountry=?,branchphone=?, + branchfax=?,branchemail=?,branchurl=?,branchip=?, + branchprinter=?,branchnotes=? WHERE branchcode=? "; my $sth = $dbh->prepare($query); $sth->execute( $data->{'branchname'}, $data->{'branchaddress1'}, $data->{'branchaddress2'}, - $data->{'branchaddress3'}, $data->{'branchphone'}, - $data->{'branchfax'}, $data->{'branchemail'}, + $data->{'branchaddress3'}, $data->{'branchzip'}, + $data->{'branchcity'}, $data->{'branchcountry'}, + $data->{'branchphone'}, $data->{'branchfax'}, + $data->{'branchemail'}, $data->{'branchurl'}, $data->{'branchip'}, $data->{'branchprinter'}, + $data->{'branchnotes'}, $data->{'branchcode'}, ); } -- 1.6.3.3
>From f037d7cd82ba31b41b1170e1bc5ba29316a84659 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?S=C3=A9bastien=20Hinderer?= <[email protected]> Date: Mon, 27 Jul 2009 11:43:24 +0200 Subject: [PATCH 3/3] Modifies branches script and template so that the newly added rows are taken into account. Content-Type: text/plain; charset="utf-8" --- admin/branches.pl | 19 +++++++++++++++---- .../prog/en/modules/admin/branches.tmpl | 15 +++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/admin/branches.pl b/admin/branches.pl index ed7625c..10ebe34 100755 --- a/admin/branches.pl +++ b/admin/branches.pl @@ -214,10 +214,15 @@ sub editbranchform { branchaddress1 => $data->{'branchaddress1'}, branchaddress2 => $data->{'branchaddress2'}, branchaddress3 => $data->{'branchaddress3'}, + branchzip => $data->{'branchzip'}, + branchcity => $data->{'branchcity'}, + branchcountry => $data->{'branchcountry'}, branchphone => $data->{'branchphone'}, branchfax => $data->{'branchfax'}, branchemail => $data->{'branchemail'}, - branchip => $data->{'branchip'} + branchurl => $data->{'branchurl'}, + branchip => $data->{'branchip'}, + branchnotes => $data->{'branchnotes'}, ); } @@ -301,9 +306,13 @@ sub branchinfotable { # - branchaddress1 \ # - branchaddress2 | # - branchaddress3 | comprising the old "address" field + # - branchzip | + # - branchcity | + # - branchcountry | # - branchphone | # - branchfax | # - branchemail / + # - branchurl / # - address-empty-p (1 if no address information, 0 otherwise) # - categories (containing a static error message) # - category_list (loop containing "categoryname") @@ -316,9 +325,11 @@ sub branchinfotable { my $address_empty_p = 1; for my $field ( 'branchaddress1', 'branchaddress2', - 'branchaddress3', 'branchphone', - 'branchfax', 'branchemail', - 'branchip', 'branchprinter' + 'branchaddress3', 'branchzip', + 'branchcity', 'branchcountry', + 'branchphone', 'branchfax', + 'branchemail', 'branchurl', + 'branchip', 'branchprinter', 'branchnotes' ) { $row{$field} = $branch->{$field}; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl index 2b71304..2d03b63 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl @@ -109,9 +109,13 @@ <li><label for="branchaddress1">Address Line 1</label><input type="text" name="branchaddress1" id="branchaddress1" value="<!-- TMPL_VAR name="branchaddress1" escape="HTML" -->" /></li> <li><label for="branchaddress2">Address Line 2</label><input type="text" name="branchaddress2" id="branchaddress2" value="<!-- TMPL_VAR name="branchaddress2" escape="HTML" -->" /></li> <li><label for="branchaddress3">Address Line 3</label><input type="text" name="branchaddress3" id="branchaddress3" value="<!-- TMPL_VAR name="branchaddress3" escape="HTML" -->" /></li> + <li><label for="branchzip">Zip/Postal Code</label><input type="text" name="branchzip" id="branchzip" value="<!-- TMPL_VAR name="branchzip" escape="HTML" -->" /></li> + <li><label for="branchcity">City</label><input type="text" name="branchcity" id="branchcity" value="<!-- TMPL_VAR name="branchcity" escape="HTML" -->" /></li> + <li><label for="branchcountry">Country</label><input type="text" name="branchcountry" id="branchcountry" value="<!-- TMPL_VAR name="branchcountry" escape="HTML" -->" /></li> <li><label for="branchphone">Phone</label><input type="text" name="branchphone" id="branchphone" value="<!-- TMPL_VAR name="branchphone" escape="HTML" -->" /></li> <li><label for="branchfax">Fax</label><input type="text" name="branchfax" id="branchfax" value="<!-- TMPL_VAR name="branchfax" escape="HTML" -->" /></li> <li><label for="branchemail">Email</label><input type="text" name="branchemail" id="branchemail" value="<!-- TMPL_VAR name="branchemail" escape="HTML" -->" /></li> + <li><label for="branchurl">URL</label><input type="text" name="branchurl" id="branchurl" value="<!-- TMPL_VAR name="branchurl" escape="HTML" -->" /></li> <li><label for="branchip">IP</label><input type="text" name="branchip" id="branchip" value="<!-- TMPL_VAR name="branchip" escape="HTML" -->" /> <span class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</span></li> <!-- <li><label for="branchprinter">Library Printer</label> @@ -126,6 +130,7 @@ <!-- /TMPL_LOOP --> </select></li> --> + <li><label for="branchnotes">Notes</label><input type="text" name="branchnotes" id="branchnotes" value="<!-- TMPL_VAR name="branchnotes" escape="HTML" -->" /></li> </ol> </fieldset> <fieldset class="action"><input type="submit" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/admin/branches.pl">Cancel</a></fieldset> @@ -183,12 +188,22 @@ <br /><!-- TMPL_VAR name="branchaddress2" escape="HTML" --><!-- /TMPL_IF --> <!-- TMPL_IF name="branchaddress3" --> <br /><!-- TMPL_VAR name="branchaddress3" escape="HTML" --><!-- /TMPL_IF --> + <!-- TMPL_IF name="branchzip" --> + <br /><!-- TMPL_VAR name="branchzip" escape="HTML" --><!-- /TMPL_IF --> + <!-- TMPL_IF name="branchcity" --> + <br /><!-- TMPL_VAR name="branchcity" escape="HTML" --><!-- /TMPL_IF --> + <!-- TMPL_IF name="branchcountry" --> + <br /><!-- TMPL_VAR name="branchcountry" escape="HTML" --><!-- /TMPL_IF --> <!-- TMPL_IF name="branchphone" --> <br />Ph: <!-- TMPL_VAR name="branchphone" escape="HTML" --><!-- /TMPL_IF --> <!-- TMPL_IF name="branchfax" --> <br />Fax: <!-- TMPL_VAR name="branchfax" escape="HTML" --><!-- /TMPL_IF --> <!-- TMPL_IF name="branchemail" --> <br />Email: <!-- TMPL_VAR name="branchemail" escape="HTML" --><!-- /TMPL_IF --> + <!-- TMPL_IF name="branchurl" --> + <br />URL: <!-- TMPL_VAR name="branchurl" escape="HTML" --><!-- /TMPL_IF --> + <!-- TMPL_IF name="branchnotes" --> + <br />Notes: <!-- TMPL_VAR name="branchnotesl" escape="HTML" --><!-- /TMPL_IF --> <!-- /TMPL_IF --> </td> <td> -- 1.6.3.3
>From 23d94861d4bfacf295c68fccd6300e2d2279eec3 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?S=C3=A9bastien=20Hinderer?= <[email protected]> Date: Sat, 1 Aug 2009 13:05:55 +0200 Subject: [PATCH 1/3] Database structure modification. Content-Type: text/plain; charset="utf-8" Adds the country and B_country columns to the borrowers table. --- installer/data/Pg/kohastructure.sql | 2 ++ installer/data/mysql/kohastructure.sql | 2 ++ installer/data/mysql/updatedatabase.pl | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 0 deletions(-) diff --git a/installer/data/Pg/kohastructure.sql b/installer/data/Pg/kohastructure.sql index 8c444fe..69abd24 100644 --- a/installer/data/Pg/kohastructure.sql +++ b/installer/data/Pg/kohastructure.sql @@ -473,6 +473,7 @@ address text NOT NULL, address2 text, city text NOT NULL, zipcode varchar(25) default NULL, +country text, email text, phone text, mobile varchar(50) default NULL, @@ -484,6 +485,7 @@ B_streettype varchar(50) default NULL, B_address varchar(100) default NULL, B_city text, B_zipcode varchar(25) default NULL, +B_country text, B_email text, B_phone text, dateofbirth date default NULL, diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 591ab58..fe71e4f 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -444,6 +444,7 @@ CREATE TABLE `borrowers` ( `address2` text, `city` mediumtext NOT NULL, `zipcode` varchar(25) default NULL, + `country` text, `email` mediumtext, `phone` text, `mobile` varchar(50) default NULL, @@ -455,6 +456,7 @@ CREATE TABLE `borrowers` ( `B_address` varchar(100) default NULL, `B_city` mediumtext, `B_zipcode` varchar(25) default NULL, + `B_country` text, `B_email` text, `B_phone` mediumtext, `dateofbirth` date default NULL, diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index d6ccd0a..902227b 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -2480,6 +2480,22 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } +=item + + Deal with borrowers + +=cut + +$DBversion = "3.01.00.039"; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + # update borrowers table + # + $dbh->do("ALTER TABLE borrowers ADD `country` text AFTER zipcode"); + $dbh->do("ALTER TABLE borrowers ADD `B_country` text AFTER B_zipcode"); + print "Upgrade to $DBversion done (branches)\n"; + SetVersion ($DBversion); +} + =item DropAllForeignKeys($table) Drop all foreign keys of the table $table -- 1.6.3.3
>From cd040b645ed0e5460034df33b26a8637b6394bbe Mon Sep 17 00:00:00 2001 From: =?utf-8?q?S=C3=A9bastien=20Hinderer?= <[email protected]> Date: Sun, 2 Aug 2009 07:50:08 +0200 Subject: [PATCH 2/3] Takes columns country and B_country of table borrowers into account in related operations. Content-Type: text/plain; charset="utf-8" --- C4/Members.pm | 2 ++ circ/circulation.pl | 1 + circ/ysearch.pl | 5 +++-- .../intranet-tmpl/prog/en/includes/circ-menu.inc | 1 + .../en/modules/help/tools/import_borrowers.tmpl | 2 +- .../prog/en/modules/members/member.tmpl | 2 +- .../prog/en/modules/members/memberentrygen.tmpl | 8 ++++++++ labels/pcard-member-search.pl | 1 + members/boraccount.pl | 1 + members/guarantor_search.pl | 1 + members/mancredit.pl | 1 + members/maninvoice.pl | 1 + members/member-flags.pl | 1 + members/member-password.pl | 1 + members/member.pl | 1 + members/memberentry.pl | 5 +++-- members/moremember.pl | 2 +- members/pay.pl | 1 + members/readingrec.pl | 1 + misc/cronjobs/overdue_notices.pl | 4 ++-- tools/import_borrowers.pl | 4 ++-- 21 files changed, 35 insertions(+), 11 deletions(-) diff --git a/C4/Members.pm b/C4/Members.pm index b2ce916..d82e5e4 100644 --- a/C4/Members.pm +++ b/C4/Members.pm @@ -677,6 +677,7 @@ sub AddMember { . ",address=" . $dbh->quote( $data{'address'} ) . ",address2=" . $dbh->quote( $data{'address2'} ) . ",zipcode=" . $dbh->quote( $data{'zipcode'} ) + . ",country=" . $dbh->quote( $data{'country'} ) . ",city=" . $dbh->quote( $data{'city'} ) . ",phone=" . $dbh->quote( $data{'phone'} ) . ",email=" . $dbh->quote( $data{'email'} ) @@ -694,6 +695,7 @@ sub AddMember { . ",contactnote=" . $dbh->quote( $data{'contactnote'} ) . ",B_address=" . $dbh->quote( $data{'B_address'} ) . ",B_zipcode=" . $dbh->quote( $data{'B_zipcode'} ) + . ",B_country=" . $dbh->quote( $data{'B_country'} ) . ",B_city=" . $dbh->quote( $data{'B_city'} ) . ",B_phone=" . $dbh->quote( $data{'B_phone'} ) . ",B_email=" . $dbh->quote( $data{'B_email'} ) diff --git a/circ/circulation.pl b/circ/circulation.pl index 986b10c..09b1131 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -663,6 +663,7 @@ $template->param( borrowernotes => $borrower->{'borrowernotes'}, city => $borrower->{'city'}, zipcode => $borrower->{'zipcode'}, + country => $borrower->{'country'}, phone => $borrower->{'phone'} || $borrower->{'mobile'}, cardnumber => $borrower->{'cardnumber'}, amountold => $amountold, diff --git a/circ/ysearch.pl b/circ/ysearch.pl index 136ca76..c7a9b67 100755 --- a/circ/ysearch.pl +++ b/circ/ysearch.pl @@ -41,7 +41,7 @@ if ($auth_status ne "ok") { } my $dbh = C4::Context->dbh; -my $sql = qq(SELECT surname, firstname, cardnumber, address, city, zipcode +my $sql = qq(SELECT surname, firstname, cardnumber, address, city, zipcode, country FROM borrowers WHERE surname LIKE ? OR firstname LIKE ? @@ -55,6 +55,7 @@ while ( my $rec = $sth->fetchrow_hashref ) { $rec->{cardnumber} . "\t" . $rec->{address} . "\t" . $rec->{city} . "\t" . - $rec->{zip} . + $rec->{zip} . "\t" . + $rec->{country} . "\n"; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc index 6c88037..67e7b39 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -23,6 +23,7 @@ <!-- TMPL_IF NAME="city" --> <!-- TMPL_VAR NAME="city" --> <!-- TMPL_VAR NAME="zipcode" --> + <!-- TMPL_IF NAME="country" -->, <!-- TMPL_VAR NAME="country" --><!-- /TMPL_IF --> <!-- TMPL_ELSE --> <span class="empty">No city stored.</span> <!-- /TMPL_IF --></li> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/import_borrowers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/import_borrowers.tmpl index ef2c0e1..5576350 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/import_borrowers.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/import_borrowers.tmpl @@ -7,7 +7,7 @@ <ul> <li>Format your file with the following fields <ul> - <li>'cardnumber', 'surname', 'firstname', 'title', 'othernames', 'initials', 'streetnumber', 'streettype', 'address', 'address2', 'city', 'zipcode', 'email', 'phone', 'mobile', 'fax', 'emailpro', 'phonepro', 'B_streetnumber', 'B_streettype', 'B_address', 'B_city', 'B_zipcode', 'B_email', 'B_phone', 'dateofbirth', 'branchcode', 'categorycode', 'dateenrolled', 'dateexpiry', 'gonenoaddress', 'lost', 'debarred', 'contactname', 'contactfirstname', 'contacttitle', 'borrowernotes', 'relationship', 'ethnicity', 'ethnotes', 'sex', 'userid', 'opacnote', 'contactnote', 'password', 'sort1', 'sort2' + <li>'cardnumber', 'surname', 'firstname', 'title', 'othernames', 'initials', 'streetnumber', 'streettype', 'address', 'address2', 'city', 'zipcode', 'country', 'email', 'phone', 'mobile', 'fax', 'emailpro', 'phonepro', 'B_streetnumber', 'B_streettype', 'B_address', 'B_city', 'B_zipcode', 'B_country', 'B_email', 'B_phone', 'dateofbirth', 'branchcode', 'categorycode', 'dateenrolled', 'dateexpiry', 'gonenoaddress', 'lost', 'debarred', 'contactname', 'contactfirstname', 'contacttitle', 'borrowernotes', 'relationship', 'ethnicity', 'ethnotes', 'sex', 'userid', 'opacnote', 'contactnote', 'password', 'sort1', 'sort2' <ul> <li> <span style="background-color: #ffe599"> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl index 0873983..96b29ac 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl @@ -75,7 +75,7 @@ <!-- /TMPL_UNLESS --> <!-- /TMPL_IF --> <td><!-- TMPL_VAR NAME="cardnumber" --></td> - <td style="white-space: nowrap;"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> <br /> <!-- TMPL_VAR NAME="address" --><!-- TMPL_IF NAME="address2" --><br /><!-- TMPL_VAR NAME="address2" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="city" --><br /><!-- TMPL_VAR NAME=city --><!-- /TMPL_IF --><!-- TMPL_IF NAME="zipcode" --> <!-- TMPL_VAR NAME="zipcode" --><!-- /TMPL_IF --></td> + <td style="white-space: nowrap;"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> <br /> <!-- TMPL_VAR NAME="address" --><!-- TMPL_IF NAME="address2" --><br /><!-- TMPL_VAR NAME="address2" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="city" --><br /><!-- TMPL_VAR NAME=city --><!-- /TMPL_IF --><!-- TMPL_IF NAME="zipcode" --> <!-- TMPL_VAR NAME="zipcode" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="country" -->, <!-- TMPL_VAR NAME="country" --><!-- /TMPL_IF --></td> <td><!-- TMPL_VAR NAME="category_description" --> (<!-- TMPL_VAR name="category_type" -->)</td> <td><!-- TMPL_VAR NAME="branchcode" --></td> <td><!-- TMPL_VAR NAME="dateexpiry" --></td> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl index abcc658..546ded5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl @@ -415,6 +415,10 @@ <input type="text" name="zipcode" id="zipcode" size="10" value="<!-- TMPL_VAR NAME="zipcode" -->" /> <!-- TMPL_IF NAME="mandatoryzipcode" --><span class="required">Required</span><!-- /TMPL_IF --> </li> + <li> + <label for="country">Country: </label> + <input type="text" name="country" id="country" value="<!-- TMPL_VAR NAME="country" -->" /> + </li> </ol> </fieldset> @@ -520,6 +524,10 @@ <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="<!-- TMPL_VAR NAME="B_zipcode" -->" /> <!-- TMPL_IF NAME="mandatoryB_zipcode" --><span class="required">Required</span><!-- /TMPL_IF --> </li> + <li> + <label for="B_country">Country: </label> + <input type="text" name="B_country" id="B_country" value="<!-- TMPL_VAR NAME="B_country" -->" /> + </li> <li> <!-- TMPL_IF NAME="mandatoryB_phone" --> <label for="B_phone" class="required"> diff --git a/labels/pcard-member-search.pl b/labels/pcard-member-search.pl index 1ff5cf1..b269a5c 100755 --- a/labels/pcard-member-search.pl +++ b/labels/pcard-member-search.pl @@ -113,6 +113,7 @@ for (my $i=($startfrom-1)*$resultsperpage; $i < $to; $i++){ address2 => $results->[$i]{'address2'}, city => $results->[$i]{'city'}, zipcode => $results->[$i]{'zipcode'}, + country => $results->[$i]{'country'}, branchcode => $results->[$i]{'branchcode'}, overdues => $od, issues => $issue, diff --git a/members/boraccount.pl b/members/boraccount.pl index 40dd68a..d1d1fa7 100755 --- a/members/boraccount.pl +++ b/members/boraccount.pl @@ -114,6 +114,7 @@ $template->param( address2 => $data->{'address2'}, city => $data->{'city'}, zipcode => $data->{'zipcode'}, + country => $data->{'country'}, phone => $data->{'phone'}, email => $data->{'email'}, branchcode => $data->{'branchcode'}, diff --git a/members/guarantor_search.pl b/members/guarantor_search.pl index 881df94..4224da8 100755 --- a/members/guarantor_search.pl +++ b/members/guarantor_search.pl @@ -83,6 +83,7 @@ if ($member ne ''){ address => $results->[$i]{'address'}, city => $results->[$i]{'city'}, zipcode => $results->[$i]{'zipcode'}, + country => $results->[$i]{'country'}, branchcode => $results->[$i]{'branchcode'}, guarantorinfo =>$guarantorinfo, #op diff --git a/members/mancredit.pl b/members/mancredit.pl index 5a7ec1d..c2b49bd 100755 --- a/members/mancredit.pl +++ b/members/mancredit.pl @@ -81,6 +81,7 @@ if ($add){ address2 => $data->{'address2'}, city => $data->{'city'}, zipcode => $data->{'zipcode'}, + country => $data->{'country'}, phone => $data->{'phone'}, email => $data->{'email'}, branchcode => $data->{'branchcode'}, diff --git a/members/maninvoice.pl b/members/maninvoice.pl index 4ad2067..a0b0832 100755 --- a/members/maninvoice.pl +++ b/members/maninvoice.pl @@ -98,6 +98,7 @@ if ($add){ address2 => $data->{'address2'}, city => $data->{'city'}, zipcode => $data->{'zipcode'}, + country => $data->{'country'}, phone => $data->{'phone'}, email => $data->{'email'}, branchcode => $data->{'branchcode'}, diff --git a/members/member-flags.pl b/members/member-flags.pl index d2eea2f..b71d704 100755 --- a/members/member-flags.pl +++ b/members/member-flags.pl @@ -177,6 +177,7 @@ $template->param( address2 => $bor->{'address2'}, city => $bor->{'city'}, zipcode => $bor->{'zipcode'}, + country => $bor->{'country'}, phone => $bor->{'phone'}, email => $bor->{'email'}, branchcode => $bor->{'branchcode'}, diff --git a/members/member-password.pl b/members/member-password.pl index f18db80..696a436 100755 --- a/members/member-password.pl +++ b/members/member-password.pl @@ -100,6 +100,7 @@ $template->param( picture => 1 ) if $picture; address2 => $bor->{'address2'}, city => $bor->{'city'}, zipcode => $bor->{'zipcode'}, + country => $bor->{'country'}, phone => $bor->{'phone'}, email => $bor->{'email'}, branchcode => $bor->{'branchcode'}, diff --git a/members/member.pl b/members/member.pl index b43b30b..fcc6ee1 100755 --- a/members/member.pl +++ b/members/member.pl @@ -109,6 +109,7 @@ for (my $i=($startfrom-1)*$resultsperpage; $i < $to; $i++){ address2 => $results->[$i]{'address2'}, city => $results->[$i]{'city'}, zipcode => $results->[$i]{'zipcode'}, + country => $results->[$i]{'country'}, branchcode => $results->[$i]{'branchcode'}, overdues => $od, issues => $issue, diff --git a/members/memberentry.pl b/members/memberentry.pl index c259dfd..c7beb7f 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -210,18 +210,19 @@ if ( defined($guarantorid) and $newdata{'contactname'} = $guarantordata->{'surname'}; $newdata{'contacttitle'} = $guarantordata->{'title'}; foreach (qw(streetnumber address streettype address2 - zipcode city phone phonepro mobile fax email emailpro branchcode)) { + zipcode country city phone phonepro mobile fax email emailpro branchcode)) { $newdata{$_} = $guarantordata->{$_}; } } } } -###############test to take the right zipcode and city name ############## +###############test to take the right zipcode, country and city name ############## if (!defined($guarantorid) or $guarantorid eq '' or $guarantorid eq '0') { # set only if parameter was passed from the form $newdata{'city'} = $input->param('city') if defined($input->param('city')); $newdata{'zipcode'} = $input->param('zipcode') if defined($input->param('zipcode')); + $newdata{'country'} = $input->param('counry') if defined($input->param('country')); } #builds default userid diff --git a/members/moremember.pl b/members/moremember.pl index 494121f..a76d142 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -137,7 +137,7 @@ my $catcode; if ( $category_type eq 'C') { if ($data->{'guarantorid'} ne '0' ) { my $data2 = GetMember( $data->{'guarantorid'} ,'borrowernumber'); - foreach (qw(address city B_address B_city phone mobile zipcode)) { + foreach (qw(address city B_address B_city phone mobile zipcode country B_country)) { $data->{$_} = $data2->{$_}; } } diff --git a/members/pay.pl b/members/pay.pl index 06ae687..8e8567c 100755 --- a/members/pay.pl +++ b/members/pay.pl @@ -155,6 +155,7 @@ $template->param( picture => 1 ) if $picture; address2 => $data->{'address2'}, city => $data->{'city'}, zipcode => $data->{'zipcode'}, + country => $data->{'country'}, phone => $data->{'phone'}, email => $data->{'email'}, branchcode => $data->{'branchcode'}, diff --git a/members/readingrec.pl b/members/readingrec.pl index 6107ef4..7ffdfee 100755 --- a/members/readingrec.pl +++ b/members/readingrec.pl @@ -109,6 +109,7 @@ $template->param( address2 => $data->{'address2'}, city => $data->{'city'}, zipcode => $data->{'zipcode'}, + country => $data->{'country'}, phone => $data->{'phone'}, email => $data->{'email'}, branchcode => $data->{'branchcode'}, diff --git a/misc/cronjobs/overdue_notices.pl b/misc/cronjobs/overdue_notices.pl index 23ce459..831cdfc 100755 --- a/misc/cronjobs/overdue_notices.pl +++ b/misc/cronjobs/overdue_notices.pl @@ -290,7 +290,7 @@ if ( defined $csvfilename ) { } else { open $csv_fh, ">", $csvfilename or die "unable to open $csvfilename: $!"; } - if ( $csv->combine(qw(name surname address1 address2 zipcode city email itemcount itemsinfo)) ) { + if ( $csv->combine(qw(name surname address1 address2 zipcode city country email itemcount itemsinfo)) ) { print $csv_fh $csv->string, "\n"; } else { $verbose and warn 'combine failed on argument: ' . $csv->error_input; @@ -340,7 +340,7 @@ END_SQL # <date> <itemcount> <firstname> <lastname> <address1> <address2> <address3> <city> <postcode> my $borrower_sql = <<'END_SQL'; -SELECT COUNT(*), issues.borrowernumber, firstname, surname, address, address2, city, zipcode, email, MIN(date_due) as longest_issue +SELECT COUNT(*), issues.borrowernumber, firstname, surname, address, address2, city, zipcode, country, email, MIN(date_due) as longest_issue FROM issues,borrowers,categories WHERE issues.borrowernumber=borrowers.borrowernumber AND borrowers.categorycode=categories.categorycode diff --git a/tools/import_borrowers.pl b/tools/import_borrowers.pl index f987fa3..ebbff4f 100755 --- a/tools/import_borrowers.pl +++ b/tools/import_borrowers.pl @@ -22,9 +22,9 @@ # File format # # cardnumber,surname,firstname,title,othernames,initials,streetnumber,streettype, -# address line , address line 2, city, zipcode, email, phone, mobile, fax, work email, work phone, +# address line , address line 2, city, zipcode, contry, email, phone, mobile, fax, work email, work phone, # alternate streetnumber, alternate streettype, alternate address line 1, alternate city, -# alternate zipcode, alternate email, alternate phone, date of birth, branchcode, +# alternate zipcode, alternate country, alternate email, alternate phone, date of birth, branchcode, # categorycode, enrollment date, expiry date, noaddress, lost, debarred, contact surname, # contact firstname, contact title, borrower notes, contact relationship, ethnicity, ethnicity notes # gender, username, opac note, contact note, password, sort one, sort two -- 1.6.3.3
>From 48a4a7bb465db7dfbb134d7176ade928938fff95 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?S=C3=A9bastien=20Hinderer?= <[email protected]> Date: Sun, 2 Aug 2009 07:52:06 +0200 Subject: [PATCH 3/3] Update Koha version: 3.01.00.038->3.01.00.039. Content-Type: text/plain; charset="utf-8" --- kohaversion.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kohaversion.pl b/kohaversion.pl index 68df586..5509870 100644 --- a/kohaversion.pl +++ b/kohaversion.pl @@ -10,7 +10,7 @@ use strict; sub kohaversion { - our $VERSION = '3.01.00.038'; + our $VERSION = '3.01.00.039'; # version needs to be set this way # so that it can be picked up by Makefile.PL # during install -- 1.6.3.3
_______________________________________________ Koha-patches mailing list [email protected] http://lists.koha.org/mailman/listinfo/koha-patches
