From: Stephan Köhler <s.koehler@linet-services.de>
Date: Sat, 26 Nov 2005 16:29:25 +0000 (+0000)
Subject: Merge von 617 aus unstable: UBL Bug
X-Git-Tag: release-2.2.0~77
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=6ce732c8e61b47d9bf59ca49715dec96706d64c0;p=kivitendo-erp.git

Merge von 617 aus unstable: UBL Bug
Fixed Bug #187, UBL wenn als Kategorie nicht "alle" ausgewaehlt wird
---

diff --git a/SL/GL.pm b/SL/GL.pm
index a0d781baf..a080b85fc 100644
--- a/SL/GL.pm
+++ b/SL/GL.pm
@@ -281,9 +281,9 @@ sub all_transactions {
     $apwhere .= " AND c.gifi_accno = '$form->{gifi_accno}'";
   }
   if ($form->{category} ne 'X') {
-    $glwhere .= " AND c.category = '$form->{category}'";
-    $arwhere .= " AND c.category = '$form->{category}'";
-    $apwhere .= " AND c.category = '$form->{category}'";
+    $glwhere .= " AND gl.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = '$form->{category}'))";
+    $arwhere .= " AND ar.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = '$form->{category}'))";
+    $apwhere .= " AND ap.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = '$form->{category}'))";
   }
 
   if ($form->{accno}) {
diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index 7962daf9c..445d4f3fa 100644
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -305,12 +305,8 @@ sub search {
     . $locale->text('All') . qq|
 		  <input name="category" class=radio type=radio value=A>&nbsp;|
     . $locale->text('Asset') . qq|
-		  <input name="category" class=radio type=radio value=C>&nbsp;|
-    . $locale->text('Contra') . qq|
 		  <input name="category" class=radio type=radio value=L>&nbsp;|
     . $locale->text('Liability') . qq|
-		  <input name="category" class=radio type=radio value=Q>&nbsp;|
-    . $locale->text('Equity') . qq|
 		  <input name="category" class=radio type=radio value=I>&nbsp;|
     . $locale->text('Revenue') . qq|
 		  <input name="category" class=radio type=radio value=E>&nbsp;|