diff options
| -rw-r--r-- | LedgerSMB/IS.pm | 8 | ||||
| -rw-r--r-- | LedgerSMB/User.pm | 2 | ||||
| -rwxr-xr-x | import_members.pl | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/LedgerSMB/IS.pm b/LedgerSMB/IS.pm index 4f67145c..82c566d5 100644 --- a/LedgerSMB/IS.pm +++ b/LedgerSMB/IS.pm @@ -865,7 +865,7 @@ sub post_invoice { 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 @@ sub post_invoice { taxincluded = ?, curr = ?, department_id = ?, - employee_id = ?, + person_id = ?, till = ?, language_code = ?, ponumber = ? @@ -1859,12 +1859,12 @@ sub retrieve_invoice { 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); diff --git a/LedgerSMB/User.pm b/LedgerSMB/User.pm index f67ad9c4..5ef96a6a 100644 --- a/LedgerSMB/User.pm +++ b/LedgerSMB/User.pm @@ -1007,7 +1007,7 @@ sub save_member { # 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; diff --git a/import_members.pl b/import_members.pl index 4ffe765a..a6aec9de 100755 --- a/import_members.pl +++ b/import_members.pl @@ -239,7 +239,7 @@ sub save_member { # 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; |