Bugzilla – Attachment 26466 Details for
Bug 11967
Add support for RMA notices to Acquisitions.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Add RMA support for Acquisitions.
0001-Add-RMA-support-for-Acquisitions.patch (text/plain), 22.97 KB, created by
Frédérick Capovilla
on 2014-03-19 20:50:43 UTC
(
hide
)
Description:
Add RMA support for Acquisitions.
Filename:
MIME Type:
Creator:
Frédérick Capovilla
Created:
2014-03-19 20:50:43 UTC
Size:
22.97 KB
patch
obsolete
>From 3dc98d865e11b6b355e8bd33150724ea836a0017 Mon Sep 17 00:00:00 2001 >From: Maxime Pelletier <maxime.pelletier@libeo.com> >Date: Fri, 7 Mar 2014 12:31:30 -0500 >Subject: [PATCH] Add RMA support for Acquisitions. > >--- > C4/Letters.pm | 82 +++++++++ > acqui/returnorder.pl | 182 ++++++++++++++++++++ > .../data/mysql/en/mandatory/sample_notices.sql | 13 ++ > .../mysql/fr-FR/1-Obligatoire/sample_notices.sql | 11 ++ > installer/data/mysql/updatedatabase.pl | 19 ++ > .../intranet-tmpl/prog/en/css/staff-global.css | 12 ++ > .../prog/en/includes/acquisitions-menu.inc | 1 + > .../prog/en/modules/acqui/returnorder.tt | 108 ++++++++++++ > .../intranet-tmpl/prog/en/modules/tools/letter.tt | 5 + > tools/letter.pl | 2 +- > 10 files changed, 434 insertions(+), 1 deletions(-) > create mode 100755 acqui/returnorder.pl > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/returnorder.tt > >diff --git a/C4/Letters.pm b/C4/Letters.pm >index 5025c10..6f10fa5 100644 >--- a/C4/Letters.pm >+++ b/C4/Letters.pm >@@ -416,6 +416,88 @@ sub SendAlerts { > ); > sendmail(%mail) or carp $Mail::Sendmail::error; > } >+ elsif ( $type eq 'rma' ) { >+ my $userenv = C4::Context->userenv; >+ my $branchcode = $userenv->{branch}; >+ >+ # prepare the letter... >+ # search the biblionumber >+ my $strsth = >+ "select aqorders.*,aqbasket.*,biblio.*,biblioitems.* from aqorders >+ LEFT JOIN aqbasket on aqbasket.basketno=aqorders.basketno >+ LEFT JOIN biblio on aqorders.biblionumber=biblio.biblionumber >+ LEFT JOIN biblioitems on aqorders.biblioitemnumber=biblioitems.biblioitemnumber >+ where aqorders.ordernumber IN (" >+ . join( ",", @$externalid ) . ")"; >+ my $sthorders = $dbh->prepare($strsth); >+ $sthorders->execute; >+ my $dataorders = $sthorders->fetchall_arrayref( {} ); >+ my $sthbookseller = >+ $dbh->prepare("select * from aqbooksellers where id=?"); >+ $sthbookseller->execute( $dataorders->[0]->{booksellerid} ); >+ my $databookseller = $sthbookseller->fetchrow_hashref; >+ >+ my $letter = GetPreparedLetter ( >+ module => 'rma', >+ letter_code => $letter_code, >+ branchcode => $branchcode, >+ tables => { >+ 'aqbooksellers' => $dataorders->[0]->{booksellerid}, >+ 'branches' => $branchcode, >+ }, >+ ); >+ >+ # parsing librarian name >+ $letter->{content} =~ s/<<LibrarianFirstname>>/$userenv->{firstname}/g; >+ $letter->{content} =~ s/<<LibrarianSurname>>/$userenv->{surname}/g; >+ $letter->{content} =~ >+ s/<<LibrarianEmailaddress>>/$userenv->{emailaddress}/g; >+ >+ #Parses the content of item tags >+ foreach my $data (@$dataorders) { >+ my $line = $1 if ($letter->{content} =~ m/(<item>.*<\/item>)/); >+ foreach my $field ( keys %$data ) { >+ $line =~ s/(<<[^\.]+.$field>>)/$data->{$field}/; >+ } >+ $line =~ s/<\/{0,1}?item>//g; # strip all item tags... >+ $letter->{content} =~ s/(<item>.*<\/item>)/$line\n$1/; >+ } >+ #Remove the final item tags from the initial content >+ $letter->{content} =~ s/(<item>.*<\/item>)//; >+ >+ my $innerletter = $letter; >+ >+ # ... then send mail >+ if ( $databookseller->{bookselleremail} >+ || $databookseller->{contemail} ) >+ { >+ utf8::encode($innerletter->{title}); >+ utf8::encode($innerletter->{content}); >+ my %mail = ( >+ To => $databookseller->{bookselleremail} >+ . ( >+ $databookseller->{contemail} >+ ? "," . $databookseller->{contemail} >+ : "" >+ ), >+ From => $userenv->{emailaddress}, >+ Subject => "" . $innerletter->{title}, >+ Message => "" . $innerletter->{content}, >+ 'Content-Type' => 'text/plain; charset="utf8"', >+ ); >+ sendmail(%mail) or carp $Mail::Sendmail::error; >+ } >+ if ( C4::Context->preference("LetterLog") ) { >+ logaction( >+ "ACQUISITION", >+ "Send RMA letter", >+ "", >+ "order list : " >+ . join( ",", @$externalid ) >+ . "\n$innerletter->{title}\n$innerletter->{content}" >+ ); >+ } >+ } > } > > =head2 GetPreparedLetter( %params ) >diff --git a/acqui/returnorder.pl b/acqui/returnorder.pl >new file mode 100755 >index 0000000..ba1d0c6 >--- /dev/null >+++ b/acqui/returnorder.pl >@@ -0,0 +1,182 @@ >+#!/usr/bin/perl >+ >+use strict; >+use warnings; >+use CGI; >+use C4::Bookseller; >+use C4::Auth; >+use C4::Koha; >+use C4::Output; >+use C4::Context; >+use C4::Acquisition; >+use C4::Letters; >+use C4::Branch; # GetBranches >+use C4::Members qw/GetMember/; >+use C4::Dates qw/format_date/; >+use C4::Reports; >+ >+my $input = new CGI; >+my ($template, $loggedinuser, $cookie) = get_template_and_user({ >+ template_name => "acqui/returnorder.tt", >+ query => $input, >+ type => "intranet", >+ authnotrequired => 0, >+ flagsrequired => {acquisition => 'order_receive'}, >+ debug => 1, >+}); >+ >+my $supplierid = $input->param('supplierid') || undef; # we don't want "" or 0 >+my $delay = $input->param('delay'); >+my $branch = $input->param('branch'); >+my $op = $input->param('op'); >+ >+my @errors = (); >+$delay = 30 unless defined $delay; >+unless ($delay =~ /^\d{1,3}$/) { >+ push @errors, {delay_digits => 1, bad_delay => $delay}; >+ $delay = 30; #default value for delay >+} >+ >+if ($op and $op eq "findsupplier") >+{ >+ my $supplier = $input->param('supplier'); >+ my @suppliers = C4::Bookseller::GetBookSeller($supplier); >+ my $count = scalar @suppliers; >+ my @loop_suppliers; >+ for ( my $i = 0 ; $i < $count ; $i++ ) { >+ my $orders = GetBasketsByBookseller( $suppliers[$i]->{'id'}, {groupby => "aqbasket.basketno", orderby => "aqbasket.basketname"} ); >+ my $ordcount = scalar @$orders; >+ my %line; >+ >+ $line{supplierid} = $suppliers[$i]->{'id'}; >+ $line{name} = $suppliers[$i]->{'name'}; >+ $line{active} = $suppliers[$i]->{'active'}; >+ my @loop_basket; >+ my $uid = GetMember(borrowernumber => $loggedinuser)->{userid} if $loggedinuser; >+ my $i3 = 0; >+ for ( my $i2 = 0 ; $i2 < $ordcount ; $i2++ ) { >+ if ( $orders->[$i2]{'authorisedby'} == $loggedinuser || haspermission($uid, { flagsrequired => { 'acquisition' => '*' } } ) ) { >+ my %inner_line; >+ my @orders_items = GetOrders($orders->[$i2]{'basketno'}); >+ $inner_line{basketno} = $orders->[$i2]{'basketno'}; >+ $inner_line{basketname} = $orders->[$i2]{'basketname'}; >+ $inner_line{total} = scalar @orders_items; >+ $inner_line{authorisedby} = $orders->[$i2]{'authorisedby'}; >+ my $authby = GetMember(borrowernumber => $orders->[$i2]{'authorisedby'}); >+ $inner_line{surname} = $authby->{'firstname'}; >+ $inner_line{firstname} = $authby->{'surname'}; >+ $inner_line{creationdate} = format_date( $orders->[$i2]{'creationdate'} ); >+ $inner_line{closedate} = format_date( $orders->[$i2]{'closedate'} ); >+ $inner_line{uncertainprice} = $orders->[$i2]{'uncertainprice'}; >+ $inner_line{orders_items} = \@orders_items; >+ $inner_line{odd} = $i3 % 2; >+ if ($inner_line{total} > 0) { >+ push @loop_basket, \%inner_line; >+ $i3++; >+ } >+ } >+ } >+ $line{loop_basket} = \@loop_basket; >+ push @loop_suppliers, \%line; >+ } >+ >+ #use Data::Dumper; >+ #die Dumper \@loop_suppliers; >+ >+ my @letters; >+ my $letters=GetLetters("rma"); >+ foreach (keys %$letters){ >+ push @letters, {code=>$_,name=>$letters->{$_}}; >+ } >+ $template->param(letters=>\@letters) if (@letters); >+ $template->param(suppliers => \@loop_suppliers); >+ $template->param(suppliername => $input->param('supplier')); >+} >+ >+if ($op and $op eq "send_alert"){ >+ my @ordernums = $input->param("generate_for"); >+ my $output = $input->param("output"); >+ if ($output eq "email"){ >+ SendAlerts('rma',\@ordernums,$input->param("letter_code")); >+ } >+ else { >+ >+ my $dbh = C4::Context->dbh; >+ my $basename = $input->param("basename"); >+ my $sep = $input->param("sep"); >+ print $input->header( >+ -type => 'application/vnd.sun.xml.calc', >+ -encoding => 'utf-8', >+ -attachment => "$basename.csv", >+ -name => "$basename.csv" >+ ); >+ >+ my $strsth = "SELECT aqorders.*,aqbasket.*,biblio.*,biblioitems.*, bs.* >+ FROM aqorders >+ LEFT JOIN aqbasket on aqbasket.basketno=aqorders.basketno >+ LEFT JOIN biblio on aqorders.biblionumber=biblio.biblionumber >+ LEFT JOIN biblioitems on aqorders.biblionumber=biblioitems.biblionumber >+ JOIN aqbooksellers bs on bs.id = booksellerid >+ where aqorders.ordernumber IN (". join( ",", @ordernums ) . ")"; >+ my $sthorders = $dbh->prepare($strsth); >+ $sthorders->execute; >+ my $dataorders = $sthorders->fetchall_arrayref( {} ); >+ >+ print "aqbooksellers.name" . $sep; >+ print "aqbooksellers.address1" . $sep; >+ print "aqbooksellers.address2" . $sep; >+ print "aqbooksellers.address3" . $sep; >+ print "aqbooksellers.address4" . $sep; >+ print "aqbooksellers.phone" . $sep; >+ print "aqorders.ordernumber" . $sep; >+ print "biblioitems.isbn" . $sep; >+ print "biblio.title" . $sep; >+ print "biblio.author" . $sep; >+ print "aqorders.quantity" . $sep; >+ print "aqorders.listprice" . $sep; >+ print "\n"; >+ >+ foreach my $data (@$dataorders) { >+ print _surround($data->{name}) . $sep; >+ print _surround($data->{address1}) . $sep; >+ print _surround($data->{address2}) . $sep; >+ print _surround($data->{address3}) . $sep; >+ print _surround($data->{address4}) . $sep; >+ print _surround($data->{phone}) . $sep; >+ print _surround($data->{ordernumber}) . $sep; >+ print _surround($data->{isbn}) . $sep; >+ print _surround($data->{title}) . $sep; >+ print _surround($data->{author}) . $sep; >+ print _surround($data->{quantity}) . $sep; >+ print _surround($data->{listprice}) . $sep; >+ print "\n"; >+ } >+ >+ exit(1); >+ } >+} >+ >+sub _surround { >+ my $string = shift || ""; >+ $string =~ s/"/""/g; >+ return "\"$string\""; >+} >+ >+my $CGIextChoice = CGI::scrolling_list( >+ -name => 'MIME', >+ -id => 'MIME', >+ -values => ['CSV'], # FIXME translation >+ -size => 1, >+ -multiple => 0 >+); >+ >+my $CGIsepChoice = C4::Reports::GetDelimiterChoices; >+ >+$template->param(ERROR_LOOP => \@errors) if (@errors); >+$template->param( >+ CGIextChoice => $CGIextChoice, >+ CGIsepChoice => $CGIsepChoice, >+ delay => $delay, >+ intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"), >+); >+output_html_with_http_headers $input, $cookie, $template->output; >diff --git a/installer/data/mysql/en/mandatory/sample_notices.sql b/installer/data/mysql/en/mandatory/sample_notices.sql >index 2d09971..242ddd2 100644 >--- a/installer/data/mysql/en/mandatory/sample_notices.sql >+++ b/installer/data/mysql/en/mandatory/sample_notices.sql >@@ -117,3 +117,16 @@ http://<<OPACBaseURL>>/cgi-bin/koha/opac-registration-verify.pl?token=<<borrower > > If you did not initiate this request, you may safely ignore this one-time message. The request will expire shortly.' > ); >+ >+ >+INSERT INTO `letter` VALUES ('rma', 'RMA', 'Return merchandise authorization', 'Return merchandise authorization', '<<aqbooksellers.name>> >+<<aqbooksellers.address1>> >+<<aqbooksellers.address2>> >+<<aqbooksellers.address3>> >+<<aqbooksellers.address4>> >+<<aqbooksellers.phone>> >+ >+Some items in this order will be returned : >+Order number >+<item><<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each)</item>' >+); >diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql >index 4b786b6..7c96ed7 100644 >--- a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql >+++ b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql >@@ -19,3 +19,14 @@ VALUES > ('suggestions','ORDERED','Suggestion commandée', 'Suggestion commandée','Cher(e) <<borrowers.firstname>> <<borrowers.surname>>,\n\nVous avez effectué une demande de suggestion d\'achat sur le docuement <<suggestions.title>> de <<suggestions.author>>.\n\nNous sommes heureux de vous informer que le document que vous avez demandé est maintenant en commande. Le document devrait arriver rapidement dans nos collections.\n\nVous serez averti quand le docuement sera disponible.\n\nSi vous avez des questions, merci de nous contacter à l\'adresse <<branches.branchemail>>\n\nMerci,\n\n<<branches.branchname>>'), > ('suggestions','REJECTED','Suggestion rejetée', 'Suggestion d\'achat rejeté','Cher(e) <<borrowers.firstname>> <<borrowers.surname>>,\n\nVous avez fait la demande du document <<suggestions.title>> de <<suggestions.author>>.\n\nla Bibliothèque a examiné votre demande ce jour, et a décidé de ne pas retenir la suggestion pour l\'instant.\n\nLa raison est la suivante: <<suggestions.reason>>\n\nSi vous avez des questions, merci de nous contacter à l\'adresse <<branches.branchemail>>.\n\nMerci,\n\n<<branches.branchname>>'); > INSERT INTO `letter` (module, code, name, title, content) VALUES ('circulation','RENEWAL','Item Renewal','Renewals','Les documents suivants ont été renouvelés\r\n----\r\n<<biblio.title>>\r\n----\r\nMerci, <<branches.branchname>>.'); >+INSERT INTO `letter` VALUES ('rma', 'RMA', 'Bon de retour', 'Bon de retour', '<<aqbooksellers.name>> >+<<aqbooksellers.address1>> >+<<aqbooksellers.address2>> >+<<aqbooksellers.address3>> >+<<aqbooksellers.address4>> >+<<aqbooksellers.phone>> >+ >+Certains items de la commande seront retournés : >+Numéro de commande >+<item><<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> commandé(s)) ($<<aqorders.listprice>> chacun)</item>' >+); >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index 9039766..ea82cc6 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -8074,6 +8074,25 @@ if ( CheckVersion($DBversion) ) { > SetVersion($DBversion); > } > >+$DBversion = "XXX"; >+if ( CheckVersion($DBversion) ) { >+ $dbh->do(q{ >+INSERT INTO `letter` VALUES ('rma', 'RMA', 'Return merchandise authorization', 'Return merchandise authorization', '<<aqbooksellers.name>> >+<<aqbooksellers.address1>> >+<<aqbooksellers.address2>> >+<<aqbooksellers.address3>> >+<<aqbooksellers.address4>> >+<<aqbooksellers.phone>> >+ >+Some items in this order will be returned : >+Order number >+<item><<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each)</item>' >+); >+ }); >+ print "Upgrade to $DBversion done (Add the RMA letter)\n"; >+ SetVersion($DBversion); >+} >+ > =head1 FUNCTIONS > > =head2 TableExists($table) >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css >index 685ebef..32488e9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css >+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css >@@ -1984,6 +1984,18 @@ fieldset.rows+h3 {clear:both;padding-top:.5em;} > color : #cc0000; > } > >+td.expanded { >+ background : transparent url("../../img/collapse.gif") 0 6px no-repeat; >+ cursor : pointer; >+ padding-left : 12px; >+} >+ >+td.collapsed { >+ background : transparent url("../../img/expand.gif") 0 6px no-repeat; >+ cursor : pointer; >+ padding-left : 12px; >+} >+ > div.pager { > background-color : #E8E8E8; > border : 1px solid #BCBCBC; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc >index 439118d..79e8ec5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc >@@ -1,5 +1,6 @@ > <ul> > <li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li> >+ <li><a href="/cgi-bin/koha/acqui/returnorder.pl">Return order</a></li> > [% IF ( suggestion ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% ELSE %][% END %] > <li><a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a></li> > [% IF ( CAN_user_acquisition_budget_manage ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/returnorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/returnorder.tt >new file mode 100644 >index 0000000..2ee4919 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/returnorder.tt >@@ -0,0 +1,108 @@ >+[% INCLUDE 'doc-head-open.inc' %] >+<title>Koha › Acquisitions › Return merchandise authorization</title> >+[% INCLUDE 'doc-head-close.inc' %] >+</head> >+<body> >+[% INCLUDE 'header.inc' %] >+[% INCLUDE 'acquisitions-search.inc' %] >+ >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="returnorder.pl">Return merchandise authorization</a></div> >+ >+<div id="doc3" class="yui-t2"> >+ >+ <div id="bd"> >+ <div id="yui-main"> >+ <div class="yui-b"> >+ >+<h1>Return merchandise authorization</h1> >+<div id="acqui_returnorder"> >+ >+<form name="findsupplier" action="returnorder.pl" method="post"> >+ <input type="hidden" name="op" value="findsupplier" /> >+ <p><label for="supplierpage">Vendor </label> >+ <input type="text" size="25" name="supplier" id="supplierpage" class="focus" value="[% suppliername %]" /> >+ <input type="submit" value="Search" /> >+ </p> >+</form> >+ >+[% IF ( suppliers ) %] >+<form action="returnorder.pl" name="returnorder" method="post"> >+ <input type="hidden" name="op" value="send_alert" /> >+ <table> >+ <tr> >+ <th>Basket (#)</th> >+ <th>Items</th> >+ <th>Created by</th> >+ <th>Date</th> >+ </tr> >+ [% FOREACH supplier IN suppliers %] >+ [% FOREACH loop_baske IN supplier.loop_basket %] >+ <tr class="[% IF ( loop_baske.odd ) %]highlight[% END %]" >+ onclick="jQuery('.orders_items_[% loop_baske.basketno %]').toggle(); >+ jQuery(this).children(':first').toggleClass('collapsed');jQuery(this).children(':first').toggleClass('expanded')" >+ style="cursor:pointer;"> >+ <td class="collapsed"> [% loop_baske.basketname %] (#[% loop_baske.basketno %])</td> >+ <td>[% loop_baske.total %]</td> >+ <td> >+ [% loop_baske.firstname %] >+ [% loop_baske.surname %] >+ </td> >+ <td>[% loop_baske.creationdate %]</td> >+ </tr> >+ [% FOREACH orders_item IN loop_baske.orders_items %] >+ <tr class="orders_items_[% orders_item.basketno %] [% IF ( orders_item.odd ) %] highlight[% END %]" >+ style="display:none;"> >+ <td colspan="3"> >+ [% orders_item.title %][% orders_item.seriestitle %][% orders_item.volume %] >+ by [% orders_item.author %] >+ </td> >+ <td> >+ <input type="checkbox" name="generate_for" value="[% orders_item.ordernumber %]" /> >+ </td> >+ </tr> >+ [% END %] >+ [% END %] >+ [% END %] >+ </table> >+ <fieldset class="rows"> >+ <legend>Output</legend> >+ <ol> >+ [% IF ( letters ) %] >+ <li> >+ <label for="outputemail">Send email</label> >+ <input type="radio" name="output" value="email" id="outputemail" checked="checked" /> >+ <label class="inline" for="letter_code">Using notice: </label> >+ <select name="letter_code" id="letter_code"> >+ [% FOREACH letter IN letters %] >+ <option value="[% letter.code %]">[% letter.name %]</option> >+ [% END %] >+ </select> >+ </li> >+ [% END %] >+ <li> >+ <label for="outputfile">To a file:</label> >+ <input type="radio" name="output" value="file" id="outputfile" /> >+ <label class="inline" for="basename">Named: </label> >+ <input type="text" name="basename" id="basename" value="Export" /> >+ <label class="inline" for="MIME">Into an application</label> >+ [% CGIextChoice %] >+ [% CGIsepChoice %] >+ </li> >+ </ol> >+ </fieldset> >+ <fieldset class="action"> >+ <input type="submit" value="Generate RMA" /> >+ <input type="hidden" name="report_name" value="[% report_name %]" /> >+ <input type="hidden" name="do_it" value="1" /> >+ </fieldset> >+ </form> >+[% ELSE %]<p>No baskets for this vendor.</p> >+[% END %] >+</div> >+</div> >+</div> >+<div class="yui-b"> >+[% INCLUDE 'acquisitions-menu.inc' %] >+</div> >+</div> >+[% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >index c414787..0858b5d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >@@ -279,6 +279,11 @@ $(document).ready(function() { > [% ELSE %] > <option value="members">Members</option> > [% END %] >+ [% IF ( rma ) %] >+ <option value="rma" selected="selected">Return Merchandise Authorization</option> >+ [% ELSE %] >+ <option value="rma">Return Merchandise Authorization</option> >+ [% END %] > [% IF ( serial ) %] > <option value="serial" selected="selected">Serials (routing list)</option> > [% ELSE %] >diff --git a/tools/letter.pl b/tools/letter.pl >index 7582e66..e62d465 100755 >--- a/tools/letter.pl >+++ b/tools/letter.pl >@@ -176,7 +176,7 @@ sub add_form { > if ($module eq 'reserves') { > push @{$field_selection}, add_fields('borrowers', 'reserves', 'biblio', 'items'); > } >- elsif ($module eq 'claimacquisition') { >+ elsif ($module eq 'claimacquisition' || $module eq 'rma') { > push @{$field_selection}, add_fields('aqbooksellers', 'aqorders', 'biblio', 'biblioitems'); > } > elsif ($module eq 'claimissues') { >-- >1.7.2.5 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 11967
:
26466
|
31381