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

(-)a/acqui/booksellers.pl (-1 / +2 lines)
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
        booksellerid  => $suppliers[0]->{'booksellerid'}
90
        booksellerid  => $suppliers[0]->{'id'},
91
        basketcount   => $suppliers[0]->{'basketcount'}
91
    );
92
    );
92
}
93
}
93
94
(-)a/acqui/invoice.pl (-1 / +1 lines)
Lines 185-191 $template->param( Link Here
185
    invoiceid        => $details->{'invoiceid'},
185
    invoiceid        => $details->{'invoiceid'},
186
    invoicenumber    => $details->{'invoicenumber'},
186
    invoicenumber    => $details->{'invoicenumber'},
187
    suppliername     => $details->{'suppliername'},
187
    suppliername     => $details->{'suppliername'},
188
    supplierid       => $details->{'booksellerid'},
188
    booksellerid       => $details->{'booksellerid'},
189
    datereceived     => $details->{'datereceived'},
189
    datereceived     => $details->{'datereceived'},
190
    shipmentdate     => $details->{'shipmentdate'},
190
    shipmentdate     => $details->{'shipmentdate'},
191
    billingdate      => $details->{'billingdate'},
191
    billingdate      => $details->{'billingdate'},
(-)a/acqui/invoices.pl (-5 / +6 lines)
Lines 50-56 my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( Link Here
50
);
50
);
51
51
52
my $invoicenumber    = $input->param('invoicenumber');
52
my $invoicenumber    = $input->param('invoicenumber');
53
my $supplier         = $input->param('supplier');
53
my $supplierid       = $input->param('supplierid');
54
my $shipmentdatefrom = $input->param('shipmentdatefrom');
54
my $shipmentdatefrom = $input->param('shipmentdatefrom');
55
my $shipmentdateto   = $input->param('shipmentdateto');
55
my $shipmentdateto   = $input->param('shipmentdateto');
56
my $billingdatefrom  = $input->param('billingdatefrom');
56
my $billingdatefrom  = $input->param('billingdatefrom');
Lines 71-77 if ( $op and $op eq "do_search" ) { Link Here
71
    my $billingdateto_iso    = C4::Dates->new($billingdateto)->output("iso");
71
    my $billingdateto_iso    = C4::Dates->new($billingdateto)->output("iso");
72
    my @invoices             = GetInvoices(
72
    my @invoices             = GetInvoices(
73
        invoicenumber    => $invoicenumber,
73
        invoicenumber    => $invoicenumber,
74
        suppliername     => $supplier,
74
        supplierid       => $supplierid,
75
        shipmentdatefrom => $shipmentdatefrom_iso,
75
        shipmentdatefrom => $shipmentdatefrom_iso,
76
        shipmentdateto   => $shipmentdateto_iso,
76
        shipmentdateto   => $shipmentdateto_iso,
77
        billingdatefrom  => $billingdatefrom_iso,
77
        billingdatefrom  => $billingdatefrom_iso,
Lines 89-94 if ( $op and $op eq "do_search" ) { Link Here
89
            billingdate     => $_->{billingdate},
89
            billingdate     => $_->{billingdate},
90
            invoicenumber   => $_->{invoicenumber},
90
            invoicenumber   => $_->{invoicenumber},
91
            suppliername    => $_->{suppliername},
91
            suppliername    => $_->{suppliername},
92
            booksellerid      => $_->{booksellerid},
92
            receivedbiblios => $_->{receivedbiblios},
93
            receivedbiblios => $_->{receivedbiblios},
93
            receiveditems   => $_->{receiveditems},
94
            receiveditems   => $_->{receiveditems},
94
            subscriptionid  => $_->{subscriptionid},
95
            subscriptionid  => $_->{subscriptionid},
Lines 104-116 my @suppliers_loop = (); Link Here
104
my $suppliername;
105
my $suppliername;
105
foreach (@suppliers) {
106
foreach (@suppliers) {
106
    my $selected = 0;
107
    my $selected = 0;
107
    if ( $supplier && $supplier == $_->{'id'} ) {
108
    if ( $supplierid && $supplierid == $_->{'id'} ) {
108
        $selected     = 1;
109
        $selected     = 1;
109
        $suppliername = $_->{'name'};
110
        $suppliername = $_->{'name'};
110
    }
111
    }
111
    my %row = (
112
    my %row = (
112
        suppliername => $_->{'name'},
113
        suppliername => $_->{'name'},
113
        supplierid   => $_->{'id'},
114
        booksellerid   => $_->{'id'},
114
        selected     => $selected,
115
        selected     => $selected,
115
    );
116
    );
116
    push @suppliers_loop, \%row;
117
    push @suppliers_loop, \%row;
Lines 138-144 $template->param( Link Here
138
    do_search => ( $op and $op eq "do_search" ) ? 1 : 0,
139
    do_search => ( $op and $op eq "do_search" ) ? 1 : 0,
139
    results_loop             => \@results_loop,
140
    results_loop             => \@results_loop,
140
    invoicenumber            => $invoicenumber,
141
    invoicenumber            => $invoicenumber,
141
    supplier                 => $supplier,
142
    booksellerid             => $supplierid,
142
    suppliername             => $suppliername,
143
    suppliername             => $suppliername,
143
    billingdatefrom          => $billingdatefrom,
144
    billingdatefrom          => $billingdatefrom,
144
    billingdateto            => $billingdateto,
145
    billingdateto            => $billingdateto,
(-)a/acqui/uncertainprice.pl (+2 lines)
Lines 127-132 $template->param( uncertainpriceorders => \@orders, Link Here
127
                                   booksellercontemail => $bookseller->{'contemail'},
127
                                   booksellercontemail => $bookseller->{'contemail'},
128
                                   booksellercontnotes => $bookseller->{'contnotes'},
128
                                   booksellercontnotes => $bookseller->{'contnotes'},
129
                                   booksellernotes => $bookseller->{'notes'},
129
                                   booksellernotes => $bookseller->{'notes'},
130
                                   basketcount   => $bookseller->{'basketcount'},
131
                                   subscriptioncount   => $bookseller->{'subscriptioncount'},
130
                                   owner => $owner,
132
                                   owner => $owner,
131
                                   scriptname => "/cgi-bin/koha/acqui/uncertainprice.pl");
133
                                   scriptname => "/cgi-bin/koha/acqui/uncertainprice.pl");
132
output_html_with_http_headers $input, $cookie, $template->output;
134
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/admin/aqcontract.pl (+2 lines)
Lines 51-56 $template->param( Link Here
51
    contractnumber => $contractnumber,
51
    contractnumber => $contractnumber,
52
    booksellerid   => $booksellerid,
52
    booksellerid   => $booksellerid,
53
    booksellername => $bookseller->{name},
53
    booksellername => $bookseller->{name},
54
    basketcount   => $bookseller->{'basketcount'},
55
    subscriptioncount   => $bookseller->{'subscriptioncount'},
54
);
56
);
55
57
56
#ADD_FORM: called if $op is 'add_form'. Used to create form to add or  modify a record
58
#ADD_FORM: called if $op is 'add_form'. Used to create form to add or  modify a record
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc (-33 / +12 lines)
Lines 9-46 Link Here
9
9
10
    // YUI Toolbar Functions
10
    // YUI Toolbar Functions
11
11
12
    function yuiToolbar() {   
12
    function yuiToolbar() {
13
    
14
        new YAHOO.widget.Button("newperiod");
15
        new YAHOO.widget.Button("newbudget");
16
        new YAHOO.widget.Button("newsupplier");
17
        new YAHOO.widget.Button("newbasket");
18
        new YAHOO.widget.Button("editsupplier");
13
        new YAHOO.widget.Button("editsupplier");
19
        new YAHOO.widget.Button("deletesupplier");
14
        new YAHOO.widget.Button("deletesupplier");
20
        new YAHOO.widget.Button("receive");
15
        new YAHOO.widget.Button("receive");
21
        new YAHOO.widget.Button("newcontract");
16
        [% UNLESS ( booksellerid ) %]new YAHOO.widget.Button("newvendor");[% END %]
22
        new YAHOO.widget.Button("editcontracts");
23
17
24
        var manageorders = [
18
        var newmenu = [
25
            [% IF ( CAN_user_acquisition_order_manage ) %]
19
            [% IF ( CAN_user_acquisition_order_manage ) %]
26
              [% IF (active) %]
20
                { text: _("Basket"), url: "/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid %]&op=add_form"},
27
                { text: _("New basket"), url: "/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid %]&op=add_form"},
28
              [% END %]
29
                { text: _("Baskets"), url: "/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid %]"},
30
                { text: _("Basket groups"), url: "/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]"},
31
            [% END %]
32
            { text: _("Receive shipments"), url: "/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]" },
33
            [% IF ( basketno ) %]
34
                { text: _("Uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&owner=1"}
35
            [% ELSE %]
36
                { text: _("Uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&owner=1"}
37
            [% END %]
21
            [% END %]
22
            [% IF ( CAN_user_acquisition_contracts_manage ) %]{ text: _("Contract"), url: "/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid %]"},[% END %]
23
            { text: _("Vendor"), url: "/cgi-bin/koha/acqui/supplier.pl?op=enter"}
38
        ]
24
        ]
39
        [% IF ( booksellerid ) %]
25
        new YAHOO.widget.Button({type: "menu", label: _("New"), name: "newmenu", menu: newmenu, container: "newmenuc"});
40
            [% IF ( basketcount ) %]
41
                new YAHOO.widget.Button({type: "menu", label: _("Manage orders"), name: "manageorders", menu: manageorders, container: "toolbar-list"});
42
            [% END %]
43
        [% END %]
44
    }
26
    }
45
27
46
    //]]>
28
    //]]>
Lines 48-65 Link Here
48
    <ul id="toolbar-list" class="toolbar">
30
    <ul id="toolbar-list" class="toolbar">
49
        [% IF ( booksellerid ) %]
31
        [% IF ( booksellerid ) %]
50
            [% IF ( CAN_user_acquisition_vendors_manage ) %]
32
            [% IF ( CAN_user_acquisition_vendors_manage ) %]
51
                <li><a id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]&amp;op=enter">Edit</a></li>
33
                <li id="newmenuc"></li>
34
                <li><a id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]&amp;op=enter">Edit vendor</a></li>
52
                [% UNLESS ( basketcount OR subscriptioncount ) %]
35
                [% UNLESS ( basketcount OR subscriptioncount ) %]
53
                    <li><a id="deletesupplier" href="javascript:confirm_deletion()">Delete</a></li>
36
                    <li><a id="deletesupplier" href="javascript:confirm_deletion()">Delete vendor</a></li>
54
                [% END %]
55
                <li><a id="newcontract" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid %]">New contract</a></li>
56
                <li><a id="editcontracts" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">Contracts</a></li>
57
                [% IF (active && !basketcount) %]
58
                    <li><a id="newbasket" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid %]&amp;op=add_form">New basket</a></li>
59
                [% END %]
37
                [% END %]
60
            [% END %]
38
            [% END %]
39
                [% IF ( CAN_user_acquisition_order_receive && basketcount ) %]<li><a id="receive" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid %]">Receive shipments</a></li>[% END %]
61
        [% ELSE %]
40
        [% ELSE %]
62
            <li><a id="newbudget" href="/cgi-bin/koha/acqui/supplier.pl?op=enter">New vendor</a></li>
41
            <li><a id="newvendor" href="/cgi-bin/koha/acqui/supplier.pl?op=enter">New vendor</a></li>
63
        [% END %]
42
        [% END %]
64
    </ul>
43
    </ul>
65
</div>
44
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc (+15 lines)
Line 0 Link Here
1
[% IF ( booksellerid ) %]
2
<div id="menu">
3
    <ul>
4
        [% IF ( CAN_user_acquisition_order_manage ) %]<li><a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid %]">Baskets</a></li>[% END %]
5
        [% IF ( CAN_user_acquisition_group_manage ) %]<li><a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]">Basket groups</a></li>[% END %]
