X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FIS.pm;h=b1df09770cddc1bf0f3fb9206d3774e2def38a56;hb=be47ce7f0ee15e692ade53804c8b4682dc89d627;hp=aa8ded951b5f862e6230b114a16350b6a9a22209;hpb=96d10eccdcde8518cf9cc1ed863be32cf34ccfc2;p=kivitendo-erp.git

diff --git a/SL/IS.pm b/SL/IS.pm
index aa8ded951..b1df09770 100644
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -130,8 +130,6 @@ sub invoice_details {
   my @tax_arrays =
     qw(taxbase tax taxdescription taxrate taxnumber);
 
-  map({ $form->{$_} = [] } (@arrays, @tax_arrays));
-
   foreach $item (sort { $a->[1] cmp $b->[1] } @partsgroup) {
     $i = $item->[0];
 
@@ -445,7 +443,7 @@ sub customer_details {
   }
 
   # get rest for the customer
-  my $query = qq|SELECT ct.*, cp.*, ct.notes as customernotes
+  my $query = qq|SELECT ct.*, cp.*, ct.notes as customernotes, ct.phone AS customerphone, ct.fax AS customerfax, ct.email AS customeremail
                  FROM customer ct
                  LEFT JOIN contacts cp on ct.id = cp.cp_cv_id
 		 WHERE ct.id = $form->{customer_id} $contact order by cp.cp_id limit 1|;
@@ -741,7 +739,7 @@ sub post_invoice {
 		  '$form->{"description_$i"}', '$form->{"longdescription_$i"}', $form->{"qty_$i"},
 		  $form->{"sellprice_$i"}, $fxsellprice,
 		  $form->{"discount_$i"}, $allocated, 'f',
-		  '$form->{"unit_$i"}', $deliverydate, | . conv_i($form->{"project_id_$i"}) . qq|,
+		  '$form->{"unit_$i"}', $deliverydate, | . conv_i($form->{"project_id_$i"}, 'NULL') . qq|,
 		  '$form->{"serialnumber_$i"}', '$pricegroup_id',
 		  '$form->{"ordnumber_$i"}', '$form->{"transdate_$i"}', '$form->{"cusordnumber_$i"}', $baseqty, '$subtotal')|;
       $dbh->do($query) || $form->dberror($query);
@@ -927,11 +925,11 @@ sub post_invoice {
         $form->{"paid_$i"} *= -1;
   
         $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
-                    source, memo, ?)
+                    source, memo, project_id)
                     VALUES ($form->{id}, (SELECT c.id FROM chart c
-                                        WHERE c.accno = '$accno', project_id),
+                                        WHERE c.accno = '$accno'),
                     $form->{"paid_$i"}, '$form->{"datepaid_$i"}',
-                    '$form->{"source_$i"}', '$form->{"memo_$i"}')|;
+                    '$form->{"source_$i"}', '$form->{"memo_$i"}', ?)|;
         do_query($form, $dbh, $query, $project_id);
   
         # exchangerate difference