diff --git a/Changelog b/Changelog index 369e6d289f..54f3936bce 100644 --- a/Changelog +++ b/Changelog @@ -7,6 +7,11 @@ 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) +* 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 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) 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; diff --git a/UI/Contact/contact.html b/UI/Contact/contact.html index b30277a796..e006924efb 100644 --- a/UI/Contact/contact.html +++ b/UI/Contact/contact.html @@ -590,7 +590,7 @@ label = text('Threshold') class = "numeric" } ?> - 0 ?> +
- 0 ?> + $form->{"${taccno}_description"} format_amount(\%myconfig, $form->{"mt_amount_$item"}) .qq|" size="10"/> format_amount(\%myconfig, $form->{"mt_rate_$item"}) .qq|" size="4"/> format_amount(\%myconfig, $form->{"mt_basis_$item"}) .qq|" size="10"/>