View | Details | Raw Unified | Return to bug 11967
Collapse All | Expand All

(-)a/C4/Letters.pm (+82 lines)
Lines 416-421 sub SendAlerts { Link Here
416
        );
416
        );
417
        sendmail(%mail) or carp $Mail::Sendmail::error;
417
        sendmail(%mail) or carp $Mail::Sendmail::error;
418
    }
418
    }
419
    elsif ( $type eq 'rma' ) {
420
        my $userenv = C4::Context->userenv;
421
        my $branchcode = $userenv->{branch};
422
423
        # prepare the letter...
424
        # search the biblionumber
425
        my $strsth =
426
        "select aqorders.*,aqbasket.*,biblio.*,biblioitems.* from aqorders 
427
        LEFT JOIN aqbasket on aqbasket.basketno=aqorders.basketno 
428
        LEFT JOIN biblio on aqorders.biblionumber=biblio.biblionumber 
429
        LEFT JOIN biblioitems on aqorders.biblioitemnumber=biblioitems.biblioitemnumber 
430
        where aqorders.ordernumber IN ("
431
          . join( ",", @$externalid ) . ")";
432
        my $sthorders = $dbh->prepare($strsth);
433
        $sthorders->execute;
434
        my $dataorders = $sthorders->fetchall_arrayref( {} );
435
        my $sthbookseller =
436
          $dbh->prepare("select * from aqbooksellers where id=?");
437
        $sthbookseller->execute( $dataorders->[0]->{booksellerid} );
438
        my $databookseller = $sthbookseller->fetchrow_hashref;
439
440
        my $letter = GetPreparedLetter (
441
            module => 'rma',
442
            letter_code => $letter_code,
443
            branchcode => $branchcode,
444
            tables => {
445
                'aqbooksellers'    => $dataorders->[0]->{booksellerid},
446
                'branches' => $branchcode,
447
            },
448
        );
449
450
        # parsing librarian name
451
        $letter->{content} =~ s/<<LibrarianFirstname>>/$userenv->{firstname}/g;
452
        $letter->{content} =~ s/<<LibrarianSurname>>/$userenv->{surname}/g;
453
        $letter->{content} =~
454
          s/<<LibrarianEmailaddress>>/$userenv->{emailaddress}/g;
455
456
        #Parses the content of item tags
457
        foreach my $data (@$dataorders) {
458
            my $line = $1 if ($letter->{content} =~ m/(<item>.*<\/item>)/);
459
            foreach my $field ( keys %$data ) {
460
                $line =~ s/(<<[^\.]+.$field>>)/$data->{$field}/;
461
            }
462
            $line =~ s/<\/{0,1}?item>//g; # strip all item tags...
463
            $letter->{content} =~ s/(<item>.*<\/item>)/$line\n$1/;
464
        }
465
        #Remove the final item tags from the initial content
466
        $letter->{content} =~ s/(<item>.*<\/item>)//;
467
468
        my $innerletter = $letter;
469
470
        # ... then send mail
471
        if (   $databookseller->{bookselleremail}
472
            || $databookseller->{contemail} )
473
        {
474
            utf8::encode($innerletter->{title});
475
            utf8::encode($innerletter->{content});
476
            my %mail = (
477
                To => $databookseller->{bookselleremail}
478
                  . (
479
                    $databookseller->{contemail}
480
                    ? "," . $databookseller->{contemail}
481
                    : ""
482
                  ),
483
                From           => $userenv->{emailaddress},
484
                Subject        => "" . $innerletter->{title},
485
                Message        => "" . $innerletter->{content},
486
                'Content-Type' => 'text/plain; charset="utf8"',
487
            );
488
            sendmail(%mail) or carp $Mail::Sendmail::error;
489
        }
490
        if ( C4::Context->preference("LetterLog") ) {
491
            logaction(
492
                "ACQUISITION",
493
                "Send RMA letter",
494
                "",
495
                "order list : "
496
                  . join( ",", @$externalid )
497
                  . "\n$innerletter->{title}\n$innerletter->{content}"
498
            );
499
        }
500
    }
419
}
501
}
420
502
421
=head2 GetPreparedLetter( %params )
503
=head2 GetPreparedLetter( %params )
(-)a/acqui/returnorder.pl (+182 lines)
Line 0 Link Here
1
#!/usr/bin/perl
2
3
use strict;
4
use warnings;
5
use CGI;
6
use C4::Bookseller;
7
use C4::Auth;
8
use C4::Koha;
9
use C4::Output;
10
use C4::Context;
11
use C4::Acquisition;
12
use C4::Letters;
13
use C4::Branch; # GetBranches
14
use C4::Members qw/GetMember/;
15
use C4::Dates qw/format_date/;
16
use C4::Reports;
17
18
my $input = new CGI;
19
my ($template, $loggedinuser, $cookie) = get_template_and_user({
20
    template_name => "acqui/returnorder.tt",
21
    query => $input,
22
    type => "intranet",
23
    authnotrequired => 0,
24
    flagsrequired => {acquisition => 'order_receive'},
25
    debug => 1,
26
});
27
28
my $supplierid = $input->param('supplierid') || undef; # we don't want "" or 0
29
my $delay      = $input->param('delay');
30
my $branch     = $input->param('branch');
31
my $op         = $input->param('op');
32
33
my @errors = ();
34
$delay = 30 unless defined $delay;
35
unless ($delay =~ /^\d{1,3}$/) {
36
    push @errors, {delay_digits => 1, bad_delay => $delay};
37
    $delay = 30;    #default value for delay
38
}
39
40
if ($op and $op eq "findsupplier")
41
{
42
    my $supplier = $input->param('supplier');
43
    my @suppliers = C4::Bookseller::GetBookSeller($supplier);
44
    my $count = scalar @suppliers;
45
    my @loop_suppliers;
46
    for ( my $i = 0 ; $i < $count ; $i++ ) {
47
        my $orders  = GetBasketsByBookseller( $suppliers[$i]->{'id'}, {groupby => "aqbasket.basketno", orderby => "aqbasket.basketname"} );
48
        my $ordcount = scalar @$orders;
49
        my %line;
50
51
        $line{supplierid} = $suppliers[$i]->{'id'};
52
        $line{name}       = $suppliers[$i]->{'name'};
53
        $line{active}     = $suppliers[$i]->{'active'};
54
        my @loop_basket;
55
        my $uid = GetMember(borrowernumber => $loggedinuser)->{userid} if $loggedinuser;
56
        my $i3 = 0;
57
        for ( my $i2 = 0 ; $i2 < $ordcount ; $i2++ ) {
58
            if ( $orders->[$i2]{'authorisedby'} == $loggedinuser || haspermission($uid, { flagsrequired   => { 'acquisition' => '*' } } ) ) {
59
                my %inner_line;
60
                my @orders_items = GetOrders($orders->[$i2]{'basketno'});
61
                $inner_line{basketno}     = $orders->[$i2]{'basketno'};
62
                $inner_line{basketname}     = $orders->[$i2]{'basketname'};
63
                $inner_line{total}        = scalar @orders_items;
64
                $inner_line{authorisedby} = $orders->[$i2]{'authorisedby'};
65
                my $authby = GetMember(borrowernumber => $orders->[$i2]{'authorisedby'});
66
                $inner_line{surname}      = $authby->{'firstname'};
67
                $inner_line{firstname}    = $authby->{'surname'};
68
                $inner_line{creationdate} = format_date( $orders->[$i2]{'creationdate'} );
69
                $inner_line{closedate}    = format_date( $orders->[$i2]{'closedate'}    );
70
                $inner_line{uncertainprice} = $orders->[$i2]{'uncertainprice'};
71
                $inner_line{orders_items} = \@orders_items;
72
                $inner_line{odd} = $i3 % 2;
73
                if ($inner_line{total} > 0) {
74
                    push @loop_basket, \%inner_line;
75
                    $i3++;
76
                }
77
            }
78
        }
79
        $line{loop_basket} = \@loop_basket;
80
        push @loop_suppliers, \%line;
81
    }
82
83
    #use Data::Dumper;
84
    #die Dumper \@loop_suppliers;
85
86
    my @letters;
87
    my $letters=GetLetters("rma");
88
    foreach (keys %$letters){
89
        push @letters, {code=>$_,name=>$letters->{$_}};
90
    }
91
    $template->param(letters=>\@letters) if (@letters);
92
    $template->param(suppliers => \@loop_suppliers);
93
    $template->param(suppliername => $input->param('supplier'));
94
}
95
96
if ($op and $op eq "send_alert"){
97
    my @ordernums = $input->param("generate_for");
98
    my $output = $input->param("output");
99
    if ($output eq "email"){
100
        SendAlerts('rma',\@ordernums,$input->param("letter_code"));
101
    }
102
    else {
103
104
        my $dbh = C4::Context->dbh;
105
        my $basename = $input->param("basename");
106
        my $sep      = $input->param("sep");
107
        print $input->header(
108
            -type       => 'application/vnd.sun.xml.calc',
109
            -encoding    => 'utf-8',
110
            -attachment => "$basename.csv",
111
            -name       => "$basename.csv"
112
        );
113
114
        my $strsth = "SELECT aqorders.*,aqbasket.*,biblio.*,biblioitems.*, bs.*
115
            FROM aqorders
116
            LEFT JOIN aqbasket on aqbasket.basketno=aqorders.basketno
117
            LEFT JOIN biblio on aqorders.biblionumber=biblio.biblionumber
118
            LEFT JOIN biblioitems on aqorders.biblionumber=biblioitems.biblionumber
119
            JOIN aqbooksellers bs on bs.id = booksellerid
120
            where aqorders.ordernumber IN (". join( ",", @ordernums ) . ")";
121
        my $sthorders = $dbh->prepare($strsth);
122
        $sthorders->execute;
123
        my $dataorders = $sthorders->fetchall_arrayref( {} );
124
125
        print "aqbooksellers.name" . $sep;
126
        print "aqbooksellers.address1" . $sep;
127
        print "aqbooksellers.address2" . $sep;
128
        print "aqbooksellers.address3" . $sep;
129
        print "aqbooksellers.address4" . $sep;
130
        print "aqbooksellers.phone" . $sep;
131
        print "aqorders.ordernumber" . $sep;
132
        print "biblioitems.isbn" . $sep;
133
        print "biblio.title" . $sep;
134
        print "biblio.author" . $sep;
135
        print "aqorders.quantity" . $sep;
136
        print "aqorders.listprice" . $sep;
137
        print "\n";
138
139
        foreach my $data (@$dataorders) {
140
            print _surround($data->{name}) . $sep;
141
            print _surround($data->{address1}) . $sep;
142
            print _surround($data->{address2}) . $sep;
143
            print _surround($data->{address3}) . $sep;
144
            print _surround($data->{address4}) . $sep;
145
            print _surround($data->{phone}) . $sep;
146
            print _surround($data->{ordernumber}) . $sep;
147
            print _surround($data->{isbn}) . $sep;
148
            print _surround($data->{title}) . $sep;
149
            print _surround($data->{author}) . $sep;
150
            print _surround($data->{quantity}) . $sep;
151
            print _surround($data->{listprice}) . $sep;
152
            print "\n";
153
        }
154
155
        exit(1);
156
    }
157
}
158
159
sub _surround {
160
    my $string = shift || "";
161
    $string =~ s/"/""/g;
162
    return "\"$string\"";
163
}
164
165
my $CGIextChoice = CGI::scrolling_list(
166
    -name     => 'MIME',
167
    -id       => 'MIME',
168
    -values   => ['CSV'], # FIXME translation
169
    -size     => 1,
170
    -multiple => 0
171
);
172
173
my $CGIsepChoice = C4::Reports::GetDelimiterChoices;
174
175
$template->param(ERROR_LOOP => \@errors) if (@errors);
176
$template->param(
177
    CGIextChoice  => $CGIextChoice,
178
    CGIsepChoice  => $CGIsepChoice,
179
    delay => $delay,
180
    intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
181
);
182
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/installer/data/mysql/en/mandatory/sample_notices.sql (+13 lines)
Lines 117-119 http://<<OPACBaseURL>>/cgi-bin/koha/opac-registration-verify.pl?token=<<borrower Link Here
117
117
118
If you did not initiate this request, you may safely ignore this one-time message. The request will expire shortly.'
118
If you did not initiate this request, you may safely ignore this one-time message. The request will expire shortly.'
119
);
119
);
120
121
122
INSERT INTO `letter` VALUES ('rma', 'RMA', 'Return merchandise authorization', 'Return merchandise authorization', '<<aqbooksellers.name>>
123
<<aqbooksellers.address1>>
124
<<aqbooksellers.address2>>
125
<<aqbooksellers.address3>>
126
<<aqbooksellers.address4>>
127
<<aqbooksellers.phone>>
128
129
Some items in this order will be returned :
130
Order number
131
<item><<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each)</item>'
132
);
(-)a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql (+11 lines)
Lines 19-21 VALUES Link Here
19
('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>>'),
19
('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>>'),
20
('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>>');
20
('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>>');
21
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>>.');
21
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>>.');
22
INSERT INTO `letter` VALUES ('rma', 'RMA', 'Bon de retour', 'Bon de retour', '<<aqbooksellers.name>>
23
<<aqbooksellers.address1>>
24
<<aqbooksellers.address2>>
25
<<aqbooksellers.address3>>
26
<<aqbooksellers.address4>>
27
<<aqbooksellers.phone>>
28
29
Certains items de la commande seront retournés : 
30
Numéro de commande 
31
<item><<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> commandé(s)) ($<<aqorders.listprice>> chacun)</item>'
32
);
(-)a/installer/data/mysql/updatedatabase.pl (+19 lines)
Lines 8074-8079 if ( CheckVersion($DBversion) ) { Link Here
8074
    SetVersion($DBversion);
8074
    SetVersion($DBversion);
8075
}
8075
}
8076
8076
8077
$DBversion = "XXX";
8078
if ( CheckVersion($DBversion) ) {
8079
    $dbh->do(q{
8080
INSERT INTO `letter` VALUES ('rma', 'RMA', 'Return merchandise authorization', 'Return merchandise authorization', '<<aqbooksellers.name>>
8081
<<aqbooksellers.address1>>
8082
<<aqbooksellers.address2>>
8083
<<aqbooksellers.address3>>
8084
<<aqbooksellers.address4>>
8085
<<aqbooksellers.phone>>
8086
8087
Some items in this order will be returned :
8088
Order number
8089
<item><<aqorders.ordernumber>> (<<aqorders.title>>) (<<aqorders.quantity>> ordered) ($<<aqorders.listprice>> each)</item>'
8090
);
8091
    });
8092
    print "Upgrade to $DBversion done (Add the RMA letter)\n";
8093
    SetVersion($DBversion);
8094
}
8095
8077
=head1 FUNCTIONS
8096
=head1 FUNCTIONS
8078
8097
8079
=head2 TableExists($table)
8098
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css (+12 lines)
Lines 1984-1989 fieldset.rows+h3 {clear:both;padding-top:.5em;} Link Here
1984
    color : #cc0000;
