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

(-)a/acqui/basket.pl (-4 / +4 lines)
Lines 52-58 basket.pl Link Here
52
52
53
The basket number.
53
The basket number.
54
54
55
=item supplierid
55
=item booksellerid
56
56
57
the supplier this script have to display the basket.
57
the supplier this script have to display the basket.
58
58
Lines 64-70 the supplier this script have to display the basket. Link Here
64
64
65
my $query        = new CGI;
65
my $query        = new CGI;
66
my $basketno     = $query->param('basketno');
66
my $basketno     = $query->param('basketno');
67
my $booksellerid = $query->param('supplierid');
67
my $booksellerid = $query->param('booksellerid');
68
68
69
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
69
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
70
    {
70
    {
Lines 80-86 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
80
my $basket = GetBasket($basketno);
80
my $basket = GetBasket($basketno);
81
81
82
# FIXME : what about the "discount" percentage?
82
# FIXME : what about the "discount" percentage?
83
# FIXME : the query->param('supplierid') below is probably useless. The bookseller is always known from the basket
83
# FIXME : the query->param('booksellerid') below is probably useless. The bookseller is always known from the basket
84
# if no booksellerid in parameter, get it from basket
84
# if no booksellerid in parameter, get it from basket
85
# warn "=>".$basket->{booksellerid};
85
# warn "=>".$basket->{booksellerid};
86
$booksellerid = $basket->{booksellerid} unless $booksellerid;
86
$booksellerid = $basket->{booksellerid} unless $booksellerid;
Lines 162-168 if ( $op eq 'delete_confirm' ) { Link Here
162
                         basketgroupid => $basketgroupid } );
162
                         basketgroupid => $basketgroupid } );
163
            print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid='.$booksellerid.'&closed=1');
163
            print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid='.$booksellerid.'&closed=1');
164
        } else {
164
        } else {
165
            print $query->redirect('/cgi-bin/koha/acqui/booksellers.pl?supplierid=' . $booksellerid);
165
            print $query->redirect('/cgi-bin/koha/acqui/booksellers.pl?booksellerid=' . $booksellerid);
166
        }
166
        }
167
        exit;
167
        exit;
168
    } else {
168
    } else {
(-)a/acqui/basketheader.pl (-2 / +2 lines)
Lines 33-41 notes to the supplier, local notes, and the contractnumber, which identifies the Link Here
33
33
34
=over 4
34
=over 4
35
35
36
=item supplierid
36
=item booksellerid
37
37
38
C<$supplierid> is the id of the supplier we add the basket to.
38
C<$booksellerid> is the id of the supplier we add the basket to.
39
39
40
=item basketid
40
=item basketid
41
41
(-)a/acqui/booksellers.pl (-7 / +7 lines)
Lines 41-47 C<$supplier> is the string with which we search for a supplier Link Here
41
41
42
=back
42
=back
43
43
44
=item id or supplierid
44
=item id or booksellerid
45
45
46
The id of the supplier whose baskets we will display
46
The id of the supplier whose baskets we will display
47
47
Lines 74-84 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
74
74
75
#parameters
75
#parameters
76
my $supplier = $query->param('supplier');
76
my $supplier = $query->param('supplier');
77
my $id = $query->param('id') || $query->param('supplierid');
77
my $booksellerid = $query->param('booksellerid');
78
my @suppliers;
78
my @suppliers;
79
79
80
if ($id) {
80
if ($booksellerid) {
81
    push @suppliers, GetBookSellerFromId($id);
81
    push @suppliers, GetBookSellerFromId($booksellerid);
82
} else {
82
} else {
83
    @suppliers = GetBookSeller($supplier);
83
    @suppliers = GetBookSeller($supplier);
84
}
84
}
Lines 87-93 my $supplier_count = @suppliers; Link Here
87
if ( $supplier_count == 1 ) {
87
if ( $supplier_count == 1 ) {
88
    $template->param(
88
    $template->param(
89
        supplier_name => $suppliers[0]->{'name'},
89
        supplier_name => $suppliers[0]->{'name'},
90
        id            => $suppliers[0]->{'id'}
90
        booksellerid  => $suppliers[0]->{'booksellerid'}
91
    );
91
    );
92
}
92
}
93
93
Lines 132-138 for my $vendor (@suppliers) { Link Here
132
132
133
    push @{$loop_suppliers},
133
    push @{$loop_suppliers},
134
      { loop_basket => $loop_basket,
134
      { loop_basket => $loop_basket,
135
        supplierid  => $vendor->{id},
135
        booksellerid  => $vendor->{id},
136
        name        => $vendor->{name},
136
        name        => $vendor->{name},
137
        active      => $vendor->{active},
137
        active      => $vendor->{active},
138
      };
138
      };
Lines 140-146 for my $vendor (@suppliers) { Link Here
140
}
140
}
141
$template->param(
141
$template->param(
142
    loop_suppliers => $loop_suppliers,
142
    loop_suppliers => $loop_suppliers,
143
    supplier       => ( $id || $supplier ),
143
    supplier       => ( $booksellerid || $supplier ),
144
    count          => $supplier_count,
144
    count          => $supplier_count,
145
);
145
);
146
146
(-)a/acqui/finishreceive.pl (-2 / +2 lines)
Lines 48-54 my $datereceived=$input->param('datereceived'); Link Here
48
my $replacement=$input->param('rrp');
48
my $replacement=$input->param('rrp');
49
my $gst=$input->param('gst');
49
my $gst=$input->param('gst');
50
my $freight=$input->param('freight');
50
my $freight=$input->param('freight');
51
my $supplierid = $input->param('supplierid');
51
my $booksellerid = $input->param('booksellerid');
52
my $cnt=0;
52
my $cnt=0;
53
my $error_url_str;
53
my $error_url_str;
54
my $ecost = $input->param('ecost');
54
my $ecost = $input->param('ecost');
Lines 114-117 if ($quantityrec > $origquantityrec ) { Link Here
114
    	$datereceived = ModReceiveOrder($biblionumber,$ordernumber, $quantityrec ,$user,$unitprice,$invoiceno,$freight,$replacement,undef,$datereceived);
114
    	$datereceived = ModReceiveOrder($biblionumber,$ordernumber, $quantityrec ,$user,$unitprice,$invoiceno,$freight,$replacement,undef,$datereceived);
115
	}
115
	}
116
}
116
}
117
    print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst&datereceived=$datereceived$error_url_str");
117
    print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoice=$invoiceno&booksellerid=$booksellerid&freight=$freight&gst=$gst&datereceived=$datereceived$error_url_str");
(-)a/acqui/lateorders.pl (-5 / +5 lines)
Lines 29-35 given on input arg. Link Here
29
29
30
=over 4
30
=over 4
31
31
32
=item supplierid
32
=item booksellerid
33
To know on which supplier this script have to display late order.
33
To know on which supplier this script have to display late order.
34
34
35
=item delay
35
=item delay
Lines 64-70 my ($template, $loggedinuser, $cookie) = get_template_and_user({ Link Here
64
	debug => 1,
64
	debug => 1,
65
});
65
});
66
66
67
my $supplierid = $input->param('supplierid') || undef; # we don't want "" or 0
67
my $booksellerid = $input->param('booksellerid') || undef; # we don't want "" or 0
68
my $delay      = $input->param('delay');
68
my $delay      = $input->param('delay');
69
my $branch     = $input->param('branch');
69
my $branch     = $input->param('branch');
70
my $op         = $input->param('op');
70
my $op         = $input->param('op');
Lines 79-92 unless ($delay =~ /^\d{1,3}$/) { Link Here
79
my %supplierlist = GetBooksellersWithLateOrders($delay);
79
my %supplierlist = GetBooksellersWithLateOrders($delay);
80
my (@sloopy);	# supplier loop
80
my (@sloopy);	# supplier loop
81
foreach (keys %supplierlist){
81
foreach (keys %supplierlist){
82
	push @sloopy, (($supplierid and $supplierid eq $_ )            ? 
82
	push @sloopy, (($booksellerid and $booksellerid eq $_ )            ? 
83
					{id=>$_, name=>$supplierlist{$_}, selected=>1} :
83
					{id=>$_, name=>$supplierlist{$_}, selected=>1} :
84
					{id=>$_, name=>$supplierlist{$_}} )            ;
84
					{id=>$_, name=>$supplierlist{$_}} )            ;
85
}
85
}
86
$template->param(SUPPLIER_LOOP => \@sloopy);
86
$template->param(SUPPLIER_LOOP => \@sloopy);
87
$template->param(Supplier=>$supplierlist{$supplierid}) if ($supplierid);
87
$template->param(Supplier=>$supplierlist{$booksellerid}) if ($booksellerid);
88
88
89
my @lateorders = GetLateOrders($delay,$supplierid,$branch);
89
my @lateorders = GetLateOrders($delay,$booksellerid,$branch);
90
90
91
my $total;
91
my $total;
92
foreach (@lateorders){
92
foreach (@lateorders){
(-)a/acqui/newordersuggestion.pl (-3 / +3 lines)
Lines 100-106 my $input = new CGI; Link Here
100
100
101
# getting the CGI params
101
# getting the CGI params
102
my $basketno        = $input->param('basketno');
102
my $basketno        = $input->param('basketno');
103
my $supplierid      = $input->param('booksellerid');
103
my $booksellerid      = $input->param('booksellerid');
104
my $author          = $input->param('author');
104
my $author          = $input->param('author');
105
my $title           = $input->param('title');
105
my $title           = $input->param('title');
106
my $publishercode   = $input->param('publishercode');
106
my $publishercode   = $input->param('publishercode');
Lines 134-144 my $suggestions_loop = Link Here
134
                title			=> $title, 
134
                title			=> $title, 
135
                publishercode	=> $publishercode,
135
                publishercode	=> $publishercode,
136
                STATUS        => 'ACCEPTED'});
136
                STATUS        => 'ACCEPTED'});
