bugfixes for acquisition module

diff --git a/C4/Members.pm b/C4/Members.pm
index 8a5b33f..502d0f3 100644 (file)
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -1637,7 +1637,7 @@ sub ExtendMemberSubscriptionTo {
     my $dbh = C4::Context->dbh;
     unless ($date){
       $date=POSIX::strftime("%Y-%m-%d",localtime(time));
-      my $borrower = GetBorrower($borrowerid,'borrowernumber');
+      my $borrower = GetMember($borrowerid,'borrowernumber');
       $date = GetExpiryDate( $borrower->{'categorycode'}, $date );
     }
     my $sth = $dbh->do(<<EOF);

diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl
index 7ebb053..d1a21a5 100755 (executable)
--- a/acqui/neworderempty.pl
+++ b/acqui/neworderempty.pl
@@ -184,7 +184,7 @@ foreach my $thisbranch ( sort keys %$branches ) {
 $template->param( branchloop => \@branchloop );
 
 # build bookfund list
-my $borrower= GetBorrower($loggedinuser);
+my $borrower= GetMember($loggedinuser);
 my ( $flags, $homebranch )= ($borrower->{'flags'},$borrower->{'branchcode'});
 
 my $count2;

diff --git a/acqui/parcel.pl b/acqui/parcel.pl
index ca03a2c..1d0ee1f 100644 (file)
--- a/acqui/parcel.pl
+++ b/acqui/parcel.pl
@@ -73,7 +73,7 @@ my $count = scalar @booksellers;
 my $invoice=$input->param('invoice') || '';
 my $freight=$input->param('freight');
 my $gst=$input->param('gst');
-my $datereceived=$input->param('datereceived') || format_date(join "-",Date::Calc::Today());
+my $datereceived=format_date_in_iso($input->param('datereceived')) || format_date(join "-",Date::Calc::Today());
 my $code=$input->param('code');
 
 my ($template, $loggedinuser, $cookie)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl
index 6a292b3..89bed17 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl
@@ -92,7 +92,7 @@
                                <tr>
                                        <td>
                                            <!-- TMPL_IF NAME="invoicenumber" -->
-                                               <a href="/cgi-bin/koha/acqui/parcel.pl?code=<!-- TMPL_VAR NAME="invoicenumber"-->&supplierid=<!-- TMPL_VAR NAME="id"-->&datereceived=<!-- TMPL_VAR NAME="datereceived" -->">Parcel</a>
+                                               <a href="/cgi-bin/koha/acqui/parcel.pl?invoice=<!-- TMPL_VAR NAME="invoicenumber"-->&supplierid=<!-- TMPL_VAR NAME="id"-->&datereceived=<!-- TMPL_VAR NAME="datereceived" -->">Parcel</a>
                                            <!-- TMPL_ELSE -->
                                                &nbsp;
                                            <!-- /TMPL_IF -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/parcels.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/parcels.tmpl
index 48ceb7c..ae75b28 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/acqui/parcels.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/parcels.tmpl
@@ -84,7 +84,7 @@
         </td>
         <!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number">
         <!-- /TMPL_IF -->
-            <a href="/cgi-bin/koha/acqui/parcel.pl?type=intra&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" ESCAPE=URL -->&amp;datereceived=<!-- TMPL_VAR NAME="raw_datereceived" ESCAPE=URL --><!--TMPL_IF Name="code"-->&amp;code=<!--TMPL_VAR Name="code" ESCAPE=URL --><!--/TMPL_IF-->">
+            <a href="/cgi-bin/koha/acqui/parcel.pl?type=intra&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" ESCAPE=URL -->&amp;datereceived=<!-- TMPL_VAR NAME="raw_datereceived" ESCAPE=URL --><!--TMPL_IF Name="code"-->&amp;invoice=<!--TMPL_VAR Name="code" ESCAPE=URL --><!--/TMPL_IF-->">
                 <!-- TMPL_VAR NAME="datereceived" -->
             </a>
         </td>