1984
    color : #cc0000;
1985
    }
1985
    }
1986
1986
1987
td.expanded {
1988
        background : transparent url("../../img/collapse.gif") 0 6px no-repeat;
1989
        cursor : pointer;
1990
        padding-left : 12px;
1991
}
1992
1993
td.collapsed {
1994
        background : transparent url("../../img/expand.gif") 0 6px no-repeat;
1995
        cursor : pointer;
1996
	padding-left : 12px;
1997
}
1998
1987
div.pager {
1999
div.pager {
1988
	background-color : #E8E8E8;
2000
	background-color : #E8E8E8;
1989
	border : 1px solid #BCBCBC;
2001
	border : 1px solid #BCBCBC;
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc (+1 lines)
Lines 1-5 Link Here
1
<ul>
1
<ul>
2
	<li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>
2
	<li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>
3
    <li><a href="/cgi-bin/koha/acqui/returnorder.pl">Return order</a></li>
3
	[% IF ( suggestion ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% ELSE %][% END %]
4
	[% IF ( suggestion ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% ELSE %][% END %]
4
    <li><a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a></li>
5
    <li><a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a></li>
5
    [% IF ( CAN_user_acquisition_budget_manage ) %]
6
    [% IF ( CAN_user_acquisition_budget_manage ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/returnorder.tt (+108 lines)
Line 0 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Acquisitions &rsaquo; Return merchandise authorization</title>
3
[% INCLUDE 'doc-head-close.inc' %]
4
</head>
5
<body>
6
[% INCLUDE 'header.inc' %]
7
[% INCLUDE 'acquisitions-search.inc' %]
8
9
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="returnorder.pl">Return merchandise authorization</a></div>
10
11
<div id="doc3" class="yui-t2">
12
13
   <div id="bd">
14
	<div id="yui-main">
15
	<div class="yui-b">
16
17
<h1>Return merchandise authorization</h1>
18
<div id="acqui_returnorder">
19
20
<form name="findsupplier" action="returnorder.pl" method="post">
21
	<input type="hidden" name="op" value="findsupplier" />
22
	<p><label for="supplierpage">Vendor </label>
23
    <input type="text" size="25" name="supplier" id="supplierpage" class="focus" value="[% suppliername %]" />
24
	<input type="submit" value="Search" />
25
	</p>
26
</form>
27
28
[% IF ( suppliers ) %]
29
<form action="returnorder.pl" name="returnorder" method="post">
30
  <input type="hidden" name="op" value="send_alert" />
31
    <table>
32
        <tr>
33
            <th>Basket (#)</th>
34
            <th>Items</th>
35
            <th>Created by</th>
36
            <th>Date</th>
37
        </tr>
38
    [% FOREACH supplier IN suppliers %]
39
        [% FOREACH loop_baske IN supplier.loop_basket %]
40
        <tr class="[% IF ( loop_baske.odd ) %]highlight[% END %]"
41
            onclick="jQuery('.orders_items_[% loop_baske.basketno %]').toggle();
42
                jQuery(this).children(':first').toggleClass('collapsed');jQuery(this).children(':first').toggleClass('expanded')"
43
                style="cursor:pointer;">
44
            <td class="collapsed"> [% loop_baske.basketname %] (#[% loop_baske.basketno %])</td>
45
            <td>[% loop_baske.total %]</td>
46
            <td>
47
                    [% loop_baske.firstname %]
48
                    [% loop_baske.surname %]
49
            </td>
50
            <td>[% loop_baske.creationdate %]</td>
51
        </tr>
52
        [% FOREACH orders_item IN loop_baske.orders_items %]
53
        <tr class="orders_items_[% orders_item.basketno %] [% IF ( orders_item.odd ) %] highlight[% END %]"
54
            style="display:none;">
55
            <td colspan="3">
56
                [% orders_item.title %][% orders_item.seriestitle %][% orders_item.volume %]
57
                by [% orders_item.author %]
58
            </td>
59
            <td>
60
                <input type="checkbox" name="generate_for" value="[% orders_item.ordernumber %]" />
61
            </td>
62
        </tr>
63
        [% END %]
64
        [% END %]
65
        [% END %]        
66
    </table>
67
    <fieldset class="rows">
68
	<legend>Output</legend>
69
        <ol>
70
            [% IF ( letters ) %]
71
            <li>
72
                <label for="outputemail">Send email</label>
73
                <input type="radio" name="output" value="email" id="outputemail" checked="checked" />
74
                <label class="inline" for="letter_code">Using notice: </label>
75
                <select name="letter_code" id="letter_code">
76
                  [% FOREACH letter IN letters %]
77
                    <option value="[% letter.code %]">[% letter.name %]</option>
78
                  [% END %]
79
                </select>
80
            </li>
81
            [% END %]
82
            <li>
83
                <label for="outputfile">To a file:</label>
84
                <input type="radio" name="output" value="file" id="outputfile" />
85
                <label class="inline" for="basename">Named: </label>
86
                <input type="text" name="basename" id="basename" value="Export" />
87
                <label class="inline" for="MIME">Into an application</label>
88
                [% CGIextChoice %]
89
                [% CGIsepChoice %]
90
            </li>
91
        </ol>
92
    </fieldset>
93
    <fieldset class="action">
94
        <input type="submit" value="Generate RMA" />
95
        <input type="hidden" name="report_name" value="[% report_name %]" />
96
        <input type="hidden" name="do_it" value="1" />
97
	</fieldset>
98
     </form>
99
[% ELSE %]<p>No baskets for this vendor.</p>
100
[% END %]
101
</div>
102
</div>
103
</div>
104
<div class="yui-b">
105
[% INCLUDE 'acquisitions-menu.inc' %]
106
</div>
107
</div>
108
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt (+5 lines)
Lines 279-284 $(document).ready(function() { Link Here
279
                                    [% ELSE %]
279
                                    [% ELSE %]
280
                                    <option value="members">Members</option>
280
                                    <option value="members">Members</option>
281
                                    [% END %]
281
                                    [% END %]
282
                                    [% IF ( rma ) %]
283
                                    <option value="rma" selected="selected">Return Merchandise Authorization</option>
284
                                    [% ELSE %]
285
                                    <option value="rma">Return Merchandise Authorization</option>
286
                                    [% END %]
282
                                    [% IF ( serial ) %]
287
                                    [% IF ( serial ) %]
283
                                    <option value="serial" selected="selected">Serials (routing list)</option>
288
                                    <option value="serial" selected="selected">Serials (routing list)</option>
284
                                    [% ELSE %]
289
                                    [% ELSE %]
(-)a/tools/letter.pl (-2 / +1 lines)
Lines 176-182 sub add_form { Link Here
176
    if ($module eq 'reserves') {
176
    if ($module eq 'reserves') {
177
        push @{$field_selection}, add_fields('borrowers', 'reserves', 'biblio', 'items');
177
        push @{$field_selection}, add_fields('borrowers', 'reserves', 'biblio', 'items');
178
    }
178
    }
179
    elsif ($module eq 'claimacquisition') {
179
    elsif ($module eq 'claimacquisition' || $module eq 'rma') {
180
        push @{$field_selection}, add_fields('aqbooksellers', 'aqorders', 'biblio', 'biblioitems');
180
        push @{$field_selection}, add_fields('aqbooksellers', 'aqorders', 'biblio', 'biblioitems');
181
    }
181
    }
182
    elsif ($module eq 'claimissues') {
182
    elsif ($module eq 'claimissues') {
183
- 

Return to bug 11967