137
my $vendor = GetBookSellerFromId($supplierid);
137
my $vendor = GetBookSellerFromId($booksellerid);
138
$template->param(
138
$template->param(
139
    suggestions_loop        => $suggestions_loop,
139
    suggestions_loop        => $suggestions_loop,
140
    basketno                => $basketno,
140
    basketno                => $basketno,
141
    supplierid              => $supplierid,
141
    booksellerid              => $booksellerid,
142
    name					=> $vendor->{'name'},
142
    name					=> $vendor->{'name'},
143
    "op_$op"                => 1,
143
    "op_$op"                => 1,
144
);
144
);
(-)a/acqui/orderreceive.pl (-6 / +6 lines)
Lines 34-40 It permit to write a new order as 'received'. Link Here
34
34
35
=over 4
35
=over 4
36
36
37
=item supplierid
37
=item booksellerid
38
38
39
to know on what supplier this script has to display receive order.
39
to know on what supplier this script has to display receive order.
40
40
Lines 79-85 use C4::Biblio; Link Here
79
my $input      = new CGI;
79
my $input      = new CGI;
80
80
81
my $dbh          = C4::Context->dbh;
81
my $dbh          = C4::Context->dbh;
82
my $supplierid   = $input->param('supplierid');
82
my $booksellerid   = $input->param('booksellerid');
83
my $ordernumber       = $input->param('ordernumber');
83
my $ordernumber       = $input->param('ordernumber');
84
my $search       = $input->param('receive');
84
my $search       = $input->param('receive');
85
my $invoice      = $input->param('invoice');
85
my $invoice      = $input->param('invoice');
Lines 89-95 my $datereceived = $input->param('datereceived'); Link Here
89
89
90
$datereceived = $datereceived ? C4::Dates->new($datereceived, 'iso') : C4::Dates->new();
90
$datereceived = $datereceived ? C4::Dates->new($datereceived, 'iso') : C4::Dates->new();
91
91
92
my $bookseller = GetBookSellerFromId($supplierid);
92
my $bookseller = GetBookSellerFromId($booksellerid);
93
my $input_gst = ($input->param('gst') eq '' ? undef : $input->param('gst'));
93
my $input_gst = ($input->param('gst') eq '' ? undef : $input->param('gst'));
94
my $gst= $input_gst // $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
94
my $gst= $input_gst // $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
95
my $results = SearchOrder($ordernumber,$search);
95
my $results = SearchOrder($ordernumber,$search);
Lines 138-144 if ( $count == 1 ) { Link Here
138
        biblionumber          => @$results[0]->{'biblionumber'},
138
        biblionumber          => @$results[0]->{'biblionumber'},
139
        ordernumber           => @$results[0]->{'ordernumber'},
139
        ordernumber           => @$results[0]->{'ordernumber'},
140
        biblioitemnumber      => @$results[0]->{'biblioitemnumber'},
140
        biblioitemnumber      => @$results[0]->{'biblioitemnumber'},
141
        supplierid            => @$results[0]->{'booksellerid'},
141
        booksellerid            => @$results[0]->{'booksellerid'},
142
        freight               => $freight,
142
        freight               => $freight,
143
        gst                   => $gst,
143
        gst                   => $gst,
144
        name                  => $bookseller->{'name'},
144
        name                  => $bookseller->{'name'},
Lines 172-184 else { Link Here
172
        $line{gst}          = $gst;
172
        $line{gst}          = $gst;
173
        $line{title}        = @$results[$i]->{'title'};
173
        $line{title}        = @$results[$i]->{'title'};
174
        $line{author}       = @$results[$i]->{'author'};
174
        $line{author}       = @$results[$i]->{'author'};
175
        $line{supplierid}   = $supplierid;
175
        $line{booksellerid}   = $booksellerid;
176
        push @loop, \%line;
176
        push @loop, \%line;
177
    }
177
    }
178
178
179
    $template->param(
179
    $template->param(
180
        loop         => \@loop,
180
        loop         => \@loop,
181
        supplierid   => $supplierid,
181
        booksellerid   => $booksellerid,
182
    );
182
    );
183
}
183
}
184
my $op = $input->param('op');
184
my $op = $input->param('op');
(-)a/acqui/parcel.pl (-9 / +9 lines)
Lines 34-40 It allows to write an order as 'received' when he arrives. Link Here
34
34
35
=over 4
35
=over 4
36
36
37
=item supplierid
37
=item booksellerid
38
38
39
To know the supplier this script has to show orders.
39
To know the supplier this script has to show orders.
40
40
Lines 70-77 use C4::Dates qw/format_date format_date_in_iso/; Link Here
70
use JSON;
70
use JSON;
71
71
72
my $input=new CGI;
72
my $input=new CGI;
73
my $supplierid=$input->param('supplierid');
73
my $booksellerid=$input->param('booksellerid');
74
my $bookseller=GetBookSellerFromId($supplierid);
74
my $bookseller=GetBookSellerFromId($booksellerid);
75
75
76
my $invoice=$input->param('invoice') || '';
76
my $invoice=$input->param('invoice') || '';
77
my $freight=$input->param('freight');
77
my $freight=$input->param('freight');
Lines 101-107 if($input->param('format') eq "json"){ Link Here
101
       
101
       
102
    my @datas;
102
    my @datas;
103
    my $search   = $input->param('search') || '';
103
    my $search   = $input->param('search') || '';
104
    my $supplier = $input->param('supplierid') || '';
104
    my $supplier = $input->param('booksellerid') || '';
105
    my $basketno = $input->param('basketno') || '';
105
    my $basketno = $input->param('basketno') || '';
106
    my $orderno  = $input->param('orderno') || '';
106
    my $orderno  = $input->param('orderno') || '';
107
107
Lines 154-160 if( scalar(@rcv_err) ) { Link Here
154
}
154
}
155
155
156
my $cfstr         = "%.2f";                                                           # currency format string -- could get this from currency table.
156
my $cfstr         = "%.2f";                                                           # currency format string -- could get this from currency table.
157
my @parcelitems   = GetParcel($supplierid, $invoice, $datereceived->output('iso'));
157
my @parcelitems   = GetParcel($booksellerid, $invoice, $datereceived->output('iso'));
158
my $countlines    = scalar @parcelitems;
158
my $countlines    = scalar @parcelitems;
159
my $totalprice    = 0;
159
my $totalprice    = 0;
160
my $totalfreight  = 0;
160
my $totalfreight  = 0;
Lines 173-179 for (my $i = 0 ; $i < $countlines ; $i++) { Link Here
173
    $line{invoice} = $invoice;
173
    $line{invoice} = $invoice;
174
    $line{gst}     = $gst;
174
    $line{gst}     = $gst;
175
    $line{total} = sprintf($cfstr, $total);
175
    $line{total} = sprintf($cfstr, $total);
176
    $line{supplierid} = $supplierid;
176
    $line{booksellerid} = $booksellerid;
177
    push @loop_received, \%line;
177
    push @loop_received, \%line;
178
    $totalprice += $parcelitems[$i]->{'unitprice'};
178
    $totalprice += $parcelitems[$i]->{'unitprice'};
179
    $line{unitprice} = sprintf($cfstr, $parcelitems[$i]->{'unitprice'});
179
    $line{unitprice} = sprintf($cfstr, $parcelitems[$i]->{'unitprice'});
Lines 189-195 for (my $i = 0 ; $i < $countlines ; $i++) { Link Here
189
    $tototal       += $total;
189
    $tototal       += $total;
190
}
190
}
191
191
192
my $pendingorders = GetPendingOrders($supplierid);
192
my $pendingorders = GetPendingOrders($booksellerid);
193
my $countpendings = scalar @$pendingorders;
193
my $countpendings = scalar @$pendingorders;
194
194
195
# pending orders totals
195
# pending orders totals
Lines 213-219 for (my $i = 0 ; $i < $countpendings ; $i++) { Link Here
213
    $line{invoice} = $invoice;
213
    $line{invoice} = $invoice;
214
    $line{gst} = $gst;
214
    $line{gst} = $gst;
215
    $line{total} = $total;
215
    $line{total} = $total;
216
    $line{supplierid} = $supplierid;
216
    $line{booksellerid} = $booksellerid;
217
    $ordergrandtotal += $line{ecost} * $line{quantity};
217
    $ordergrandtotal += $line{ecost} * $line{quantity};
218
    
218
    
219
    my $biblionumber = $line{'biblionumber'};
219
    my $biblionumber = $line{'biblionumber'};
Lines 291-297 $template->param( Link Here
291
    invoicedatereceived   => $datereceived->output('iso'),
291
    invoicedatereceived   => $datereceived->output('iso'),
292
    formatteddatereceived => $datereceived->output(),
292
    formatteddatereceived => $datereceived->output(),
293
    name                  => $bookseller->{'name'},
293
    name                  => $bookseller->{'name'},
294
    supplierid            => $supplierid,
294
    booksellerid            => $booksellerid,
295
    gst                   => $gst,
295
    gst                   => $gst,
296
    freight               => $freight,
296
    freight               => $freight,
297
    invoice               => $invoice,
297
    invoice               => $invoice,
(-)a/acqui/parcels.pl (-5 / +5 lines)
Lines 35-41 It allows to write an order/parcels as 'received' when he arrives. Link Here
35
35
36
=over 4
36
=over 4
37
37
38
=item supplierid
38
=item booksellerid
39
39
40
To know the supplier this script has to show orders.
40
To know the supplier this script has to show orders.
41
41
Lines 77-83 use C4::Acquisition; Link Here
77
use C4::Bookseller qw/ GetBookSellerFromId /;
77
use C4::Bookseller qw/ GetBookSellerFromId /;
78
78
79
my $input          = CGI->new;
79
my $input          = CGI->new;
80
my $supplierid     = $input->param('supplierid');
80
my $booksellerid     = $input->param('booksellerid');
81
my $order          = $input->param('orderby') || 'datereceived desc';
81
my $order          = $input->param('orderby') || 'datereceived desc';
82
my $startfrom      = $input->param('startfrom');
82
my $startfrom      = $input->param('startfrom');
83
my $code           = $input->param('filter');
83
my $code           = $input->param('filter');
Lines 96-103 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
96
    }
96
    }
