Merge branch 'master' of /usr/local/git/koha_base.git/

[koha-ffzg.git] / C4 / Accounts.pm

diff --git a/C4/Accounts.pm b/C4/Accounts.pm
index 945c8ed..d47c438 100755 (executable)
--- a/C4/Accounts.pm
+++ b/C4/Accounts.pm
@@ -357,16 +357,10 @@ sub manualinvoice {
         my $sth = $dbh->prepare(
             "INSERT INTO  accountlines
                         (borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding, itemnumber,notify_id)
-        VALUES (?, ?, now(), ?,?, ?,?,?,?)"
-        );
-
-#     $sth->execute($borrowernumber, $accountno, $amount, $desc, $type, $amountleft, $data->{'itemnumber'});
-        $sth->execute( $borrowernumber, $accountno, $amount, $desc, $type,
-            $amountleft, $itemnum, $notifyid );
-    }
-    else {
-        my $sth = $dbh->prepare(
-            "INSERT INTO  accountlines
+        VALUES (?, ?, now(), ?,?, ?,?,?,?)");
+     $sth->execute($borrowernumber, $accountno, $amount, $desc, $type, $amountleft, $itemnum,$notifyid) || return $sth->errstr;
+  } else {
+    my $sth=$dbh->prepare("INSERT INTO  accountlines
             (borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding,notify_id)
             VALUES (?, ?, now(), ?, ?, ?, ?,?)"
         );