Bug 18177: remove aqbooksellers.booksellerfax

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

diff --git a/Koha/Acquisition/Bookseller.pm b/Koha/Acquisition/Bookseller.pm
index 6b2b248..526743a 100644 (file)
--- a/Koha/Acquisition/Bookseller.pm
+++ b/Koha/Acquisition/Bookseller.pm
@@ -85,7 +85,6 @@ on the API.
 
 sub to_api_mapping {
     return {
-        booksellerfax   => undef,
         bookselleremail => undef,
         booksellerurl   => undef,
         currency        => undef,

diff --git a/acqui/uncertainprice.pl b/acqui/uncertainprice.pl
index 5ecf41d..e41dbdd 100755 (executable)
--- a/acqui/uncertainprice.pl
+++ b/acqui/uncertainprice.pl
@@ -108,7 +108,6 @@ $template->param( uncertainpriceorders => \@orders,
                                    bookselleraddress3 => $bookseller->address3,
                                    bookselleraddress4 => $bookseller->address4,
                                    booksellerphone =>$bookseller->phone,
-                                   booksellerfax => $bookseller->fax,
                                    booksellerurl => $bookseller->url,
                                    booksellernotes => $bookseller->notes,
                                    basketcount   => $bookseller->baskets->count,

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
index 86d0f19..81e16cc 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
@@ -37,7 +37,6 @@
             </p>
             <p><strong>Phone: </strong>
                 [% booksellerphone | html %] / Fax:
-                [% booksellerfax | html %]</p>
             <dl>
                 [% FOREACH contact IN contacts %]
                     <dt><strong>Contact: </strong></dt>

diff --git a/t/db_dependent/Bookseller.t b/t/db_dependent/Bookseller.t
index 9e3aae8..f9a3ec9 100644 (file)
--- a/t/db_dependent/Bookseller.t
+++ b/t/db_dependent/Bookseller.t
@@ -765,7 +765,7 @@ sub field_filter {
     my ($struct) = @_;
 
     for my $field (
-        'bookselleremail', 'booksellerfax',
+        'bookselleremail',
         'booksellerurl',
         'currency',        'invoiceprice',
         'listprice',       'contacts'