Debitoren-/Kreditoren-/Dialogbuchungen: Fremdschlüsselspalte "department_id" nicht...

Conflicts:
	SL/AP.pm

diff --git a/SL/AP.pm b/SL/AP.pm
index 3c8e2404f042ad76e448309ad0f132b0afc44875..44ddc110c7c64950c7d3a65eb9ab03ea20b504a3 100644 (file)
--- a/SL/AP.pm
+++ b/SL/AP.pm
@@ -58,7 +58,6 @@ sub post_transaction {
   delete $form->{currency} unless $form->{defaultcurrency};
 
   ($null, $form->{department_id}) = split(/--/, $form->{department});
   delete $form->{currency} unless $form->{defaultcurrency};
 
   ($null, $form->{department_id}) = split(/--/, $form->{department});

-  $form->{department_id} *= 1;

 
   if ($form->{currency} eq $form->{defaultcurrency}) {
     $form->{exchangerate} = 1;
 
   if ($form->{currency} eq $form->{defaultcurrency}) {
     $form->{exchangerate} = 1;

diff --git a/SL/AR.pm b/SL/AR.pm
index 26c0bca1e227ff8e1c2864fef2ab3586f151f944..5b82ff10850eb2a0857ebff4dc19ff3ccd576162 100644 (file)
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -143,7 +143,6 @@ sub post_transaction {
 
   # update department
   ($null, $form->{department_id}) = split(/--/, $form->{department});
 
   # update department
   ($null, $form->{department_id}) = split(/--/, $form->{department});

-  $form->{department_id} *= 1;

 
   # amount for AR account
   $form->{receivables} = $form->round_amount($form->{amount}, 2) * -1;
 
   # amount for AR account
   $form->{receivables} = $form->round_amount($form->{amount}, 2) * -1;

diff --git a/SL/GL.pm b/SL/GL.pm
index 7bcb475090160ffea5c79d6e06d6991953c4dcbc..bf9e1c96c164fa9236d91f2626ba04de9671a29b 100644 (file)
--- a/SL/GL.pm
+++ b/SL/GL.pm
@@ -109,7 +109,6 @@ sub post_transaction {
   }
 
   my ($null, $department_id) = split(/--/, $form->{department});
   }
 
   my ($null, $department_id) = split(/--/, $form->{department});

-  $department_id *= 1;

 
   $form->{ob_transaction} *= 1;
   $form->{cb_transaction} *= 1;
 
   $form->{ob_transaction} *= 1;
   $form->{cb_transaction} *= 1;


@@ -122,7 +121,7 @@ sub post_transaction {
        WHERE id = ?|;
 
   @values = ($form->{reference}, $form->{description}, $form->{notes},
        WHERE id = ?|;
 
   @values = ($form->{reference}, $form->{description}, $form->{notes},

-             conv_date($form->{transdate}), $department_id, $form->{taxincluded} ? 't' : 'f',
+             conv_date($form->{transdate}), conv_i($department_id), $form->{taxincluded} ? 't' : 'f',

              $form->{storno} ? 't' : 'f', conv_i($form->{storno_id}), $form->{ob_transaction} ? 't' : 'f', $form->{cb_transaction} ? 't' : 'f',
              conv_i($form->{id}));
   do_query($form, $dbh, $query, @values);
              $form->{storno} ? 't' : 'f', conv_i($form->{storno_id}), $form->{ob_transaction} ? 't' : 'f', $form->{cb_transaction} ? 't' : 'f',
              conv_i($form->{id}));
   do_query($form, $dbh, $query, @values);