From 7daee80066b1c1a34eda1ca79ca5a82adc4fc434 Mon Sep 17 00:00:00 2001
From: Chris Travers <chris@efficito.com>
Date: Tue, 7 Oct 2014 06:44:10 -0700
Subject: [PATCH 1/6] Fixing bug 1239, reopening books when over an existing
 close point throws error

--HG--
extra : source : 6225d8b119f19a57d536ae7e52d61ed22ed676cb
---
 Changelog                 |  1 +
 sql/modules/EndOfYear.sql | 36 +++++++++++++++++++++---------------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/Changelog b/Changelog
index 67ad7020a4..fbc3f1fab2 100644
--- a/Changelog
+++ b/Changelog
@@ -7,6 +7,7 @@ Changelog for 1.3.45
 * Fixed pricematrix prices not respected for vendors (Chris T, bug 1230)
 * Added tests for Sysconfig (Chris T, bug 1232)
 * Added first-rate starman/plack support (Chris T)
+* Fixed bug 1239, reopening on previous close throws error (Chris T)
 
 Chris T is Chris Travers
 
diff --git a/sql/modules/EndOfYear.sql b/sql/modules/EndOfYear.sql
index 2c0b62c614..eb7daf0eb1 100644
--- a/sql/modules/EndOfYear.sql
+++ b/sql/modules/EndOfYear.sql
@@ -179,6 +179,27 @@ $$ LANGUAGE PLPGSQL;
 COMMENT ON FUNCTION eoy_reopen_books(in_end_date date) IS
 $$ Removes checkpoints and reverses yearend transactions on in_end_date$$;
 
+CREATE OR REPLACE FUNCTION eoy__reopen_books_at(in_reopen_date date) 
+RETURNS BOOL
+LANGUAGE SQL AS
+$$
+
+    SELECT eoy_reopen_books(end_date) 
+      FROM (SELECT end_date 
+              FROM account_checkpoint
+             WHERE end_date >= $1
+             GROUP BY end_date) eoy_dates
+  ORDER BY end_date;
+
+SELECT CASE WHEN (SELECT count(*) > 0 from account_checkpoint 
+                   where end_date = $1 - 1)
+            THEN true
+            ELSE eoy_create_checkpoint($1 - 1) > 0
+       END;
+
+$$;
+
+
 CREATE OR REPLACE FUNCTION account__obtain_balance
 (in_transdate date, in_account_id int)
 RETURNS numeric AS
@@ -222,19 +243,4 @@ COMMENT ON FUNCTION eoy_earnings_accounts() IS
 $$ Lists equity accounts for the retained earnings dropdown.$$;
 
 
-CREATE OR REPLACE FUNCTION eoy__reopen_books_at(in_reopen_date date) 
-RETURNS BOOL
-LANGUAGE SQL AS
-$$
-
-    SELECT eoy_reopen_books(end_date) 
-      FROM (SELECT end_date 
-              FROM account_checkpoint
-             WHERE end_date >= $1
-             GROUP BY end_date) eoy_dates
-  ORDER BY end_date;
-
-SELECT eoy_create_checkpoint($1 - 1) > 0;
-
-$$;
 COMMIT;

From 1cff70bb0ca464b3a54a4ee6b8de366fe4238a5b Mon Sep 17 00:00:00 2001
From: Chris Travers <chris@efficito.com>
Date: Wed, 8 Oct 2014 03:18:31 -0700
Subject: [PATCH 2/6] Quieting some template tests.

---
 Changelog               | 1 +
 UI/Contact/contact.html | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index fbc3f1fab2..87e92c997d 100644
--- a/Changelog
+++ b/Changelog
@@ -8,6 +8,7 @@ Changelog for 1.3.45
 * Added tests for Sysconfig (Chris T, bug 1232)
 * Added first-rate starman/plack support (Chris T)
 * Fixed bug 1239, reopening on previous close throws error (Chris T)
+* Quited some of the test cases (Chris T)
 
 Chris T is Chris Travers
 
diff --git a/UI/Contact/contact.html b/UI/Contact/contact.html
index 62734973d0..48e8021a44 100644
--- a/UI/Contact/contact.html
+++ b/UI/Contact/contact.html
@@ -580,7 +580,7 @@
 			label = text('Threshold')
 			class = "numeric"
                } ?>