6
        [% IF ( CAN_user_acquisition_contracts_manage ) %]<li><a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">Contracts</a></li>[% END %]
7
        <li><a href="/cgi-bin/koha/acqui/invoices.pl?supplierid=[% booksellerid %]&amp;op=do_search">Invoices</a></li>
8
        [% IF ( CAN_user_acquisition_order_manage ) %][% IF ( basketno ) %]
9
        <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]&amp;owner=1">Uncertain prices</a></li>
10
        [% ELSE %]
11
        <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&amp;owner=1">Uncertain prices</a></li>
12
        [% END %] [% END %]
13
    </ul>
14
</div>
15
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt (-69 / +9 lines)
Lines 1-8 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo;
2
<title>Koha &rsaquo; Acquisitions &rsaquo;
3
[% IF ( add_form ) %]
3
[% IF ( add_form ) %]
4
    [% IF ( basketno ) %]Edit basket '[% basketname %]'
4
    [% IF ( basketno ) %]Edit basket '[% basketname %]'
5
        [% ELSE %]add a basket to [% booksellername %]
5
        [% ELSE %]Add a basket to [% booksellername %]
6
    [% END %]
6
    [% END %]
7
[% END %]
7
[% END %]
8
</title>
8
</title>
Lines 28-88 function Check(ff) { Link Here
28
}
28
}
29
//]]>
29
//]]>
30
</script>
30
</script>
31
<style type="text/css">
32
33
div.workarea { padding:10px; float:left }
34
35
ul.draglist { 
36
    position: relative;
37
    width: 200px; 
38
    height:240px;
39
    background: #f7f7f7;
40
    border: 1px solid gray;
41
    list-style: none;
42
    margin:0;
43
    padding:0;
44
}
45
46
ul.draglist li {
47
    margin: 1px;
48
    cursor: move;
49
    zoom: 1;
50
}
51
52
ul.draglist_alt { 
53
    position: relative;
54
    width: 200px; 
55
    list-style: none;
56
    margin:0;
57
    padding:0;
58
    /*
59
       The bottom padding provides the cushion that makes the empty 
60
       list targetable.  Alternatively, we could leave the padding 
61
       off by default, adding it when we detect that the list is empty.
62
    */
63
    padding-bottom:20px;
64
}
65
66
ul.draglist_alt li {
67
    margin: 1px;
68
    cursor: move; 
69
}
70
71
72
li.list1 {
73
    background-color: #D1E6EC;
74
    border:1px solid #7EA6B2;
75
}
76
77
li.list2 {
78
    background-color: #D8D4E2;
79
    border:1px solid #6B4C86;
80
}
81
82
#user_actions { float: right; }
83
84
</style>
85
86
</head>
31
</head>
87
<body id="acq_basketheader" class="acq">
32
<body id="acq_basketheader" class="acq">
88
[% INCLUDE 'header.inc' %]
33
[% INCLUDE 'header.inc' %]
Lines 94-111 li.list2 { Link Here
94
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> &rsaquo;
39
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> &rsaquo;
95
    [% IF ( add_form ) %]
40
    [% IF ( add_form ) %]
96
        [% IF ( basketno ) %]Edit basket '[% basketname %]'
41
        [% IF ( basketno ) %]Edit basket '[% basketname %]'
97
        [% ELSE %]add a basket to [% booksellername %]
42
        [% ELSE %]Add a basket to [% booksellername %]
98
        [% END %]
43
        [% END %]
99
    [% END %]
44
    [% END %]
100
</div>
45
</div>
101
46
102
<div id="doc3" class="yui-t2">
47
<div id="doc" class="yui-t7">
103
    <div id="bd">
48
    <div id="bd">
104
    
49
105
    <div id="yui-main">
50
    <div id="yui-main">
106
    
51
107
    <div class="yui-b">
108
    
109
    [% IF ( add_form ) %]
52
    [% IF ( add_form ) %]
110
        [% IF ( basketno ) %]
53
        [% IF ( basketno ) %]
111
            <h1>Edit basket [% basketname %]</h1>
54
            <h1>Edit basket [% basketname %]</h1>
Lines 126-132 li.list2 { Link Here
126
                        <input type="text" name="basketname" id="basketname" size="40" maxlength="80" value="[% basketname %]" />
69
                        <input type="text" name="basketname" id="basketname" size="40" maxlength="80" value="[% basketname %]" />
127
                </li>
70
                </li>
128
                 <li>
71
                 <li>
129
                    <label for="billingplace">Billing Place:</label>
72
                    <label for="billingplace">Billing place:</label>
130
                    <select name="billingplace" id="billingplace">
73
                    <select name="billingplace" id="billingplace">
131
                        <option value="">--</option>
74
                        <option value="">--</option>
132
                        [% FOREACH billingplace IN billingplaceloop %]
75
                        [% FOREACH billingplace IN billingplaceloop %]
Lines 141-147 li.list2 { Link Here
141
                    </select>
84
                    </select>
142
                </li>
85
                </li>
143
                <li>
86
                <li>
144
                    <label for="deliveryplace">Delivery  Place:</label>
87
                    <label for="deliveryplace">Delivery place:</label>
145
                    <select name="deliveryplace" id="deliveryplace">
88
                    <select name="deliveryplace" id="deliveryplace">
146
                        <option value="">--</option>
89
                        <option value="">--</option>
147
                        [% FOREACH deliveryplace IN deliveryplaceloop %]
90
                        [% FOREACH deliveryplace IN deliveryplaceloop %]
Lines 194-207 li.list2 { Link Here
194
        <fieldset class="action">
137
        <fieldset class="action">
195
            <input type="hidden" name="op" value="add_validate" />
138
            <input type="hidden" name="op" value="add_validate" />
196
            <input type="button" value="Save" onclick="Check(this.form);" />
139
            <input type="button" value="Save" onclick="Check(this.form);" />
140
            <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">Cancel</a>
197
        </fieldset>
141
        </fieldset>
198
    </form>
142
    </form>
199
    [% END %]
143
    [% END %]
200
</div>
144
</div>
201
</div>
145
</div>
202
<div class="yui-b">
203
    [% INCLUDE 'acquisitions-menu.inc' %]
204
</div>
205
</div>
206
146
207
[% INCLUDE 'intranet-bottom.inc' %]
147
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt (-3 / +4 lines)
Lines 47-55 $(document).ready(function() { Link Here
47
    <div class="yui-b">
47
    <div class="yui-b">
48
    
48
    
49
[% INCLUDE 'acquisitions-toolbar.inc' %]
49
[% INCLUDE 'acquisitions-toolbar.inc' %]
50
[% IF ( count == 1 ) %]	
50
[% UNLESS ( count == 1 ) %]
51
<h1> [% supplier_name %] </h1>
52
[% ELSE %]
53
<h1>You searched on <b>vendor [% supplier %],</b> [% count %] results found</h1>
51
<h1>You searched on <b>vendor [% supplier %],</b> [% count %] results found</h1>
54
[% END %]
52
[% END %]
55
[% IF ( loop_suppliers.size ) %]
53
[% IF ( loop_suppliers.size ) %]
Lines 139-144 $(document).ready(function() { Link Here
139
</div>
137
</div>
140
</div>
138
</div>
141
<div class="yui-b">
139
<div class="yui-b">
140
[% IF ( booksellerid ) %]
141
[% INCLUDE 'vendor-menu.inc' %]
142
[% END %]
142
[% INCLUDE 'acquisitions-menu.inc' %]
143
[% INCLUDE 'acquisitions-menu.inc' %]
143
</div>
144
</div>
144
</div>
145
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-1 / +1 lines)
Lines 40-46 Link Here
40
      [% END %]
40
      [% END %]
41
      <h1>Invoice: [% invoicenumber %]</h1>
41
      <h1>Invoice: [% invoicenumber %]</h1>
42
42
43
      <p>Supplier: [% suppliername %]</p>
43
      <p>Supplier: <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% suppliername %]</a></p>
44
      <form action="" method="post">
44
      <form action="" method="post">
45
        <fieldset>
45
        <fieldset>
46
          <label for="shipmentdate">Shipment date:</label>
46
          <label for="shipmentdate">Shipment date:</label>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt (-7 / +7 lines)
Lines 57-64 $(document).ready(function() { Link Here
57
            <tbody>
57
            <tbody>
58
              [% FOREACH result IN results_loop %]
58
              [% FOREACH result IN results_loop %]
59
                <tr>
59
                <tr>
60
                  <td>[% result.invoicenumber %]</td>
60
                  <td><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% result.invoiceid %]">[% result.invoicenumber %]</a></td>
61
                  <td>[% result.suppliername %]</td>
61
                  <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% result.booksellerid %]">[% result.suppliername %]</a></td>
62
                  <td>
62
                  <td>
63
                    [% IF (result.billingdate) %]
63
                    [% IF (result.billingdate) %]
64
                      [% result.billingdate | $KohaDates %]
64
                      [% result.billingdate | $KohaDates %]
Lines 76-84 $(document).ready(function() { Link Here
76
                  <td>
76
                  <td>
77
                    <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% result.invoiceid %]">Details</a> /
77
                    <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% result.invoiceid %]">Details</a> /
78
                    [% IF ( result.closedate ) %]
78
                    [% IF ( result.closedate ) %]
79
                      <a href="invoice.pl?op=reopen&invoiceid=[% result.invoiceid %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% supplier %]%26billingdatefrom=[% billingdatefrom %]%26billingdateto=[% billingdateto %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]">Reopen</a>
79
                      <a href="invoice.pl?op=reopen&amp;invoiceid=[% result.invoiceid %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% supplier %]%26billingdatefrom=[% billingdatefrom %]%26billingdateto=[% billingdateto %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]">Reopen</a>
80
                    [% ELSE %]
80
                    [% ELSE %]
81
                      <a href="invoice.pl?op=close&invoiceid=[% result.invoiceid %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% supplier %]%26billingdatefrom=[% billingdatefrom %]%26billingdateto=[% billingdateto %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]">Close</a>
81
                      <a href="invoice.pl?op=close&amp;invoiceid=[% result.invoiceid %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% supplier %]%26billingdatefrom=[% billingdatefrom %]%26billingdateto=[% billingdateto %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]">Close</a>
82
                    [% END %]
82
                    [% END %]
83
                  </td>
83
                  </td>
84
                </tr>
84
                </tr>
Lines 148-160 $(document).ready(function() { Link Here
148
          </li>
148
          </li>
149
          <li>
149
          <li>
150
            <label for="supplier">Supplier:</label>
150
            <label for="supplier">Supplier:</label>
151
            <select id="supplier" name="supplier">
151
            <select id="supplier" name="supplierid">
152
              <option value="">All</option>
152
              <option value="">All</option>
153
              [% FOREACH supplier IN suppliers_loop %]
153
              [% FOREACH supplier IN suppliers_loop %]
154
                [% IF ( supplier.selected ) %]
154
                [% IF ( supplier.selected ) %]
155
                  <option selected="selected" value="[% supplier.supplierid %]">[% supplier.suppliername %]</option>
155
                  <option selected="selected" value="[% supplier.booksellerid %]">[% supplier.suppliername %]</option>
156
                [% ELSE %]
156
                [% ELSE %]
157
                  <option value="[% supplier.supplierid %]">[% supplier.suppliername %]</option>
157
                  <option value="[% supplier.booksellerid %]">[% supplier.suppliername %]</option>
158
                [% END %]
158
                [% END %]
159
              [% END %]
159
              [% END %]
160
            </select>
160
            </select>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt (-1 / +6 lines)
Lines 47-56 if (f.company.value == "") { Link Here
47
47
48
<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>
48
<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>
49
49
50
<div id="doc" class="yui-t7">
50
<div id="doc3" class="yui-t2">
51
51
52
<div id="bd">
52
<div id="bd">
53
    <div id="yui-main">
53
    <div id="yui-main">
54
    <div class="yui-b">
54
    [% IF ( enter ) %]
55
    [% IF ( enter ) %]
55
        [% IF ( booksellerid ) %]
56
        [% IF ( booksellerid ) %]
56
        <h1>Update: [% name %]</h1>
57
        <h1>Update: [% name %]</h1>
Lines 284-287 if (f.company.value == "") { Link Here
284
285
285
</div>
286
</div>
286
</div>
287
</div>
288
<div class="yui-b">
289
[% INCLUDE 'vendor-menu.inc' %]
290
</div>
291
</div>
287
[% INCLUDE 'intranet-bottom.inc' %]
292
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt (-38 / +51 lines)
Lines 1-5 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Orders with uncertain prices for Vendor [% booksellername %]</title>
2
<title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( booksellername ) %]Orders with uncertain prices for vendor [% booksellername %][% ELSE %]Orders with uncertain prices[% END %]</title>
3
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
3
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
4
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
5
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
5
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
Lines 30-70 function check(form) { Link Here
30
[% INCLUDE 'header.inc' %]
30
[% INCLUDE 'header.inc' %]
31
[% INCLUDE 'acquisitions-search.inc' %]
31
[% INCLUDE 'acquisitions-search.inc' %]
32
32
33
<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>
33
<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 ( booksellername ) %]<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> &rsaquo; Uncertain prices for vendor [% booksellername %][% ELSE %]Uncertain prices[% END %]</div>
34
34
35
<div id="doc" class="yui-t7">
35
<div id="doc3" class="yui-t2">
36
   <div id="bd">
36
37
        <div id="yui-main">
37
    <div id="bd">
38
    <div id="yui-main">
39
    <div class="yui-b">
40
41
[% INCLUDE 'acquisitions-toolbar.inc' %]
38
        [% IF ( validate ) %]
42
        [% IF ( validate ) %]
39
            <META HTTP-EQUIV=Refresh CONTENT="0; url=[% scriptname %]?booksellerid=[% booksellerid %]">
43
            <META HTTP-EQUIV=Refresh CONTENT="0; url=[% scriptname %]?booksellerid=[% booksellerid %]">
40
        [% ELSE %]
44
        [% ELSE %]
41
        <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>
45
        [% IF ( booksellername ) %]
42
        <h2>Contact information</h2>
46
            <h1>Orders with uncertain prices for vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a></h1>
43
        <p><strong>Address: </strong>
47
            <h2>Contact information</h2>
44
            [% booksellerpostal %]
48
            <p><strong>Address: </strong>
45
            [% bookselleraddress1 %]
49
                [% booksellerpostal %]
46
            [% bookselleraddress2 %]
50
                [% bookselleraddress1 %]
47
            [% bookselleraddress3 %]
51
                [% bookselleraddress2 %]
48
            [% bookselleraddress4 %]
52
                [% bookselleraddress3 %]
49
            <a href="[% booksellerurl %]">[% booksellerurl %]</a>
53
                [% bookselleraddress4 %]
50
        </p>
54
                <a href="[% booksellerurl %]">[% booksellerurl %]</a>
51
        <p><strong>Phone: </strong>
55
            </p>
52
            [% booksellerphone %] / Fax:
56
            <p><strong>Phone: </strong>
53
            [% booksellerfax %]</p>
57
                [% booksellerphone %] / Fax:
54
        <dl>
58
                [% booksellerfax %]</p>
55
            <dt><strong>Contact: </strong></dt>
59
            <dl>
56
            <dd>[% booksellercontact %]
60
                <dt><strong>Contact: </strong></dt>
57
            [% booksellercontpos %]
61
                <dd>[% booksellercontact %]
58
            [% booksellercontphone %]
62
                [% booksellercontpos %]
59
            [% booksellercontaltphone %]
63
                [% booksellercontphone %]
60
            [% booksellercontemail %]
64
                [% booksellercontaltphone %]
61
            [% booksellercontnotes %]
65
                [% booksellercontemail %]
62
            </dd>
66
                [% booksellercontnotes %]
63
        </dl>
67
                </dd>
64
        [% IF ( booksellernotes ) %]
68
            </dl>
65
        <p><strong>Notes: </strong>
69
            [% IF ( booksellernotes ) %]
66
            [% booksellernotes %]</p>
70
            <p><strong>Notes: </strong>
71
                [% booksellernotes %]</p>
72
            [% END %]
67
        [% END %]
73
        [% END %]
74
68
        <h2>Orders with uncertain prices</h2>
75
        <h2>Orders with uncertain prices</h2>
69
        <form action="[% scriptname %]" method="post" name="uncertainprices">
76
        <form action="[% scriptname %]" method="post" name="uncertainprices">
70
        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
77
        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
Lines 86-97 function check(form) { Link Here
86
        <table id="uncertainpricet">
93
        <table id="uncertainpricet">
87
        <thead>
94
        <thead>
88
	    <tr>
95
	    <tr>
89
            <th>basket</th>
96
            <th>Basket</th>
90
	        <th>order</th>
97
           <th>Order</th>
91
            <th>by</th>
98
            <th>By</th>
92
            <th>uncertain</th>
99
            <th>Uncertain</th>
93
	        <th>price</th>
100
            <th>Price</th>
94
	        <th>quantity</th>
101
            <th>Quantity</th>
95
	    </tr>
102
	    </tr>
96
        </thead>
103
        </thead>
97
        <tbody>
104
        <tbody>
Lines 128-132 function check(form) { Link Here
128
	<fieldset class="action"><input type="button" value="Save" onclick="check(this.form)" /></fieldset>
135
	<fieldset class="action"><input type="button" value="Save" onclick="check(this.form)" /></fieldset>
129
	</form>
136
	</form>
130
	[% END %]
137
	[% END %]
138
139
</div>
140
</div>
141
<div class="yui-b">
142
[% INCLUDE 'vendor-menu.inc' %]
143
</div>
131
</div>
144
</div>
132
</div>[% INCLUDE 'intranet-bottom.inc' %]
145
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt (-22 / +12 lines)
Lines 83-91 function Check(ff) { Link Here
83
    [% IF ( else ) %]Contracts[% END %]
83
    [% IF ( else ) %]Contracts[% END %]
84
</div>
84
</div>
85
85
86
<div id="doc" class="yui-t7">
86
<div id="doc3" class="yui-t2">
87
87
    <div id="bd">
88
    <div id="bd">
88
        <div id="yui-main">
89
    <div id="yui-main">
90
    <div class="yui-b">
91
92
[% INCLUDE 'acquisitions-toolbar.inc' %]
89
                [% IF ( add_form ) %]
93
                [% IF ( add_form ) %]
90
                    <form name="Aform" action="[% script_name %]" method="post">
94
                    <form name="Aform" action="[% script_name %]" method="post">
91
                        <input type="hidden" name="op" value="add_validate" />
95
                        <input type="hidden" name="op" value="add_validate" />
Lines 161-183 function Check(ff) { Link Here
161
                </form>
165
                </form>
162
            [% END %]
166
            [% END %]
163
            [% IF ( else ) %]
167
            [% IF ( else ) %]
164
                <div id="toolbar">
165
                    <script type="text/javascript">
166
                        //<![CDATA[
167
                        // prepare DOM for YUI Toolbar
168
                        $(document).ready(function() {
169
                        yuiToolbar();
170
                        });
171
                        // YUI Toolbar Functions
172
                        function yuiToolbar() {
173
                        new YAHOO.widget.Button("newcontract");
174
                        }
175
                        //]]>
176
                    </script>
177
                    <ul class="toolbar">
178
                        <li><a id="newcontract" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid %]">New contract</a></li>
179
                    </ul>
180
                </div>
181
                <h2>Contract(s) of [% booksellername %]</h2>
168
                <h2>Contract(s) of [% booksellername %]</h2>
182
                [% IF ( loop ) %]
169
                [% IF ( loop ) %]
183
                    <table>
170
                    <table>
Lines 202-210 function Check(ff) { Link Here
202
                    [% END %]
189
                    [% END %]
203
                </table>
190
                </table>
204
                [% ELSE %]
191
                [% ELSE %]
205
                <div class="dialog message">There are no contracts with this vendor.</div>
192
                <div class="dialog message">There are no contracts with this vendor. <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid %]">Add a contract</a>.</div>
206
                [% END %]
193
                [% END %]
207
            [% END %]
194
            [% END %]
208
        </div>
195
</div>
196
</div>
197
<div class="yui-b">
198
[% INCLUDE 'vendor-menu.inc' %]
199
</div>
209
</div>
200
</div>
210
[% INCLUDE 'intranet-bottom.inc' %]
201
[% INCLUDE 'intranet-bottom.inc' %]
211
- 

Return to bug 8913