Attachment #119842 for bug #27631

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

Lines 184-190 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-1 / +1 lines)
184	[% END %]	184	[% END %]
185		185
186	[% IF ( NO_BOOKSELLER ) %]	186	[% IF ( NO_BOOKSELLER ) %]
187	<h2>Vendor not found</h2>	187	<h1>Vendor not found</h1>
188	[% ELSE %]	188	[% ELSE %]
189	[% IF ( delete_confirmed ) %]	189	[% IF ( delete_confirmed ) %]
190	<div class="dialog message">	190	<div class="dialog message">

Lines 39-44 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt (+1 lines)
39	<main>	39	<main>
40		40
41	[% INCLUDE 'acquisitions-toolbar.inc' %]	41	[% INCLUDE 'acquisitions-toolbar.inc' %]
		42	<h1>Search for vendor</h1>
42	[% UNLESS ( count == 1 ) %]	43	[% UNLESS ( count == 1 ) %]
43	[% UNLESS count %]	44	[% UNLESS count %]
44	<h1>Your search returned no results.</h1>	45	<h1>Your search returned no results.</h1>

Lines 32-38 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt (-1 / +1 lines)
32	[% UNLESS ( confirmcancel ) %]	32	[% UNLESS ( confirmcancel ) %]
33	<form method="post" action="">	33	<form method="post" action="">
34	<div class="dialog alert">	34	<div class="dialog alert">
35	<h3>Are you sure you want to cancel this order ([% ordernumber \| html %])</h3>	35	<h1>Are you sure you want to cancel this order ([% ordernumber \| html %])</h1>
36	<p>	36	<p>
37	[% IF (del_biblio) %]	37	[% IF (del_biblio) %]
38	Bibliographic record will be deleted too.	38	Bibliographic record will be deleted too.

Lines 50-59 Basket [% basket.basketno \| html %] &rsaquo; Duplicate existing orders Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt (-2 / +1 lines)
50	<div class="col-sm-10 col-sm-push-2">	50	<div class="col-sm-10 col-sm-push-2">
51	<main>	51	<main>
52		52
		53	<h1>Duplicate existing orders</h1>
53	[% INCLUDE 'blocking_errors.inc' %]	54	[% INCLUDE 'blocking_errors.inc' %]
54		55
55	<h2>Duplicate existing orders</h2>
56
57	[% IF op == 'search' \|\| op == 'select' %]	56	[% IF op == 'search' \|\| op == 'select' %]
58	<form action="/cgi-bin/koha/acqui/duplicate_orders.pl" method="post">	57	<form action="/cgi-bin/koha/acqui/duplicate_orders.pl" method="post">
59	<fieldset class="rows">	58	<fieldset class="rows">

Lines 26-32 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt (-1 / +1 lines)
26	<div class="col-sm-10 col-sm-push-2">	26	<div class="col-sm-10 col-sm-push-2">
27	<main>	27	<main>
28		28
29	<h2>Select the library account submitting the EDI order</h2>	29	<h1>Select the library account submitting the EDI order</h1>
30	<br />	30	<br />
31	<form action="/cgi-bin/koha/acqui/basket.pl" method="get">	31	<form action="/cgi-bin/koha/acqui/basket.pl" method="get">
32	<p>Select ordering library account: </p>	32	<p>Select ordering library account: </p>

Lines 25-30 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt (+1 lines)
25	<div class="row">	25	<div class="row">
26	<div class="col-sm-10 col-sm-push-2">	26	<div class="col-sm-10 col-sm-push-2">
27	<main>	27	<main>
		28	<h1>EDIFACT message display</h1>
28	<div id="edimsg">	29	<div id="edimsg">
29	[% IF no_message %]	30	[% IF no_message %]
30	<div class"dialog message">The requested message cannot be displayed</div>	31	<div class"dialog message">The requested message cannot be displayed</div>

Lines 45-50 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (+3 lines)
45	<div class="row">	45	<div class="row">
46	<div class="col-sm-10 col-sm-push-2">	46	<div class="col-sm-10 col-sm-push-2">
47	<main>	47	<main>
		48
		49	<h1>Order search</h1>
		50
48	[% IF !order_loop && search_done %]	51	[% IF !order_loop && search_done %]
49	<div class="dialog message">	52	<div class="dialog message">
50	Your search returned no results.	53	Your search returned no results.

