Attachment #83133 for bug #16939

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

Lines 413-419 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-1 / +3 lines)
413	</td>	413	</td>
414	<td><span title="[% batch_lis.staged_date \| html %]">[% batch_lis.staged_date \| $KohaDates with_hours => 1 \| html %]</span></td>	414	<td><span title="[% batch_lis.staged_date \| html %]">[% batch_lis.staged_date \| $KohaDates with_hours => 1 \| html %]</span></td>
415	<td>[% batch_lis.num_records \| html %]</td>	415	<td>[% batch_lis.num_records \| html %]</td>
416	<td><a href="[% batch_lis.scriptname \| url %]?import_batch_id=[% batch_lis.import_batch_id \| uri %]&basketno=[% basketno \| uri %]&booksellerid=[% booksellerid \| uri %]">Add orders</a></td>	416	<td class="actions">
		417	<a href="[% batch_lis.scriptname \| url %]?import_batch_id=[% batch_lis.import_batch_id \| uri %]&basketno=[% basketno \| uri %]&booksellerid=[% booksellerid \| uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add orders</a>
		418	</td>
417	</tr>	419	</tr>
418	[% END %]	420	[% END %]
419	</tbody>	421	</tbody>




         <th>Summary</th>
         <th>Publisher</th>
         <th>Copyright</th>
         <th>Actions</th>
         <th>&nbsp;</th>
      </tr>
    </thead>
    <tbody>

            <td>
                [% biblio.copyrightdate | html %]
            </td>
            <td class="actions">
                <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblio.biblionumber | uri %]&amp;viewas=html" class="previewMARC btn btn-default btn-xs"><i class="fa fa-eye"></i> View MARC</a>
                <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;biblionumber=[% biblio.biblionumber | uri %]" title="Order this one" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Order</a>
            <td>
            <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;biblionumber=[% biblio.biblionumber | uri %]" class="btn btn-default btn-xs" title="Order this one">
                Order
            </a>
            </td>
        </tr>
      [% END %]

