4 files changed, 11 insertions, 17 deletions
diff --git a/LedgerSMB/AA.pm b/LedgerSMB/AA.pm
index c539a34a..d9c67181 100644
--- a/LedgerSMB/AA.pm
+++ b/LedgerSMB/AA.pm
@@ -908,7 +908,7 @@ sub transactions {
 
         if ( $myconfig->{role} eq 'user' ) {
             my $login = $dbh->quote( $form->{login} );
-            $where .= " AND e.login = $login";
+            $where .= " AND e.entity_id = (select entity_id from users where username = $login";
         }
     }
 
diff --git a/LedgerSMB/DBObject.pm b/LedgerSMB/DBObject.pm
index 3451d823..be6ea7ef 100644
--- a/LedgerSMB/DBObject.pm
+++ b/LedgerSMB/DBObject.pm
@@ -45,18 +45,6 @@ use base qw(LedgerSMB);
 use strict;
 use warnings;
 
-our $AUTOLOAD;
-
-sub AUTOLOAD {
-    my ($self) = shift;
-    my $type = Scalar::Util::blessed $self;
-    $type =~ m/::(.*?)$/;
-    $type = lc $1;
-    $self->exec_method( funcname => "$type" . "_" . $AUTOLOAD, args => \@_);
-}
-
-sub DESTROY {} 
-
 sub __validate__ {}
 
 sub new {
diff --git a/LedgerSMB/DBObject/Company.pm b/LedgerSMB/DBObject/Company.pm
index 5d7d760e..ed94b015 100644
--- a/LedgerSMB/DBObject/Company.pm
+++ b/LedgerSMB/DBObject/Company.pm
@@ -52,6 +52,12 @@ sub save_bank_account {
     $self->{dbh}->commit;
 }
 
+sub save_notes {
+    my $self = shift @_;
+    $self->exec_method(funcname => 'entity__save_notes');
+    $self->{dbh}->commit;
+}
+
 sub get {
     my $self = shift @_;
 
diff --git a/LedgerSMB/Form.pm b/LedgerSMB/Form.pm
index 9e7c7748..7c3a6d65 100644
--- a/LedgerSMB/Form.pm
+++ b/LedgerSMB/Form.pm
@@ -1616,8 +1616,8 @@ sub get_employee {
     my $query = qq|
 		SELECT name, id
 		  FROM entity WHERE id IN (select entity_id
-					 FROM employee 
-					WHERE login = ?)|;
+					 FROM users 
+					WHERE username = ?)|;
 
     my $sth = $self->{dbh}->prepare($query);
     $sth->execute($login);
@@ -1721,9 +1721,9 @@ sub all_vc {
     my $sth;
 
     if ($vc eq 'customer'){
-        $self->{vc_class} = 2;
-    } else {
         $self->{vc_class} = 1;
+    } else {
+        $self->{vc_class} = 2;
         $vc = 'vendor';
     }
     my $query = qq|SELECT count(*) FROM entity_credit_account where entity_class = ?|;