Merge pull request #179 from einhverfr/1.4

1.4 RC3 final fixes
ledgersmb · Aug 23, 2014 · 24855c7 · 24855c7
2 parents e97e29f + c3680b8
commit 24855c7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/LedgerSMB/AA.pm b/LedgerSMB/AA.pm
@@ -899,7 +899,7 @@ sub get_name {
     	       16 => 'cc',
     	       17 => 'bcc' );
     $sth = $dbh->prepare($query);
-    $sth->execute( $form->{eca_id}, 14) || $form->dberror( $query );
+    $sth->execute( $form->{eca_id}, 17) || $form->dberror( $query );
 
     my $ctype;
     my $billing_email = 0;

diff --git a/sql/modules/COGS.sql b/sql/modules/COGS.sql
@@ -130,7 +130,7 @@ FOR t_inv IN
       JOIN (select id, approved, transdate from ap 
              union 
             select id, approved, transdate from gl) a 
-           ON a.id = i.trans_id AND NOT a.approved
+           ON a.id = i.trans_id AND a.approved
      WHERE qty + allocated < 0 AND parts_id = in_parts_id
   ORDER BY a.transdate, a.id, i.id
 LOOP