From 138f14c2b971f7f539bc11081f8be3cc8742de78 Mon Sep 17 00:00:00 2001 From: Mathieu Saby Date: Sat, 19 Apr 2014 10:21:51 +0200 Subject: [PATCH] Bug 9416: (follow-up) fix neworderempty and templates This followup answer QA remarks : - neworderempty.pl updated so that the 2 new variables are passed to the template - modordernotes.tt fixed to make the translation easier - in CSV headers, to make clear that no change are made for the moment, rename "note" to "internal note" Additionnaly, "Publisher code" was wrong in the csv headers. I changed it to "Publisher" (the field in database is publishercode, but the content is a real publisher name, not a code) I did not change "Note:" in modordernotes.tt, because it is just under a h1 tag which specifies the type of note the librarian is editing. Test plan : - edit an existing order, and try to change/add/delete the vendor note, and the internal note. Check the changes are properly saved - export a basket and a basketgroup in CSV. Check the columns headers are "Publisher" and "Vendor note" Signed-off-by: Katrin Fischer Fixed some tabs. Passes QA script and tests. Tested: - add notes when creating an order - edit notes modifying an order line - edit notes using the links on the basket summary - check basket CSV export - close basket - check basket group CSV export - edit notes on order receive page using the links - edit notes on receive Note: Translatability of templates could be improved by a follow-up. It's better not to divide up sentences with if/else structures. Signed-off-by: Galen Charlton --- acqui/neworderempty.pl | 7 ++++--- .../prog/en/includes/csv_headers/acqui/basket.tt | 2 +- .../prog/en/includes/csv_headers/acqui/basketgroup.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/modordernotes.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/acqui/neworderempty.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl index bc77fafbe7..93794eab02 100755 --- a/acqui/neworderempty.pl +++ b/acqui/neworderempty.pl @@ -336,7 +336,8 @@ if ( defined $subscriptionid ) { $data->{ecost} = $lastOrderReceived->{ecost}; $data->{quantity} = $lastOrderReceived->{quantity}; $data->{unitprice} = $lastOrderReceived->{unitprice}; - $data->{notes} = $lastOrderReceived->{notes}; + $data->{order_internalnote} = $lastOrderReceived->{order_internalnote}; + $data->{order_vendornote} = $lastOrderReceived->{order_vendornote}; $data->{sort1} = $lastOrderReceived->{sort1}; $data->{sort2} = $lastOrderReceived->{sort2}; @@ -385,6 +386,8 @@ $template->param( discount => $bookseller->{'discount'}, orderdiscount_2dp => sprintf( "%.2f", $data->{'discount'} || 0 ), orderdiscount => $data->{'discount'}, + order_internalnote => $data->{'order_internalnote'}, + order_vendornote => $data->{'order_vendornote'}, listincgst => $bookseller->{'listincgst'}, invoiceincgst => $bookseller->{'invoiceincgst'}, name => $bookseller->{'name'}, @@ -419,8 +422,6 @@ $template->param( (uc(C4::Context->preference("marcflavour"))) => 1 ); -$template->param ( notes => $data->{'notes'} ) if ( $ordernumber ); - output_html_with_http_headers $input, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basket.tt index efcf2920c7..fdb5781f9e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basket.tt @@ -1 +1 @@ -Contract name,Order number,Entry date,ISBN,Author,Title,Publication year,Publisher code,Collection title,Notes,Quantity,RRP,Delivery place,Billing place +Contract name,Order number,Entry date,ISBN,Author,Title,Publication year,Publisher,Collection title,Internal note,Quantity,RRP,Delivery place,Billing place diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt index d7650c1474..fd99445af9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt @@ -1 +1 @@ -Account number,Basket name,Order number,Author,Title,Publisher code,Publication year,Collection title,ISBN,Quantity,RRP,Discount,Estimated cost,Notes,Entry date,Bookseller name,Bookseller physical address,Bookseller postal address,Contract number,Contract name,Basket group delivery place,Basket group billing place,Basket delivery place,Basket billing place +Account number,Basket name,Order number,Author,Title,Publisher,Publication year,Collection title,ISBN,Quantity,RRP,Discount,Estimated cost,Internal note,Entry date,Bookseller name,Bookseller physical address,Bookseller postal address,Contract number,Contract name,Basket group delivery place,Basket group billing place,Basket delivery place,Basket billing place diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt index ee60b0e268..6ade209e71 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt @@ -1,5 +1,5 @@ [% INCLUDE 'doc-head-open.inc' %] -Koha › Acquisition › Change order [% IF (type == "vendor") %]vendor[% ELSE %]internal[% END %] note +Koha › Acquisition › Change order [% IF (type == "vendor") %]vendor note[% ELSE %]internal note[% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -12,7 +12,7 @@
-

Change order [% IF (type == "vendor") %]vendor[% ELSE %]internal[% END %] note (order no. [% ordernumber %])

+

Change order [% IF (type == "vendor") %]vendor note[% ELSE %]internal note[% END %] (order no. [% ordernumber %])

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index ab30ff2d90..e1d9ad521a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -539,7 +539,7 @@ $(document).ready(function() -
  • +
    • 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 11bc92029c..827cd2355e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -280,7 +280,7 @@ [% ELSE %] [Add internal note] [% END %] - [% IF ( loop_order.order_vendornote ) %] + [% IF ( loop_order.order_vendornote ) %]

    Vendor note: [% loop_order.order_vendornote|html %] [Change vendor note]

    [% ELSE %] [Add vendor note] -- 2.39.5