Attachment #78193 for bug #20690

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





<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 | html %]">[% name | html %]</a> &rsaquo; Receive items from : [% name | html %] [% IF ( invoice ) %][[% invoice | html %]][% END %] (order #[% ordernumber | html %])</div>

<div class="main container-fluid">
    <div class="row">
        <div class="col-sm-10 col-sm-push-2">
            <main>
	<div class="yui-b">

<h1>Receive items from : [% name | html %] [% IF ( invoice ) %][[% invoice | html %]] [% END %] (order #[% ordernumber | html %])</h1>

[% IF ( count ) %]
    <form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post" onsubmit="return Check(this);">
<div class="row">
<div class="col-sm-6">
    <div class="error" style="display:none"></div>

    <fieldset class="rows">

    <input type="hidden" name="ordernumber" value="[% ordernumber | html %]" />
    <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
	</div>
    <div class="col-sm-6">
    <fieldset class="rows">
    <legend>Accounting details</legend>
        <ol>

    </fieldset>

</div>
</div><div class="row"><fieldset class="action">
        <input type="submit"  value="Save" class="button" accesskey="w" />
        <a class="cancel" href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | html %]&sticky_filters=1">Cancel</a>
</fieldset></div>    </form>

    This ordernumber does not exist.
[% END %]

</main>
</div> <!-- /.col-sm-10.col-sm-push-2 -->
<div class="yui-b">
[% INCLUDE 'acquisitions-menu.inc' %]
</div>
</div>

<div class="col-sm-2 col-sm-pull-10">
    <aside>
        [% INCLUDE 'acquisitions-menu.inc' %]
    </aside>
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
</div> <!-- /.row -->
[% MACRO jsinclude BLOCK %]
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
[% INCLUDE 'calendar.inc' %]

    [% Asset.js("js/additem.js") | $raw %]
    [% Asset.js("js/cataloging.js") | $raw %]
    [% Asset.js("js/prevent_submit.js") | $raw %]
    <script>
        function Check(form) {
            [% IF (AcqCreateItemReceiving) %]
                var total_errors = CheckMandatorySubfields(form);

Lines 28-38 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-12 / +14 lines)
28	[% END %]	28	[% END %]
29	</div>	29	</div>
30		30
31	<div id="doc3" class="yui-t2">
32		31
33	<div id="bd">	32	<div class="main container-fluid">
34	<div id="yui-main">	33	<div class="row">
35	<div class="yui-b">	34	<div class="col-sm-10 col-sm-push-2">
		35	<main>
		36
36	[% IF ( receive_error ) %]	37	[% IF ( receive_error ) %]
37	<div class="dialog alert">	38	<div class="dialog alert">
38	<h3>Error adding items:</h3>	39	<h3>Error adding items:</h3>
Lines 387-397 Link Here
387		388
388	[% END %]	389	[% END %]
389		390
390	</div>	391	</main>
391	</div>	392	</div> <!-- /.col-sm-10.col-sm-push-2 -->
392		393
		394	<div class="col-sm-2 col-sm-pull-10">
		395	<aside>
393		396
394	<div class="yui-b">
395	<form action="/cgi-bin/koha/acqui/parcel.pl" id="filterform" method="post">	397	<form action="/cgi-bin/koha/acqui/parcel.pl" id="filterform" method="post">
396	<fieldset class="brief">	398	<fieldset class="brief">
397	<h4>Filter</h4>	399	<h4>Filter</h4>
Lines 428-444 Link Here
428	</fieldset>	430	</fieldset>
429	</form>	431	</form>
430	[% INCLUDE 'acquisitions-menu.inc' %]	432	[% INCLUDE 'acquisitions-menu.inc' %]
431	</div>	433	</aside>
432	</div>	434	</div> <!-- /.col-sm-2.col-sm-pull-10 -->
		435	</div> <!-- /.row -->