Lines 37-43 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt (-1 / +1 lines)
37	<div class="col-sm-10 col-sm-push-2">	37	<div class="col-sm-10 col-sm-push-2">
38	<main>	38	<main>
39		39
40	<h2>Files for invoice: [% invoicenumber \| html %]</h2>	40	<h1>Files for invoice: [% invoicenumber \| html %]</h1>
41	<p><strong>Vendor: </strong><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid \| uri %]">[% suppliername \| html %]</a></p>	41	<p><strong>Vendor: </strong><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid \| uri %]">[% suppliername \| html %]</a></p>
42	<br />	42	<br />
43	[% IF errors %]	43	[% IF errors %]

Lines 40-45 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-1 / +1 lines)
40	<div class="col-sm-10 col-sm-push-2">	40	<div class="col-sm-10 col-sm-push-2">
41	<main>	41	<main>
42		42
		43	<h1>Invoice: [% invoicenumber \| html %]</h1>
43	[% INCLUDE 'blocking_errors.inc' %]	44	[% INCLUDE 'blocking_errors.inc' %]
44		45
45	[% IF ( modified ) %]	46	[% IF ( modified ) %]
Lines 47-53 Link Here
47	<p>Invoice has been modified</p>	48	<p>Invoice has been modified</p>
48	</div>	49	</div>
49	[% END %]	50	[% END %]
50	<h1>Invoice: [% invoicenumber \| html %]</h1>
51		51
52	<p>Vendor: <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid \| uri %]">[% suppliername \| html %]</a></p>	52	<p>Vendor: <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid \| uri %]">[% suppliername \| html %]</a></p>
53	<form action="/cgi-bin/koha/acqui/invoice.pl" method="post" class="validated">	53	<form action="/cgi-bin/koha/acqui/invoice.pl" method="post" class="validated">




        <div class="col-sm-10 col-sm-push-2">
            <main>

<h1>
    [% IF ( ordernumber ) %]
        Modify order line
    [% ELSE %]
        New order
    [% END %]
</h1>

<div class="dialog alert order_error" style="display:none"></div>


Lines 33-39 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt (-1 / +1 lines)
33	<main>	33	<main>
34		34
35	<div class="dialog alert">	35	<div class="dialog alert">
36	<h4>Duplicate warning</h4>	36	<h1>Duplicate warning</h1>
37	<p>You selected a record from an external source that matches an existing record in your catalog: [% IF ( BiblioDefaultViewmarc ) %]<a target="_blank" title="Open in new window" href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% biblionumber \|url %]">	37	<p>You selected a record from an external source that matches an existing record in your catalog: [% IF ( BiblioDefaultViewmarc ) %]<a target="_blank" title="Open in new window" href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% biblionumber \|url %]">
38	[% ELSIF ( BiblioDefaultViewlabeled_marc ) %]<a target="_blank" title="Open in new window" href="/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=[% biblionumber \|url %]">	38	[% ELSIF ( BiblioDefaultViewlabeled_marc ) %]<a target="_blank" title="Open in new window" href="/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=[% biblionumber \|url %]">
39	[% ELSIF ( BiblioDefaultViewisbd ) %]<a target="_blank" title="Open in new window" href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=[% biblionumber \|url %]">	39	[% ELSIF ( BiblioDefaultViewisbd ) %]<a target="_blank" title="Open in new window" href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=[% biblionumber \|url %]">

Lines 41-47 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt (-1 / +1 lines)
41	<div class="col-sm-10 col-sm-push-2">	41	<div class="col-sm-10 col-sm-push-2">
42	<main>	42	<main>
43		43
44	<h2>Serials subscriptions</h2>	44	<h1>Serials subscriptions</h1>
45	[% IF (done_searched) %]	45	[% IF (done_searched) %]
46	<label for="show_only_renewed">	46	<label for="show_only_renewed">
47	<input type="checkbox" style="vertical-align: middle;" id="show_only_renewed" />	47	<input type="checkbox" style="vertical-align: middle;" id="show_only_renewed" />

