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

(-)a/C4/Acquisition.pm (-5 / +101 lines)
Lines 1306-1311 sub ModReceiveOrder { Link Here
1306
    $sth->finish();
1306
    $sth->finish();
1307
1307
1308
    my $new_ordernumber = $ordernumber;
1308
    my $new_ordernumber = $ordernumber;
1309
1310
    # If there are still items to be received
1309
    if ( $order->{quantity} > $quantrec ) {
1311
    if ( $order->{quantity} > $quantrec ) {
1310
        # Split order line in two parts: the first is the original order line
1312
        # Split order line in two parts: the first is the original order line
1311
        # without received items (the quantity is decreased),
1313
        # without received items (the quantity is decreased),
Lines 1337-1342 sub ModReceiveOrder { Link Here
1337
                ModItemOrder($itemnumber, $new_ordernumber);
1339
                ModItemOrder($itemnumber, $new_ordernumber);
1338
            }
1340
            }
1339
        }
1341
        }
1342
1343
        # create a new order for the remaining items, and set its bookfund.
1344
        foreach my $orderkey ( "linenumber", "allocation" ) {
1345
            delete($order->{'$orderkey'});
1346
        }
1347
        $order->{'quantity'} -= $quantrec;
1348
        $order->{'quantityreceived'} = 0;
1349
1350
        my ($newOrder, $newordernumber) = NewOrder($order);
1351
        # Change ordernumber in aqorders_items for items not received
1352
        my @orderitems = GetItemnumbersFromOrder( $order->{'ordernumber'} );
1353
        my $count = scalar @orderitems;
1354
1355
        for (my $i=0; $i<$count; $i++){
1356
            foreach (@$received_items){
1357
                splice (@orderitems, $i, 1) if ($orderitems[$i] == $_);
1358
            }
1359
        }
1360
        foreach (@orderitems) {
1361
            ModItemOrder($_, $newOrder);
1362
        }
1363
1364
        # Do we have to update order informations from the marc record?
1365
        my ($ordertag, $ordersubtag) = GetMarcFromKohaField('aqorders.ordernumber', 'ACQ');
1366
1367
        # Updating MARC order field if exists
1368
        if ($ordertag and $ordersubtag) {
1369
            $debug and warn "updating MARC";
1370
            # Getting record
1371
            my $record = GetMarcBiblio($biblionumber);
1372
            if ($record) {
1373
                $debug and warn "updating Record";
1374
                foreach ($record->field($ordertag)) {
1375
                    if ($_->subfield($ordersubtag) eq $ordernumber) {
1376
                        # Updating ordernumber
1377
                        $debug and warn "updating ordernumber $ordernumber => $newordernumber";
1378
                        $_->update($ordersubtag => $newordernumber);
1379
1380
                        # Updating quantity
1381
                        my ($quantitytag, $quantitysubtag) = GetMarcFromKohaField('aqorders.quantity', 'ACQ');
1382
                        if ($quantitysubtag) {
1383
                            $debug and warn "updating quantity " . $order->{quantity};
1384
                            $_->update($quantitysubtag => $order->{quantity});
1385
                        }
1386
                    }
1387
                }
1388
1389
                # Applying changes
1390
                ModBiblio($record, $biblionumber, 'ACQ');
1391
            }
1392
        }
