Bugzilla – Attachment 3830 Details for
Bug 6070
On a new order defined from suggestion some fields were missing.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
manuel rebase of initial patch
0001-PATCH-BZ6070-On-a-new-order-defined-from-suggestion-.patch (text/plain), 6.97 KB, created by
claire.hernandez@biblibre.com
on 2011-04-08 10:14:22 UTC
(
hide
)
Description:
manuel rebase of initial patch
Filename:
MIME Type:
Creator:
claire.hernandez@biblibre.com
Created:
2011-04-08 10:14:22 UTC
Size:
6.97 KB
patch
obsolete
>From aa3e89c5785a13a6af64f367cf22f35230e1e40d Mon Sep 17 00:00:00 2001 >From: Claire Hernandez <claire.hernandez@biblibre.com> >Date: Fri, 8 Apr 2011 12:11:50 +0200 >Subject: [PATCH] [PATCH] BZ6070 On a new order defined from suggestion some fields were missing. > > (MT4937) > The missing fields : publicationyear, place, collectiontitle. More the layout has been modified. >--- > acqui/neworderempty.pl | 5 ++- > .../prog/en/modules/acqui/neworderempty.tmpl | 28 ++++++++++++++----- > .../prog/en/modules/suggestion/suggestion.tmpl | 1 + > 3 files changed, 24 insertions(+), 10 deletions(-) > >diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl >index 386dda7..d5cc98c 100755 >--- a/acqui/neworderempty.pl >+++ b/acqui/neworderempty.pl >@@ -98,7 +98,7 @@ my $title = $input->param('title'); > my $author = $input->param('author'); > my $publicationyear = $input->param('publicationyear'); > my $bookseller = GetBookSellerFromId($booksellerid); # FIXME: else ERROR! >-my $ordernumber = $input->param('ordernumber') || ''; >+my $ordernumber = $input->param('ordernumber') || ''; > my $biblionumber = $input->param('biblionumber'); > my $basketno = $input->param('basketno'); > my $suggestionid = $input->param('suggestionid'); >@@ -368,6 +368,7 @@ $template->param( > budget_loop => $budget_loop, > isbn => $data->{'isbn'}, > seriestitle => $data->{'seriestitle'}, >+ collectiontitle => $data->{'collectiontitle'}, > quantity => $data->{'quantity'}, > quantityrec => $data->{'quantity'}, > rrp => $data->{'rrp'}, >@@ -376,7 +377,7 @@ $template->param( > ecost => $data->{'ecost'}, > notes => $data->{'notes'}, > publishercode => $data->{'publishercode'}, >- >+ place => $data->{'place'}, > import_batch_id => $import_batch_id, > > # CHECKME: gst-stuff needs verifing, mason. >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl >index 0eacf19..6ecee6e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl >@@ -215,21 +215,33 @@ $(document).ready(function() > </li> > <li> > <!-- TMPL_IF name="biblionumber" --> >- <span class="label">Publisher: </span> >+ <span class="label">Published by: </span> > <input type="hidden" size="50" name="publishercode" id="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" /><!-- TMPL_VAR NAME="publishercode" --> > <!-- TMPL_ELSE --> >- <label for="publishercode"> Publisher: </label> >+ <label for="publishercode"> Published by: </label> > <input type="text" size="50" name="publishercode" id="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" /> > <!-- /TMPL_IF --> > </li> > <li> >+ <span><!-- TMPL_IF name="biblionumber" --> >+ <span class="label"> At: </span> >+ <input type="hidden" size="20" name="place" id="place" value="<!-- TMPL_VAR NAME="place" -->" /><!-- TMPL_VAR NAME="place" --> >+ <!-- TMPL_ELSE --> >+ <label for="place"> At: </label> >+ <input type="text" size="20" name="place" id="place" value="<!-- TMPL_VAR NAME="place" -->" /> >+ <!-- /TMPL_IF --> >+ </span> >+ </li> >+ <li> >+ <span> > <!-- TMPL_IF name="biblionumber" --> >- <span class="label">Publication year: </span> >+ <span class="label"> On: </span> > <input type="hidden" size="10" name="publicationyear" id="publicationyear" value="<!-- TMPL_VAR NAME="publicationyear" -->" /><!-- TMPL_VAR NAME="publicationyear" --> >- <!-- TMPL_ELSE --> >- <label for="publicationyear">Publication year: </label> >- <input type="text" size="10" name="publicationyear" id="publicationyear" value="<!-- TMPL_VAR NAME="publicationyear" -->" /> >+ <!-- TMPL_ELSE --> >+ <label for="publicationyear"> On: </label> >+ <input type="text" size="4" name="publicationyear" id="publicationyear" value="<!-- TMPL_VAR NAME="publicationyear" -->" /> > <!-- /TMPL_IF --> >+ </span> > </li> > <li> > <!-- TMPL_IF name="biblionumber" --> >@@ -243,10 +255,10 @@ $(document).ready(function() > <li> > <!-- TMPL_IF name="biblionumber" --> > <span class="label">Series: </span> >- <input type="hidden" size="50" name="series" id="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /><!-- TMPL_VAR NAME="seriestitle" --> >+ <input type="hidden" size="50" name="series" id="series" value="<!-- TMPL_VAR NAME="collectiontitle" -->" /><span class="title"><!-- TMPL_VAR NAME="collectiontitle" --></span> > <!-- TMPL_ELSE --> > <label for="series">Series: </label> >- <input type="text" size="50" name="series" id="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /> >+ <input type="text" size="50" name="series" id="series" value="<!-- TMPL_VAR NAME="collectiontitle" -->" /> > <!-- /TMPL_IF --> > </li> > </ol> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl >index 3d7817e..24f20d5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl >@@ -111,6 +111,7 @@ $(document).ready(function() { calcNewsuggTotal(); }); > <li><label for="copyrightdate">Copyright date:</label><input type="text" id="copyrightdate" name="copyrightdate" size="4" maxlength="4" value="<!--TMPL_VAR Name="copyrightdate"-->" /></li> > <li><label for="isbn">ISBN or ISSN or other standard number:</label><input type="text" id="isbn" name="isbn" size="50" maxlength="80" value="<!--TMPL_VAR Name="isbn"-->"/></li> > <li><label for="publishercode">Publisher:</label><input type="text" id="publishercode" name="publishercode" size="50" maxlength="80" value="<!--TMPL_VAR Name="publishercode"-->"/></li> >+ <li><label for="publicationyear"> Publication year:</label><input type="text" id="publicationyear" name="publicationyear" size="4" maxlength="80" value="<!-- TMPL_VAR name="publicationyear"-->" /></li> > <li><label for="place">Publication Place:</label><input type="text" id="place" name="place" size="50" maxlength="80" value="<!--TMPL_VAR Name="place"-->"/></li> > <li><label for="collectiontitle">Collection Title:</label><input type="text" id="collectiontitle" name="collectiontitle" size="50" maxlength="80" value="<!--TMPL_VAR Name="collectiontitle"-->"/></li> > <li><label for="itemtype">Document Type:</label> >-- >1.7.1 >
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 6070
:
3707
|
3830
|
4221
|
4222
|
4239
|
4796
|
17493
|
27015