X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/1faf637bfd4e9c4c4470a595b83ca8c44128f911..5b47ed3efe5f4ef0810096b0f4849047cee54690:/SL/IS.pm

diff --git a/SL/IS.pm b/SL/IS.pm
index 57d4a6c92..12b5b7c2e 100644
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -36,6 +36,7 @@ package IS;
 
 use Data::Dumper;
 use SL::AM;
+use SL::DBUtils;
 
 sub invoice_details {
   $main::lxdebug->enter_sub();
@@ -355,10 +356,11 @@ sub invoice_details {
 
   $form->{invtotal} =
     ($form->{taxincluded}) ? $form->{total} : $form->{total} + $tax;
-  $form->{invtotal} = $form->format_amount($myconfig, $form->{invtotal}, 2);
-  $form->{paid} = $form->format_amount($myconfig, $form->{paid}, 2);
   $form->{total} =
     $form->format_amount($myconfig, $form->{invtotal} - $form->{paid}, 2);
+
+  $form->{invtotal} = $form->format_amount($myconfig, $form->{invtotal}, 2);
+  $form->{paid} = $form->format_amount($myconfig, $form->{paid}, 2);
   $form->set_payment_options($myconfig, $form->{invdate});
 
   $form->{username} = $myconfig->{name};
@@ -977,34 +979,36 @@ Message: $form->{message}\r| if $form->{message};
   # save AR record
   $query = qq|UPDATE ar set
               invnumber = '$form->{invnumber}',
-	      ordnumber = '$form->{ordnumber}',
-	      quonumber = '$form->{quonumber}',
-	      cusordnumber = '$form->{cusordnumber}',
+              ordnumber = '$form->{ordnumber}',
+              quonumber = '$form->{quonumber}',
+              cusordnumber = '$form->{cusordnumber}',
               transdate = '$form->{invdate}',
+              orddate = | . conv_dateq($form->{orddate}) . qq|,
+              quodate = | . conv_dateq($form->{quodate}) . qq|,
               customer_id = $form->{customer_id},
               amount = $amount,
               netamount = $netamount,
               paid = $form->{paid},
-	      datepaid = $datepaid,
-	      duedate = $duedate,
+              datepaid = $datepaid,
+              duedate = $duedate,
               deliverydate = $deliverydate,
-	      invoice = '1',
-	      shippingpoint = '$form->{shippingpoint}',
-	      shipvia = '$form->{shipvia}',
-	      terms = $form->{terms},
-	      notes = '$form->{notes}',
-	      intnotes = '$form->{intnotes}',
-	      taxincluded = '$form->{taxincluded}',
-	      curr = '$form->{currency}',
-	      department_id = $form->{department_id},
-	      payment_id = $form->{payment_id},
+              invoice = '1',
+              shippingpoint = '$form->{shippingpoint}',
+              shipvia = '$form->{shipvia}',
+              terms = $form->{terms},
+              notes = '$form->{notes}',
+              intnotes = '$form->{intnotes}',
+              taxincluded = '$form->{taxincluded}',
+              curr = '$form->{currency}',
+              department_id = $form->{department_id},
+              payment_id = $form->{payment_id},
               type = '$form->{type}',
-	      language_id = $form->{language_id},
-	      taxzone_id = $form->{taxzone_id},
-	      shipto_id = $form->{shipto_id},
-	      delivery_customer_id = $form->{delivery_customer_id},
-	      delivery_vendor_id = $form->{delivery_vendor_id},
-	      employee_id = $form->{employee_id},
+              language_id = $form->{language_id},
+              taxzone_id = $form->{taxzone_id},
+              shipto_id = $form->{shipto_id},
+              delivery_customer_id = $form->{delivery_customer_id},
+              delivery_vendor_id = $form->{delivery_vendor_id},
+              employee_id = $form->{employee_id},
               storno = '$form->{storno}',
               cp_id = $form->{contact_id}
               WHERE id = $form->{id}
@@ -1483,6 +1487,7 @@ sub retrieve_invoice {
 
     # retrieve invoice
     $query = qq|SELECT a.invnumber, a.ordnumber, a.quonumber, a.cusordnumber,
+                a.orddate, a.quodate,
                 a.transdate AS invdate, a.deliverydate, a.paid, a.storno, a.gldate,
                 a.shippingpoint, a.shipvia, a.terms, a.notes, a.intnotes, a.taxzone_id,
 		a.duedate, a.taxincluded, a.curr AS currency, a.shipto_id, a.cp_id,