Final revisions to Changelog and Build.PL for 1.2.14 before beta

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/branches/1.2@2158 4979c152-3d1c-0410-bac9-87ea11338e46

3 files changed, 7 insertions, 3 deletions

diff --git a/Build.PL b/Build.PL
index bc64a1a4..e6aa8671 100644
--- a/Build.PL
+++ b/Build.PL
@@ -27,6 +27,7 @@ my $build = Module::Build->new (
 		'Config::Std'			=> 0,
 		'MIME::Lite'			=> 0,
 		'Test::More'			=> 0,
+		'Test::Trap'			=> 0,
 		},
 	recommends => {
 		'HTML::LinkExtor'		=> 0,
diff --git a/Changelog b/Changelog
index dddd0754..528c385e 100644
--- a/Changelog
+++ b/Changelog
@@ -1,8 +1,11 @@
 Changelog for 1.2.14
+* Build.PL now requires Test::Trap (Chris T, 1872529)
 * Fixed double escaping of tex under some circumstances (Seneca)
 * Added fix for bad summary information in AR/AP transactions (1800065,
 1800069, Chris T)
 * Fixed posting issue behind AR/AP transaction report anomilies (Chris T)
+* Fixed taxes added twice when viewing existing transaction (Chris T)
+* Fixed erroneous discount lines in POS invoice (Chris T)
 
 Changelog for 1.2.13
 * Fixed all known implicit cast issues with PostgreSQL 8.3 (Chris T)
diff --git a/LedgerSMB/IR.pm b/LedgerSMB/IR.pm
index 4d9958a9..1de8155a 100755
--- a/LedgerSMB/IR.pm
+++ b/LedgerSMB/IR.pm
@@ -907,16 +907,16 @@ sub reverse_invoice {
 
     # delete acc_trans
     $query = qq|DELETE FROM acc_trans WHERE trans_id = ?|;
-    $dbh->prepare($query);
+    $sth = $dbh->prepare($query);
     $sth->execute( $form->{id} ) || $form->dberror($query);
 
     # delete invoice entries
     $query = qq|DELETE FROM invoice WHERE trans_id = ?|;
-    $dbh->prepare($query);
+    $sth = $dbh->prepare($query);
     $sth->execute( $form->{id} ) || $form->dberror($query);
 
     $query = qq|DELETE FROM shipto WHERE trans_id = ?|;
-    $dbh->prepare($query);
+    $sth = $dbh->prepare($query);
     $sth->execute( $form->{id} ) || $form->dberror($query);
 
     $dbh->commit;