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

diff --git a/SL/OE.pm b/SL/OE.pm
index b6816c138564b5125dbec271469776eaa5799ec2..e11a74900b40283629881b22c6902045d43562e4 100644 (file)
--- 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 d0f1fcea3d8d42358a10102efc2e72945e874b6f..686bca695a1ee712c1260150619ebb456b69fcbb 100644 (file)
--- 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 ed75005d938c6b703848735ca4dec6122acb0c8a..0b1f8e3ce0ba1c83f92a1c9282c8dcef111c00a0 100644 (file)
--- 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>