Bugzilla – Attachment 8615 Details for
Bug 7757
Edit basket vendor after it has been created
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 7757 - Edit basket vendor after it has been created
SIGNED-OFF-Bug-7757---Edit-basket-vendor-after-it-.patch (text/plain), 6.32 KB, created by
Marc Véron
on 2012-03-23 19:35:38 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 7757 - Edit basket vendor after it has been created
Filename:
MIME Type:
Creator:
Marc Véron
Created:
2012-03-23 19:35:38 UTC
Size:
6.32 KB
patch
obsolete
>From 669c590c301eb466efa626720fa8c015f0e31578 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Fri, 23 Mar 2012 12:43:25 -0400 >Subject: [PATCH] [SIGNED-OFF] Bug 7757 - Edit basket vendor after it has been created >Content-Type: text/plain; charset="utf-8" > >Signed-off-by: mveron <veron@veron.ch> >--- > C4/Acquisition.pm | 12 ++++++++---- > acqui/basketheader.pl | 11 ++++++----- > .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +- > .../prog/en/modules/acqui/basketheader.tt | 8 ++++++++ > 4 files changed, 23 insertions(+), 10 deletions(-) > >diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm >index 0a96a02..ea8cf5c 100644 >--- a/C4/Acquisition.pm >+++ b/C4/Acquisition.pm >@@ -384,7 +384,7 @@ sub ModBasket { > > =head3 ModBasketHeader > >- &ModBasketHeader($basketno, $basketname, $note, $booksellernote, $contractnumber); >+ &ModBasketHeader($basketno, $basketname, $note, $booksellernote, $contractnumber, $booksellerid); > > Modifies a basket's header. > >@@ -400,16 +400,20 @@ Modifies a basket's header. > > =item C<$contractnumber> is the "contractnumber" (foreign) key in the "aqbasket" table. > >+=item C<$booksellerid> is the id (foreign) key in the "aqbooksellers" table for the vendor. >+ > =back > > =cut > > sub ModBasketHeader { >- my ($basketno, $basketname, $note, $booksellernote, $contractnumber) = @_; >- my $query = "UPDATE aqbasket SET basketname=?, note=?, booksellernote=? WHERE basketno=?"; >+ my ($basketno, $basketname, $note, $booksellernote, $contractnumber, $booksellerid) = @_; >+ >+ my $query = "UPDATE aqbasket SET basketname=?, note=?, booksellernote=?, booksellerid=? WHERE basketno=?"; > my $dbh = C4::Context->dbh; > my $sth = $dbh->prepare($query); >- $sth->execute($basketname,$note,$booksellernote,$basketno); >+ $sth->execute($basketname,$note,$booksellernote,$booksellerid,$basketno); >+ > if ( $contractnumber ) { > my $query2 ="UPDATE aqbasket SET contractnumber=? WHERE basketno=?"; > my $sth2 = $dbh->prepare($query2); >diff --git a/acqui/basketheader.pl b/acqui/basketheader.pl >index b33e4ef..08b38eb 100755 >--- a/acqui/basketheader.pl >+++ b/acqui/basketheader.pl >@@ -52,7 +52,7 @@ use C4::Context; > use C4::Auth; > use C4::Output; > use C4::Acquisition qw/GetBasket NewBasket GetContracts ModBasketHeader/; >-use C4::Bookseller qw/GetBookSellerFromId/; >+use C4::Bookseller qw/GetBookSellerFromId GetBookSeller/; > > > my $input = new CGI; >@@ -68,8 +68,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( > ); > > #parameters: >-my $booksellerid; >-$booksellerid = $input->param('booksellerid'); >+my $booksellerid = $input->param('booksellerid'); > my $basketno = $input->param('basketno'); > my $basket; > my $op = $input ->param('op'); >@@ -101,13 +100,15 @@ if ( $op eq 'add_form' ) { > $template->param(contractloop => \@contractloop, > basketcontractnumber => $basket->{'contractnumber'}); > } >+ my @booksellers = GetBookSeller(); > $template->param( add_form => 1, > basketname => $basket->{'basketname'}, > basketnote => $basket->{'note'}, > basketbooksellernote => $basket->{'booksellernote'}, > booksellername => $bookseller->{'name'}, > booksellerid => $booksellerid, >- basketno => $basketno >+ basketno => $basketno, >+ booksellers => \@booksellers, > ); > #End Edit > } elsif ( $op eq 'add_validate' ) { >@@ -115,7 +116,7 @@ if ( $op eq 'add_form' ) { > my $basketno; > if ( $is_an_edit ) { > $basketno = $input->param('basketno'); >- ModBasketHeader($input->param('basketno'),$input->param('basketname'),$input->param('basketnote'),$input->param('basketbooksellernote'),$input->param('basketcontractnumber')); >+ ModBasketHeader( $input->param('basketno'), $input->param('basketname'), $input->param('basketnote'), $input->param('basketbooksellernote'), $input->param('basketcontractnumber') || undef, $input->param('basketbooksellerid') ); > } else { #New basket > $basketno = NewBasket($booksellerid, $loggedinuser, $input->param('basketname'), $input->param('basketnote'), $input->param('basketbooksellernote'), $input->param('basketcontractnumber')); > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >index 88578b2..61cf10f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -110,7 +110,7 @@ > </script> > > <ul id="toolbar-list" class="toolbar"> >- <li><a href="basketheader.pl?basketno=[% basketno %]&op=add_form" class="button" id="basketheadbutton">Edit basket header information</a></li> >+ <li><a href="basketheader.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&op=add_form" class="button" id="basketheadbutton">Edit basket</a></li> > <li><a href="javascript:confirm_deletion();" class="button" id="delbasketbutton">Delete this basket</a></li> > [% IF ( unclosable ) %] > [% ELSIF ( uncertainprices ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >index 160c5f6..5f702cb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >@@ -126,6 +126,14 @@ li.list2 { > <input type="text" name="basketname" id="basketname" size="40" maxlength="80" value="[% basketname %]" /> > </li> > <li> >+ <label for="basketbooksellerid">Vendor</label> >+ <select name="basketbooksellerid" id="basketbooksellerid"> >+ [% FOREACH b IN booksellers %] >+ <option value="[% b.id %]" [% IF booksellerid == b.id %] selected="selected"[% END %]>[% b.name %]</option> >+ [% END %] >+ </select> >+ </li> >+ <li> > <label for="basketnote">Internal note</label> > <textarea name="basketnote" id="basketnote" rows="5" cols="40">[% basketnote %]</textarea> > </li> >-- >1.7.2.5
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 7757
:
8614
| 8615 |
9391
|
9422
|
9424
|
9588