433		436
434	[% MACRO jsinclude BLOCK %]	437	[% MACRO jsinclude BLOCK %]
435	[% Asset.js("js/acquisitions-menu.js") \| $raw %]	438	[% Asset.js("js/acquisitions-menu.js") \| $raw %]
436	[% INCLUDE 'datatables.inc' %]	439	[% INCLUDE 'datatables.inc' %]
437	[% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") \| $raw %]	440	[% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") \| $raw %]
438	[% Asset.js("lib/jquery/plugins/jquery.cookie.min.js") \| $raw %]	441	[% Asset.js("lib/jquery/plugins/jquery.cookie.min.js") \| $raw %]
439	<style type="text/css">#dataPreview { width : 80%; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } }</style>	442	<style>#dataPreview { width : 80%; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } }</style>
440	<script type="text/javascript">	443	<script>
441
442	dt_overwrite_html_sorting_localeCompare();	444	dt_overwrite_html_sorting_localeCompare();
443	var sticky_filters = [% sticky_filters \| html %];	445	var sticky_filters = [% sticky_filters \| html %];
444		446

Lines 14-24 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt (-12 / +20 lines)
14		14
15	<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 \| html %]">[% name \| html %]</a> &rsaquo; Receive shipment from vendor [% name \| html %]</div>	15	<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 \| html %]">[% name \| html %]</a> &rsaquo; Receive shipment from vendor [% name \| html %]</div>
16		16
17	[% IF ( count ) %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]	17	<div class="main container-fluid">
18		18	<div class="row">
19	<div id="bd">	19	[% IF ( count ) %]
20	<div id="yui-main">	20	<div class="col-sm-10 col-sm-push-2">
21	<div class="yui-b">	21	[% ELSE %]
		22	<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
		23	[% END %]
		24	<main>
22		25
23	[% IF ( error_failed_to_create_invoice ) %]	26	[% IF ( error_failed_to_create_invoice ) %]
24	<div id="error" class="dialog alert">	27	<div id="error" class="dialog alert">
Lines 172-181 Link Here
172	<fieldset class="action"><input type="submit" class="button" value="Next" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid \| html %]">Cancel</a></fieldset>	175	<fieldset class="action"><input type="submit" class="button" value="Next" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid \| html %]">Cancel</a></fieldset>
173	</form>	176	</form>
174	</div>	177	</div>
175	</div>	178	</main>
176	</div>	179	</div> <!-- /.col-sm-10.col-sm-push-2 -->
177	<div class="yui-b">	180
178	[% IF ( count ) %]<form method="get" action="parcels.pl">	181	[% IF ( count ) %]
		182	<div class="col-sm-2 col-sm-pull-10">
		183	<aside>
		184	<form method="get" action="parcels.pl">
179	<fieldset class="brief">	185	<fieldset class="brief">
180	<h4>Filter</h4>	186	<h4>Filter</h4>
181	<ol>	187	<ol>
Lines 198-206 Link Here
198	</ol>	204	</ol>
199	<fieldset class="action"><input type="submit" class="button" value="Filter" /> <a href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid \| html %]">Clear</a></fieldset>	205	<fieldset class="action"><input type="submit" class="button" value="Filter" /> <a href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid \| html %]">Clear</a></fieldset>
200	</fieldset>	206	</fieldset>
201	</form>[% END %]	207	</form>
202	</div>	208	</aside>
203	</div>	209	</div> <!-- /.col-sm-2.col-sm-pull-10 -->
		210	[% END %]
		211	</div> <!-- /.row -->
204		212
205	[% MACRO jsinclude BLOCK %]	213	[% MACRO jsinclude BLOCK %]
206	[% Asset.js("js/acquisitions-menu.js") \| $raw %]	214	[% Asset.js("js/acquisitions-menu.js") \| $raw %]





<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; Spent - [% fund_code | html %]</div>

<div class="main container-fluid">
    <div class="row">
        <div class="col-sm-10 col-sm-push-2">
            <main>
        <div class="yui-b">

