X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fmodules%2Facqui%2Fparcel.tt;h=554f0afff1ff8f26a77cd4a7031d49dd9bf0895d;hb=bf803c521fc4a2320a7bc990bcdcb58f15307a33;hp=1b6543a69f33ee698449238486ff8f739a1722ae;hpb=374b6f4b9f33a776d04cdaa696b40e8e033dda32;p=koha.git diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index 1b6543a69f..554f0afff1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -45,14 +45,15 @@ null, null, null, + null ], "sPaginationType": "four_button" } ) ); rowCountPending = $("#pendingt tbody.filterclass tr").length; rowCountReceived = $("#receivedt tbody.filterclass tr").length; - if (rowCountPending > rowsToCollapse) { pendingCollapse(); } - if (rowCountReceived > rowsToCollapse) { receivedCollapse(); } + if (rowCountPending > rowsToCollapse ) { if ( $.cookie("pendingKeepExpanded") != 1 ) { pendingCollapse(); } else { pendingExpand(); } } + if (rowCountReceived > rowsToCollapse ) { if ( $.cookie("receivedKeepExpanded") != 1 ) { receivedCollapse(); } else { receivedExpand(); } } }); // Case-insensitive version of jquery's contains function @@ -68,6 +69,7 @@ // Collapse pending items table function pendingCollapse() { + $.cookie("pendingKeepExpanded", 0, { path: "/", expires: 9999 }); $("#pendingcollapserow").remove(); $("#pendingt tr").show(); $("#pendingt tbody.filterclass tr:gt(" + (rowsToCollapse-1) + ")").hide(); @@ -77,6 +79,7 @@ // Expend pending items table function pendingExpand() { + $.cookie("pendingKeepExpanded", 1, { path: "/", expires: 9999 }); $("#pendingcollapserow").remove(); $("#pendingt tr").show(); $("#pendingt tbody.filterclass tr.orderfound").remove(); @@ -85,6 +88,7 @@ // Collapse already received items table function receivedCollapse() { + $.cookie("receivedKeepExpanded", 0, { path: "/", expires: 9999 }); $("#receivedcollapserow").remove(); $("#receivedt tbody.filterclass tr:gt(" + (rowsToCollapse-1) + ")").hide(); $("#receivedt").before("

" + _("Only the first ") + rowsToCollapse + _(" items are displayed.") + "" + _("Click here to show all ") + rowCountReceived + _(" items") + "<\/a>.<\/p>"); @@ -92,6 +96,7 @@ // Expand already received items table function receivedExpand() { + $.cookie("receivedKeepExpanded", 1, { path: "/", expires: 9999 }); $("#receivedcollapserow").remove(); $("#receivedt tr").show(); $("#receivedt").before("

" + _("All ") + rowCountReceived + _(" items are displayed.") + "" + _("Click here to show only the first ") + rowsToCollapse + _(" items") + "<\/a>.<\/p>"); @@ -121,11 +126,17 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] -

+
@@ -161,10 +172,29 @@ [% END %] [% END %] + [% IF (error_cancelling_receipt) %] +
+ Cannot cancel receipt. Possible reasons : + +
+ [% END %] +

Invoice number: [% invoice %] Received by: [% loggedinusername %] On: [% formatteddatereceived %]

- +

Go to invoice details

+[% UNLESS (invoiceclosedate) %] +
+[% ELSE %] +

+ Invoice is close, so you can't receive orders. + Reopen it. +

+[% END %] +

Already received

+ [% IF ( loop_received ) %]
@@ -282,6 +320,7 @@ + @@ -290,6 +329,7 @@ + [% IF ( totalfreight ) %] @@ -317,6 +357,7 @@ + @@ -339,6 +380,22 @@ + [% END %]
Est cost Actual cost TOTAL
  [% totalprice %] [% tototal %]
[% totalquantity %]   [% grandtot %]
[% loop_receive.ecost %] [% loop_receive.unitprice %] [% loop_receive.total %] + [% IF (loop_receive.cannot_cancel) %] + [% span_title = BLOCK %] + Cannot cancel receipt of this order line because it + was created from a partial receipt of order line no. + [% loop_receive.parent_ordernumber %], which is + already received. Try cancelling this one first and + retry. + [% END %] + + Can't cancel receipt + + [% ELSE %] + Cancel receipt + [% END %] +