Beim Ausdruck die Variablen für den Verkäufer (salesman_*) füllen.

[kivitendo-erp.git] / bin / mozilla / io.pl

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index ba008c2..f20d4e5 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -134,7 +134,7 @@ sub display_row {
   my $colspan = $#column_index + 1;
 
   $form->{invsubtotal} = 0;
-  map { $form->{"${_}_base"} = 0 } (split / /, $form->{taxaccounts});
+  map { $form->{"${_}_base"} = 0 } (split(/ /, $form->{taxaccounts}));
 
 ########################################
   # Eintrag fuer Version 2.2.0 geaendert #
@@ -242,6 +242,13 @@ sub display_row {
     $delvar       = 'reqdate';
   }
 
+  my %projectnumber_labels = ();
+  my @projectnumber_values = ("");
+  foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+    push(@projectnumber_values, $item->{"id"});
+    $projectnumber_labels{$item->{"id"}} = $item->{"projectnumber"};
+  }
+
   for $i (1 .. $numrows) {
 
     # undo formatting
@@ -348,11 +355,10 @@ sub display_row {
     }
 
     $column_data{"unit"} = "<td>" .
-      ($qty_readonly ? "&nbsp;" :
        AM->unit_select_html($is_part ? $dimension_units :
                             $is_assigned ? $service_units : $all_units,
                             "unit_$i", $this_unit,
-                            $is_assigned ? $form->{"unit_$i"} : undef))
+                            $is_assigned ? $form->{"unit_$i"} : undef)
       . "</td>";
 
     # build in drop down list for pricesgroups
@@ -486,11 +492,12 @@ sub display_row {
           <b>$serialnumber</b>&nbsp;<input name="serialnumber_$i" size=15 value="$form->{"serialnumber_$i"}">|;
     }
 