97
);
97
);
98
98
99
my $bookseller = GetBookSellerFromId($supplierid);
99
my $bookseller = GetBookSellerFromId($booksellerid);
100
my @parcels = GetParcels( $supplierid, $order, $code, $datefrom, $dateto );
100
my @parcels = GetParcels( $booksellerid, $order, $code, $datefrom, $dateto );
101
my $count_parcels = @parcels;
101
my $count_parcels = @parcels;
102
102
103
# multi page display gestion
103
# multi page display gestion
Lines 136-142 $template->param( Link Here
136
    name                     => $bookseller->{'name'},
136
    name                     => $bookseller->{'name'},
137
    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
137
    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
138
    datereceived_today       => C4::Dates->new()->output(),
138
    datereceived_today       => C4::Dates->new()->output(),
139
    supplierid               => $supplierid,
139
    booksellerid             => $booksellerid,
140
    GST                      => C4::Context->preference('gist'),
140
    GST                      => C4::Context->preference('gist'),
141
);
141
);
142
142
(-)a/acqui/supplier.pl (-9 / +9 lines)
Lines 32-38 It allows to edit & save information about this bookseller. Link Here
32
32
33
=over 4
33
=over 4
34
34
35
=item supplierid
35
=item booksellerid
36
36
37
To know the bookseller this script has to display details.
37
To know the bookseller this script has to display details.
38
38
Lines 53-62 use C4::Bookseller qw( GetBookSellerFromId DelBookseller ); Link Here
53
use C4::Budgets;
53
use C4::Budgets;
54
54
55
my $query    = CGI->new;
55
my $query    = CGI->new;
56
my $id       = $query->param('supplierid');
56
my $booksellerid       = $query->param('booksellerid');
57
my $supplier = {};
57
my $supplier = {};
58
if ($id) {
58
if ($booksellerid) {
59
    $supplier = GetBookSellerFromId($id);
59
    $supplier = GetBookSellerFromId($booksellerid);
60
}
60
}
61
my $op = $query->param('op') || 'display';
61
my $op = $query->param('op') || 'display';
62
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
62
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
Lines 77-83 $tax_rate *= 100; Link Here
77
#build array for currencies
77
#build array for currencies
78
if ( $op eq 'display' ) {
78
if ( $op eq 'display' ) {
79
79
80
    my $contracts = GetContract( { booksellerid => $id } );
80
    my $contracts = GetContract( { booksellerid => $booksellerid } );
81
81
82
    for ( @{$contracts} ) {
82
    for ( @{$contracts} ) {
83
        $_->{contractstartdate} = format_date( $_->{contractstartdate} );
83
        $_->{contractstartdate} = format_date( $_->{contractstartdate} );
Lines 85-91 if ( $op eq 'display' ) { Link Here
85
    }
85
    }
86
86
87
    $template->param(
87
    $template->param(
88
        id            => $id,
88
        booksellerid  => $booksellerid,
89
        name          => $supplier->{'name'},
89
        name          => $supplier->{'name'},
90
        postal        => $supplier->{'postal'},
90
        postal        => $supplier->{'postal'},
91
        address1      => $supplier->{'address1'},
91
        address1      => $supplier->{'address1'},
Lines 116-122 if ( $op eq 'display' ) { Link Here
116
        contracts     => $contracts,
116
        contracts     => $contracts,
117
    );
117
    );
118
} elsif ( $op eq 'delete' ) {
118
} elsif ( $op eq 'delete' ) {
119
    DelBookseller($id);
119
    DelBookseller($booksellerid);
120
    print $query->redirect('/cgi-bin/koha/acqui/acqui-home.pl');
120
    print $query->redirect('/cgi-bin/koha/acqui/acqui-home.pl');
121
    exit;
121
    exit;
122
} else {
122
} else {
Lines 134-140 if ( $op eq 'display' ) { Link Here
134
134
135
    my $gstrate = defined $supplier->{gstrate} ? $supplier->{gstrate} * 100 : '';
135
    my $gstrate = defined $supplier->{gstrate} ? $supplier->{gstrate} * 100 : '';
136
    $template->param(
136
    $template->param(
137
        id           => $id,
137
        booksellerid => $booksellerid,
138
        name         => $supplier->{'name'},
138
        name         => $supplier->{'name'},
139
        postal       => $supplier->{'postal'},
139
        postal       => $supplier->{'postal'},
140
        address1     => $supplier->{'address1'},
140
        address1     => $supplier->{'address1'},
Lines 153-159 if ( $op eq 'display' ) { Link Here
153
        contnotes    => $supplier->{'contnotes'},
153
        contnotes    => $supplier->{'contnotes'},
154
        notes        => $supplier->{'notes'},
154
        notes        => $supplier->{'notes'},
155
        # set active ON by default for supplier add (id empty for add)
155
        # set active ON by default for supplier add (id empty for add)
156
        active       => $id ? $supplier->{'active'} : 1,
156
        active       => $booksellerid ? $supplier->{'active'} : 1,
157
        gstreg        => $supplier->{'gstreg'},
157
        gstreg        => $supplier->{'gstreg'},
158
        listincgst    => $supplier->{'listincgst'},
158
        listincgst    => $supplier->{'listincgst'},
159
        invoiceincgst => $supplier->{'invoiceincgst'},
159
        invoiceincgst => $supplier->{'invoiceincgst'},
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc (-12 / +12 lines)
Lines 22-39 Link Here
22
22
23
        var manageorders = [
23
        var manageorders = [
24
            [% IF ( CAN_user_acquisition_order_manage ) %]
24
            [% IF ( CAN_user_acquisition_order_manage ) %]
25
                { text: _("New basket"), url: "/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% id %]&op=add_form"},
25
                { text: _("New basket"), url: "/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid %]&op=add_form"},
26
                { text: _("Baskets"), url: "/cgi-bin/koha/acqui/booksellers.pl?supplierid=[% id %]"},
26
                { text: _("Baskets"), url: "/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid %]"},
27
                { text: _("Basket groups"), url: "/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% id %]"},
27
                { text: _("Basket groups"), url: "/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]"},
28
            [% END %]
28
            [% END %]
29
            { text: _("Receive shipments"), url: "/cgi-bin/koha/acqui/parcels.pl?supplierid=[% id %]" },
29
            { text: _("Receive shipments"), url: "/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]" },
30
            [% IF ( basketno ) %]
30
            [% IF ( basketno ) %]
31
                { text: _("Uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% id %]&basketno=[% basketno %]&owner=1"}
31
                { text: _("Uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&owner=1"}
32
            [% ELSE %]
32
            [% ELSE %]
33
                { text: _("Uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% id %]&owner=1"}
33
                { text: _("Uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&owner=1"}
34
            [% END %]
34
            [% END %]
35
        ]
35
        ]
36
        [% IF ( id ) %]
36
        [% IF ( booksellerid ) %]
37
            [% IF ( basketcount ) %]
37
            [% IF ( basketcount ) %]
38
                new YAHOO.widget.Button({type: "menu", label: _("Manage orders"), name: "manageorders", menu: manageorders, container: "toolbar-list"});
38
                new YAHOO.widget.Button({type: "menu", label: _("Manage orders"), name: "manageorders", menu: manageorders, container: "toolbar-list"});
39
            [% END %]
39
            [% END %]
Lines 43-55 Link Here
43
    //]]>
43
    //]]>
44
    </script>
44
    </script>
45
    <ul id="toolbar-list" class="toolbar">
45
    <ul id="toolbar-list" class="toolbar">
46
        [% IF ( id ) %]
46
        [% IF ( booksellerid ) %]
47
            [% IF ( CAN_user_acquisition_vendors_manage ) %]
47
            [% IF ( CAN_user_acquisition_vendors_manage ) %]
48
                <li><a id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% id %]&amp;op=enter">Edit</a></li>
48
                <li><a id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]&amp;op=enter">Edit</a></li>
49
                <li><a id="newcontract" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% id %]">New Contract</a></li>
49
                <li><a id="newcontract" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid %]">New Contract</a></li>
50
                <li><a id="editcontracts" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% id %]">Contracts</a></li>
50
                <li><a id="editcontracts" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">Contracts</a></li>
51
                [% UNLESS ( basketcount ) %]
51
                [% UNLESS ( basketcount ) %]
52
                    <li><a id="newbasket" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% id %]&op=add_form">New Basket</a></li>
52
                    <li><a id="newbasket" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid %]&op=add_form">New Basket</a></li>
53
                [% END %]
53
                [% END %]
54
            [% END %]
54
            [% END %]
55
        [% ELSE %]
55
        [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-1 / +1 lines)
Lines 24-30 Link Here
24
<body>
24
<body>
25
[% INCLUDE 'header.inc' %]
25
[% INCLUDE 'header.inc' %]
26
[% INCLUDE 'acquisitions-search.inc' %]
26
[% INCLUDE 'acquisitions-search.inc' %]
27
<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="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]">[% booksellername %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> &rsaquo;  Add orders from iso2709 file</div>
27
<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="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> &rsaquo;  Add orders from iso2709 file</div>
28
<div id="doc3" class="yui-t2">
28
<div id="doc3" class="yui-t2">
29
   <div id="bd">
29
   <div id="bd">
30
       <div id="yui-main">
30
       <div id="yui-main">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-2 / +2 lines)
Lines 72-78 Link Here
72
[% INCLUDE 'acquisitions-search.inc' %]
72
[% INCLUDE 'acquisitions-search.inc' %]
73
73
74
74
75
<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="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]">[% name %]</a> &rsaquo; [% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname %] ([% basketno %]) for [% name %]</div>
75
<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="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> &rsaquo; [% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname %] ([% basketno %]) for [% name %]</div>
76
76
77
<div id="doc3" class="yui-t2">
77
<div id="doc3" class="yui-t2">
78
78
Lines 148-154 Link Here
148
            <h3>Basket deleted</h3>
148
            <h3>Basket deleted</h3>
149
            <META HTTP-EQUIV=Refresh CONTENT="0; url=booksellers.pl">
149
            <META HTTP-EQUIV=Refresh CONTENT="0; url=booksellers.pl">
150
        [% ELSE %]
150
        [% ELSE %]
151
        <h1>[% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname %] ([% basketno %]) for <a href="supplier.pl?supplierid=[% booksellerid %]">[% name %]</a></h1>
151
        <h1>[% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname %] ([% basketno %]) for <a href="supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a></h1>
152
        [% IF ( delete_confirm ) %]
152
        [% IF ( delete_confirm ) %]
153
            <h2>
153
            <h2>
154
            <span class="yui-button yui-link-button">
154
            <span class="yui-button yui-link-button">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt (-4 / +4 lines)
Lines 132-138 function submitForm(form) { Link Here
132
[% INCLUDE 'header.inc' %]
132
[% INCLUDE 'header.inc' %]
133
[% INCLUDE 'acquisitions-search.inc' %]
133
[% INCLUDE 'acquisitions-search.inc' %]
134
134
135
<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="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]">[% booksellername %]</a> &rsaquo; Basket Grouping</div>
135
<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="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> &rsaquo; Basket Grouping</div>
136
136
137
<div id="doc" class="yui-t7">
137
<div id="doc" class="yui-t7">
138
            
138
            
Lines 152-162 function submitForm(form) { Link Here
152
				
152
				
153
					function yuiToolbar() {
153
					function yuiToolbar() {
154
						var booksellermenu = [
154
						var booksellermenu = [
155
							{ text: _("Vendor"), url: "/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]" },
155
							{ text: _("Vendor"), url: "/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]" },
156
							{ text: _("Edit vendor"), url: "/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid %]"},
156
							{ text: _("Edit vendor"), url: "/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid %]"},
157
						]
157
						]
158
						var ordersbutton = [
158
						var ordersbutton = [
159
						         { text: _("Manage orders"), url: "/cgi-bin/koha/acqui/booksellers.pl?supplierid=[% booksellerid %]" },
159
						         { text: _("Manage orders"), url: "/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid %]" },
160
						         { text: _("Edit uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&owner=1" },
160
						         { text: _("Edit uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&owner=1" },
161
						]
161
						]
162
						new YAHOO.widget.Button("newbasketgroup");
162
						new YAHOO.widget.Button("newbasketgroup");
Lines 180-186 function submitForm(form) { Link Here
180
				</script>
180
				</script>
181
				<a href="?op=add&amp;booksellerid=[% booksellerid %]" name="newbasketgroup" id="newbasketgroup">New Basket Group</a>
181
				<a href="?op=add&amp;booksellerid=[% booksellerid %]" name="newbasketgroup" id="newbasketgroup">New Basket Group</a>
182
			</div>
182
			</div>
183
			<h1>Basket Grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]">[% booksellername %]</a></h1>
183
			<h1>Basket Grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a></h1>
184
		</div>
184
		</div>
185
[% IF ( grouping ) %]
185
[% IF ( grouping ) %]
186
	<div id="bd"> 
186
	<div id="bd"> 
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt (-1 / +1 lines)
Lines 91-97 li.list2 { Link Here
91
<div id="breadcrumbs">
91
<div id="breadcrumbs">
92
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
92
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
93
    <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;
93
    <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;
94
    <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]">[% booksellername %]</a> &rsaquo;
94
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> &rsaquo;
95
    [% IF ( add_form ) %]
95
    [% IF ( add_form ) %]
96
        [% IF ( basketno ) %]Edit basket '[% basketname %]'
96
        [% IF ( basketno ) %]Edit basket '[% basketname %]'
97
        [% ELSE %]add a basket to [% booksellername %]
97
        [% ELSE %]add a basket to [% booksellername %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt (-4 / +4 lines)
Lines 60-77 Link Here
60
        [% END %]
60
        [% END %]
61
                <td>[% IF ( CAN_user_acquisition_order_manage ) %]
61
                <td>[% IF ( CAN_user_acquisition_order_manage ) %]
62
                    [% IF ( loop_supplier.active ) %]
62
                    [% IF ( loop_supplier.active ) %]
63
                        <a href="basketheader.pl?booksellerid=[% loop_supplier.supplierid %]&amp;op=add_form">New basket</a>
63
                        <a href="basketheader.pl?booksellerid=[% loop_supplier.booksellerid %]&amp;op=add_form">New basket</a>
64
                    [% ELSE %]
64
                    [% ELSE %]
65
                        Inactive
65
                        Inactive
66
                    [% END %]
66
                    [% END %]
67
                    [% END %]
67
                    [% END %]
68
                </td>
68
                </td>
69
                <td>	<a href="parcels.pl?supplierid=[% loop_supplier.supplierid %]">Receive shipment</a>
69
                <td>	<a href="parcels.pl?booksellerid=[% loop_supplier.booksellerid %]">Receive shipment</a>
70
                </td>
70
                </td>
71
                [% IF ( loop_supplier.name ) %]
71
                [% IF ( loop_supplier.name ) %]
72
                <td><a href="supplier.pl?supplierid=[% loop_supplier.supplierid %]">[% loop_supplier.name %]</a></td>
72
                <td><a href="supplier.pl?booksellerid=[% loop_supplier.booksellerid %]">[% loop_supplier.name %]</a></td>
73
                [% ELSE %]
73
                [% ELSE %]
74
                <td><a href="supplier.pl?supplierid=[% loop_supplier.supplierid %]">NO NAME</a></td>
74
                <td><a href="supplier.pl?booksellerid=[% loop_supplier.booksellerid %]">NO NAME</a></td>
75
                [% END %]
75
                [% END %]
76
                <td>	<table>
76
                <td>	<table>
77
                        [% IF ( loop_supplier.loop_basket ) %]
77
                        [% IF ( loop_supplier.loop_basket ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (-2 / +2 lines)
Lines 78-91 Link Here
78
                    <td>[% suggestions_loo.basketname %] (<a href="basket.pl?basketno=[% suggestions_loo.basketno %]">[% suggestions_loo.basketno %]</a>)</td>
78
                    <td>[% suggestions_loo.basketname %] (<a href="basket.pl?basketno=[% suggestions_loo.basketno %]">[% suggestions_loo.basketno %]</a>)</td>
79
			<td>[% suggestions_loo.groupname %] (<a href="basketgroup.pl?booksellerid=[% suggestions_loo.id %]">[% suggestions_loo.basketgroupid %]</a>)</td>
79
			<td>[% suggestions_loo.groupname %] (<a href="basketgroup.pl?booksellerid=[% suggestions_loo.id %]">[% suggestions_loo.basketgroupid %]</a>)</td>
80
					<td>[% IF ( suggestions_loo.invoicenumber ) %]
80
					<td>[% IF ( suggestions_loo.invoicenumber ) %]
81
					        <a href="/cgi-bin/koha/acqui/parcel.pl?invoice=[% suggestions_loo.invoicenumber %]&amp;supplierid=[% suggestions_loo.id %]&amp;datereceived=[% suggestions_loo.datereceived %]">[% suggestions_loo.invoicenumber %]</a>
81
					        <a href="/cgi-bin/koha/acqui/parcel.pl?invoice=[% suggestions_loo.invoicenumber %]&amp;booksellerid=[% suggestions_loo.id %]&amp;datereceived=[% suggestions_loo.datereceived %]">[% suggestions_loo.invoicenumber %]</a>
82
					    [% ELSE %]
82
					    [% ELSE %]
83
					        &nbsp;
83
					        &nbsp;
84
					    [% END %]
84
					    [% END %]
85
					</td>
85
					</td>
86
					<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% suggestions_loo.biblionumber %]">[% suggestions_loo.title |html %]</a>
86
					<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% suggestions_loo.biblionumber %]">[% suggestions_loo.title |html %]</a>
87
                        <br />[% suggestions_loo.author %] <br /> [% suggestions_loo.isbn %]</td>
87
                        <br />[% suggestions_loo.author %] <br /> [% suggestions_loo.isbn %]</td>
88
					<td><a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% suggestions_loo.id %]">[% suggestions_loo.name %]</a></td>
88
					<td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% suggestions_loo.id %]">[% suggestions_loo.name %]</a></td>
89
					<td>[% suggestions_loo.creationdate %]</td>
89
					<td>[% suggestions_loo.creationdate %]</td>
90
					<td>[% suggestions_loo.datereceived %]</td>
90
					<td>[% suggestions_loo.datereceived %]</td>
91
					<td>[% suggestions_loo.quantity %]</td>
91
					<td>[% suggestions_loo.quantity %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt (-2 / +2 lines)
Lines 98-105 Link Here
98
[% IF ( ERROR_LOO.delay_digits ) %]<p class="error">The number of days ([% ERROR_LOO.bad_delay %]) must be a number between 0 and 999.</p>[% END %]
98
[% IF ( ERROR_LOO.delay_digits ) %]<p class="error">The number of days ([% ERROR_LOO.bad_delay %]) must be a number between 0 and 999.</p>[% END %]
99
[% END %]
99
[% END %]
100
<ol><li><label for="delay">Order date:</label><input size="3" maxlength="3" id="delay" type="text" name="delay" value="[% delay %]" /> days ago</li>
100
<ol><li><label for="delay">Order date:</label><input size="3" maxlength="3" id="delay" type="text" name="delay" value="[% delay %]" /> days ago</li>
101
	<li><label for="supplierid">Vendor:</label>
101
	<li><label for="booksellerid">Vendor:</label>
102
		<select id="supplierid" size="1" tabindex="" name="supplierid">
102
		<select id="booksellerid" size="1" tabindex="" name="booksellerid">
103
			<option value=""/>
103
			<option value=""/>
104
			[% FOREACH SUPPLIER_LOO IN SUPPLIER_LOOP %]
104
			[% FOREACH SUPPLIER_LOO IN SUPPLIER_LOOP %]
105
                [% IF ( SUPPLIER_LOO.selected ) %]<option value="[% SUPPLIER_LOO.id %]" selected="selected">[% SUPPLIER_LOO.name %]</option>
105
                [% IF ( SUPPLIER_LOO.selected ) %]<option value="[% SUPPLIER_LOO.id %]" selected="selected">[% SUPPLIER_LOO.name %]</option>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt (-1 / +1 lines)
Lines 7-13 Link Here
7
[% INCLUDE 'header.inc' %]
7
[% INCLUDE 'header.inc' %]
8
[% INCLUDE 'acquisitions-search.inc' %]
8
[% INCLUDE 'acquisitions-search.inc' %]
9
9
10
<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="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]">[% name %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?=[% basketno %]">Basket [% basketno %]</a> &rsaquo; Search Existing Records</div>
10
<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="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?=[% basketno %]">Basket [% basketno %]</a> &rsaquo; Search Existing Records</div>
11
11
12
<div id="doc3" class="yui-t2">
12
<div id="doc3" class="yui-t2">
13
   
13
   
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-1 / +1 lines)
Lines 110-116 $(document).ready(function() Link Here
110
[% INCLUDE 'header.inc' %]
110
[% INCLUDE 'header.inc' %]
111
[% INCLUDE 'acquisitions-search.inc' %]
111
[% INCLUDE 'acquisitions-search.inc' %]
112
112
113
<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="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]">[% name %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> &rsaquo; [% IF ( ordernumber ) %]Modify order details (line #[% ordernumber %])[% ELSE %]New order[% END %]</div>
113
<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="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> &rsaquo; [% IF ( ordernumber ) %]Modify order details (line #[% ordernumber %])[% ELSE %]New order[% END %]</div>
114
114
115
<div id="doc3" class="yui-t2">
115
<div id="doc3" class="yui-t2">
116
116
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt (-3 / +3 lines)
Lines 6-12 Link Here
6
[% INCLUDE 'header.inc' %]
6
[% INCLUDE 'header.inc' %]
7
[% INCLUDE 'suggestions-add-search.inc' %]
7
[% INCLUDE 'suggestions-add-search.inc' %]
8
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="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% supplierid %]">[% name %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> &rsaquo; Add order from a suggestion</div>
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="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> &rsaquo; Add order from a suggestion</div>
10
10
11
<div id="doc3" class="yui-t2">
11
<div id="doc3" class="yui-t2">
12
   
12
   
Lines 46-54 Link Here
46
                </td>
46
                </td>
47
                <td>
47
                <td>
48
                    [% IF ( suggestions_loo.biblionumber ) %]
48
                    [% IF ( suggestions_loo.biblionumber ) %]
49
                        <a href="neworderempty.pl?booksellerid=[% supplierid %]&amp;basketno=[% basketno %]&amp;suggestionid=[% suggestions_loo.suggestionid %]&amp;biblio=[% suggestions_loo.biblionumber %]" class="button">Order</a>
49
                        <a href="neworderempty.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]&amp;suggestionid=[% suggestions_loo.suggestionid %]&amp;biblio=[% suggestions_loo.biblionumber %]" class="button">Order</a>
50
                    [% ELSE %]
50
                    [% ELSE %]
51
                        <a href="neworderempty.pl?booksellerid=[% supplierid %]&amp;basketno=[% basketno %]&amp;suggestionid=[% suggestions_loo.suggestionid %]" class="button">Order</a>
51
                        <a href="neworderempty.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]&amp;suggestionid=[% suggestions_loo.suggestionid %]" class="button">Order</a>
52
                    [% END %]
52
                    [% END %]
53
                </td>
53
                </td>
54
            </tr>
54
            </tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-3 / +3 lines)
Lines 7-13 Link Here
7
[% INCLUDE 'header.inc' %]
7
[% INCLUDE 'header.inc' %]
8
[% INCLUDE 'acquisitions-search.inc' %]
8
[% INCLUDE 'acquisitions-search.inc' %]
9
9
10
<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="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% supplierid %]">[% name %]</a> &rsaquo; Receive items from : [% name %] [% IF ( invoice ) %][[% invoice %]][% END %] (order #[% ordernumber %])</div>
10
<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="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> &rsaquo; Receive items from : [% name %] [% IF ( invoice ) %][[% invoice %]][% END %] (order #[% ordernumber %])</div>
11
11
12
<div id="doc3" class="yui-t2">
12
<div id="doc3" class="yui-t2">
13
   
13
   
Lines 80-86 Link Here
80
    <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
80
    <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
81
    <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
81
    <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
82
    <input type="hidden" name="biblioitemnumber" value="[% biblioitemnumber %]" />
82
    <input type="hidden" name="biblioitemnumber" value="[% biblioitemnumber %]" />
83
    <input type="hidden" name="supplierid" value="[% supplierid %]" />
83
    <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
84
    <input type="hidden" name="datereceived" value="[% datereceived_iso %]" />
84
    <input type="hidden" name="datereceived" value="[% datereceived_iso %]" />
85
    <input type="hidden" name="freight" value="[% freight %]" />
85
    <input type="hidden" name="freight" value="[% freight %]" />
86
    <input type="hidden" name="gst" value="[% gst %]" />
86
    <input type="hidden" name="gst" value="[% gst %]" />
Lines 133-139 Link Here
133
133
134
</div>
134
</div>
135
</div><div class="yui-g"><fieldset class="action">
135
</div><div class="yui-g"><fieldset class="action">
136
        <input type="button"  value="Save" onclick="javascript:if(check_additem()) { this.form.submit(); } else { alert( _('Duplicate barcodes detected.  Please correct the errors and resubmit.') ); return false };" /> <a class="cancel" href="/cgi-bin/koha/acqui/parcel.pl?supplierid=[% supplierid %]&amp;invoice=[% invoice %]&amp;gst=[% gst %]&amp;freight=[% freight %]">Cancel</a>
136
        <input type="button"  value="Save" onclick="javascript:if(check_additem()) { this.form.submit(); } else { alert( _('Duplicate barcodes detected.  Please correct the errors and resubmit.') ); return false };" /> <a class="cancel" href="/cgi-bin/koha/acqui/parcel.pl?booksellerid=[% booksellerid %]&amp;invoice=[% invoice %]&amp;gst=[% gst %]&amp;freight=[% freight %]">Cancel</a>
137
</fieldset></div>    </form>
137
</fieldset></div>    </form>
138
[% ELSE %]
138
[% ELSE %]
139
<div id="acqui_acquire_orderlist">
139
<div id="acqui_acquire_orderlist">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-12 / +12 lines)
Lines 106-113 Link Here
106
                       + '<td>' + order.ecost + '</td>'
106
                       + '<td>' + order.ecost + '</td>'
107
                       + '<td>' + order.ordertotal + '</td>'
107
                       + '<td>' + order.ordertotal + '</td>'
108
                       + '<td>'
108
                       + '<td>'
109
                       + '<a href="orderreceive.pl?ordernumber=' + order.ordernumber + '&amp;datereceived=[% invoicedatereceived %]&amp;invoice=[% invoice %]&amp;gst=' + gst + '&amp;freight=' + order.freight + '&amp;supplierid=[% supplierid %]">Receive</a> /'
109
                       + '<a href="orderreceive.pl?ordernumber=' + order.ordernumber + '&amp;datereceived=[% invoicedatereceived %]&amp;invoice=[% invoice %]&amp;gst=' + gst + '&amp;freight=' + order.freight + '&amp;booksellerid=[% booksellerid %]">Receive</a> /'
110
                       + '<a href="parcel.pl?type=intra&amp;ordernumber=' + order.ordernumber + '&amp;biblionumber=' + order.biblionumber + '&amp;action=cancelorder&amp;supplierid=[% supplierid %]&amp;datereceived=[% invoicedatereceived %]&amp;invoice=[% invoice %]" onclick="return confirm(\'' + _('Are you sure you want to cancel this order?') + '\');">Cancel</a>'
110
                       + '<a href="parcel.pl?type=intra&amp;ordernumber=' + order.ordernumber + '&amp;biblionumber=' + order.biblionumber + '&amp;action=cancelorder&amp;booksellerid=[% booksellerid %]&amp;datereceived=[% invoicedatereceived %]&amp;invoice=[% invoice %]" onclick="return confirm(\'' + _('Are you sure you want to cancel this order?') + '\');">Cancel</a>'
111
                       + '</td></tr>').appendTo("table#pendingt");
111
                       + '</td></tr>').appendTo("table#pendingt");
112
				}
112
				}
113
113
Lines 118-124 Link Here
118
			}catch(e){alert(e);}
118
			}catch(e){alert(e);}
119
		}
119
		}
120
	}
120
	}
121
	var transaction = YAHOO.util.Connect.asyncRequest('GET', '/cgi-bin/koha/acqui/parcel.pl?supplierid=[% supplierid %]&search='+summaryStatus+'&basketno='+basketStatus+'&orderno='+orderStatus+'&format=json', callback, null);
121
	var transaction = YAHOO.util.Connect.asyncRequest('GET', '/cgi-bin/koha/acqui/parcel.pl?booksellerid=[% booksellerid %]&search='+summaryStatus+'&basketno='+basketStatus+'&orderno='+orderStatus+'&format=json', callback, null);
122
122
123
	return false;
123
	return false;
124
    }
124
    }
Lines 235-241 Link Here
235
            <tr>
235
            <tr>
236
        [% END %]
236
        [% END %]
237
                <td class="basketfilterclass"><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a></td>
237
                <td class="basketfilterclass"><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno %]">[% loop_order.basketno %]</a></td>
238
                <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber %]&amp;booksellerid=[% loop_order.supplierid %]">[% loop_order.ordernumber %]</a></td>