Lines 256-263 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-2 / +1 lines)
256	<table>	256	<table>
257	<thead>	257	<thead>
258	<tr>	258	<tr>
259	<th> </th>	259	<th>Actions</th>
260	<th> </th>
261	<th>Barcode</th>	260	<th>Barcode</th>
262	<th>Home library</th>	261	<th>Home library</th>
263	<th>Holding library</th>	262	<th>Holding library</th>




                                        <span title="0000-00-00"></span>
                                    [% END %]
                                </td>
                                <td class="actions">
                                    [% IF (sub.alreadyOnOrder) %]
                                        Outstanding order
                                    [% END %]
                                    [% IF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid %]
                                        <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;biblionumber=[% sub.biblionumber | uri %]&amp;from_subscriptionid=[% sub.subscriptionid | uri %]" title="Order this one" class="btn btn-default btn-xs">
                                            <i class="fa fa-plus"></i> Order
                                        </a>
                                    [% ELSE %]
                                        <a title="This subscription depends on another supplier" style="cursor:help">Cannot be ordered</a>





    [% IF ( breeding_loop ) %]
    <table id="resultst">
    <thead><tr>
        <th>Server</th>
        <th>Title</th>
        <th>Author</th>
        <th>ISBN</th>
        <th>LCCN</th>
        [% IF ( Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' ) %]
            <th>Additional fields</th>
        [% END %]
        <th>Preview</th>
        <th>&nbsp;</th>
    </tr></thead>
    <tbody>[% FOREACH breeding_loo IN breeding_loop %]
        [% IF ( breeding_loo.breedingid ) %]

        <tr>
            <td>[% breeding_loo.server | html %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" class="previewData">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | html %]" class="previewData">Preview card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&amp;breedingid=[% breeding_loo.breedingid | html %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Order</a> <a href="#" id="closemenu" title="Close this menu"> X </a></div></td>
            <td>[% breeding_loo.title | html %]</td>
            <td>[% breeding_loo.author | html %]</td>
            <td>[% breeding_loo.isbn | html %]</td>
            <td>[% breeding_loo.lccn | html %]</td>
            [% IF ( Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' %]
            <td>
                <dl>
                  [% FOREACH addnumberfield IN breeding_loo.addnumberfields %]
                    [% FOREACH string IN breeding_loo.$addnumberfield %]
                        <dt>[% addnumberfield | html %]:</dt>

               </dl>
            </td>
            [% END %]
            <td>
                <div class="dropdown">
                    <a class="btn btn-default btn-xs dropdown-toggle" id="z3950preview[% breeding_loo.breedingid | uri %]" role="button" data-toggle="dropdown" href="#">
                        Preview <b class="caret"></b>
                    </a>
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="z3950preview[% breeding_loo.breedingid | html %]">
                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" title="MARC" class="previewData"><i class="fa fa-eye"></i> MARC</a></li>
                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | uri %]" title="Card" class="previewData"><i class="fa fa-eye"></i> Card</a></li>
                    </ul>
                </div>
            </td>
            <td class="actions"><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&amp;breedingid=[% breeding_loo.breedingid | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Order</a></td>
        </tr>
        [% END %]
    [% END %]</tbody>




                      [% END %]
                  </ul>
            </td>
            <td class="actions">
                <p>
                    [% IF ( reserveloo.thisratio_atleast1 ) %]
                        [% IF ( CAN_user_acquisition && basketno && booksellerid ) %]<!-- [% reserveloo.ratiocalc | html %] -->
                            <a href="/cgi-bin/koha/acqui/neworderempty.pl?biblionumber=[% reserveloo.biblionumber | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;rr_quantity_to_order=[% reserveloo.ratiocalc | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% reserveloo.ratiocalc | html %] to order</a>
                        [% ELSE %]
                            <b>[% reserveloo.ratiocalc | html %] to order</b>
                        [% END %]
                        [% IF ( reserveloo.pendingorders ) %]<br><b>[% reserveloo.pendingorders | html %] pending</b>[% END %]
                    [% ELSE %]
                        0 to order
                    [% END %]
                </p>
            </td>
        </tr>
      [% END %]
      </tbody>




        'stocknumber', 'ccode', 'itype', 'materials', 'itemnotes'];

    var result = "<tr idblock='" + index + "'>";
    var edit_link = "<a href='#itemfieldset' style='text-decoration:none' onclick='showItem(\"" + index + "\");' class='btn btn-default btn-xs'><i class='fa fa-pencil'></i> "
        + (window.MSG_ADDITEM_JS_EDIT || "Edit") + "</a>";
    var del_link = "<a style='cursor:pointer' "
        + "onclick='deleteItemBlock(this, \"" + index + "\", \"" + unique_item_fields + "\");' class='btn btn-default btn-xs'><i class='fa fa-trash'></i> "
        + (window.MSG_ADDITEM_JS_DELETE || "Delete") + "</a>";
    result += "<td class='actions'>" + edit_link + " " + del_link + "</td>";
    result += "<td>" + del_link + "</td>";
    for(i in fields) {
        var field = fields[i];
        var field_elt = $("#" + index)
- 

Return to bug 16939

Lines 43-50 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt (-9 / +4 lines)
43	<th>Summary</th>	43	<th>Summary</th>
44	<th>Publisher</th>	44	<th>Publisher</th>
45	<th>Copyright</th>	45	<th>Copyright</th>
46	<th> </th>	46	<th>Actions</th>
47	<th> </th>
48	</tr>	47	</tr>
49	</thead>	48	</thead>
50	<tbody>	49	<tbody>
Lines 67-79 Link Here
67	<td>	66	<td>
68	[% biblio.copyrightdate \| html %]	67	[% biblio.copyrightdate \| html %]
69	</td>	68	</td>
70	<td>	69	<td class="actions">
71	<a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblio.biblionumber \| uri %]&viewas=html" class="btn btn-default btn-xs previewMARC">View MARC</a>	70	<a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblio.biblionumber \| uri %]&viewas=html" class="previewMARC btn btn-default btn-xs"><i class="fa fa-eye"></i> View MARC</a>
72	</td>	71	<a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&biblionumber=[% biblio.biblionumber \| uri %]" title="Order this one" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Order</a>
73	<td>
74	<a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&biblionumber=[% biblio.biblionumber \| uri %]" class="btn btn-default btn-xs" title="Order this one">
75	Order
76	</a>
77	</td>	72	</td>
78	</tr>	73	</tr>
79	[% END %]	74	[% END %]

Lines 68-80 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt (-4 / +4 lines)
68	<span title="0000-00-00"></span>	68	<span title="0000-00-00"></span>
69	[% END %]	69	[% END %]
70	</td>	70	</td>
71	<td>	71	<td class="actions">
72	[% IF (sub.alreadyOnOrder) %]	72	[% IF (sub.alreadyOnOrder) %]
73	Outstanding order	73	Outstanding order
74	[% END %]	74	[% END %]
75	[% IF not sub.aqbooksellerid \|\| booksellerid == sub.aqbooksellerid%]	75	[% IF not sub.aqbooksellerid \|\| booksellerid == sub.aqbooksellerid %]
76	<a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&biblionumber=[% sub.biblionumber \| uri %]&from_subscriptionid=[% sub.subscriptionid \| uri %]" title="Order this one">	76	<a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&biblionumber=[% sub.biblionumber \| uri %]&from_subscriptionid=[% sub.subscriptionid \| uri %]" title="Order this one" class="btn btn-default btn-xs">
77	Place order	77	<i class="fa fa-plus"></i> Order
78	</a>	78	</a>
79	[% ELSE %]	79	[% ELSE %]
80	<a title="This subscription depends on another supplier" style="cursor:help">Cannot be ordered</a>	80	<a title="This subscription depends on another supplier" style="cursor:help">Cannot be ordered</a>

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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt (-10 / +19 lines)
100		100
101	[% IF ( breeding_loop ) %]	101	[% IF ( breeding_loop ) %]
102	<table id="resultst">	102	<table id="resultst">
103	<thead> <tr>	103	<thead><tr>
104	<th>Server</th>	104	<th>Server</th>
105	<th>Title</th>	105	<th>Title</th>
106	<th>Author</th>	106	<th>Author</th>
107	<th>ISBN</th>	107	<th>ISBN</th>
108	<th>LCCN</th>	108	<th>LCCN</th>
109	[% IF Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' %]	109	[% IF ( Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' ) %]
110	<th>Additional fields</th>	110	<th>Additional fields</th>
111	[% END %]	111	[% END %]
112	<th>Preview</th>	112	<th>Preview</th>
113	<th> </th>	113	<th> </th>
114	</tr></thead>	114	</tr></thead>
115	<tbody>[% FOREACH breeding_loo IN breeding_loop %]	115	<tbody>[% FOREACH breeding_loo IN breeding_loop %]
116	[% IF ( breeding_loo.breedingid ) %]	116	[% IF ( breeding_loo.breedingid ) %]
117		117
118	<tr>	118	<tr>
119	<td>[% breeding_loo.server \| html %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid \| uri %]" class="previewData">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.breedingid \| html %]" class="previewData">Preview card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode \| uri %]&breedingid=[% breeding_loo.breedingid \| html %]&booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]">Order</a> <a href="#" id="closemenu" title="Close this menu"> X </a></div></td>	119	<td>[% breeding_loo.server \| html %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid \| uri %]" class="previewData">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.breedingid \| html %]" class="previewData">Preview card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode \| uri %]&breedingid=[% breeding_loo.breedingid \| html %]&booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]">Order</a> <a href="#" id="closemenu" title="Close this menu"> X </a></div></td>
120	<td>[% breeding_loo.title \| html %]</td>	120	<td>[% breeding_loo.title \| html %]</td>
121	<td>[% breeding_loo.author \| html %]</td>	121	<td>[% breeding_loo.author \| html %]</td>
122	<td>[% breeding_loo.isbn \| html %]</td>	122	<td>[% breeding_loo.isbn \| html %]</td>
123	<td>[% breeding_loo.lccn \| html %]</td>	123	<td>[% breeding_loo.lccn \| html %]</td>
124	[% IF Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' %]	124	[% IF ( Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' %]
125	<td>	125	<td>
126	<dl>	126	<dl>
127	[% FOREACH addnumberfield IN breeding_loo.addnumberfields %]	127	[% FOREACH addnumberfield IN breeding_loo.addnumberfields %]
128	[% FOREACH string IN breeding_loo.$addnumberfield %]	128	[% FOREACH string IN breeding_loo.$addnumberfield %]
129	<dt>[% addnumberfield \| html %]:</dt>	129	<dt>[% addnumberfield \| html %]:</dt>
Lines 133-141 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
133	</dl>	133	</dl>
134	</td>	134	</td>
135	[% END %]	135	[% END %]
136	<td><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid \| uri %]" title="MARC" class="previewData">MARC</a> \| <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.breedingid \| html %]" title="Card" class="previewData">Card</a></td>	136	<td>
137	<td><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode \| uri %]&breedingid=[% breeding_loo.breedingid \| uri %]&booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]">Order</a></td>	137	<div class="dropdown">
138		138	<a class="btn btn-default btn-xs dropdown-toggle" id="z3950preview[% breeding_loo.breedingid \| uri %]" role="button" data-toggle="dropdown" href="#">
		139	Preview <b class="caret"></b>
		140	</a>
		141	<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="z3950preview[% breeding_loo.breedingid \| html %]">
		142	<li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid \| uri %]" title="MARC" class="previewData"><i class="fa fa-eye"></i> MARC</a></li>
		143	<li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.breedingid \| uri %]" title="Card" class="previewData"><i class="fa fa-eye"></i> Card</a></li>
		144	</ul>
		145	</div>
		146	</td>
		147	<td class="actions"><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode \| uri %]&breedingid=[% breeding_loo.breedingid \| uri %]&booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Order</a></td>
