@@ -, +, @@ - Perform a search which will return invoice results. - Click on an invoice to view the details. - Everything should look normal. --- .../prog/en/modules/acqui/invoice.tt | 829 +++++++++--------- 1 file changed, 430 insertions(+), 399 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -27,24 +27,23 @@ [% SET readonly = NOT CAN_user_acquisition_edit_invoices %] - [% WRAPPER 'sub-header.inc' %] - + [% END %]
@@ -52,396 +51,426 @@
-

Invoice: [% invoicenumber | html %]

+

Invoice: [% invoicenumber | html %]

[% INCLUDE 'blocking_errors.inc' %] - [% IF ( modified ) %] -
-

Invoice has been modified

-
- [% END %] - -

Vendor: [% suppliername | html %]

-
-
-
    -
  1. - [% IF readonly %] - - [% invoicenumber | html %] - [% ELSE %] - - - Required + [% IF ( modified ) %] +
    +

    Invoice has been modified

    +
    [% END %] -
  2. -
  3. - - [% IF readonly %] - [% shipmentdate | $KohaDates %] - [% ELSE %] - -
    [% INCLUDE 'date-format.inc' %]
    - [% END %] -
  4. +

    Vendor: [% suppliername | html %]

    -
  5. - - [% IF readonly %] - [% billingdate | $KohaDates %] - [% ELSE %] - -
    [% INCLUDE 'date-format.inc' %]
    - [% END %] -
  6. + +
    +
      +
    1. + [% IF readonly %] + + [% invoicenumber | html %] + [% ELSE %] + + + Required + [% END %] +
    2. +
    3. + + [% IF readonly %] + [% shipmentdate | $KohaDates %] + [% ELSE %] + +
      [% INCLUDE 'date-format.inc' %]
      + [% END %] +
    4. +
    5. + + [% IF readonly %] + [% billingdate | $KohaDates %] + [% ELSE %] + +
      [% INCLUDE 'date-format.inc' %]
      + [% END %] +
    6. +
    7. + + [% IF readonly %] + [% shipmentcost | $Price %] + [% ELSE %] + + [% END %] +
    8. +
    9. + [% PROCESS fund_dropdown form_id => 'shipment_budget_id' form_name => 'shipment_budget_id' selected => shipment_budget_id %] +
    10. -
    11. - - [% IF readonly %] - [% shipmentcost | $Price %] - [% ELSE %] - - [% END %] -
    12. -
    13. - [% PROCESS fund_dropdown form_id => 'shipment_budget_id' form_name => 'shipment_budget_id' selected => shipment_budget_id %] -
    14. + [% IF ( invoiceclosedate ) %] +
    15. + Status: + Closed on [% invoiceclosedate | $KohaDates %] +
    16. + [% IF CAN_user_acquisition_reopen_closed_invoices AND NOT readonly %] +
    17. + + +
    18. + [% END %] + [% ELSE %] +
    19. + Status: + Open +
    20. + [% UNLESS ( readonly ) %] +
    21. + + +
    22. + [% END %] + [% END %] +
    - [% IF ( invoiceclosedate ) %] -
  7. Status: - Closed on [% invoiceclosedate | $KohaDates %]
  8. +
    + [% IF available_additional_fields.count %] + [% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_values %] + [% END %] +
    - [% IF CAN_user_acquisition_reopen_closed_invoices AND NOT readonly %] -
  9. - - -
  10. - [% END %] - [% ELSE %] -
  11. - Status: - Open -
  12. - [% UNLESS ( readonly ) %] -
  13. - - -
  14. - [% END %] - [% END %] -
-
- [% IF available_additional_fields.count %] - [% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_values %] - [% END %] -
- [% UNLESS readonly %] - - -
- - [% IF CAN_user_acquisition_delete_invoices AND NOT orders_loop.size %] - Delete - [% END %] -
- [% END %] -
-
+ [% UNLESS readonly %] + + +
+ + [% IF CAN_user_acquisition_delete_invoices AND NOT orders_loop.size %] + Delete + [% END %] +
+ [% END %] + + -

Adjustments

+

Adjustments