238
                <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber %]&amp;booksellerid=[% loop_order.booksellerid %]">[% loop_order.ordernumber %]</a></td>
239
                <td class="summaryfilterclass">
239
                <td class="summaryfilterclass">
240
                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
240
                  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
241
                [% IF ( loop_order.author ) %] by [% loop_order.author %][% END %]
241
                [% IF ( loop_order.author ) %] by [% loop_order.author %][% END %]
Lines 247-253 Link Here
247
                <td>[% loop_order.ecost %]</td>
247
                <td>[% loop_order.ecost %]</td>
248
                <td>[% loop_order.ordertotal %]</td>
248
                <td>[% loop_order.ordertotal %]</td>
249
				<td>
249
				<td>
250
				    <a href="orderreceive.pl?ordernumber=[% loop_order.ordernumber %]&amp;datereceived=[% loop_order.invoicedatereceived %]&amp;invoice=[% loop_order.invoice %]&amp;gst=[% loop_order.gst %]&amp;freight=[% loop_order.freight %]&amp;supplierid=[% loop_order.supplierid %]">Receive</a>
250
				    <a href="orderreceive.pl?ordernumber=[% loop_order.ordernumber %]&amp;datereceived=[% loop_order.invoicedatereceived %]&amp;invoice=[% loop_order.invoice %]&amp;gst=[% loop_order.gst %]&amp;freight=[% loop_order.freight %]&amp;booksellerid=[% loop_order.booksellerid %]">Receive</a>
