Select the library account submitting the EDI order
-- + +
@@ -, +, @@
- Acquisitions -> Vendor -> Basket -> Create EDIFACT order
- Acquisitions -> EDIFACT messages
- Acquisitions -> Orders search -> Results
- Acquisitions -> Late orders
- Acquisitions -> Vendor -> Add to basket -> From a subscription
- Acquisitions -> Vendor -> Add to basket -> From a suggestion
- Acquisitions -> All available funds -> Ordered
- Acquisitions -> All available funds -> Spent
- Acquisitions -> Vendor -> Add to basket -> From an external source ->
Results
---
.../prog/en/modules/acqui/edi_ean.tt | 30 +--
.../prog/en/modules/acqui/edifactmsgs.tt | 2 +-
.../prog/en/modules/acqui/histsearch.tt | 2 +-
.../prog/en/modules/acqui/lateorders.tt | 2 +-
.../en/modules/acqui/newordersubscription.tt | 126 +++++++------
.../en/modules/acqui/newordersuggestion.tt | 131 ++++++-------
.../prog/en/modules/acqui/ordered.tt | 162 ++++++++--------
.../prog/en/modules/acqui/spent.tt | 176 +++++++++---------
.../prog/en/modules/acqui/z3950_search.tt | 2 +-
9 files changed, 323 insertions(+), 310 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt
@@ -30,20 +30,22 @@
Select the library account submitting the EDI order
-
-
+
+
ISSN | -Title | -Notes | -Vendor | -Library | -Call number | -Expiration date | -- |
---|---|---|---|---|---|---|---|
[% sub.issn | html %] | -[% IF (sub.title) %][% sub.title | html %][% ELSE %] - --- - [% END %][% IF (sub.unititle) %], [% sub.unititle | html %][% END %] - | -[% IF (sub.publicnotes) %][% sub.publicnotes | html %][% END %] - [% IF (sub.internalnotes) %]([% sub.internalnotes | html %])[% END %] - | -- [% IF (sub.vendorname) %][% sub.vendorname | html %][% END %] - | -- [% IF (sub.branchcode) %][% Branches.GetName( sub.branchcode ) | html %][% END %] - | -- [% IF (sub.callnumber) %][% sub.callnumber | html %][% END %] - | -- [% sub.enddate | $KohaDates %] - | -- [% IF (sub.alreadyOnOrder) %] - Outstanding order - [% END %] - [% IF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid %] - - [% tp('verb', 'Order') | html %] - - [% ELSE %] - Cannot be ordered - [% END %] - | -
ISSN | +Title | +Notes | +Vendor | +Library | +Call number | +Expiration date | ++ |
---|---|---|---|---|---|---|---|
[% sub.issn | html %] | +[% IF (sub.title) %][% sub.title | html %][% ELSE %] + --- + [% END %][% IF (sub.unititle) %], [% sub.unititle | html %][% END %] + | +[% IF (sub.publicnotes) %][% sub.publicnotes | html %][% END %] + [% IF (sub.internalnotes) %]([% sub.internalnotes | html %])[% END %] + | ++ [% IF (sub.vendorname) %][% sub.vendorname | html %][% END %] + | ++ [% IF (sub.branchcode) %][% Branches.GetName( sub.branchcode ) | html %][% END %] + | ++ [% IF (sub.callnumber) %][% sub.callnumber | html %][% END %] + | ++ [% sub.enddate | $KohaDates %] + | ++ [% IF (sub.alreadyOnOrder) %] + Outstanding order + [% END %] + [% IF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid %] + + [% tp('verb', 'Order') | html %] + + [% ELSE %] + Cannot be ordered + [% END %] + | +
Sorry, there is no result for your search.
+ [% END %] [% ELSE %] -Sorry, there is no result for your search.
+Use the search form on the left to find subscriptions.
[% END %] - [% ELSE %] -Use the search form on the left to find subscriptions.
- [% END %] +Mine | -Suggestion | -Suggested by | -Accepted by | -Library | -Fund | -Price | -Quantity | -Total | -- | ||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
[% suggestion.managedby | html %] | -
- [% suggestion.title | html %] - [% suggestion.author | html %] -
- [% IF ( suggestion.copyrightdate ) %]© [% suggestion.copyrightdate | html %] [% END %]
- [% IF ( suggestion.volumedesc ) %]volume: [% suggestion.volumedesc | html %] [% END %]
- [% IF ( suggestion.isbn ) %]ISBN: [% suggestion.isbn | html %] [% END %]
- [% IF ( suggestion.publishercode ) %] ([% suggestion.note | html %]) [% END %] - - |
- [% INCLUDE 'patron-title.inc' patron => suggestion.suggester %] | -[% INCLUDE 'patron-title.inc' patron => suggestion.manager %] | -- [% Branches.GetName(suggestion.branchcode) | html %] - | -- [% suggestion.fund.budget_name | html %] - | -- [% suggestion.price | $Price %] - | -- [% IF (suggestion.quantity > 0) %] - [% suggestion.quantity | html %] - [% END %] - | -- [% suggestion.total | $Price %] - | -
- [% IF ( suggestion.biblionumber ) %]
- [% tp('verb', 'Order') | html %]
- [% ELSE %]
- [% tp('verb', 'Order') | html %]
+
+
+ [% IF suggestions.size %]
+ Show only mine | Show all suggestions
+
|
Title | -[% tp('noun', 'Order') | html %] | -Vendor | -Item types | -Left on order | -Estimated cost per unit | -Date ordered | -Subtotal | -
---|---|---|---|---|---|---|---|
- - [% order.title | html %] - - | -- [% IF ( CAN_user_acquisition_order_manage ) %] - [% order.ordernumber | html %] - [% ELSE %] - [% order.ordernumber | html %] - [% END %] - | -- [% order.vendorname | html %] - | -- [% FOREACH itemtype IN order.itemtypes %] - [% ItemTypes.GetDescription( itemtype ) | html %] - [% IF !loop.last() %] | [% END %] - [% END %] - | -- [% order.left | html %] - | -- [% order.ecost_tax_included | $Price %] - | -- [% order.entrydate | $KohaDates %] - | -- [% order.subtotal | $Price %] - | -
- | Adjustment cost for invoice - - [% adjustment.invoice.invoicenumber | html %] - - | -[% adjustment.adjustment | $Price %] | -
Title | +[% tp('noun', 'Order') | html %] | +Vendor | +Item types | +Left on order | +Estimated cost per unit | +Date ordered | +Subtotal | +
---|---|---|---|---|---|---|---|
+ + [% order.title | html %] + + | ++ [% IF ( CAN_user_acquisition_order_manage ) %] + [% order.ordernumber | html %] + [% ELSE %] + [% order.ordernumber | html %] + [% END %] + | ++ [% order.vendorname | html %] + | ++ [% FOREACH itemtype IN order.itemtypes %] + [% ItemTypes.GetDescription( itemtype ) | html %] + [% IF !loop.last() %] | [% END %] + [% END %] + | ++ [% order.left | html %] + | ++ [% order.ecost_tax_included | $Price %] + | ++ [% order.entrydate | $KohaDates %] + | ++ [% order.subtotal | $Price %] + | +
+ | Adjustment cost for invoice + + [% adjustment.invoice.invoicenumber | html %] + + | +[% adjustment.adjustment | $Price %] | +|||||
Total | -- | - | - | - | - | - | - [% total | $Price %] - | -
Total | ++ | + | + | + | + | + | + [% total | $Price %] + | +
Title | -[% tp('noun', 'Order') | html %] | -Vendor | -Invoice | -Item types | -Received | -Unit price | -Date ordered | -Date received | -Subtotal | -||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
- - [% order.title | html %] - - | -- [% order.ordernumber | html %] - | -- [% order.vendorname | html %] - | -- [% order.invoicenumber | html %] - | -- [% FOREACH itemtype IN order.itemtypes %] - [% ItemTypes.GetDescription( itemtype ) | html %] - [% IF !loop.last() %] | [% END %] - [% END %] - | -- [% order.quantityreceived | html %] - | -- [% order.unitprice_tax_included | $Price %] - | -- [% order.entrydate | $KohaDates %] - | -- [% order.datereceived | $KohaDates %] - | -- [% order.rowtotal | $Price %] - | -
Title | +[% tp('noun', 'Order') | html %] | +Vendor | +Invoice | +Item types | +Received | +Unit price | +Date ordered | +Date received | +Subtotal | +||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Sub total | -[% subtotal | $Price %] | ++ + [% order.title | html %] + + | ++ [% order.ordernumber | html %] + | ++ [% order.vendorname | html %] + | ++ [% order.invoicenumber | html %] + | ++ [% FOREACH itemtype IN order.itemtypes %] + [% ItemTypes.GetDescription( itemtype ) | html %] + [% IF !loop.last() %] | [% END %] + [% END %] + | ++ [% order.quantityreceived | html %] + | ++ [% order.unitprice_tax_included | $Price %] + | ++ [% order.entrydate | $KohaDates %] + | ++ [% order.datereceived | $KohaDates %] + | ++ [% order.rowtotal | $Price %] + | ||||||||
- | Shipping cost for invoice - - [% shipmentcost.invoicenumber | html %] - - | -[% shipmentcost.shipmentcost | $Price %] | +Sub total | +[% subtotal | $Price %] | |||||||||||||||
- | Adjustment cost for invoice - - [% adjustment.invoice.invoicenumber | html %] - - | -[% adjustment.adjustment | $Price %] | -|||||||||||||||||
+ | Shipping cost for invoice + + [% shipmentcost.invoicenumber | html %] + + | +[% shipmentcost.shipmentcost | $Price %] | +|||||||||||||||||
TOTAL | -[% total | $Price %] | -
--