Hiding notes with ledgersmb.css on top company div for now.

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

2 files changed, 13 insertions, 8 deletions

diff --git a/LedgerSMB/CA.pm b/LedgerSMB/CA.pm
index 117d9d1e..169e6827 100644
--- a/LedgerSMB/CA.pm
+++ b/LedgerSMB/CA.pm
@@ -151,7 +151,6 @@ sub all_transactions {
 
     my $fromdate_where;
     my $todate_where;
-    
     ( $form->{fromdate}, $form->{todate} ) =
       $form->from_to( $form->{year}, $form->{month}, $form->{interval} )
       if !$form->{fromdate} && !$form->{todate};
@@ -372,7 +371,6 @@ sub all_transactions {
                     }
                 }
             }
-
             $sth = $dbh->prepare($query);
             $sth->execute(@queryargs);
             my @balance = $sth->fetchrow_array;
@@ -385,7 +383,7 @@ sub all_transactions {
 
     $query = "";
     $union = "";
-
+    
     foreach my $id (@id) {
 
         # get all transactions
@@ -425,7 +423,9 @@ sub all_transactions {
 			       ac.source, a.till, ac.chart_id
 			  FROM ar a
 			  JOIN acc_trans ac ON (ac.trans_id = a.id)
-			  JOIN entity e ON (a.entity_id = e.id)
+			  JOIN entity_credit_account eca 
+			        ON (a.entity_credit_account = eca.id)
+			  JOIN entity e ON (eca.entity_id = e.id)
 			$dpt_join
 			 WHERE ac.chart_id = ?
 			       AND ($approved OR (a.approved AND ac.approved))
@@ -456,7 +456,9 @@ sub all_transactions {
 			       ac.source, a.till, ac.chart_id
 			  FROM ap a
 			  JOIN acc_trans ac ON (ac.trans_id = a.id)
-			  JOIN entity e ON (a.entity_id = e.id)
+			  JOIN entity_credit_account eca 
+			        ON (a.entity_credit_account = eca.id)
+			  JOIN entity e ON (eca.entity_id = e.id)
 			$dpt_join
 			 WHERE ac.chart_id = ?
 			       AND ($approved OR (a.approved AND ac.approved))
@@ -482,7 +484,6 @@ sub all_transactions {
     }
 
     $query .= qq| ORDER BY $sortorder |;
-
     $sth = $dbh->prepare($query);
     $sth->execute(@queryargs) || $form->dberror($query);
 
diff --git a/css/ledgersmb.css b/css/ledgersmb.css
index 573c590e..7e537783 100644
--- a/css/ledgersmb.css
+++ b/css/ledgersmb.css
@@ -186,7 +186,7 @@ h2.error {
   font-size: 14pt;
 }
 
-div.note {
+#notes_div div.note {
 	margin: 1em;
 	padding: 1em;
 	border: 2px;
@@ -197,7 +197,7 @@ div.note {
 	border-style: groove;
 }
 
-div.note:hover {
+#notes_div div.note:hover {
 	overflow:visible;
 	background-color: #ddd;
 	border-style: groove;
@@ -207,6 +207,10 @@ div.note:hover {
 	overflow: auto;
 }
 
+#company_div div.note {
+	display: none;
+}
+
 tr.active {
 	background-color: #ddd;
 }