251
				    
251
				    
252
				</td>
252
				</td>
253
				<td>
253
				<td>
Lines 281-297 Link Here
281
   <div id="resultnumber">
281
   <div id="resultnumber">
282
	<!-- Row of numbers corresponding to search result pages -->
282
	<!-- Row of numbers corresponding to search result pages -->
283
	[% IF ( displayprev ) %]
283
	[% IF ( displayprev ) %]
284
		<a href="parcel.pl?type=intra&amp;supplierid=[% supplierid %]&amp;startfrom=[% prevstartfrom %][% IF ( datereceived ) %]&amp;datereceived=[% datereceived %][% END %][% IF ( invoice ) %]&amp;invoice=[% invoice %][% END %][% IF ( resultsperpage ) %]&amp;resultsperpage=[% resultsperpage %][% END %]#resultnumber">&lt;&lt; Previous</a>
284
		<a href="parcel.pl?type=intra&amp;booksellerid=[% booksellerid %]&amp;startfrom=[% prevstartfrom %][% IF ( datereceived ) %]&amp;datereceived=[% datereceived %][% END %][% IF ( invoice ) %]&amp;invoice=[% invoice %][% END %][% IF ( resultsperpage ) %]&amp;resultsperpage=[% resultsperpage %][% END %]#resultnumber">&lt;&lt; Previous</a>
