Bugzilla – Attachment 27306 Details for
Bug 9416
We should have 2 kinds of notes for each order line
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
0003-PASSED-QA-Bug-9416-QA-Followup-fix-neworderempty-and.patch
0003-PASSED-QA-Bug-9416-QA-Followup-fix-neworderempty-and.patch (text/plain), 8.45 KB, created by
Katrin Fischer
on 2014-04-19 10:22:02 UTC
(
hide
)
Description:
0003-PASSED-QA-Bug-9416-QA-Followup-fix-neworderempty-and.patch
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2014-04-19 10:22:02 UTC
Size:
8.45 KB
patch
obsolete
>From 934d3dc69c88d0c723acae34dd3d5cff188c428c Mon Sep 17 00:00:00 2001 >From: Mathieu Saby <mathsabypro@gmail.com> >Date: Sat, 19 Apr 2014 10:21:51 +0200 >Subject: [PATCH 3/3] [PASSED QA] Bug 9416 QA Followup: 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 being editing > >Test plan : >- edit an existing order, and try to change/add/suppress 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 <Katrin.Fischer.83@web.de> >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. >--- > acqui/neworderempty.pl | 7 ++++--- > .../intranet-tmpl/prog/en/includes/csv_headers/acqui/basket.tt | 2 +- > .../prog/en/includes/csv_headers/acqui/basketgroup.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt | 4 ++-- > koha-tmpl/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 bc77faf..93794ea 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 efcf292..fdb5781 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 d7650c1..fd99445 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 ee60b0e..6ade209 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' %] >-<title>Koha › Acquisition › Change order [% IF (type == "vendor") %]vendor[% ELSE %]internal[% END %] note</title> >+<title>Koha › Acquisition › Change order [% IF (type == "vendor") %]vendor note[% ELSE %]internal note[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >@@ -12,7 +12,7 @@ > > <div id="bd"> > <div id="yui-main"> >- <h1>Change order [% IF (type == "vendor") %]vendor[% ELSE %]internal[% END %] note (order no. [% ordernumber %])</h1> >+ <h1>Change order [% IF (type == "vendor") %]vendor note[% ELSE %]internal note[% END %] (order no. [% ordernumber %])</h1> > <form action="/cgi-bin/koha/acqui/modordernotes.pl" method="post"> > <fieldset class="brief"> > <label for="ordernotes">Note:</label> >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 ab30ff2..e1d9ad5 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() > <label for="order_internalnote">Internal note: </label> > <textarea id="order_internalnote" cols="30" rows="3" name="order_internalnote" >[% IF ( order_internalnote ) %][% order_internalnote %][% END %]</textarea> > </li> >- <li> >+ <li> > <label for="order_vendornote">Vendor note: </label> > <textarea id="order_vendornote" cols="30" rows="3" name="order_vendornote" >[% IF ( order_vendornote ) %][% order_vendornote %][% END %]</textarea> > </li> >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 11bc920..827cd23 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 %] > [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid %]&type=internal">Add internal note</a>] > [% END %] >- [% IF ( loop_order.order_vendornote ) %] >+ [% IF ( loop_order.order_vendornote ) %] > <p class="ordernote"><strong>Vendor note: </strong>[% loop_order.order_vendornote|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid %]&type=vendor">Change vendor note</a>]</p> > [% ELSE %] > [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid %]&type=vendor">Add vendor note</a>] >-- >1.8.3.2 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 9416
:
21293
|
21964
|
23798
|
25329
|
25335
|
27231
|
27274
|
27299
|
27300
|
27301
|
27302
|
27304
|
27305
| 27306