-
-
- - [% IF (adjustments && adjustments.count > 0) %] - - - - - - - - - [% UNLESS readonly %][% END %] - - [% total_adj = 0 %] - [% FOREACH adjustment IN adjustments %] - [% total_adj = total_adj + adjustment.adjustment %] - - - - - - - [% IF adjustment.encumber_open %] - + [% END %] +
IdAmountReasonNoteFundEncumber while invoice open 
[% adjustment.adjustment_id | html %] - [% IF readonly %] - [% adjustment.adjustment | $Price %] - [% ELSE %] - - [% END %] - - [% IF readonly %] - [% AuthorisedValues.GetByCode('ADJ_REASON', adjustment.reason) | html %] - [% ELSE %] - [% reasons = AuthorisedValues.Get("ADJ_REASON") %] - [% IF reasons.0 %] - - [% ELSE %] -

None

- - [% END %] - [% END %] -
- [% IF readonly %] - [% adjustment.note | html %] - [% ELSE %] - - [% END %] - - [% PROCESS fund_dropdown form_id => "budget_id_" _ adjustment.adjustment_id form_name => 'budget_id' selected => adjustment.budget_id %] - - [% IF readonly %] - + +
+ + [% IF (adjustments && adjustments.count > 0) %] + + + + + + + + + [% UNLESS readonly %][% END %] + + [% total_adj = 0 %] + [% FOREACH adjustment IN adjustments %] + [% total_adj = total_adj + adjustment.adjustment %] + + + + + + + [% IF adjustment.encumber_open %] + [% ELSE %] - + [% END %] - - [% ELSE %] - [% END %] - - [% END %] - [% UNLESS readonly %] - - [% END %] - - [% END %] -
IdAmountReasonNoteFundEncumber while invoice open 
+ [% adjustment.adjustment_id | html %] + + [% IF readonly %] + [% adjustment.adjustment | $Price %] + [% ELSE %] + + [% END %] + + [% IF readonly %] + [% AuthorisedValues.GetByCode('ADJ_REASON', adjustment.reason) | html %] + [% ELSE %] + [% reasons = AuthorisedValues.Get("ADJ_REASON") %] + [% IF reasons.0 %] + + [% ELSE %] +

None

+ + [% END %] + [% END %] +
+ [% IF readonly %] + [% adjustment.note | html %] + [% ELSE %] + + [% END %] + + [% PROCESS fund_dropdown form_id => "budget_id_" _ adjustment.adjustment_id form_name => 'budget_id' selected => adjustment.budget_id %] + + [% IF readonly %] + + [% ELSE %] + + [% END %] + + [% IF readonly %] + + [% ELSE %] + + [% END %] + - [% IF readonly %] - - [% ELSE %] - + [% UNLESS readonly %] + + Delete + - Delete -
- [% END %] +
+ [% END %] - [% UNLESS readonly %] -

- Add an adjustment -

+ [% UNLESS readonly %] +

+ Add an adjustment +

- -
- - -
- [% END %] -
-
-

- Go to receipt page - [% IF Koha.Preference('AcqEnableFiles') %]| Manage invoice files[% END %] -

-

Invoice details

-
- [% IF orders_loop.size %] - - - - - - - - - - - - - - - - - - - [% FOREACH order IN orders_loop %] - - - - - - - - - - - - - - [% END %] - - - [% FOR tf IN foot_loop %] - - - - - - - - - - - - [% END %] - - - - - - - - - - - - - - - - - - - - - - - -
SummaryLibraryActual cost tax exc.Actual cost tax inc.Replacement priceQty.Total tax exc. ([% currency.symbol | html %])Total tax inc. ([% currency.symbol | html %])GST %GSTFund
- [% IF order.biblionumber %] - [% INCLUDE 'biblio-title.inc' biblio=order link = 1 %] - [% IF ( order.author ) %] -
by [% order.author | html %] - [% END %] + +
+ + +
+ [% END %] + + + +

+ Go to receipt page + [% IF Koha.Preference('AcqEnableFiles') %]| Manage invoice files[% END %] +

+ +

Invoice details

+ +
+ [% IF orders_loop.size %] + + + + + + + + + + + + + + + + + + + [% FOREACH order IN orders_loop %] + + + + + + + + + + + + + + [% END %] + + + [% FOR tf IN foot_loop %] + + + + + + + + + + + + [% END %] + + + + + + + + + + + + + + + + + + + + + + + +
SummaryLibraryActual cost tax exc.Actual cost tax inc.Replacement priceQty.Total tax exc. ([% currency.symbol | html %])Total tax inc. ([% currency.symbol | html %])GST %GSTFund
+ [% IF order.biblionumber %] + [% INCLUDE 'biblio-title.inc' biblio=order link = 1 %] + [% IF ( order.author ) %] +
by [% order.author | html %] + [% END %] + [% ELSE %] + Deleted bibliographic record, can't find title + [% END %] + [% IF ( order.isbn ) %] – [% order.isbn | html %][% END %] + [% IF ( order.publishercode ) %] +
[% order.publishercode | html %] + [% IF order.publicationyear %], [% order.publicationyear | html %] + [% ELSIF ( order.copyrightdate ) %][% order.copyrightdate | html %][% END %] + [% END %] +
+