285
	[% END %]
285
	[% END %]
286
	[% FOREACH number IN numbers %]
286
	[% FOREACH number IN numbers %]
287
		[% IF ( number.highlight ) %]
287
		[% IF ( number.highlight ) %]
288
		<span class="current">[% number.number %]</span>
288
		<span class="current">[% number.number %]</span>
289
		[% ELSE %]
289
		[% ELSE %]
290
		<a href="parcel.pl?type=intra&amp;supplierid=[% supplierid %]&amp;startfrom=[% number.startfrom %][% IF ( number.datereceived ) %]&amp;datereceived=[% number.datereceived %][% END %][% IF ( number.invoice ) %]&amp;invoice=[% number.invoice %][% END %][% IF ( number.resultsperpage ) %]&amp;resultsperpage=[% number.resultsperpage %][% END %]#resultnumber">[% number.number %]</a>
290
		<a href="parcel.pl?type=intra&amp;booksellerid=[% booksellerid %]&amp;startfrom=[% number.startfrom %][% IF ( number.datereceived ) %]&amp;datereceived=[% number.datereceived %][% END %][% IF ( number.invoice ) %]&amp;invoice=[% number.invoice %][% END %][% IF ( number.resultsperpage ) %]&amp;resultsperpage=[% number.resultsperpage %][% END %]#resultnumber">[% number.number %]</a>
291
		[% END %]
291
		[% END %]
292
	[% END %]
292
	[% END %]
293
	[% IF ( displaynext ) %]
