[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha maninvoice.pl C4/Accounts2.pm koha-tmpl/in... [dev_week]
From: |
Kyle Hall |
Subject: |
[Koha-cvs] koha maninvoice.pl C4/Accounts2.pm koha-tmpl/in... [dev_week] |
Date: |
Thu, 26 Apr 2007 17:58:58 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Kyle Hall <kylemhall> 07/04/26 17:58:57
Modified files:
. : maninvoice.pl
C4 : Accounts2.pm
koha-tmpl/intranet-tmpl/ccfls/en/acqui.simple: isbnsearch.tmpl
Log message:
Added more by barcode stuff for manual invoices, does not break
existing functionality.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/maninvoice.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.8.6.2&r2=1.8.6.3
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Accounts2.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.22.4.1.2.2&r2=1.22.4.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui.simple/isbnsearch.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.2&r2=1.1.2.1.2.3
Patches:
Index: maninvoice.pl
===================================================================
RCS file: /sources/koha/koha/Attic/maninvoice.pl,v
retrieving revision 1.8.6.2
retrieving revision 1.8.6.3
diff -u -b -r1.8.6.2 -r1.8.6.3
--- maninvoice.pl 24 Apr 2007 13:35:46 -0000 1.8.6.2
+++ maninvoice.pl 26 Apr 2007 17:58:57 -0000 1.8.6.3
@@ -49,7 +49,7 @@
my $desc=$input->param('desc');
my $amount=$input->param('amount');
my $type=$input->param('type');
- manualinvoice($bornum,$itemnum,$desc,$type,$amount);
+ manualinvoice($bornum,$itemnum,$desc,$type,$amount,$barcode);
print $input->redirect("/cgi-bin/koha/boraccount.pl?bornum=$bornum");
} else {
my ($template, $loggedinuser, $cookie)
Index: C4/Accounts2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Attic/Accounts2.pm,v
retrieving revision 1.22.4.1.2.2
retrieving revision 1.22.4.1.2.3
diff -u -b -r1.22.4.1.2.2 -r1.22.4.1.2.3
--- C4/Accounts2.pm 26 Mar 2007 16:29:33 -0000 1.22.4.1.2.2
+++ C4/Accounts2.pm 26 Apr 2007 17:58:57 -0000 1.22.4.1.2.3
@@ -274,12 +274,13 @@
or C<REF>.
C<$itemnumber> is the item involved, if pertinent; otherwise, it
should be the empty string.
-
+C<$barcode> is the items barcode. Optional
=cut
#'
# FIXME - Okay, so what does this function do, really?
+## It creates a manual fine.
sub manualinvoice{
- my ($bornum,$itemnum,$desc,$type,$amount,$user)address@hidden;
+ my ($bornum,$itemnum,$desc,$type,$amount,$user,$barcode)address@hidden;
my $dbh = C4::Context->dbh;
my $insert;
$itemnum=~ s/ //g;
@@ -302,7 +303,11 @@
$amountleft=refund('',$bornum,$amount);
}
if ($itemnum ne ''){
- $desc.=" ".$itemnum;
+ if ( $barcode ) {
+ $desc .= " ( $barcode )";
+ } else {
+ $desc .= " " . $itemnum;
+ }
my $sth=$dbh->prepare("INSERT INTO accountlines
(borrowernumber, accountno, date, amount, description,
accounttype, amountoutstanding, itemnumber)
VALUES (?, ?, now(), ?,?, ?,?,?)");
Index: koha-tmpl/intranet-tmpl/ccfls/en/acqui.simple/isbnsearch.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui.simple/Attic/isbnsearch.tmpl,v
retrieving revision 1.1.2.1.2.2
retrieving revision 1.1.2.1.2.3
diff -u -b -r1.1.2.1.2.2 -r1.1.2.1.2.3
--- koha-tmpl/intranet-tmpl/ccfls/en/acqui.simple/isbnsearch.tmpl 12 Jan
2007 13:48:23 -0000 1.1.2.1.2.2
+++ koha-tmpl/intranet-tmpl/ccfls/en/acqui.simple/isbnsearch.tmpl 26 Apr
2007 17:58:57 -0000 1.1.2.1.2.3
@@ -76,7 +76,7 @@
<td><a
href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Add
items</a></td>
<!-- TMPL_ELSE -->
<td><a
href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Edit
Biblio</a></td>
- <td><a
href="additem.pl?bibid=<!-- TMPL_VAR NAME="bibid" -->">Edit Items</a></td>
+ <td><a
href="additem.pl?bibid=<!-- TMPL_VAR NAME="biblionumber" -->">Edit
Items</a></td>
<!-- /TMPL_IF -->
<!-- TMPL_UNLESS NAME="NOTMARC"
-->
<td><a
href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber"
-->&op=duplicate">Duplicate</a></td><!-- /TMPL_UNLESS --></tr>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha maninvoice.pl C4/Accounts2.pm koha-tmpl/in... [dev_week],
Kyle Hall <=