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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc (-2 / +2 lines)
Lines 16-23 Link Here
16
        <span class="filteraction" id="filteraction_on"> <a href="#" onclick="$('#filters').show();$('.filteraction').toggle();">[+]</a></span>
16
        <span class="filteraction" id="filteraction_on"> <a href="#" onclick="$('#filters').show();$('.filteraction').toggle();">[+]</a></span>
17
	<input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced Search</a>
17
	<input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced Search</a>
18
    <p id="filters" style="display:none">
18
    <p id="filters" style="display:none">
19
      <label for="basket">Basket: </label><input type="text" name="basket" id="basket">
19
      <label for="basket">Basket: </label><input type="text" name="basket" id="basket" />
20
      <label for="booksellerinvoicenumber">Invoice No.: </label><input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber">
20
      <label for="booksellerinvoicenumber">Invoice No.: </label><input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" />
21
    </p>
21
    </p>
22
	</form>
22
	</form>
23
	</div>	
23
	</div>	
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-55 / +66 lines)
Lines 3-9 Link Here
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
[% UNLESS ( closedate ) %]
4
[% UNLESS ( closedate ) %]
5
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
5
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
6
<script type="text/JavaScript">
6
<script type="text/javascript">
7
//<![CDATA[
7
//<![CDATA[
8
    $(document).ready(function() {
8
    $(document).ready(function() {
9
        $("#orders").tablesorter({
9
        $("#orders").tablesorter({
Lines 13-32 Link Here
13
            }
13
            }
14
        });
14
        });
15
    });
15
    });
16
//]]>
17
</script>
18
<script type="text/javascript">
19
//<![CDATA[
20
            function confirm_close() {
16
            function confirm_close() {
21
                var is_confirmed = confirm(_('Are you sure you want to close this basket?'));
17
                var is_confirmed = confirm(_('Are you sure you want to close this basket?'));
22
                if (is_confirmed) {
18
                if (is_confirmed) {
23
                    window.location = "[% script_name %]?op=close&basketno=[% basketno %]";
19
                    window.location = "[% script_name %]?op=close&basketno=[% basketno %]";
24
                }
20
                }
25
            }
21
            }
26
//]]>
27
        </script>