293
	[% IF ( displaynext ) %]
294
		<a href="parcel.pl?type=intra&amp;supplierid=[% supplierid %]&amp;startfrom=[% nextstartfrom %][% IF ( datereceived ) %]&amp;datereceived=[% datereceived %][% END %][% IF ( invoice ) %]&amp;invoice=[% invoice %][% END %][% IF ( resultsperpage ) %]&amp;resultsperpage=[% resultsperpage %][% END %]#resultnumber">Next &gt;&gt;</a>
294
		<a href="parcel.pl?type=intra&amp;booksellerid=[% booksellerid %]&amp;startfrom=[% nextstartfrom %][% IF ( datereceived ) %]&amp;datereceived=[% datereceived %][% END %][% IF ( invoice ) %]&amp;invoice=[% invoice %][% END %][% IF ( resultsperpage ) %]&amp;resultsperpage=[% resultsperpage %][% END %]#resultnumber">Next &gt;&gt;</a>
295
	[% END %]
295
	[% END %]
296
	</div>
296
	</div>
297
</div>
297
</div>
Lines 356-362 Link Here
356
            <tr>
356
            <tr>
357
        [% END %]
357
        [% END %]
358
                <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a></td>
358
                <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a></td>
359
                <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&amp;booksellerid=[% supplierid %]">[% loop_receive.ordernumber %]</a></td>
359
                <td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&amp;booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td>
360
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.title |html %]</a>
360
                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.title |html %]</a>
361
                [% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %]
361
                [% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %]
362
                [% IF ( loop_receive.isbn ) %] - [% loop_receive.isbn %][% END %]
362
                [% IF ( loop_receive.isbn ) %] - [% loop_receive.isbn %][% END %]
Lines 375-383 Link Here
375
	[% ELSE %]There are no received orders.[% END %]
375
	[% ELSE %]There are no received orders.[% END %]
376
</div>
376
</div>
377
377
378
<!--<form action="/cgi-bin/koha/acqui/parcels.pl?supplierid=[% supplierid %]" method="post">-->
378
<!--<form action="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]" method="post">-->
379
<form action="parcels.pl?supplierid=[% supplierid %]" method="post">
379
<form action="parcels.pl?booksellerid=[% booksellerid %]" method="post">
380
    <input type="hidden" name="supplierid" value="[% supplierid %]" />
380
    <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
381
    <fieldset class="action">
381
    <fieldset class="action">
382
        <input type="submit" value="Finish receiving" />
382
        <input type="submit" value="Finish receiving" />
383
    </fieldset>
383
    </fieldset>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt (-10 / +10 lines)
Lines 7-13 Link Here
7
[% INCLUDE 'header.inc' %]
7
[% INCLUDE 'header.inc' %]
8
[% INCLUDE 'acquisitions-search.inc' %]
8
[% INCLUDE 'acquisitions-search.inc' %]
9
9
10
<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="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% supplierid %]">[% name %]</a> &rsaquo; Receive shipment from vendor [% name %]</div>
10
<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="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> &rsaquo; Receive shipment from vendor [% name %]</div>
11
11
12
[% IF ( count ) %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
12
[% IF ( count ) %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
13
   
13
   
Lines 15-21 Link Here
15
	<div id="yui-main">
15
	<div id="yui-main">
16
	<div class="yui-b">
16
	<div class="yui-b">
17
	
17
	
18
<h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% supplierid %]">[% name %]</a></h1>
18
<h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a></h1>
19
19
20
[% IF ( count ) %]
20
[% IF ( count ) %]
21
<p> [% count %] shipments</p>
21
<p> [% count %] shipments</p>
Lines 42-48 Link Here
42
            [% searchresult.number %]
42
            [% searchresult.number %]
43
        </td>
43
        </td>
44
        <td>
44
        <td>
45
            <a href="/cgi-bin/koha/acqui/parcel.pl?type=intra&amp;supplierid=[% supplierid |url %]&amp;datereceived=[% searchresult.raw_datereceived |url %][% IF ( searchresult.code ) %]&amp;invoice=[% searchresult.code |url %][% END %]">
45
            <a href="/cgi-bin/koha/acqui/parcel.pl?type=intra&amp;booksellerid=[% booksellerid |url %]&amp;datereceived=[% searchresult.raw_datereceived |url %][% IF ( searchresult.code ) %]&amp;invoice=[% searchresult.code |url %][% END %]">
46
                [% searchresult.datereceived %]</a>
46
                [% searchresult.datereceived %]</a>
47
        </td>
47
        </td>
48
        <td>
48
        <td>
Lines 64-80 Link Here
64
<div id="resultnumber">
64
<div id="resultnumber">
65
<!-- Row of numbers corresponding to search result pages -->
65
<!-- Row of numbers corresponding to search result pages -->
66
[% IF ( displayprev ) %]
66
[% IF ( displayprev ) %]
67
    <a href="parcels.pl?supplierid=[% supplierid %]&amp;startfrom=[% prevstartfrom %][% IF ( datefrom ) %]&amp;datefrom=[% datefrom %][% END %][% IF ( dateto ) %]&amp;dateto=[% dateto %][% END %][% IF ( code ) %]&amp;filter=[% code %][% END %][% IF ( orderby ) %]&amp;orderby=[% orderby %][% END %][% IF ( resultsperpage ) %]&amp;resultsperpage=[% resultsperpage %][% END %]&amp;type=intra">&lt;&lt; Previous</a>
67
    <a href="parcels.pl?booksellerid=[% booksellerid %]&amp;startfrom=[% prevstartfrom %][% IF ( datefrom ) %]&amp;datefrom=[% datefrom %][% END %][% IF ( dateto ) %]&amp;dateto=[% dateto %][% END %][% IF ( code ) %]&amp;filter=[% code %][% END %][% IF ( orderby ) %]&amp;orderby=[% orderby %][% END %][% IF ( resultsperpage ) %]&amp;resultsperpage=[% resultsperpage %][% END %]&amp;type=intra">&lt;&lt; Previous</a>
68
[% END %]
68
[% END %]
69
[% FOREACH number IN numbers %]
69
[% FOREACH number IN numbers %]
70
    [% IF ( number.highlight ) %]
70
    [% IF ( number.highlight ) %]
71
    <span class="current">[% number.number %]</span>
71
    <span class="current">[% number.number %]</span>
72
    [% ELSE %]
72
    [% ELSE %]
73
    <a href="parcels.pl?supplierid=[% number.supplierid %]&amp;startfrom=[% number.startfrom %][% IF ( number.datefrom ) %]&amp;datefrom=[% number.datefrom %][% END %][% IF ( number.dateto ) %]&amp;dateto=[% number.dateto %][% END %][% IF ( number.code ) %]&amp;filter=[% number.code %][% END %][% IF ( number.orderby ) %]&amp;orderby=[% number.orderby %][% END %][% IF ( number.resultsperpage ) %]&amp;resultsperpage=[% number.resultsperpage %][% END %]&amp;type=intra">[% number.number %]</a>
73
    <a href="parcels.pl?booksellerid=[% number.booksellerid %]&amp;startfrom=[% number.startfrom %][% IF ( number.datefrom ) %]&amp;datefrom=[% number.datefrom %][% END %][% IF ( number.dateto ) %]&amp;dateto=[% number.dateto %][% END %][% IF ( number.code ) %]&amp;filter=[% number.code %][% END %][% IF ( number.orderby ) %]&amp;orderby=[% number.orderby %][% END %][% IF ( number.resultsperpage ) %]&amp;resultsperpage=[% number.resultsperpage %][% END %]&amp;type=intra">[% number.number %]</a>
74
    [% END %]
74
    [% END %]
75
[% END %]
75
[% END %]
76
[% IF ( displaynext ) %]
76
[% IF ( displaynext ) %]
77
    <a href="parcels.pl?supplierid=[% supplierid %]&amp;startfrom=[% nextstartfrom %][% IF ( datefrom ) %]&amp;datefrom=[% datefrom %][% END %][% IF ( dateto ) %]&amp;dateto=[% dateto %][% END %][% IF ( code ) %]&amp;filter=[% code %][% END %][% IF ( orderby ) %]&amp;orderby=[% orderby %][% END %][% IF ( resultsperpage ) %]&amp;resultsperpage=[% resultsperpage %][% END %]&amp;type=intra">Next &gt;&gt;</a>
77
    <a href="parcels.pl?booksellerid=[% booksellerid %]&amp;startfrom=[% nextstartfrom %][% IF ( datefrom ) %]&amp;datefrom=[% datefrom %][% END %][% IF ( dateto ) %]&amp;dateto=[% dateto %][% END %][% IF ( code ) %]&amp;filter=[% code %][% END %][% IF ( orderby ) %]&amp;orderby=[% orderby %][% END %][% IF ( resultsperpage ) %]&amp;resultsperpage=[% resultsperpage %][% END %]&amp;type=intra">Next &gt;&gt;</a>
78
[% END %]
78
[% END %]
79
</div>
79
</div>
80
</div>
80
</div>
Lines 86-92 Link Here
86
    <legend>Receive a new shipment</legend>
86
    <legend>Receive a new shipment</legend>
87
       <ol> <li>
87
       <ol> <li>
88
            <label for="invoice">Vendor Invoice </label>
88
            <label for="invoice">Vendor Invoice </label>
89
            <input type="hidden" name="supplierid" value="[% supplierid %]" />
89
            <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
90
            <input type="hidden" name="op" value="new" />
90
            <input type="hidden" name="op" value="new" />
91
			<input type="text" size="20" id="invoice" name="invoice" />
91
			<input type="text" size="20" id="invoice" name="invoice" />
92
        </li>
92
        </li>
Lines 115-121 Link Here
115
				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>	</li>
115
				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>	</li>
116
		</ol>
116
		</ol>
117
    </fieldset>
117
    </fieldset>
118
            <fieldset class="action"><input type="submit" class="button" value="Next" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% supplierid %]">Cancel</a></fieldset>
