X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/464f44accd46ed0b2e1f7e2459f53337a6720a7f..821000492469caf76c696216579dc303cde85631:/SL/DO.pm

diff --git a/SL/DO.pm b/SL/DO.pm
index 236a173c2..4e109d812 100644
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -293,7 +293,6 @@ sub save {
     UPDATE delivery_order_items SET
        delivery_order_id = ?, position = ?, parts_id = ?, description = ?, longdescription = ?, qty = ?, base_qty = ?,
        sellprice = ?, discount = ?, unit = ?, reqdate = ?, project_id = ?, serialnumber = ?,
-       ordnumber = ?, transdate = ?, cusordnumber = ?,
        lastcost = ? , price_factor_id = ?, price_factor = (SELECT factor FROM price_factors where id = ?),
        marge_price_factor = ?, pricegroup_id = ?, active_price_source = ?, active_discount_source = ?
     WHERE id = ?
@@ -368,8 +367,6 @@ SQL
                $form->{"sellprice_$i"}, $form->{"discount_$i"} / 100,
                $form->{"unit_$i"}, conv_date($items_reqdate), conv_i($form->{"project_id_$i"}),
                $form->{"serialnumber_$i"},
-               $form->{"ordnumber_$i"}, conv_date($form->{"transdate_$i"}),
-               $form->{"cusordnumber_$i"},
                $form->{"lastcost_$i"},
                conv_i($form->{"price_factor_id_$i"}), conv_i($form->{"price_factor_id_$i"}),
                conv_i($form->{"marge_price_factor_$i"}),
@@ -688,6 +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.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
@@ -722,7 +720,8 @@ sub retrieve {
     }
   }
   $sth->finish();
-
+  $form->{mtime}   ||= $form->{itime};
+  $form->{lastmtime} = $form->{mtime};
   $form->{donumber_array} =~ s/\s*$//g;
   $form->{ordnumber_array} =~ s/ //;
   $form->{ordnumber_array} =~ s/\s*$//g;
@@ -1056,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};