28
<script type="text/javascript">
29
//<![CDATA[
30
            function confirm_deletion() {
22
            function confirm_deletion() {
31
                var is_confirmed = confirm(_('Are you sure you want to delete this basket?'));
23
                var is_confirmed = confirm(_('Are you sure you want to delete this basket?'));
32
                if (is_confirmed) {
24
                if (is_confirmed) {
Lines 50-55 Link Here
50
//]]>
42
//]]>
51
</script>
43
</script>
52
[% ELSE %]
44
[% ELSE %]
45
<script type="text/javascript">
46
//<![CDATA[
47
    $(document).ready(function(){
48
        $("#basketgroupid").change(function(){
49
            if($(this).val() == "new"){
50
                location.href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% booksellerid %]";
51
            }
52
        });
53
    });
54
//]]>
55
</script>
53
[% UNLESS ( grouped ) %]
56
[% UNLESS ( grouped ) %]
54
<script type="text/javascript">
57
<script type="text/javascript">
55
//<![CDATA[
58
//<![CDATA[
Lines 164-206 Link Here
164
            </h2>
167
            </h2>
165
        [% END %]
168
        [% END %]
166
        [% IF ( basketno ) %]
169
        [% IF ( basketno ) %]
167
            <div id="acqui_basket_summary"  class="yui-g">
170
            <div id="acqui_basket_summary" class="yui-g">
168
                <h2>Basket details</h2>
171
                <div class="rows">
169
                [% IF ( basketnote ) %]<p>Internal note: [% basketnote %]</p>[% END %]
172
                <div class="yui-u first">
170
                [% IF ( basketbooksellernote ) %]<p>Vendor note: [% basketbooksellernote %]</p>[% END %]
173
                <ol>
174
                [% IF ( basketnote ) %]<li><span class="label">Internal note:</span> [% basketnote %]</li>[% END %]
175
                [% IF ( basketbooksellernote ) %]<li><span class="label">Vendor note:</span> [% basketbooksellernote %]</li>[% END %]
171
                [% IF ( basketcontractno ) %]
176
                [% IF ( basketcontractno ) %]
172
                    <p>Contract name: <a href="../admin/aqcontract.pl?op=add_form&amp;contractnumber=[% basketcontractno %]&amp;booksellerid=[% booksellerid %]">[% basketcontractname %]</a></p>
177
                    <li><span class="label">Contract name:</span> <a href="../admin/aqcontract.pl?op=add_form&amp;contractnumber=[% basketcontractno %]&amp;booksellerid=[% booksellerid %]">[% basketcontractname %]</a></li>
173
                [% END %]
178
                [% END %]
174
                [% IF ( authorisedbyname ) %]<p>Managed by:  [% authorisedbyname %]</p>[% END %]
179
                [% IF ( authorisedbyname ) %]<li><span class="label">Managed by:</span>  [% authorisedbyname %]</li>[% END %]
175
                [% IF ( creationdate ) %]<p>Opened on:  [% creationdate %]</p>[% END %]
180
                [% IF ( creationdate ) %]<li><span class="label">Opened on:</span>  [% creationdate %]</li>[% END %]
181
                [% IF ( closedate ) %]<li><span class="label">Closed on:</span> [% closedate %]</li>[% END %]
182
183
                </ol>
184
                </div>
176
                [% IF ( closedate ) %]
185
                [% IF ( closedate ) %]
177
                <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="post">
186
                <div class="yui-u">
178
                <p>Closed on:  [% closedate %]</p>
187
                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="post">
179
                [% IF ( basketgroups ) %]
188
180
                    <p> Basket group: <select id="basketgroupid" name="basketgroupid">
189
                        <p><label for="basketgroupid"><strong>Basket group:</strong></label></p>
181
                        [% FOREACH basketgroup IN basketgroups %]
190
                        <p><select id="basketgroupid" name="basketgroupid">
182
                            [% IF ( basketgroup.default ) %]
191
                            <option value="new">Add new group</option>
192
                                                    [% FOREACH basketgroup IN basketgroups %]
193
                                                        [% IF ( basketgroup.default ) %]
183
                            <option value="[% basketgroup.id %]" selected="selected">[% basketgroup.name %]</option>
194
                            <option value="[% basketgroup.id %]" selected="selected">[% basketgroup.name %]</option>
184
                            [% ELSE %]
195
                                                        [% ELSE %]
185
                            <option value="[% basketgroup.id %]">[% basketgroup.name %]</option>
196
                            <option value="[% basketgroup.id %]">[% basketgroup.name %]</option>
186
                            [% END %]
197
                                                        [% END %]
187
                        [% END %]
198
                                                    [% END %]
188
                        </select>
199
                        </select></p>
189
                        <input type="hidden" id="basketno" value="[% basketno %]" name="basketno" />
200
201
                        <p><input type="hidden" id="basketno" value="[% basketno %]" name="basketno" />
190
                        <input type="hidden" value="mod_basket" name="op" />
202
                        <input type="hidden" value="mod_basket" name="op" />
191
                        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
203
                        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
192
                        <input type="submit" value="Change basket group" />
204
                        <input type="submit" value="Change basket group" /></p>
193
                    </p>
205
194
                </form>
206
                    </form>
195
                [% ELSE %]
207
                </div>
196
                    <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% basketgroups %]&amp;basketgroupid=[% id %]">[% name %]</a>
197
                [% END %]
198
                [% END %]
208
                [% END %]
199
            </div>
209
            </div>
210
            </div>
200
        [% END %]
211
        [% END %]
201
212
202
        [% UNLESS ( delete_confirm ) %]
213
        [% UNLESS ( delete_confirm ) %]
203
        <div id="acqui_basket_content">
214
        <div id="acqui_basket_content" class="yui-g">
204
        <h2>Order Details</h2>
215
        <h2>Order Details</h2>
205
        [% IF ( books_loop ) %]
216
        [% IF ( books_loop ) %]
206
            <table id="orders">
217
            <table id="orders">
Lines 223-233 Link Here
223
                <tfoot>
234
                <tfoot>
224
                [% IF ( GST ) %]
235
                [% IF ( GST ) %]
225
                <tr>
236
                <tr>
226
                    <th>Total Tax Exc.</th>
237
                    <th scope="row">Total Tax Exc.</th>
227
                    <th>[% total_rrp_gste %]</th>
238
                    <td>[% total_rrp_gste %]</td>
228
                    <th>&nbsp;</th>
239
                    <td>&nbsp;</td>
229
                    <th>[% qty_total %]</th>
240
                    <td>[% qty_total %]</td>
230
                    <th>[% total_est_gste %]</th>
241
                    <td>[% total_est_gste %]</td>
231
                        [% IF ( active ) %]
242
                        [% IF ( active ) %]
232
                            [% IF ( closedate ) %]
243
                            [% IF ( closedate ) %]
233
                            <td colspan="1" rowspan="3">&nbsp;</td>
244
                            <td colspan="1" rowspan="3">&nbsp;</td>
Lines 237-262 Link Here
237
                        [% END %]
248
                        [% END %]
238
                </tr>
249
                </tr>
239
                <tr>
250
                <tr>
240
                    <th>Tax ([% gist_rate %])</th>
251
                    <th scope="row">Tax ([% gist_rate %])</th>
241
                    <th>[% gist_rrp %]</th>
252
                    <td>[% gist_rrp %]</td>
242
                    <th>&nbsp;</th>
253
                    <td>&nbsp;</td>
243
                    <th>&nbsp;</th>
254
                    <td>&nbsp;</td>
244
                    <th>[% gist_est %]</th>
255
                    <td>[% gist_est %]</td>
245
                </tr>
256
                </tr>
246
                <tr>
257
                <tr>
247
                    <th>Total Tax Inc. ([% currency %])</th>
258
                    <th scope="row">Total Tax Inc. ([% currency %])</th>
248
                    <th>[% total_rrp_gsti %]</th>
259
                    <td>[% total_rrp_gsti %]</td>
249
                    <th>&nbsp;</th>
260
                    <td>&nbsp;</td>
250
                    <th>[% qty_total %]</th>
261
                    <td>[% qty_total %]</td>
251
                    <th>[% total_est_gsti %]</th>
262
                    <td>[% total_est_gsti %]</td>
252
                </tr>
263
                </tr>
253
                [% ELSE %]
264
                [% ELSE %]td
254
                <tr>
265
                <tr>
255
                    <th>Total ([% currency %])</th>
266
                    <th scope="row">Total ([% currency %])</th>
256
                    <th>[% total_rrp_gsti %]</th>
267
                    <td>[% total_rrp_gsti %]</td>
257
                    <th>&nbsp;</th>
268
                    <td>&nbsp;</td>
258
                    <th>[% qty_total %]</th>
269
                    <td>[% qty_total %]</td>
259
                    <th>[% total_est_gsti %]</th>
270
                    <td>[% total_est_gsti %]</td>
260
                </tr>
271
                </tr>
261
                [% END %]
272
                [% END %]
262
                </tfoot>
273
                </tfoot>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt (-193 / +151 lines)
Lines 1-16 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Basket Grouping for [% booksellername %]</title>
2
<title>Koha &rsaquo; Basket Grouping for [% booksellername |html %]</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
4
<script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
5
<link rel="stylesheet" type="text/css" href="[% yuipath %]/fonts/fonts-min.css" />
5
[% IF ( grouping ) %]
6
<script type="text/javascript" src="[% yuipath %]/yahoo-dom-event/yahoo-dom-event.js"></script>
6
<script type="text/javascript" src="[% yuipath %]/yahoo-dom-event/yahoo-dom-event.js"></script>
7
<script type="text/javascript" src="[% yuipath %]/animation/animation-min.js"></script>
7
<script type="text/javascript" src="[% yuipath %]/animation/animation-min.js"></script>
8
<script type="text/javascript" src="[% yuipath %]/dragdrop/dragdrop-min.js"></script>
8
<script type="text/javascript" src="[% yuipath %]/dragdrop/dragdrop-min.js"></script>
9
<script type="text/javascript" src="[% yuipath %]/element/element-min.js"></script>
9
<script type="text/javascript" src="[% yuipath %]/element/element-min.js"></script>
10
<script type="text/javascript" src="[% yuipath %]/tabview/tabview-min.js"></script>
11
<script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
12
<link rel="stylesheet" type="text/css" href="[% yuipath %]/tabview/assets/skins/sam/tabview.css" /> 
13
 
14
<style type="text/css">
10
<style type="text/css">
15
/*margin and padding on body element
11
/*margin and padding on body element
16
  can introduce errors in determining
12
  can introduce errors in determining
Lines 34-56 body { Link Here
34
}
30
}
35
31
36
div.workarea_alt { padding: 5px; float:left; width: 95%;}
32
div.workarea_alt { padding: 5px; float:left; width: 95%;}
37
div.closed { background-color="pink"; padding:10px; float:left; width: 45%;}
33
div.closed { background-color: pink; padding:10px; float:left; width: 45%;}
38
39
ul.closed {
40
    position: relative;
41
    background: grey;
42
    padding-bottom:10;
43
    border: 1px solid gray;
44
    list-style: none;
45
    margin:0;
46
    padding: 5px;
47
}
48
34
49
ul.draglist {
35
ul.draglist {
50
    position: relative;
36
    position: relative;
51
    background: #f7f7f7;
37
    background: #EEE;
52
    padding-bottom:10;
38
    padding-bottom:10;
53
    border: 1px solid gray;
39
    border: 1px inset gray;
54
    list-style: none;
40
    list-style: none;
55
    margin:0;
41
    margin:0;
56
    padding: 5px;
42
    padding: 5px;
Lines 93-120 fieldset.various li { Link Here
93
    clear: none;
79
    clear: none;
94
}
80
}
95
81
96
.basketgroup {
97
	margin-top: 10px;
98
	font-size: 1.2em;
99
	font-weight: bold;
100
	list-style: none;
101
	background-color: #D8D4E2;
102
	display: block;
103
}
104
.basketgroup li{
105
	font-size: 0.5em;
106
	list-style: none;
107
	display: inline;
108
}
109
110
</style>
82
</style>
111
83
 [% END %]
112
<script type="text/javascript">
84
<script type="text/javascript">
113
//<![CDATA[
85
//<![CDATA[
114
	YAHOO.util.Event.onDOMReady(DDApp.init, DDApp, true);
86
	YAHOO.util.Event.onDOMReady(DDApp.init, DDApp, true);
115
	var tabView = new YAHOO.widget.TabView('bgtabs');
116
//]]>
117
118
87
119
function submitForm(form) {
88
function submitForm(form) {
120
    if (form.close.checked == true) {
89
    if (form.close.checked == true) {
Lines 125-194 function submitForm(form) { Link Here
125
	form.appendChild(input);
94
	form.appendChild(input);
126
    }
95
    }
127
}
96
}
97
// prepare DOM for YUI Toolbar
128
98
99
 $(document).ready(function() {
100
  //  $("#toolbar").empty();
101
    yuiToolbar();
102
    $("#basket_groups > ul").tabs();
103
 });
104
105
// YUI Toolbar Functions
106
107
function yuiToolbar() {
108
	var booksellermenu = [
109
		{ text: _("Vendor"), url: "/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]" },
110
		{ text: _("Edit vendor"), url: "/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid %]"},
111
	]
112
	var ordersbutton = [
113
	         { text: _("Manage orders"), url: "/cgi-bin/koha/acqui/booksellers.pl?supplierid=[% booksellerid %]" },
114
	         { text: _("Edit uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&owner=1" },
115
	]
116
	new YAHOO.widget.Button("newbasketgroup");
117
    new YAHOO.widget.Button({
118
        type: "menu",
119
        label: _("Vendor"),
120
        name: "booksellerbutton",
121
        menu: booksellermenu,
122
        container: "toolbar"
123
    });
124
125
    new YAHOO.widget.Button({
126
        type: "menu",
127
        label: _("Orders"),
128
        name: "ordersbutton",
129
        menu: ordersbutton,
130
        container: "toolbar"
131
    });
132
}
133
//]]>
129
</script>
134
</script>
130
</head>
135
</head>
131
<body>
136
<body>
132
[% INCLUDE 'header.inc' %]
137
[% INCLUDE 'header.inc' %]
133
[% INCLUDE 'acquisitions-search.inc' %]
138
[% INCLUDE 'acquisitions-search.inc' %]
134
139
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>
140
<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 |html %]</a> &rsaquo; Basket Grouping</div>
136
141
137
<div id="doc" class="yui-t7">
142
<div id="doc" class="yui-t7">
138
            
143
            
139
        <div class="yui-b"> 
144
        <div class="yui-b"> 
140
        	<div id="toolbar">
145
        	<div id="toolbar">
141
				<script type="text/javascript">
142
					//<![CDATA[
143
				
144
					// prepare DOM for YUI Toolbar
145
				
146
					 $(document).ready(function() {
147
					  //  $("#toolbar").empty();
148
					    yuiToolbar();
149
					 });
150
				
151
					// YUI Toolbar Functions
152
				
153
					function yuiToolbar() {
154
						var booksellermenu = [
155
							{ text: _("Vendor"), url: "/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]" },
156
							{ text: _("Edit vendor"), url: "/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid %]"},
157
						]
158
						var ordersbutton = [
159
						         { text: _("Manage orders"), url: "/cgi-bin/koha/acqui/booksellers.pl?supplierid=[% booksellerid %]" },
160
						         { text: _("Edit uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&owner=1" },
161
						]
162
						new YAHOO.widget.Button("newbasketgroup");
163
					    new YAHOO.widget.Button({
164
					        type: "menu",
165
					        label: _("Vendor"),
166
					        name: "booksellerbutton",
167
					        menu: booksellermenu,
168
					        container: "toolbar"
169
					    });
170
					    
171
					    new YAHOO.widget.Button({
172
					        type: "menu",
173
					        label: _("Orders"),
174
					        name: "ordersbutton",
175
					        menu: ordersbutton,
176
					        container: "toolbar"
177
					    });
178
					}
179
					//]]>
180
				</script>
181
				<a href="?op=add&amp;booksellerid=[% booksellerid %]" name="newbasketgroup" id="newbasketgroup">New Basket Group</a>
146
				<a href="?op=add&amp;booksellerid=[% booksellerid %]" name="newbasketgroup" id="newbasketgroup">New Basket Group</a>
182
			</div>
147
			</div>
183
			<h1>Basket Grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]">[% booksellername %]</a></h1>
148
			<h1>Basket Grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% booksellerid %]">[% booksellername |html %]</a></h1>
184
		</div>
149
		</div>
185
[% IF ( grouping ) %]
150
[% IF ( grouping ) %]
186
	<div id="bd"> 
151
	<div id="bd"> 
187
	    <div class="yui-g"> 
152
	    <div class="yui-g"> 
188
		    <div class="yui-u grouping"> 
153
		    <div class="yui-u">
189
154
190
				<form action="[% scriptname %]" method="post" name="basketgroups" id="basketgroups">
155
				<form action="[% scriptname %]" method="post" name="basketgroups" id="basketgroups">
191
	            <div id="groups">
156
	            <div id="groups">
157
	            <fieldset class="brief">
192
	            <div class="workarea_alt" >
158
	            <div class="workarea_alt" >
193
	            <h3>Ungrouped Baskets</h3>
159
	            <h3>Ungrouped Baskets</h3>
194
	            <ul id="ungrouped" class="draglist_alt">
160
	            <ul id="ungrouped" class="draglist_alt">
Lines 209-214 function submitForm(form) { Link Here
209
	                [% END %]
175
	                [% END %]
210
	                </ul>
176
	                </ul>
211
	            </div>
177
	            </div>
178
	            </fieldset>
212
	            </div>
179
	            </div>
213
	            </form>
180
	            </form>
214
181
Lines 216-246 function submitForm(form) { Link Here
216
			
183
			
217
		    <div class="yui-u first"> 
184
		    <div class="yui-u first"> 
218
		    	<form action="" method="post" id="groupingform" onsubmit="return submitForm(this)">
185
		    	<form action="" method="post" id="groupingform" onsubmit="return submitForm(this)">
219
					<fieldset id="various" class='various' >
186
					<fieldset id="various" class="brief">
220
						<h3><label for="basketgroupname">Basket Group Name:</label></h3>
187
					<ol>
221
						<input type="text" name="basketgroupname" id="basketgroupname" value="[% name %]" />
188
						<li><label for="basketgroupname">Basket Group Name:</label>
222
						<h3><label for="billingplace">Billing Place:</label></h3>
189
							<input type="text" name="basketgroupname" id="basketgroupname" value="[% name %]" /></li>
223
						<select name="billingplace" id="billingplace">
190
						<li><label for="billingplace">Billing Place:</label>
224
							[% FOREACH billingplaceloo IN billingplaceloop %]
191
							<select name="billingplace" id="billingplace" style="width:13em;">
225
                                [% IF ( billingplaceloo.selected ) %]<option value="[% billingplaceloo.value %]" selected="selected">[% billingplaceloo.branchname %]</option>
192
								[% FOREACH billingplaceloo IN billingplaceloop %]
226
                                [% ELSE %]<option value="[% billingplaceloo.value %]">[% billingplaceloo.branchname %]</option>[% END%]
193
	                                [% IF ( billingplaceloo.selected ) %]<option value="[% billingplaceloo.value %]" selected="selected">[% billingplaceloo.branchname %]</option>
227
							[% END %]
194
	                                [% ELSE %]<option value="[% billingplaceloo.value %]">[% billingplaceloo.branchname %]</option>[% END%]
228
						</select>
195
								[% END %]
229
						<h3><label for="deliveryplace">Delivery Place:</label></h3>
196
												</select></li>
230
						<select name="deliveryplace" id="deliveryplace">
197
						<li><label for="deliveryplace">Delivery Place:</label>
231
							<option value="">--</option>
198
							<select name="deliveryplace" id="deliveryplace" style="width:13em;">
232
							[% FOREACH deliveryplaceloo IN deliveryplaceloop %]
199
								<option value="">--</option>
233
                                [% IF ( deliveryplaceloo.selected ) %]<option value="[% deliveryplaceloo.value %]" selected="selected">[% deliveryplaceloo.branchname %]</option>
200
								[% FOREACH deliveryplaceloo IN deliveryplaceloop %]
234
                                [% ELSE %]<option value="[% deliveryplaceloo.value %]">[% deliveryplaceloo.branchname %]</option>[% END %]
201
	                                [% IF ( deliveryplaceloo.selected ) %]<option value="[% deliveryplaceloo.value %]" selected="selected">[% deliveryplaceloo.branchname %]</option>
235
							[% END %]
202
	                                [% ELSE %]<option value="[% deliveryplaceloo.value %]">[% deliveryplaceloo.branchname %]</option>[% END %]
236
						</select>
203
								[% END %]
237
                        <p>or</p>
204
												</select></li>
238
                        <h3><label for="freedeliveryplace">Delivery Place:</label></h3>
205
                        <li><p>or</p></li>
239
                        <textarea cols="26" name="freedeliveryplace" id="freedeliveryplace">[% freedeliveryplace %]</textarea>
206
                        <li><label for="freedeliveryplace">Delivery Place:</label>
240
						<h3><label for="deliverycomment">Delivery comment:</label></h3>
207
                            <textarea cols="26" rows="3" name="freedeliveryplace" id="freedeliveryplace">[% freedeliveryplace %]</textarea></li>
241
						<textarea cols="26" name="deliverycomment" id="deliverycomment">[% deliverycomment %]</textarea>
208
						<li><label for="deliverycomment">Delivery comment:</label>
242
		         		<div class="workarea">
209
							<textarea cols="26" rows="3" name="deliverycomment" id="deliverycomment">[% deliverycomment %]</textarea>
243
							<h3>Grouping:</h3>
210
						</li>
211
						<li><span class="label">Baskets in this group:</span>
244
							<ul class="draglist" id="bg">
212
							<ul class="draglist" id="bg">
245
								[% FOREACH selectedbasket IN selectedbaskets %]
213
								[% FOREACH selectedbasket IN selectedbaskets %]
246
				                    <li class="grouped" id="b-[% selectedbasket.basketno %]" >
214
				                    <li class="grouped" id="b-[% selectedbasket.basketno %]" >
Lines 255-359 function submitForm(form) { Link Here
255
				                        <input type="hidden" class="basket" name="basket" value="[% selectedbasket.basketno %]" />
223
				                        <input type="hidden" class="basket" name="basket" value="[% selectedbasket.basketno %]" />
256
				                    </li>
224
				                    </li>
257
			                    [% END %]
225
			                    [% END %]
258
259
							</ul>
226
							</ul>
260
						</div>
227
						</li>
261
						<div><input type="checkbox" name="close"> Close</input></div>
228
						<li><label><input type="checkbox" id="close" name="close" /> Close basket group</label></li>
262
		                <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
229
						</ol>
230
					</fieldset>
231
232
	                <fieldset class="action"><input type="hidden" name="booksellerid" value="[% booksellerid %]" />
263
		                [% IF ( basketgroupid ) %]
233
		                [% IF ( basketgroupid ) %]
264
		                	<input type="hidden" name="basketgroupid" value="[% basketgroupid %]" />
234
		                	<input type="hidden" name="basketgroupid" value="[% basketgroupid %]" />
265
		                [% END %]
235
		                [% END %]
266
		                <input type="hidden" name="op" value="attachbasket" />
236
		                <input type="hidden" name="op" value="attachbasket" />
267
		                <input type="submit" value="Save" />
237
		                <input type="submit" value="Save" />
268
					</fieldset>
238
	                </fieldset>
269
				</form>
239
				</form>
270
			</div> 
240
			</div> 
271
		</div> 	 
241
		</div> 	 
272
    </div> 
242
    </div> 
273
[% ELSE %]
243
[% ELSE %]
274
	<div class="yui-g"> 
244
	<div class="yui-g">
275
		<div id="bgtabs" class="yui-navset">
245
	<div id="basket_groups" class="toptabs">
276
		    <ul class="yui-nav">
246
	<ul class="ui-tabs-nav">
277
                [% UNLESS ( closed ) %]<li class="selected"><a href="#opened"><em>Opened</em></a></li>
247
        [% UNLESS ( closed ) %]<li class="ui-tabs-selected"><a href="#opened">Open</a></li>
278
                [% ELSE%]<li><a href="#opened"><em>Opened</em></a></li>[% END %]
248
        [% ELSE%]<li><a href="#opened">Open</a></li>[% END %]
279
                [% IF ( closed ) %]<li class="selected"><a href="#closed"><em>Closed</em></a></li>
249
        [% IF ( closed ) %]<li class="ui-tabs-selected"><a href="#closed">Closed</a></li>
280
                [% ELSE %]<li><a href="#closed"><em>Closed</em></a></li>[% END %]
250
        [% ELSE %]<li><a href="#closed">Closed</a></li>[% END %]
281
		    </ul>            
251
    </ul>
282
		    <div class="yui-content">
252
    <div id="opened">
283
		        <div id="opened">
253
		<table>
284
		        	<ul>
254
			<thead>
285
		        		[% FOREACH basketgroup IN basketgroups %]
255
				<tr>
286
		        			[% UNLESS ( basketgroup.closed ) %]
256
					<th>Basket Group</th><th colspan="3">Action</th>
287
		        		<li class="basketgroup">
257
				</tr>
288
		        			[% IF ( basketgroup.name ) %]
258
			</thead>
289
		        				[% basketgroup.name %]
259
			<tbody>
290
		        			[% ELSE %]
260
			[% FOREACH basketgroup IN basketgroups %]
291
		        				Basket Group n°[% basketgroup.id %]
261
				[% UNLESS ( basketgroup.closed ) %]
292
		        			[% END %]
262
					<tr>
293
   			       			<ul>
263
						<td><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% basketgroup.booksellerid %]&amp;basketgroupid=[% basketgroup.id %]">[% IF ( basketgroup.name ) %]
294
		        				<li>
264
													[% basketgroup.name %]
295
		        					<span class="yui-button yui-link-button">
265
												[% ELSE %]
296
		        						<span class="first-child">
266
													Basket group no. [% basketgroup.id %]
297
		        							<a href="javascript:closeandprint([% basketgroup.id %])" class="yui-button yui-link-button">Close & Print</a>
267
												[% END %]</a>
298
	        							</span>
268
						</td>
299
        							</span>
269
							<td>
300
	        					</li>
270
								<input type="button" onclick="closeandprint([% basketgroup.id %])" value="Close and Print" />
301
		        				<li>
271
							</td>
302
		        					<span class="yui-button yui-link-button">
272
							<td>
303
		        						<span class="first-child">
273
								<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Edit" /></form>
304
		        							<a href="?op=add&amp;booksellerid=[% basketgroup.booksellerid %]&amp;basketgroupid=[% basketgroup.id %]" class="yui-button yui-link-button" >Edit</a>
274
							</td>
305
	        							</span>
275
							<td>
306
        							</span>
276
								<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Delete" /></form>
307
       							</li>
277
							</td>
308
       							<li>
278
					</tr>
309
		        					<span class="yui-button yui-link-button">
279
				[% END %]
310
		        						<span class="first-child">
280
			[% END %]
311
		        							<a href="?op=delete&amp;booksellerid=[% basketgroup.booksellerid %]&amp;basketgroupid=[% basketgroup.id %]" class="yui-button yui-link-button" >Delete</a>
281
			</tbody>
312
	        							</span>
282
		</table>
313
        							</span>
283
    </div>
314
       							</li>
284
    <div id="closed">
315
       							
285
		<table>
316
		        			</ul>
286
			<thead>
317
		        		</li>
287
				<tr>
318
		        			[% END %]
288
					<th>Basket Group</th><th colspan="3">Action</th>
319
		        		[% END %]
289
				</tr>
320
		        	</ul>
290
			</thead>
321
		        </div>
291
			<tbody>
322
		        <div id="closed">
292
				[% FOREACH basketgroup IN basketgroups %]
323
		        	<ul>
293
				[% IF ( basketgroup.closed ) %]
324
		        		[% FOREACH basketgroup IN basketgroups %]
294
				<tr>
325
			        		[% IF ( basketgroup.closed ) %]
295
				<td>
326
			        		<li class="basketgroup">
296
					<a href="/cgi-bin/koha/acqui/basketgroup.pl?op=reopen&amp;booksellerid=[% basketgroup.booksellerid %]&amp;basketgroupid[% basketgroup.id %]">[% IF ( basketgroup.name ) %]
327
			        			[% IF ( basketgroup.name ) %]
297
											[% basketgroup.name %]
328
			        				[% basketgroup.name %]
298
										[% ELSE %]
329
			        			[% ELSE %]
299
											Basket group no. [% basketgroup.id %]
330
			        				Basket Group n°[% basketgroup.id %]
300
										[% END %]</a>
331
			        			[% END %]
301
					</td>
332
			        			<ul>
302
					<td>
333
			        				<li>
303
							<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Reopen" /></form>
334
										<span class="yui-button yui-link-button">
304
						</td>
335
			        						<span class="first-child">
305
						<td>
336
		        								<a href="/cgi-bin/koha/acqui/basketgroup.pl?op=reopen&amp;booksellerid=[% basketgroup.booksellerid %]&amp;basketgroupid=[% basketgroup.id %]" class="yui-button yui-link-button">Reopen</a>
306
							<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Print" /></form>
337
	        								</span>
307
						</td>
338
        								</span>
308
				</tr>
339
			        				</li>
309
				[% END %]
340
			        				<li>
310
				[% END %]
341
										<span class="yui-button yui-link-button">
311
				</tbody>
342
			        						<span class="first-child">
312
		        </table>
343
		        								<a href="/cgi-bin/koha/acqui/basketgroup.pl?op=print&amp;basketgroupid=[% basketgroup.id %]" class="yui-button yui-link-button">Print</a>
344
	        								</span>
345
        								</span>
346
			        				</li>
347
			        			</ul>
348
			        		</li>
349
			        		[% END %]
350
		        		[% END %]
351
		        	</ul>
352
		        </div>
313
		        </div>
353
		    </div>
314
		    </div>
354
		</div>
315
		    </div>
355
		
356
	</div> 
357
[% END %]
316
[% END %]
358
317
359
[% INCLUDE 'intranet-bottom.inc' %]
318
[% INCLUDE 'intranet-bottom.inc' %]
360
- 

Return to bug 6818