SF.net SVN: ledger-smb: [1465] trunk

[..hidden..]

Revision: 1465
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=1465&view=rev
Author:   einhverfr
Date:     2007-08-26 21:51:46 -0700 (Sun, 26 Aug 2007)

Log Message:
-----------
Applying a few bugfixes,

Modified Paths:
--------------
    trunk/LedgerSMB/IS.pm
    trunk/LedgerSMB/User.pm
    trunk/import_members.pl

Modified: trunk/LedgerSMB/IS.pm
===================================================================
--- trunk/LedgerSMB/IS.pm	2007-08-24 17:42:32 UTC (rev 1464)
+++ trunk/LedgerSMB/IS.pm	2007-08-27 04:51:46 UTC (rev 1465)
@@ -865,7 +865,7 @@
     if ( !$form->{id} ) {
 
         $query = qq|
-			INSERT INTO ar (invnumber, employee_id) 
+			INSERT INTO ar (invnumber, person_id) 
 			     VALUES ('$uid', ?)|;
         $sth = $dbh->prepare($query);
         $sth->execute( $form->{employee_id} ) || $form->dberror($query);
@@ -1508,7 +1508,7 @@
 		       taxincluded = ?,
 		       curr = ?,
 		       department_id = ?,
-		       employee_id = ?,
+		       person_id = ?,
 		       till = ?,
 		       language_code = ?,
 		       ponumber = ?
@@ -1859,12 +1859,12 @@
 			          a.shippingpoint, a.shipvia, a.terms, a.notes, 
 			          a.intnotes,
 			          a.duedate, a.taxincluded, a.curr AS currency,
-			          a.employee_id, e.name AS employee, a.till, 
+			          a.person_id, e.name AS employee, a.till, 
 			          a.entity_id, a.reverse
 			          a.language_code, a.ponumber,
 			          a.on_hold
 			     FROM ar a
-			LEFT JOIN employee e ON (e.entity_id = a.employee_id)
+			LEFT JOIN employee e ON (e.entity_id = a.person_id)
 			    WHERE a.id = ?|;
 
         $sth = $dbh->prepare($query);

Modified: trunk/LedgerSMB/User.pm
===================================================================
--- trunk/LedgerSMB/User.pm	2007-08-24 17:42:32 UTC (rev 1464)
+++ trunk/LedgerSMB/User.pm	2007-08-27 04:51:46 UTC (rev 1465)
@@ -1007,7 +1007,7 @@
         # add login to employees table if it does not exist
         my $login = $self->{login};
         $login =~ s/@.*//;
-        my $sth = $dbh->prepare("SELECT id FROM employee WHERE login = ?;");
+        my $sth = $dbh->prepare("SELECT entity_id FROM employee WHERE login = ?;");
         $sth->execute($login);
 
         my ($id) = $sth->fetchrow_array;

Modified: trunk/import_members.pl
===================================================================
--- trunk/import_members.pl	2007-08-24 17:42:32 UTC (rev 1464)
+++ trunk/import_members.pl	2007-08-27 04:51:46 UTC (rev 1465)
@@ -239,7 +239,7 @@
         # add login to employee table if it does not exist
         my $login = $self->{login};
         $login =~ s/@.*//;
-        my $sth = $dbh->prepare("SELECT id FROM employee WHERE login = ?;");
+        my $sth = $dbh->prepare("SELECT entity_id FROM employee WHERE login = ?;");
         $sth->execute($login);
 
         my ($id) = $sth->fetchrow_array;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.