-          <td> <?lsmb IF pricegroups.size > 0 ?>
+          <td> <?lsmb IF pricegroups.size ?>
                <div id="pricegroup-div">
                <?lsmb pricegroups.unshift({});
                 INCLUDE select element_data = {
@@ -597,7 +597,7 @@
 	<tr id="taxform-threshold-row">
 
 	
-	 <td><?lsmb IF taxform_list.size > 0 ?>
+	 <td><?lsmb IF taxform_list.size ?>
              <?lsmb taxform_list.unshift({});
                     INCLUDE select element_data = {
 			name = "taxform_id"

From 4b0bf46dd89b21df5af77a67e6480705d6a92d94 Mon Sep 17 00:00:00 2001
From: Chris Travers <chris@efficito.com>
Date: Tue, 14 Oct 2014 05:05:38 -0700
Subject: [PATCH 3/6] Fixing bug 1244, manually entered tax crashes edit screen

---
 Changelog | 3 ++-
 bin/is.pl | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index 87e92c997d..f1884d60b6 100644
--- a/Changelog
+++ b/Changelog
@@ -8,7 +8,8 @@ Changelog for 1.3.45
 * Added tests for Sysconfig (Chris T, bug 1232)
 * Added first-rate starman/plack support (Chris T)
 * Fixed bug 1239, reopening on previous close throws error (Chris T)
-* Quited some of the test cases (Chris T)
+* Quieted some of the test cases (Chris T)
+* Fixed bug 1244, manually entered tax crashes invoice on edit (Chris T)
 
 Chris T is Chris Travers
 
diff --git a/bin/is.pl b/bin/is.pl
index 5c8168c0b6..526075fbd4 100644
--- a/bin/is.pl
+++ b/bin/is.pl
@@ -744,15 +744,15 @@ sub form_footer {
                 <th align=right>$form->{"${taccno}_description"}</th>
                 <td><input type="text" name="mt_amount_$item"
                         id="mt-amount-$item" value="|
-                        .$form->format_amount($form->{"mt_amount_$item"}) 
+                        .$form->format_amount(\%myconfig, $form->{"mt_amount_$item"}) 
                         .qq|" size="10"/></td>
                 <td><input type="text" name="mt_rate_$item"
                          id="mt-rate-$item" value="|
-                        .$form->format_amount($form->{"mt_rate_$item"}) 
+                        .$form->format_amount(\%myconfig, $form->{"mt_rate_$item"}) 
                         .qq|" size="4"/></td>
                 <td><input type="text" name="mt_basis_$item"
                          id="mt-basis-$item" value="|
-                        .$form->format_amount($form->{"mt_basis_$item"}) 
+                        .$form->format_amount(\%myconfig, $form->{"mt_basis_$item"}) 
                         .qq|" size="10"/></td>
                 <td><input type="text" name="mt_ref_$item"
                          id="mt-ref-$item" value="|

From c5e75eaee072720b27286fb8363985fbdc4649c8 Mon Sep 17 00:00:00 2001
From: Chris Travers <chris@efficito.com>
Date: Tue, 14 Oct 2014 06:54:03 -0700
Subject: [PATCH 4/6] Fixing bug 1251 that affects some backports only

---
 Changelog             | 1 +
 LedgerSMB/DBObject.pm | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Changelog b/Changelog
index f1884d60b6..0819d12773 100644
--- a/Changelog
+++ b/Changelog
@@ -10,6 +10,7 @@ Changelog for 1.3.45
 * Fixed bug 1239, reopening on previous close throws error (Chris T)
 * Quieted some of the test cases (Chris T)
 * Fixed bug 1244, manually entered tax crashes invoice on edit (Chris T)
+* Fixed bug 1251, some backports failing due to misplacing db cnx (Chris T)
 
 Chris T is Chris Travers
 
diff --git a/LedgerSMB/DBObject.pm b/LedgerSMB/DBObject.pm
index a0bf89e821..d81b26cb40 100644
--- a/LedgerSMB/DBObject.pm
+++ b/LedgerSMB/DBObject.pm
@@ -49,6 +49,7 @@ package LedgerSMB::DBObject;
 use Scalar::Util;
 use base qw(LedgerSMB);
 use LedgerSMB::Log;
+use LedgerSMB::App_State;
 use strict;
 use warnings;
 
@@ -107,6 +108,7 @@ sub exec_method {
     my $self   = shift @_;
     my %args  = (ref($_[0]) eq 'HASH')? %{$_[0]}: @_;
     my $funcname = $args{funcname};
+    $self->{dbh} ||= $LedgerSMB::App_State::DBH;
     
     my $schema   = $args{schema} || $LedgerSMB::Sysconfig::db_namespace;
     

From 0bb5f7c0dc55682290eadc4cfc1dfdc6c33396f0 Mon Sep 17 00:00:00 2001
From: Chris Travers <chris@efficito.com>
Date: Wed, 15 Oct 2014 05:51:58 -0700
Subject: [PATCH 5/6] Fixing bug 1241

---
 LedgerSMB/AA.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/LedgerSMB/AA.pm b/LedgerSMB/AA.pm
index 022f40ad75..7a48b6c011 100755
--- a/LedgerSMB/AA.pm
+++ b/LedgerSMB/AA.pm
@@ -890,12 +890,12 @@ sub transactions {
 
     if ( !$form->{summary} and !$form->{outstanding} ) {
         $acc_trans_flds = qq|
-			, c.accno, ac.source,
-			p.projectnumber, ac.memo AS description,
-			ac.amount AS linetotal,
+			, c.accno, 
+			p.projectnumber, 
+                        ((1 - i.discount) * i.qty * i.sellprice) as linetotal, 
 			i.description AS linedescription|;
-        $group_by_fields = qq|, c.accno, ac.source, p.projectnumber, ac.memo,
-                              ac.amount, i.description |;
+        $group_by_fields = qq|, c.accno, p.projectnumber,
+                              i.discount, i.qty, i.sellprice, i.description |;
 
         $acc_trans_join = qq| 
 			     JOIN acc_trans ac ON (a.id = ac.trans_id)

From a2ad1adfa81800790f6208313431905f02bec965 Mon Sep 17 00:00:00 2001
From: Chris Travers <chris@efficito.com>
Date: Wed, 15 Oct 2014 05:52:35 -0700
Subject: [PATCH 6/6] Updating changelog for 1.3-only fix

---
 Changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Changelog b/Changelog
index 0819d12773..c321b75886 100644
--- a/Changelog
+++ b/Changelog
@@ -11,6 +11,7 @@ Changelog for 1.3.45
 * Quieted some of the test cases (Chris T)
 * Fixed bug 1244, manually entered tax crashes invoice on edit (Chris T)
 * Fixed bug 1251, some backports failing due to misplacing db cnx (Chris T)
+* Fixed bug 1241, join projection, amounts in invoice details report (Chris T)
 
 Chris T is Chris Travers