<h1>Fund: [% fund_code | html %]</h1>
<h2>Spent</h2>


    <tfoot>
        [% IF shipmentcosts.size || ( adjustments && adjustments.count > 0 ) %]
            <tr>
                <td colspan="9"> Sub total </td>
                <td class="data"> [% subtotal | html %] </td>
            </tr>

    </tfoot>
</table>

</main>
</div> <!-- /.col-sm-10.col-sm-push-2 -->

<div class="col-sm-2 col-sm-pull-10">
    <aside>
        [% INCLUDE 'acquisitions-menu.inc' %]
    </aside>
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
</div> <!-- /.row -->

[% MACRO jsinclude BLOCK %]
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
    [% INCLUDE 'datatables.inc' %]
    <script>
        $(document).ready(function() {
            $("#spent").dataTable($.extend(true, {}, dataTablesDefaults, {
                "aoColumnDefs": [

Lines 100-110 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt (-19 / +19 lines)
100		100
101	<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 \| html %]">[% name \| html %]</a> &rsaquo; Update: [% name \| html %][% ELSE %]Add vendor[% END %] [% ELSE %][% name \| html %][% END %]</div>	101	<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 \| html %]">[% name \| html %]</a> &rsaquo; Update: [% name \| html %][% ELSE %]Add vendor[% END %] [% ELSE %][% name \| html %][% END %]</div>
102		102
103	<div id="doc3" class="yui-t2">	103	<div class="main container-fluid">
		104	<div class="row">
		105	<div class="col-sm-10 col-sm-push-2">
		106	<main>
104		107
105	<div id="bd">
106	<div id="yui-main">
107	<div class="yui-b">
108	[% IF ( enter ) %]	108	[% IF ( enter ) %]
109	[% IF ( booksellerid ) %]	109	[% IF ( booksellerid ) %]
110	<h1>Update: [% name \| html %]</h1>	110	<h1>Update: [% name \| html %]</h1>
Lines 115-121 Link Here
115	[% UNLESS ( enter ) %][% INCLUDE 'acquisitions-toolbar.inc' %][% END %]	115	[% UNLESS ( enter ) %][% INCLUDE 'acquisitions-toolbar.inc' %][% END %]
116	[% IF ( enter ) %]	116	[% IF ( enter ) %]
117	<form action="updatesupplier.pl" name="updatesupplier" class="validated" method="post">	117	<form action="updatesupplier.pl" name="updatesupplier" class="validated" method="post">
118	<div class="yui-g">
119	<input type="hidden" name="booksellerid" value="[% booksellerid \| html %]" />	118	<input type="hidden" name="booksellerid" value="[% booksellerid \| html %]" />
120	<fieldset class="rows">	119	<fieldset class="rows">
121	<legend>Company details</legend>	120	<legend>Company details</legend>
Lines 148-155 Link Here
148	[% END %]	147	[% END %]
149	<button id="add-contact" class="btn btn-default"><i class="fa fa-plus"></i> Add another contact</button>	148	<button id="add-contact" class="btn btn-default"><i class="fa fa-plus"></i> Add another contact</button>
150	</fieldset>	149	</fieldset>
151	</div>	150
152	<div class="yui-g">
153	<fieldset class="rows">	151	<fieldset class="rows">
154	<legend>Ordering information</legend>	152	<legend>Ordering information</legend>
155	<ol class="radio"><li><label for="activestatus" class="radio">Vendor is:</label>	153	<ol class="radio"><li><label for="activestatus" class="radio">Vendor is:</label>
Lines 244-255 Link Here
244	<fieldset class="action"><input type="submit" value="Save" /> [% IF ( booksellerid ) %]	242	<fieldset class="action"><input type="submit" value="Save" /> [% IF ( booksellerid ) %]
245	<a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid \| html %]">[% ELSE %]<a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">	243	<a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid \| html %]">[% ELSE %]<a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
246	[% END %]Cancel</a></fieldset>	244	[% END %]Cancel</a></fieldset>
247	</div>
248	</form>	245	</form>
249	[% ELSE %]	246	[% ELSE %]
250	<h1>[% name \| html %]</h1>	247	<h1>[% name \| html %]</h1>
251	<div class="yui-g">	248	<div class="row">
252	<div id="supplier-company-details" class="yui-u first">	249	<div id="supplier-company-details" class="col-sm-6">
253	<h2>Vendor details</h2>	250	<h2>Vendor details</h2>
254	<p><span class="label">Company name: </span>[% name \| html %]</p>	251	<p><span class="label">Company name: </span>[% name \| html %]</p>
255	<p><span class="label">Postal address: </span>[% postal \| html %]</p>	252	<p><span class="label">Postal address: </span>[% postal \| html %]</p>
Lines 292-298 Link Here
292	</div>	289	</div>
293	</div>	290	</div>
294		291
295	<div class="supplier-contact-details yui-u">	292	<div class="supplier-contact-details col-sm-6">
296	<h2>Contact</h2>	293	<h2>Contact</h2>
297	[% FOREACH contact IN contacts %]	294	[% FOREACH contact IN contacts %]
298	[% INCLUDE show_contact %]	295	[% INCLUDE show_contact %]
Lines 311-317 Link Here
311	</div>	308	</div>
312		309
313	[% IF ( contracts ) %]	310	[% IF ( contracts ) %]
314	<div id="supplier-contracts" class="yui-g">	311	<div id="supplier-contracts">
315	<h2>Contract(s)</h2>	312	<h2>Contract(s)</h2>
316	<table id="contractst">	313	<table id="contractst">
317	<thead>	314	<thead>
Lines 345-361 Link Here
345		342
346	[% END %]	343	[% END %]
347		344
348	</div>	345	</main>
349	</div>	346	</div> <!-- /.col-sm-10.col-sm-push-2 -->
350	<div class="yui-b">	347
351	[% INCLUDE 'vendor-menu.inc' %]	348	<div class="col-sm-2 col-sm-pull-10">
352	</div>	349	<aside>
353	</div>	350	[% INCLUDE 'vendor-menu.inc' %]
		351	</aside>
		352	</div> <!-- /.col-sm-2.col-sm-pull-10 -->
		353	</div> <!-- /.row -->
354		354
355	[% MACRO jsinclude BLOCK %]	355	[% MACRO jsinclude BLOCK %]
356	[% Asset.js("js/acquisitions-menu.js") \| $raw %]	356	[% Asset.js("js/acquisitions-menu.js") \| $raw %]
357	[% INCLUDE 'datatables.inc' %]	357	[% INCLUDE 'datatables.inc' %]
358	<script type="text/javascript">	358	<script>
359	function confirm_deletion() {	359	function confirm_deletion() {
360	if (confirm(_("Confirm deletion of this vendor ?"))) {	360	if (confirm(_("Confirm deletion of this vendor ?"))) {
361	window.location="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid \| html %]&op=delete";	361	window.location="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid \| html %]&op=delete";





<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 | html %]">[% booksellername | html %]</a> &rsaquo; Uncertain prices for vendor [% booksellername | html %][% ELSE %]Uncertain prices[% END %]</div>

<div class="main container-fluid">
    <div class="row">
        <div class="col-sm-10 col-sm-push-2">
            <main>
    <div class="yui-b">

[% INCLUDE 'acquisitions-toolbar.inc' %]
        [% IF ( validate ) %]

	</form>
	[% END %]

</main>
</div> <!-- /.col-sm-10.col-sm-push-2 -->

<div class="col-sm-2 col-sm-pull-10">
    <aside>
        [% INCLUDE 'vendor-menu.inc' %]
    </aside>
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
</div> <!-- /.row -->

[% MACRO jsinclude BLOCK %]
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
    [% INCLUDE 'datatables.inc' %]
    <script>
        $(document).ready(function() {
            var uncertainpricet = $("#uncertainpricet").dataTable($.extend(true, {}, dataTablesDefaults, {
                "aoColumnDefs": [
- 

Return to bug 20690