summaryrefslogtreecommitdiff
path: root/LedgerSMB
diff options
context:
space:
mode:
Diffstat (limited to 'LedgerSMB')
-rwxr-xr-xLedgerSMB/Form.pm6
-rwxr-xr-xLedgerSMB/HR.pm8
-rwxr-xr-xLedgerSMB/User.pm2
3 files changed, 2 insertions, 14 deletions
diff --git a/LedgerSMB/Form.pm b/LedgerSMB/Form.pm
index 6f2b80e1..60752d22 100755
--- a/LedgerSMB/Form.pm
+++ b/LedgerSMB/Form.pm
@@ -2154,9 +2154,6 @@ sub all_departments {
while ( my $ref = $sth->fetchrow_hashref('NAME_lc') ) {
push @{ $self->{all_department} }, $ref;
- if ($self->{department_id} == $ref->{id}){
- $self->{department} = "$ref->{description}--$ref->{id}";
- }
}
$sth->finish;
@@ -2200,7 +2197,6 @@ sub create_links {
my ( $self, $module, $myconfig, $vc, $job ) = @_;
- $self->{department_id} = $myconfig->{department_id};
# get last customers or vendors
my ( $query, $sth );
@@ -2375,8 +2371,6 @@ sub lastname_used {
my ( $self, $myconfig, $dbh2, $vc, $module ) = @_;
my $dbh = $self->{dbh};
- $self->{department_id} = $myconfig->{department_id};
-
$vc ||= $self->{vc}; # add default to correct for improper passing
my $arap = ( $vc eq 'customer' ) ? "ar" : "ap";
my $where = "1 = 1";
diff --git a/LedgerSMB/HR.pm b/LedgerSMB/HR.pm
index 7324694e..4f1f4dab 100755
--- a/LedgerSMB/HR.pm
+++ b/LedgerSMB/HR.pm
@@ -126,10 +126,6 @@ sub save_employee {
my ( $null, $managerid ) = split /--/, $form->{manager};
$managerid *= 1;
$form->{sales} *= 1;
- my ($department, $department_id) = (undef, undef);
- if ($form->{department}){
- ($department, $department_id) = split /--/, $form->{department};
- }
$query = qq|
@@ -154,7 +150,6 @@ sub save_employee {
dob = ?,
iban = ?,
bic = ?,
- department_id = ?,
managerid = ?
WHERE id = ?|;
$sth = $dbh->prepare($query);
@@ -168,8 +163,7 @@ sub save_employee {
$form->{homephone}, $form->{startdate}, $form->{enddate},
$form->{notes}, $form->{role}, $form->{sales},
$form->{email}, $form->{ssn}, $form->{dob},
- $form->{iban}, $form->{bic}, $department_id,
- $managerid,
+ $form->{iban}, $form->{bic}, $managerid,
$form->{id}
) || $form->dberror( __FILE__ . ':' . __LINE__ . ':' . $query );
diff --git a/LedgerSMB/User.pm b/LedgerSMB/User.pm
index 3d025588..e935583d 100755
--- a/LedgerSMB/User.pm
+++ b/LedgerSMB/User.pm
@@ -138,7 +138,7 @@ sub fetch_config {
email, fax, menuwidth, name, numberformat,
password, print, printer, role, sid,
signature, stylesheet, tel, templates,
- timeout, vclimit, u.username, department_id
+ timeout, vclimit, u.username
FROM users_conf as uc, users as u
WHERE u.username = ?
AND u.id = uc.id;"