From: Sven Schöling <s.schoeling@linet-services.de>
Date: Wed, 28 Nov 2012 10:35:34 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0rc1~12
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/3f26a3a5f90df8b834de122d6fb1dfab59a6e804?hp=77e970131474e547c6a115f00fdbe119a5c008aa

Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
---

diff --git a/SL/OE.pm b/SL/OE.pm
index b6816c138..e11a74900 100644
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -115,11 +115,11 @@ sub transactions {
 
   if ($form->{"projectnumber"}) {
     $query .= <<SQL;
-      AND (pr.projectnumber ILIKE ?) OR EXISTS (
+      AND ((pr.projectnumber ILIKE ?) OR EXISTS (
         SELECT * FROM orderitems oi
         LEFT JOIN project proi ON proi.id = oi.project_id
         WHERE proi.projectnumber ILIKE ? AND oi.trans_id = o.id
-      )
+      ))
 SQL
     push @values, "%" . $form->{"projectnumber"} . "%", "%" . $form->{"projectnumber"} . "%" ;
   }
diff --git a/templates/webpages/pe/partsgroup_form.html b/templates/webpages/pe/partsgroup_form.html
index d0f1fcea3..686bca695 100644
--- a/templates/webpages/pe/partsgroup_form.html
+++ b/templates/webpages/pe/partsgroup_form.html
@@ -36,6 +36,9 @@
 <input type=submit class=submit name=action value="[% 'Delete' | $T8 %]">
 [%- END %]
 
-<input type=button onclick="set_history_window([% id %]);" name=history id=history value="[% 'history' | $T8 %]">
+[%- IF ( id ) %]
+  <input type=button onclick="set_history_window([% id %]);" name=history id=history value="[% 'history' | $T8 %]">
+[%- END %]
+
 </form>
 
diff --git a/templates/webpages/pe/pricegroup_form.html b/templates/webpages/pe/pricegroup_form.html
index ed75005d9..0b1f8e3ce 100644
--- a/templates/webpages/pe/pricegroup_form.html
+++ b/templates/webpages/pe/pricegroup_form.html
@@ -36,6 +36,9 @@
 <input type=submit class=submit name=action value="[% 'Delete' | $T8 %]">
 [%- END %]
 
-<input type=button onclick="set_history_window([% id %]);" name=history id=history value="[% 'history' | $T8 %]">
+[%- IF ( id ) %]
+  <input type=button onclick="set_history_window([% id %]);" name=history id=history value="[% 'history' | $T8 %]">
+[%- END %]
+
 </form>