139	</tr>	148	</tr>
140	[% END %]	149	[% END %]
141	[% END %]</tbody>	150	[% END %]</tbody>

Lines 87-99 function constructTrNode(index, unique_item_fields) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/additem.js (-5 / +3 lines)
87	'stocknumber', 'ccode', 'itype', 'materials', 'itemnotes'];	87	'stocknumber', 'ccode', 'itype', 'materials', 'itemnotes'];
88		88
89	var result = "<tr idblock='" + index + "'>";	89	var result = "<tr idblock='" + index + "'>";
90	var edit_link = "<a href='#itemfieldset' style='text-decoration:none' onclick='showItem(\"" + index + "\");'>"	90	var edit_link = "<a href='#itemfieldset' style='text-decoration:none' onclick='showItem(\"" + index + "\");' class='btn btn-default btn-xs'><i class='fa fa-pencil'></i> "
91	+ (window.MSG_ADDITEM_JS_EDIT \|\| "Edit") + "</a>";	91	+ (window.MSG_ADDITEM_JS_EDIT \|\| "Edit") + "</a>";
92	var del_link = "<a style='cursor:pointer' "	92	var del_link = "<a style='cursor:pointer' "
93	+ "onclick='deleteItemBlock(this, \"" + index + "\", \"" + unique_item_fields + "\");'>"	93	+ "onclick='deleteItemBlock(this, \"" + index + "\", \"" + unique_item_fields + "\");' class='btn btn-default btn-xs'><i class='fa fa-trash'></i> "
94	+ (window.MSG_ADDITEM_JS_DELETE \|\| "Delete") + "</a>";	94	+ (window.MSG_ADDITEM_JS_DELETE \|\| "Delete") + "</a>";
95	result += "<td>" + edit_link + "</td>";	95	result += "<td class='actions'>" + edit_link + " " + del_link + "</td>";
96	result += "<td>" + del_link + "</td>";
97	for(i in fields) {	96	for(i in fields) {
98	var field = fields[i];	97	var field = fields[i];
99	var field_elt = $("#" + index)	98	var field_elt = $("#" + index)
100	-