mebil

[kivitendo-erp.git] / SL / DO.pm

diff --git a/SL/DO.pm b/SL/DO.pm
index 4cc0f59..4e109d8 100644 (file)
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -685,7 +685,7 @@ sub retrieve {
          dord.closed, dord.reqdate, dord.department_id, dord.cusordnumber,
          d.description AS department, dord.language_id,
          dord.shipto_id,
-         dord.itime,dord.mtime,
+         dord.itime, dord.mtime,
          dord.globalproject_id, dord.delivered, dord.transaction_description,
          dord.taxzone_id, dord.taxincluded, dord.payment_id, (SELECT cu.name FROM currencies cu WHERE cu.id=dord.currency_id) AS currency,
          dord.delivery_term_id, dord.itime::DATE AS insertdate
@@ -720,7 +720,7 @@ sub retrieve {
     }
   }
   $sth->finish();
-  $form->{mtime} = $form->{itime} if !$form->{mtime};
+  $form->{mtime}   ||= $form->{itime};
   $form->{lastmtime} = $form->{mtime};
   $form->{donumber_array} =~ s/\s*$//g;
   $form->{ordnumber_array} =~ s/ //;
@@ -1055,6 +1055,7 @@ sub order_details {
 
   $form->{delivery_term} = SL::DB::Manager::DeliveryTerm->find_by(id => $form->{delivery_term_id} || undef);
   $form->{delivery_term}->description_long($form->{delivery_term}->translated_attribute('description_long', $form->{language_id})) if $form->{delivery_term} && $form->{language_id};
+  $form->{department}    = SL::DB::Manager::Department->find_by(id => $form->{department_id})->load->description if $form->{department_id};
 
   $form->{username} = $myconfig->{name};