Lines 36-43 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt (-2 / +1 lines)
36	<div class="col-sm-10 col-sm-push-2">	36	<div class="col-sm-10 col-sm-push-2">
37	<main>	37	<main>
38		38
39	<h1>Fund: [% fund_code \| html %]</h1>	39	<h1>Ordered - Fund: [% fund_code \| html %]</h1>
40	<h2>Ordered</h2>
41		40
42	<table id="spent">	41	<table id="spent">
43	<thead>	42	<thead>




            <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
        [% END %]
            <main>
<h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a></h1>

[% IF ( error_failed_to_create_invoice ) %]
    <div id="error" class="dialog alert">
        <p>An error has occurred. Invoice cannot be created.</p>
    </div>
[% END %]
<h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a></h1>

    [% IF duplicate_invoices %]
    <div id="parcels_duplicate_invoice" class="dialog alert">

Lines 4-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt (+1 lines)
4	</head>	4	</head>
5	<body id="acq_showorder" class="acq">	5	<body id="acq_showorder" class="acq">
6	<div id="main">	6	<div id="main">
		7	<h1>Order details</h1>
7	[% IF order %]	8	[% IF order %]
8	<fieldset class="rows">	9	<fieldset class="rows">
9	<ol>	10	<ol>

Lines 36-43 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt (-2 / +1 lines)
36	<div class="col-sm-10 col-sm-push-2">	36	<div class="col-sm-10 col-sm-push-2">
37	<main>	37	<main>
38		38
39	<h1>Fund: [% fund_code \| html %]</h1>	39	<h1>Spent - Fund: [% fund_code \| html %]</h1>
40	<h2>Spent</h2>
41		40
42	<table id="spent">	41	<table id="spent">
43	<thead>	42	<thead>

Lines 8-13 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt (+1 lines)
8		8
9	<body id="acq_transferorder" class="acq">	9	<body id="acq_transferorder" class="acq">
10	<div class="container-fluid">	10	<div class="container-fluid">
		11	<h1>Transfer order</h1>
11	[% IF ( bookselleridfrom ) %]	12	[% IF ( bookselleridfrom ) %]
12	<h3>Search for a vendor to transfer to</h3>	13	<h3>Search for a vendor to transfer to</h3>
13	<div class="transferinfo">	14	<div class="transferinfo">

Lines 79-85 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt (-1 / +1 lines)
79	[% END %]	79	[% END %]
80	[% END %]	80	[% END %]
81		81
82	<h2>Orders with uncertain prices</h2>	82	<h1>Orders with uncertain prices</h1>
83	<form action="[% scriptname \| html %]" method="post">	83	<form action="[% scriptname \| html %]" method="post">
84	<input type="hidden" name="booksellerid" value="[% booksellerid \| html %]" />	84	<input type="hidden" name="booksellerid" value="[% booksellerid \| html %]" />
85	<label for="owner">Orders from:</label>	85	<label for="owner">Orders from:</label>

Lines 54-60 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt (-2 / +1 lines)
54	<form method="post" action="z3950_search.pl" name="f" class="checkboxed">	54	<form method="post" action="z3950_search.pl" name="f" class="checkboxed">
55	<div class="row">	55	<div class="row">
56	<div class="col-sm-6">	56	<div class="col-sm-6">
57	<h2>Order from external source</h2>	57	<h1>Order from external source</h1>
58	<input type="hidden" name="op" id="op" value="do_search" />	58	<input type="hidden" name="op" id="op" value="do_search" />
59	<fieldset class="rows">	59	<fieldset class="rows">
60	<ol>	60	<ol>
61	-

Return to bug 27631

Lines 38-50 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt (-1 / +1 lines)
38	<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">	38	<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
39	[% END %]	39	[% END %]
40	<main>	40	<main>
		41	<h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid \| uri %]">[% name \| html %]</a></h1>
41		42
42	[% IF ( error_failed_to_create_invoice ) %]	43	[% IF ( error_failed_to_create_invoice ) %]
43	<div id="error" class="dialog alert">	44	<div id="error" class="dialog alert">
44	<p>An error has occurred. Invoice cannot be created.</p>	45	<p>An error has occurred. Invoice cannot be created.</p>
45	</div>	46	</div>
46	[% END %]	47	[% END %]
47	<h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid \| uri %]">[% name \| html %]</a></h1>
48		48
49	[% IF duplicate_invoices %]	49	[% IF duplicate_invoices %]
50	<div id="parcels_duplicate_invoice" class="dialog alert">	50	<div id="parcels_duplicate_invoice" class="dialog alert">