Merge branch 'master' of ssh://lx-office/~/lx-office-erp

diff --git a/SL/Auth.pm b/SL/Auth.pm
index 10855e2..e7f8f7b 100644 (file)
--- a/SL/Auth.pm
+++ b/SL/Auth.pm
@@ -824,7 +824,7 @@ sub evaluate_rights_ary {
     }
   }
 
-  $main::lxdebug->enter_sub(2);
+  $main::lxdebug->leave_sub(2);
 
   return $value;
 }
@@ -858,7 +858,7 @@ sub _parse_rights_string {
       pop @stack;
 
       if (!@stack) {
-        $main::lxdebug->enter_sub(2);
+        $main::lxdebug->leave_sub(2);
         return 0;
       }
 
@@ -874,7 +874,7 @@ sub _parse_rights_string {
 
   my $result = ($access || (1 < scalar @stack)) ? 0 : evaluate_rights_ary($stack[0]);
 
-  $main::lxdebug->enter_sub(2);
+  $main::lxdebug->leave_sub(2);
 
   return $result;
 }

diff --git a/SL/WH.pm b/SL/WH.pm
index b164a30..669b295 100644 (file)
--- a/SL/WH.pm
+++ b/SL/WH.pm
@@ -99,7 +99,8 @@ sub transfer {
     } else {
       push @values, $transfer_types{$directions[$direction]}->{$transfer->{transfer_type}};
     }
-
+    
+    $transfer->{comment} = defined($transfer->{comment}) ? $transfer->{comment} : '';
     push @values, "$transfer->{comment}";
 
     my $qty = $transfer->{qty};
@@ -279,12 +280,12 @@ sub get_warehouse_journal {
   # filters
   my (@filter_ary, @filter_vars, $joins, %select_tokens, %select);
 
-  if ($filter{warehouse_id} ne '') {
+  if ($filter{warehouse_id}) {
     push @filter_ary, "w1.id = ? OR w2.id = ?";
     push @filter_vars, $filter{warehouse_id}, $filter{warehouse_id};
   }
 
-  if ($filter{bin_id} ne '') {
+  if ($filter{bin_id}) {
     push @filter_ary, "b1.id = ? OR b2.id = ?";
     push @filter_vars, $filter{bin_id}, $filter{bin_id};
   }
@@ -396,6 +397,7 @@ sub get_warehouse_journal {
   my $group_clause = join ", ", map { +/^l_/; "r_$'" }
         ( grep( { !/qty$/ and /^l_/ and $form->{$_} eq 'Y' } keys %$form), qw(l_parts_id l_partunit l_itime) );
 
+  $where_clause = defined($where_clause) ? $where_clause : '';
   my $query =
   qq|SELECT DISTINCT $select{trans}
     FROM inventory i1