X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fmodules%2Facqui%2Fparcel.tt;h=877d263d73b7bff42e6688cb0b72f9031a913b0a;hb=d85fa9c5fbc1e73e63c830a019331041e54c597d;hp=7b0f7ca1e89b306d6836a76ba57ced12aa5ae373;hpb=5432bd488f2cd842f4fece93c42423a3fc26143b;p=koha_fer
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 7b0f7ca1e8..877d263d73 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -11,16 +11,20 @@
-
[% INCLUDE 'header.inc' %]
[% INCLUDE 'acquisitions-search.inc' %]
-Home ›
Acquisitions › [% IF ( datereceived ) %]
- Receipt summary for
[% name %] [% IF ( invoice ) %]
[ [% invoice %] ][% END %] on
[% formatteddatereceived %]
- [% ELSE %]
- Receive orders from [% name %]
- [% END %]
+Home ›
Acquisitions ›
+ [% IF ( datereceived ) %]
+ Receipt summary for
[% name %]
+ [% IF ( invoice ) %]
+
[ [% invoice %] ]
+ [% END %]
+ on
[% formatteddatereceived %]
+ [% ELSE %]
+ Receive orders from [% name %]
+ [% END %]
+
@@ -224,10 +143,28 @@
[% END %]
[% END %]
+ [% IF (error_cancelling_receipt) %]
+
+ Cannot cancel receipt. Possible reasons :
+
+ -
+ The order line you trying to cancel was created from a partial receipt
+ of another order line which is already received. Try to cancel this
+ one first and retry.
+
+ -
+ The order line you trying to cancel was created from a partial receipt
+ of another order line which has been deleted. Cancellation is not
+ possible.
+
+
+
+ [% END %]
+
Invoice number: [% invoice %] Received by: [% loggedinusername %] On: [% formatteddatereceived %]
-
+[% UNLESS (invoiceclosedate) %]
Pending orders
@@ -237,23 +174,15 @@
Basket |
Order line |
Summary |
-
View record |
+
View record |
Quantity |
Unit cost |
Order cost |
+
Fund |
|
|
-
- TOTAL |
- [% totalPquantity %] |
- |
- [% ordergrandtotal %] |
- |
- |
-
-
[% FOREACH loop_order IN loop_orders %]
@@ -280,58 +209,66 @@
[% loop_order.quantity %] |
[% loop_order.ecost %] |
[% loop_order.ordertotal %] |
+ [% loop_order.budget_name %] |
- Receive
-
+ Receive
|
- [% IF ( loop_order.left_holds_on_order ) %]
- Can't delete order
- [% ELSE %]
- Delete order
- [% END %]
- [% IF ( loop_order.can_del_bib ) %]
- Delete order and catalog record
- [% ELSE %]
- Can't delete order and catalog record
- [% END %]
- [% IF ( loop_order.left_item ) %]
- [% loop_order.items %] item(s) left
- [% END %]
- [% IF ( loop_order.left_biblio ) %]
- [% loop_order.biblios %] order(s) left
- [% END %]
- [% IF ( loop_order.left_subscription ) %]
- [% loop_order.subscriptions %] subscription(s) left
- [% END %]
- [% IF ( loop_order.left_holds ) %]
- [% loop_order.holds %] hold(s) left
- [% END %]
- |
-
+ [% IF ( loop_order.left_holds_on_order ) %]
+ Can't delete order
+ [% ELSE %]
+ Delete order
+ [% END %]
+ [% IF ( loop_order.can_del_bib ) %]
+ Delete order and catalog record
+ [% ELSE %]
+ Can't delete order and catalog record
+ [% END %]
+ [% IF ( loop_order.left_item ) %]
+ [% loop_order.items %] item(s) left
+ [% END %]
+ [% IF ( loop_order.left_biblio ) %]
+ [% loop_order.biblios %] order(s) left
+ [% END %]
+ [% IF ( loop_order.left_subscription ) %]
+ [% loop_order.subscriptions %] subscription(s) left
+ [% END %]
+ [% IF ( loop_order.left_holds ) %]
+ [% loop_order.holds %] hold(s) left
+ [% END %]
+
+
+ [% END %]
+
+ [% ELSE %]There are no pending orders.[% END %]
+
+
+ [% IF ( displayprev ) %]
+
<< Previous
[% END %]
-
- [% ELSE %]There are no pending orders.[% END %]
-
-
- [% IF ( displayprev ) %]
-
<< Previous
- [% END %]
- [% FOREACH number IN numbers %]
- [% IF ( number.highlight ) %]
-
[% number.number %]
- [% ELSE %]
-
[% number.number %]
- [% END %]
- [% END %]
- [% IF ( displaynext ) %]
-
Next >>
- [% END %]
-
-
+ [% FOREACH number IN numbers %]
+ [% IF ( number.highlight ) %]
+
[% number.number %]
+ [% ELSE %]
+
[% number.number %]
+ [% END %]
+ [% END %]
+ [% IF ( displaynext ) %]
+
Next >>
+ [% END %]
+
+
+[% ELSE %]
+
+ Invoice is closed, so you can't receive orders anymore.
+ Reopen it.
+
+[% END %]
+
Already received
+
[% IF ( loop_received ) %]