118
            <fieldset class="action"><input type="submit" class="button" value="Next" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">Cancel</a></fieldset>
119
        </form>
119
        </form>
120
    </div>
120
    </div>
121
</div>
121
</div>
Lines 125-131 Link Here
125
    <fieldset class="brief">
125
    <fieldset class="brief">
126
	<h4>Filter</h4>
126
	<h4>Filter</h4>
127
        <ol>
127
        <ol>
128
            <li> <input type="hidden" name="supplierid" value="[% supplierid %]" /></li>
128
            <li> <input type="hidden" name="booksellerid" value="[% booksellerid %]" /></li>
129
            <li><label for="filter">Invoice number:</label><input type="text" size="20" name="filter" value="[% filter %]" id="filter" /></li>
129
            <li><label for="filter">Invoice number:</label><input type="text" size="20" name="filter" value="[% filter %]" id="filter" /></li>
130
            <li><label for="datefrom">From:</label><input type="text" size="9" id="datefrom" name="datefrom" value="[% datefrom %]" /><br /> 
130
            <li><label for="datefrom">From:</label><input type="text" size="9" id="datefrom" name="datefrom" value="[% datefrom %]" /><br /> 
131
                <label for="dateto">To:</label><input type="text" size="9" id="dateto" name="dateto" value="[% dateto %]" /></li>
131
                <label for="dateto">To:</label><input type="text" size="9" id="dateto" name="dateto" value="[% dateto %]" /></li>
Lines 142-148 Link Here
142
                <option value="100">100</option>
142
                <option value="100">100</option>
143
                </select></li>
143
                </select></li>
144
        </ol>
144
        </ol>
145
	<fieldset class="action"><input type="submit" class="button" value="Filter" /> <a href="/cgi-bin/koha/acqui/parcels.pl?supplierid=[% supplierid %]">Clear</a></fieldset>
145
	<fieldset class="action"><input type="submit" class="button" value="Filter" /> <a href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]">Clear</a></fieldset>
146
	</fieldset>
146
	</fieldset>
147
</form>[% END %]
147
</form>[% END %]
148
</div>
148
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt (-6 / +6 lines)
Lines 5-11 Link Here
5
//<![CDATA[
5
//<![CDATA[
6
function confirm_deletion() {
6
function confirm_deletion() {
7
    if (confirm(_("Confirm deletion of this vendor ?"))) {
7
    if (confirm(_("Confirm deletion of this vendor ?"))) {
8
        window.location="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% id %]&op=delete";
8
        window.location="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]&op=delete";
9
    }
9
    }
10
}
10
}
11
function check(f) {
11
function check(f) {
Lines 22-35 if (f.company.value == "") { Link Here
22
[% INCLUDE 'header.inc' %]
22
[% INCLUDE 'header.inc' %]
23
[% INCLUDE 'acquisitions-search.inc' %]
23
[% INCLUDE 'acquisitions-search.inc' %]
24
24
25
<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; [% IF ( enter ) %][% IF ( id ) %] <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% id %]">[% name %]</a> &rsaquo; Update: [% name %][% ELSE %]Add vendor[% END %] [% ELSE %][% name %][% END %]</div>
25
<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; [% IF ( enter ) %][% IF ( booksellerid ) %] <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> &rsaquo; Update: [% name %][% ELSE %]Add vendor[% END %] [% ELSE %][% name %][% END %]</div>
26
26
27
<div id="doc" class="yui-t7">
27
<div id="doc" class="yui-t7">
28
28
29
<div id="bd">
29
<div id="bd">
30
    <div id="yui-main">
30
    <div id="yui-main">
31
    [% IF ( enter ) %]
31
    [% IF ( enter ) %]
32
        [% IF ( id ) %]
32
        [% IF ( booksellerid ) %]
33
        <h1>Update: [% name %]</h1>
33
        <h1>Update: [% name %]</h1>
34
    [% ELSE %]
34
    [% ELSE %]
35
        <h1>Add vendor</h1>
35
        <h1>Add vendor</h1>
Lines 39-45 if (f.company.value == "") { Link Here
39
[% IF ( enter ) %]
39
[% IF ( enter ) %]
40
    <form action="updatesupplier.pl" name="updatesupplier" method="post">
40
    <form action="updatesupplier.pl" name="updatesupplier" method="post">
41
    <div class="yui-g">
41
    <div class="yui-g">
42
        <input type="hidden" name="id" value="[% id %]" />
42
        <input type="hidden" name="id" value="[% booksellerid %]" />
43
        <fieldset class="rows">
43
        <fieldset class="rows">
44
            <legend>Company details</legend>
44
            <legend>Company details</legend>
45
            <ol><li><label for="company" class="required">Name * </label>
45
            <ol><li><label for="company" class="required">Name * </label>
Lines 138-145 if (f.company.value == "") { Link Here
138
            <li><label for="notes">Notes</label>
138
            <li><label for="notes">Notes</label>
139
                <textarea cols="40" rows="4" id="notes" name="notes" >[% notes %]</textarea></li></ol>			
139
                <textarea cols="40" rows="4" id="notes" name="notes" >[% notes %]</textarea></li></ol>			
140
        </fieldset>
140
        </fieldset>
141
        <fieldset class="action"><input type="button" value="Save" onclick="check(this.form);" /> [% IF ( id ) %]
141
        <fieldset class="action"><input type="button" value="Save" onclick="check(this.form);" /> [% IF ( booksellerid ) %]
142
        <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% id %]">[% ELSE %]<a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
142
        <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% ELSE %]<a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
143
        [% END %]Cancel</a></fieldset>
143
        [% END %]Cancel</a></fieldset>
144
        </div>
144
        </div>
145
    </form>
145
    </form>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt (-2 / +2 lines)
Lines 14-20 function check(form) { Link Here
14
[% INCLUDE 'header.inc' %]
14
[% INCLUDE 'header.inc' %]
15
[% INCLUDE 'acquisitions-search.inc' %]
15
[% INCLUDE 'acquisitions-search.inc' %]
16
16
17
<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="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]">[% booksellername %]</a> &rsaquo; Uncertain prices for vendor: [% booksellername %]</div>
17
<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="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> &rsaquo; Uncertain prices for vendor: [% booksellername %]</div>
18
18
19
<div id="doc" class="yui-t7">
19
<div id="doc" class="yui-t7">
20
   <div id="bd">
20
   <div id="bd">
Lines 22-28 function check(form) { Link Here
22
        [% IF ( validate ) %]
22
        [% IF ( validate ) %]
23
            <META HTTP-EQUIV=Refresh CONTENT="0; url=[% scriptname %]?booksellerid=[% booksellerid %]">
23
            <META HTTP-EQUIV=Refresh CONTENT="0; url=[% scriptname %]?booksellerid=[% booksellerid %]">
24
        [% ELSE %]
24
        [% ELSE %]
25
        <h1>Orders with uncertain prices for vendor <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]">[% booksellername %]</a> <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]&amp;op=enter">(edit)</a></h1>
25
        <h1>Orders with uncertain prices for vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]&amp;op=enter">(edit)</a></h1>
26
        <h2>Contact information</h2>
26
        <h2>Contact information</h2>
27
        <p><strong>Address: </strong>
27
        <p><strong>Address: </strong>
28
            [% booksellerpostal %]
28
            [% booksellerpostal %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt (-2 / +1 lines)
Lines 63-69 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
63
[% INCLUDE 'header.inc' %]
63
[% INCLUDE 'header.inc' %]
64
[% INCLUDE 'acquisitions-search.inc' %]
64
[% INCLUDE 'acquisitions-search.inc' %]
65
65
66
<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="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]">[% name %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> &rsaquo; Order from Z39.50 search</div>
66
<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="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> &rsaquo; Order from Z39.50 search</div>
67
<div id="doc3" class="yui-t7">
67
<div id="doc3" class="yui-t7">
68
      <div id="bd">
68
      <div id="bd">
69
	  [% IF ( opsearch ) %]
69
	  [% IF ( opsearch ) %]
70
- 

Return to bug 7113