-    print qq|
-          <b>$projectnumber</b>&nbsp;<input name="projectnumber_$i" size=10 value="$form->{"projectnumber_$i"}">
-                 <input type=hidden name="oldprojectnumber_$i" value="$form->{"projectnumber_$i"}">
-                 <input type=hidden name="project_id_$i" value="$form->{"project_id_$i"}">
-|;
+    print qq|<b>$projectnumber</b>&nbsp;| .
+      NTI($cgi->popup_menu('-name' => "project_id_$i",
+                           '-values' => \@projectnumber_values,
+                           '-labels' => \%projectnumber_labels,
+                           '-default' => $form->{"project_id_$i"}));
+
     if ($form->{type} eq 'invoice' or $form->{type} =~ /order/) {
       my $reqdate_term =
         ($form->{type} eq 'invoice')
@@ -511,7 +518,7 @@ sub display_row {
 ############## ENDE Neueintrag ##################
 
     map { $form->{"${_}_base"} += $linetotal }
-      (split / /, $form->{"taxaccounts_$i"});
+      (split(/ /, $form->{"taxaccounts_$i"}));
 
     $form->{invsubtotal} += $linetotal;
   }
@@ -667,7 +674,7 @@ sub select_item {
 <input name="new_taxaccounts_$i" type=hidden value="$ref->{taxaccounts}">
 <input name="new_partsgroup_$i" type=hidden value="$ref->{partsgroup}">
 <input name="new_formel_$i" type=hidden value="$ref->{formel}">
-<input name="new_longdescription_$i" type=hidden value="$ref->{longdescription}">
+<input name="new_longdescription_$i" type=hidden value="| . Q($ref->{longdescription}) . qq|">
 <input name="new_not_discountable_$i" type=hidden value="$ref->{not_discountable}">
 <input name="new_part_payment_id_$i" type=hidden value="$ref->{part_payment_id}">
 <input name="new_partnotes_$i" type="hidden" value="| . Q($ref->{"partnotes"}) . qq|">
@@ -881,6 +888,9 @@ sub display_form {
 
   relink_accounts();
 
+  my $new_rowcount = $form->{"rowcount"} * 1 + 1;
+  $form->{"project_id_${new_rowcount}"} = $form->{"globalproject_id"};
+
   $form->language_payment(\%myconfig);
 
   # if we have a display_form
@@ -889,6 +899,8 @@ sub display_form {
     exit;
   }
 
+  Common::webdav_folder($form) if ($webdav);
+
   #   if (   $form->{print_and_post}
   #       && $form->{second_run}
   #       && ($form->{action} eq "display_form")) {
@@ -1115,12 +1127,12 @@ sub invoicetotal {
 
     $amount = $sellprice * (1 - $discount / 100) * $qty;
     map { $form->{"${_}_base"} += $amount }
-      (split / /, $form->{"taxaccounts_$i"});
+      (split (/ /, $form->{"taxaccounts_$i"}));
     $form->{oldinvtotal} += $amount;
   }
 
   map { $form->{oldinvtotal} += ($form->{"${_}_base"} * $form->{"${_}_rate"}) }
-    split / /, $form->{taxaccounts}
+    split(/ /, $form->{taxaccounts})
     if !$form->{taxincluded};
 
   $form->{oldtotalpaid} = 0;
@@ -1279,7 +1291,7 @@ sub request_for_quotation {
   quotation();
 }
 
-sub e_mail {
+sub edit_e_mail {
   $lxdebug->enter_sub();
   if ($form->{second_run}) {
     $form->{print_and_post} = 0;
@@ -1547,20 +1559,6 @@ sub print_options {
       . $locale->text('Credit Note');
   }
 
-  if ($form->{type} eq 'ship_order') {
-    $type = qq|<select name=formname>
-           <option value=pick_list $form->{PD}{pick_list}>|
-      . $locale->text('Pick List') . qq|
-           <option value=packing_list $form->{PD}{packing_list}>|
-      . $locale->text('Packing List');
-  }
-
-  if ($form->{type} eq 'receive_order') {
-    $type = qq|<select name=formname>
-           <option value=bin_list $form->{PD}{bin_list}>|
-      . $locale->text('Bin List');
-  }
-
   if ($form->{media} eq 'email') {
     $media = qq|<select name=sendmode>
            <option value=attachment $form->{SM}{attachment}>|
@@ -1658,10 +1656,16 @@ sub print_options {
   }
 
   $form->{groupitems} = "checked" if $form->{groupitems};
+  $form->{remove_draft} = "checked" if $form->{remove_draft};
 
   print qq|
           <td>| . $locale->text('Group Items') . qq|</td>
-          <td><input name=groupitems type=checkbox class=checkbox $form->{groupitems}></td>
+          <td><input name=groupitems type=checkbox class=checkbox $form->{groupitems}></td>|;
+
+  print qq|
+          <td>| . $locale->text('Remove Draft') . qq|</td>
+          <td><input name=remove_draft type=checkbox class=checkbox $form->{remove_draft}></td>| if (!$form->{id} && $form->{draft_id});
+  print qq|
         </tr>
       </table>
     </td>
@@ -1858,7 +1862,8 @@ sub print_form {
   # $locale->text('Quotation Date missing!')
 
   # assign number
-  if (!$form->{"${inv}number"} && !$form->{preview}) {
+  $form->{what_done} = $form->{formname};
+  if (!$form->{"${inv}number"} && !$form->{preview} && !$form->{id}) {
     $form->{"${inv}number"} = $form->update_defaults(\%myconfig, $numberfld);
     if ($form->{media} ne 'email') {
 
@@ -1871,6 +1876,12 @@ sub print_form {
       $form->{rowcount}--;
 
       &{"$display_form"};
+      # saving the history
+         if(!exists $form->{addition}) {
+           $form->{addition} = "PRINTED";
+           $form->save_history($form->dbconnect(\%myconfig));
+      }
+      # /saving the history
       exit;
     }
   }
@@ -1883,6 +1894,7 @@ sub print_form {
 
   $language_saved = $form->{language_id};
   $payment_id_saved = $form->{payment_id};
+  $salesman_id_saved = $form->{salesman_id};
 
   &{"$form->{vc}_details"}();
 
@@ -1904,7 +1916,6 @@ sub print_form {
   }
 
   ($form->{employee}) = split /--/, $form->{employee};
-  ($form->{warehouse}, $form->{warehouse_id}) = split /--/, $form->{warehouse};
 
   # create the form variables
   if ($order) {
@@ -1913,6 +1924,8 @@ sub print_form {
     IS->invoice_details(\%myconfig, \%$form, $locale);
   }
 
+  $form->get_salesman(\%myconfig, $salesman_id_saved);
+
   if ($form->{shipto_id}) {
     $form->get_shipto(\%myconfig);
   }
@@ -2047,6 +2060,24 @@ sub print_form {
   }
   $queued = $form->{queued};
 
+# saving the history
+  if(!exists $form->{addition}) {
+    if($form->{media} =~ /printer/) {
+       $form->{addition} = "PRINTED";
+    }
+    elsif($form->{media} =~ /email/) {
+       $form->{addition} = "MAILED";
+    }
+    elsif($form->{media} =~ /queue/) {
+       $form->{addition} = "QUEUED";
+    }
+    elsif($form->{media} =~ /screen/) {
+       $form->{addition} = "SCREENED";
+    }
+    $form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history
+
   $form->parse_template(\%myconfig, $userspath);
 
   $form->{callback} = "";
@@ -2334,7 +2365,6 @@ sub relink_accounts {
   $lxdebug->leave_sub();
 }
 
-
 sub set_duedate {
   $lxdebug->enter_sub();