1393
1394
1340
    } else {
1395
    } else {
1341
        $sth=$dbh->prepare("update aqorders
1396
        $sth=$dbh->prepare("update aqorders
1342
                            set quantityreceived=?,datereceived=?,invoiceid=?,
1397
                            set quantityreceived=?,datereceived=?,invoiceid=?,
Lines 1344-1349 sub ModReceiveOrder { Link Here
1344
                            where biblionumber=? and ordernumber=?");
1399
                            where biblionumber=? and ordernumber=?");
1345
        $sth->execute($quantrec,$datereceived,$invoiceid,$cost,$rrp,$ecost,$biblionumber,$ordernumber);
1400
        $sth->execute($quantrec,$datereceived,$invoiceid,$cost,$rrp,$ecost,$biblionumber,$ordernumber);
1346
        $sth->finish;
1401
        $sth->finish;
1402
1403
        # Removing MARC order field if exists
1404
        DelMarcOrder($biblionumber, $ordernumber);
1347
    }
1405
    }
1348
    return ($datereceived, $new_ordernumber);
1406
    return ($datereceived, $new_ordernumber);
1349
}
1407
}
Lines 1563-1573 sub DelOrder { Link Here
1563
    my $sth = $dbh->prepare($query);
1621
    my $sth = $dbh->prepare($query);
1564
    $sth->execute( $bibnum, $ordernumber );
1622
    $sth->execute( $bibnum, $ordernumber );
1565
    $sth->finish;
1623
    $sth->finish;
1624
1625
    # Removing MARC order field if exists
1626
    DelMarcOrder($bibnum, $ordernumber);
1627
1566
    my @itemnumbers = GetItemnumbersFromOrder( $ordernumber );
1628
    my @itemnumbers = GetItemnumbersFromOrder( $ordernumber );
1567
    foreach my $itemnumber (@itemnumbers){
1629
    foreach my $itemnumber (@itemnumbers){
1568
    	C4::Items::DelItem( $dbh, $bibnum, $itemnumber );
1630
        C4::Items::DelItem( $dbh, $bibnum, $itemnumber );
1631
    }
1632
1633
}
1634
1635
=head3 DelMarcOrder
1636
1637
    &DelMarcOrder($biblionumber, $ordernumber);
1638
1639
Delete the order field from the MARC record. aqorders.ordernumber needs
1640
to be linked to a MARC field/subfield. The field is deleted if the value of
1641
the subfield containing the ordernumber matches the ordernumber given
1642
in parameter
1643
1644
=cut
1645
1646
sub DelMarcOrder {
1647
    my ($biblionumber, $ordernumber) = @_;
1648
1649
    # Do we have to remove order informations from the marc record?
1650
    my ($ordertag, $ordersubtag) = GetMarcFromKohaField('aqorders.ordernumber', 'ACQ');
1651
1652
    # Removing MARC order field if exists
1653
    if ($ordertag and $ordersubtag) {
1654
        # Getting record
1655
        my $record = GetMarcBiblio($biblionumber);
1656
        if ($record) {
1657
            # Looking for the right field
1658
            foreach ($record->field($ordertag)) {
1659
                if ($_->subfield($ordersubtag) eq $ordernumber) {
1660
                    $record->delete_field($_);
1661
                }
1662
            }
1663
            # Applying changes
1664
            ModBiblio($record, $biblionumber, 'ACQ');
1665
        }
1569
    }
1666
    }
1570
    
1571
}
1667
}
1572
1668
1573
=head2 FUNCTIONS ABOUT PARCELS
1669
=head2 FUNCTIONS ABOUT PARCELS
Lines 1871-1877 sub GetLateOrders { Link Here
1871
1967
1872
Retreives some acquisition history information
1968
Retreives some acquisition history information
1873
1969
1874
params:  
1970
params:
1875
  title
1971
  title
1876
  author
1972
  author
1877
  name
1973
  name
Lines 1928-1934 sub GetHistory { Link Here
1928
        SELECT
2024
        SELECT
1929
            biblio.title,
2025
            biblio.title,
1930
            biblio.author,
2026
            biblio.author,
1931
	    biblioitems.isbn,
2027
            biblioitems.isbn,
1932
        biblioitems.ean,
2028
        biblioitems.ean,
1933
            aqorders.basketno,
2029
            aqorders.basketno,
1934
            aqbasket.basketname,
2030
            aqbasket.basketname,
Lines 1948-1954 sub GetHistory { Link Here
1948
        LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
2044
        LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
1949
        LEFT JOIN aqbasketgroups ON aqbasket.basketgroupid=aqbasketgroups.id
2045
        LEFT JOIN aqbasketgroups ON aqbasket.basketgroupid=aqbasketgroups.id
1950
        LEFT JOIN aqbooksellers ON aqbasket.booksellerid=aqbooksellers.id
2046
        LEFT JOIN aqbooksellers ON aqbasket.booksellerid=aqbooksellers.id
1951
	LEFT JOIN biblioitems ON biblioitems.biblionumber=aqorders.biblionumber
2047
        LEFT JOIN biblioitems ON biblioitems.biblionumber=aqorders.biblionumber
1952
        LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber
2048
        LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber
1953
    LEFT JOIN aqinvoices ON aqorders.invoiceid = aqinvoices.invoiceid";
2049
    LEFT JOIN aqinvoices ON aqorders.invoiceid = aqinvoices.invoiceid";
1954
2050
(-)a/acqui/addorder.pl (-36 / +111 lines)
Lines 122-131 if it is an order from an existing suggestion : the id of this suggestion. Link Here
122
use strict;
122
use strict;
123
use warnings;
123
use warnings;
124
use CGI;
124
use CGI;
125
use C4::Auth;			# get_template_and_user
125
use C4::Auth;           # get_template_and_user
126
use C4::Acquisition;	# NewOrder DelOrder ModOrder
126
use C4::Acquisition;    # NewOrder DelOrder ModOrder
127
use C4::Suggestions;	# ModStatus
127
use C4::Suggestions;    # ModStatus
128
use C4::Biblio;			# AddBiblio TransformKohaToMarc
128
use C4::Biblio;         # AddBiblio TransformKohaToMarc
129
use C4::Bookseller qw/GetBookSellerFromId/;
129
use C4::Items;
130
use C4::Items;
130
use C4::Output;
131
use C4::Output;
131
132
Lines 150-156 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
150
);
151
);
151
152
152
# get CGI parameters
153
# get CGI parameters
153
my $orderinfo					= $input->Vars;
154
my $orderinfo = $input->Vars;
154
$orderinfo->{'list_price'}    ||=  0;
155
$orderinfo->{'list_price'}    ||=  0;
155
$orderinfo->{'uncertainprice'} ||= 0;
156
$orderinfo->{'uncertainprice'} ||= 0;
156
157
Lines 163-214 my $user = $input->remote_user; Link Here
163
# delete biblio if delbiblio has been set to 1 by the librarian
164
# delete biblio if delbiblio has been set to 1 by the librarian
164
my $bibitemnum;
165
my $bibitemnum;
165
if ( $orderinfo->{quantity} ne '0' ) {
166
if ( $orderinfo->{quantity} ne '0' ) {
167
168
    # Getting bookseller's name
169
    if ($orderinfo->{booksellerid}) {
170
        my $bookseller = GetBookSellerFromId($orderinfo->{booksellerid});
171
        $orderinfo->{supplierreference} = $bookseller->{name};
172
    }
173
174
    # Do we have to add order informations to the marc record?
175
    my ($ordertag, $ordersubtag) = GetMarcFromKohaField('aqorders.ordernumber', 'ACQ');
176
    my $record;
177
    my $existingbiblio; # Was the order made on an existing biblio?
178
    my $ordermodif;     # Is this an order modification?
179
166
    #TODO:check to see if biblio exists
180
    #TODO:check to see if biblio exists
167
    unless ( $$orderinfo{biblionumber} ) {
181
    unless ( $orderinfo->{biblionumber} ) {
168
        #if it doesnt create it
182
        #if it doesnt create it
169
        my $record = TransformKohaToMarc(
183
        my $tmprecord = TransformKohaToMarc(
170
            {
184
            {   "biblio.title"                => "$$orderinfo{title}",
171
                "biblio.title"                => "$$orderinfo{title}",
185
                "biblio.author"               => $$orderinfo{author}          ? $$orderinfo{author}          : "",
172
                "biblio.author"               => $$orderinfo{author}          ? $$orderinfo{author}        : "",
186
                "biblio.seriestitle"          => $$orderinfo{series}          ? $$orderinfo{series}          : "",
173
                "biblio.seriestitle"          => $$orderinfo{series}          ? $$orderinfo{series}        : "",
187
                "biblio.copyrightdate"        => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear} : "",
174
                "biblioitems.isbn"            => $$orderinfo{isbn}            ? $$orderinfo{isbn}          : "",
188
                "biblioitems.isbn"            => $$orderinfo{isbn}            ? $$orderinfo{isbn}            : "",
175
                "biblioitems.ean"             => $$orderinfo{ean}             ? $$orderinfo{ean}           : "",
189
                "biblioitems.ean"             => $$orderinfo{ean}             ? $$orderinfo{ean}             : "",
176
                "biblioitems.publishercode"   => $$orderinfo{publishercode}   ? $$orderinfo{publishercode} : "",
190
                "biblioitems.publishercode"   => $$orderinfo{publishercode}   ? $$orderinfo{publishercode}   : "",
177
                "biblioitems.publicationyear" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "",
191
                "biblioitems.publicationyear" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear} : "",
178
                "biblio.copyrightdate"        => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "",
192
                "biblioitems.itemtype"        => $$orderinfo{itemtype}        ? $$orderinfo{itemtype}        : "",
179
                "biblioitems.itemtype"        => $$orderinfo{itemtype} ? $$orderinfo{itemtype} : "",
193
                "biblioitems.editionstatement"=> $$orderinfo{editionstatement}? $$orderinfo{editionstatement}: "",
180
                "biblioitems.editionstatement"=> $$orderinfo{editionstatement} ? $$orderinfo{editionstatement} : "",
194
                "aqorders.branchcode"         => $$orderinfo{branchcode}      ? $$orderinfo{branchcode}      : "",
181
                "aqorders.branchcode"         => $$orderinfo{branchcode} ? $$orderinfo{branchcode} : "",
195
                "aqorders.quantity"           => $$orderinfo{quantity}        ? $$orderinfo{quantity}        : "",
182
                "aqorders.quantity"           => $$orderinfo{quantity} ? $$orderinfo{quantity} : "",
196
                "aqorders.listprice"          => $$orderinfo{listprice}       ? $$orderinfo{listprice}       : "",
183
                "aqorders.listprice"          => $$orderinfo{listprice} ? $$orderinfo{listprice} : "",
197
                "aqorders.uncertainprice"     => $$orderinfo{uncertainprice}  ? $$orderinfo{uncertainprice}  : "",
184
                "aqorders.uncertainprice"     => $$orderinfo{uncertainprice} ? $$orderinfo{uncertainprice} : "",
198
                "aqorders.rrp"                => $$orderinfo{rrp}             ? $$orderinfo{rrp}             : "",
185
                "aqorders.rrp"                => $$orderinfo{rrp} ? $$orderinfo{rrp} : "",
199
                "aqorders.ecost"              => $$orderinfo{ecost}           ? $$orderinfo{ecost}           : "",
186
                "aqorders.ecost"              => $$orderinfo{ecost} ? $$orderinfo{ecost} : "",
200
                "aqorders.discount"           => $$orderinfo{discount}        ? $$orderinfo{discount}        : "",
187
                "aqorders.discount"           => $$orderinfo{discount} ? $$orderinfo{discount} : "",
201
                "aqorders.notes"              => $$orderinfo{notes}           ? $$orderinfo{notes}           : "",
188
            });
202
                "aqorders.supplierreference"  => $$orderinfo{supplierreference}?$$orderinfo{supplierreference}:"",
203
                "aqorders.sort1"              => $$orderinfo{sort1}           ? $$orderinfo{sort1}           : "",
204
                "aqorders.sort2"              => $$orderinfo{sort2}           ? $$orderinfo{sort2}           : ""
205
            }
206
        );
189
207
190
        # create the record in catalogue, with framework ''
208
        # create the record in catalogue, with framework ''
191
        my ($biblionumber,$bibitemnum) = AddBiblio($record,'');
209
        my ( $biblionumber, $bibitemnum ) = AddBiblio( $tmprecord, '' );
210
192
        # change suggestion status if applicable
211
        # change suggestion status if applicable
193
        if ($$orderinfo{suggestionid}) {
212
        if ($$orderinfo{suggestionid}) {
194
            ModSuggestion( {suggestionid=>$$orderinfo{suggestionid}, STATUS=>'ORDERED', biblionumber=>$biblionumber} );
213
            ModSuggestion( {suggestionid=>$$orderinfo{suggestionid}, STATUS=>'ORDERED', biblionumber=>$biblionumber} );
195
        }
214
        }
196
		$orderinfo->{biblioitemnumber}=$bibitemnum;
215
        $orderinfo->{biblioitemnumber} = $bibitemnum;
197
		$orderinfo->{biblionumber}=$biblionumber;
216
        $orderinfo->{biblionumber}     = $biblionumber;
217
    } else {
218
        $existingbiblio = 1;
198
    }
219
    }
199
220
200
    $orderinfo->{unitprice} = $orderinfo->{ecost} if not defined $orderinfo->{unitprice} or $orderinfo->{unitprice} eq '';
221
    $orderinfo->{unitprice} = $orderinfo->{ecost} if not defined $orderinfo->{unitprice} or $orderinfo->{unitprice} eq '';
201
222
202
    # if we already have $ordernumber, then it's an ordermodif
223
    # Getting record
203
    if ($$orderinfo{ordernumber}) {
224
    $record = GetMarcBiblio($orderinfo->{biblionumber});
204
        ModOrder( $orderinfo);
225
205
    }
226
206
    else { # else, it's a new line
227
228
     # if we already have $ordernumber, then it's an ordermodif
229
    if ( $orderinfo->{ordernumber} ) {
230
        ModOrder($orderinfo);
231
        $ordermodif = 1;
232
233
    } else {    # else, it's a new line
207
        @$orderinfo{qw(basketno ordernumber )} = NewOrder($orderinfo);
234
        @$orderinfo{qw(basketno ordernumber )} = NewOrder($orderinfo);
235
236
        # We have to add the ordernumber in the designated subfield
237
        if ($ordertag && $record && !$ordermodif) {
238
239
            # If it's a new line, but we don't have any $ordertag field yet,
240
            if (!$record->field($ordertag)) {
241
                # We add a new $ordertag field, with the ordernumber as subfield (other fields will be populated later)
242
                $record->insert_fields_ordered(new MARC::Field($ordertag, '', '', $ordersubtag => $orderinfo->{ordernumber})) if (!$record->field($ordertag));
243
            } else {
244
                # Else, it's a new line, and we already have a $ordertag field
245
                foreach ($record->field($ordertag)) {
246
                    # If there's a $ordertag field without ordernumber, we create it
247
                    if (!$_->subfield($ordersubtag)) {
248
                        $_->update($ordersubtag, $orderinfo->{ordernumber});
249
                    }
250
                }
251
            }
252
            ModBiblio($record, $orderinfo->{biblionumber}, 'ACQ');
253
        }
254
255
208
    }
256
    }
209
257
210
    # now, add items if applicable
258
    if ($record) {
211
    if (C4::Context->preference('AcqCreateItem') eq 'ordering') {
259
260
        # If we have to add order infos to the marc record
261
        if ($ordertag) {
262
263
            # If the order was made on an existing biblio and it is not a modification, we add the field
264
            $record->insert_fields_ordered(new MARC::Field($ordertag, '', '', $ordersubtag => $$orderinfo{ordernumber})) if (!$ordermodif && $existingbiblio);
265
266
            foreach ($record->field($ordertag)) {
267
                # Looking for the matching one
268
                if ($_->subfield($ordersubtag) eq $orderinfo->{ordernumber}) {
269
270
                    # Replacing or creating subfields
271
                    my ($t, $st);
272
                    for my $tablefield (qw/branchcode quantity listprice uncertainprice rrp ecost notes supplierreference sort1 sort2/) {
273
                        ($t, $st) = GetMarcFromKohaField("aqorders.$tablefield", 'ACQ');
274
                        $_->update($st, $orderinfo->{$tablefield}) if ($orderinfo->{$tablefield} and $st);
275
                    }
276
                    ModBiblio($record, $orderinfo->{biblionumber}, 'ACQ');
277
                }
278
            }
279
280
        }
281
282
    }
283
284
285
      # now, add items if applicable
286
    if ( C4::Context->preference('AcqCreateItem') eq 'ordering' ) {
212
287
213
        my @tags         = $input->param('tag');
288
        my @tags         = $input->param('tag');
214
        my @subfields    = $input->param('subfield');
289
        my @subfields    = $input->param('subfield');
(-)a/admin/koha2marclinks.pl (-6 / +2 lines)
Lines 157-168 q|select tagfield,tagsubfield,liblibrarian,kohafield from marc_subfield_structur Link Here
157
    $template->param(
157
    $template->param(
158
        loop      => \@loop_data,
158
        loop      => \@loop_data,
159
        tablename => CGI::scrolling_list(
159
        tablename => CGI::scrolling_list(
160
            -name   => 'tablename',
160
            -name     => 'tablename',
161
            -values => [
161
            -values   => [ 'biblio', 'biblioitems', 'items', 'aqorders'],
162
                'biblio',
163
                'biblioitems',
164
                'items',
165
            ],
166
            -default  => $tablename,
162
            -default  => $tablename,
167
            -size     => 1,
163
            -size     => 1,
168
            -multiple => 0
164
            -multiple => 0
(-)a/admin/marc_subfields_structure.pl (+6 lines)
Lines 122-127 if ( $op eq 'add_form' ) { Link Here
122
    while ( ( my $field ) = $sth2->fetchrow_array ) {
122
    while ( ( my $field ) = $sth2->fetchrow_array ) {
123
        push @kohafields, "items." . $field;
123
        push @kohafields, "items." . $field;
124
    }
124
    }
125
    $sth2 = $dbh->prepare("SHOW COLUMNS from aqorders");
126
    $sth2->execute;
127
    while ( ( my $field ) = $sth2->fetchrow_array ) {
128
        push @kohafields, "aqorders." . $field;
129
    }
130
125
131
126
    # build authorised value list
132
    # build authorised value list
127
    $sth2->finish;
133
    $sth2->finish;
(-)a/installer/data/mysql/kohastructure.sql (+1 lines)
Lines 2792-2797 CREATE TABLE `aqorders` ( -- information related to the basket line items Link Here
2792
  `claims_count` int(11) default 0, -- count of claim letters generated
2792
  `claims_count` int(11) default 0, -- count of claim letters generated
2793
  `claimed_date` date default NULL, -- last date a claim was generated
2793
  `claimed_date` date default NULL, -- last date a claim was generated
2794
  parent_ordernumber int(11) default NULL, -- ordernumber of parent order line, or same as ordernumber if no parent
2794
  parent_ordernumber int(11) default NULL, -- ordernumber of parent order line, or same as ordernumber if no parent
2795
  `branchcode` varchar(10) default NULL,
2795
  PRIMARY KEY  (`ordernumber`),
2796
  PRIMARY KEY  (`ordernumber`),
2796
  KEY `basketno` (`basketno`),
2797
  KEY `basketno` (`basketno`),
2797
  KEY `biblionumber` (`biblionumber`),
2798
  KEY `biblionumber` (`biblionumber`),
(-)a/installer/data/mysql/updatedatabase.pl (+7 lines)
Lines 6557-6562 if ( CheckVersion($DBversion) ) { Link Here
6557
    SetVersion($DBversion);
6557
    SetVersion($DBversion);
6558
}
6558
}
6559
6559
6560
$DBversion = "3.11.00.XXX";
6561
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
6562
    $dbh->do("ALTER TABLE `aqorders` ADD `branchcode` VARCHAR( 10 ) NULL");
6563
    print "Upgrade to $DBversion done (Adding branchcode in aqorders)\n";
6564
    SetVersion($DBversion);
6565
}
6566
6560
=head1 FUNCTIONS
6567
=head1 FUNCTIONS
6561
6568
6562
=head2 TableExists($table)
6569
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-1 / +22 lines)
Lines 349-354 $(document).ready(function() Link Here
349
        </ol>
349
        </ol>
350
    </fieldset>
350
    </fieldset>
351
351
352
    <!-- Acquisition details -->
353
    <fieldset class="rows">
354
        <legend>Acquisition details</legend>
355
        <ol>
356
        <li>
357
            <label for="branchcode">Branch: </label>
358
            <select name="branchcode" id="branchcode">
359
                    <option value=""></option>
360
                [% FOREACH branch_loo IN branchloop %]
361
                    [% IF (branch_loo.selected) %]
362
                        <option value="[% branch_loo.value %]" selected="selected">[% branch_loo.branchname %]</option>
363
                    [% ELSE %]
364
                        <option value="[% branch_loo.value %]">[% branch_loo.branchname %]</option>
365
                    [% END %]
366
                [% END %]
367
            </select>
368
        </li>
369
        </ol>
370
    </fieldset>
371
372
373
352
    [% IF ( suggestionid ) %]
374
    [% IF ( suggestionid ) %]
353
        <fieldset class="rows">
375
        <fieldset class="rows">
354
        <legend>Suggestion</legend>
376
        <legend>Suggestion</legend>
355
- 

Return to bug 7294