[% order.branchcode | html %]

+
+ [% order.unitprice_tax_excluded | $Price %] + + [% order.unitprice_tax_included | $Price %] + + [% order.replacementprice | $Price %] + [% IF ( order.uncertainprice ) %] + (Uncertain) + [% END %] + + [% order.quantity | html %] + + [% order.total_tax_excluded | $Price %] + + [% order.total_tax_included | $Price %] + + [% order.tax_rate * 100 | html %] + + [% order.tax_value | $Price %] + + [% order.budget_name | html %]
+ Modify fund +
Total (GST [% tf.tax_rate * 100 | html %] %) + [% tf.quantity | html %][% tf.total_tax_excluded | $Price %][% tf.total_tax_included | $Price %] [% tf.tax_value | $Price %] 
Total ([% currency.symbol | html %]) + [% total_quantity | html %][% total_tax_excluded | $Price %][% total_tax_included | $Price %] [% total_tax_value | $Price %] 
Total + adjustments + shipment cost ([% currency.symbol | html %]) + [% total_quantity | html %][% total_tax_excluded_shipment + total_adj | $Price %][% total_tax_included_shipment + total_adj | $Price %] [% total_tax_value | $Price %] 
[% ELSE %] - Deleted bibliographic record, can't find title +
+

No orders yet

+ [% IF adjustments && adjustments.count > 0 || shipmentcost && shipmentcost > 0 %] +

Adjustments plus shipping: [% total_adj + shipmentcost | $Price %]

+ [% END %] +
[% END %] - [% IF ( order.isbn ) %] – [% order.isbn | html %][% END %] - [% IF ( order.publishercode ) %] -
[% order.publishercode | html %] - [% IF order.publicationyear %], [% order.publicationyear | html %] - [% ELSIF ( order.copyrightdate ) %][% order.copyrightdate | html %][% END %] + [% IF ( (Koha.Preference('AcqEnableFiles')) && files ) %] +
+

Files attached to invoice

+ + + + + + + + + + + [% FOREACH f IN files %] + + + + + + + [% END %] + +
NameTypeDescriptionUploaded
+ [% f.file_name | html %] + [% f.file_type | html %][% f.file_description | html %] + [% f.date_uploaded | $KohaDates %] +
[% END %] -

[% order.branchcode | html %]

[% order.unitprice_tax_excluded | $Price %][% order.unitprice_tax_included | $Price %][% order.replacementprice | $Price %] [% IF ( order.uncertainprice ) %] (Uncertain) [% END %][% order.quantity | html %][% order.total_tax_excluded | $Price %][% order.total_tax_included | $Price %][% order.tax_rate * 100 | html %][% order.tax_value | $Price %] - [% order.budget_name | html %]
- Modify fund -
Total (GST [% tf.tax_rate * 100 | html %] %) - [% tf.quantity | html %][% tf.total_tax_excluded | $Price %][% tf.total_tax_included | $Price %] [% tf.tax_value | $Price %] 
Total ([% currency.symbol | html %]) - [% total_quantity | html %][% total_tax_excluded | $Price %][% total_tax_included | $Price %] [% total_tax_value | $Price %] 
Total + adjustments + shipment cost ([% currency.symbol | html %]) - [% total_quantity | html %][% total_tax_excluded_shipment + total_adj | $Price %][% total_tax_included_shipment + total_adj | $Price %] [% total_tax_value | $Price %] 
- [% ELSE %] -

No orders yet

- [% IF adjustments && adjustments.count > 0 || shipmentcost && shipmentcost > 0 %] -

Adjustments plus shipping: [% total_adj + shipmentcost | $Price %]

- [% END %] -
- [% END %] - [% IF ( (Koha.Preference('AcqEnableFiles')) && files ) %] -
-

Files attached to invoice

- - - - - - - - - - - [% FOREACH f IN files %] - - - - - - - [% END %] - -
NameTypeDescriptionUploaded
[% f.file_name | html %][% f.file_type | html %][% f.file_description | html %] - [% f.date_uploaded | $KohaDates %] -
- [% END %] -
-
-
+ + +
- - + +