X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/f73ef83b744b60ee18c232726ca8904cad42b1bc..ec93aab75346a6caeeeca81ddc7a070e73a6a7c8:/bin/mozilla/io.pl

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index c1d5bfe08..d8b522de2 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -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
@@ -486,11 +493,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->{"oldprojectnumber_$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')
@@ -667,9 +675,10 @@ 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|">
 
 <input name="new_id_$i" type=hidden value=$ref->{id}>
 
@@ -732,7 +741,9 @@ sub item_selected {
   $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
 
   map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} }
-    qw(id partnumber description sellprice listprice inventory_accno income_accno expense_accno bin unit weight assembly taxaccounts partsgroup formel longdescription not_discountable);
+    qw(id partnumber description sellprice listprice inventory_accno
+       income_accno expense_accno bin unit weight assembly taxaccounts
+       partsgroup formel longdescription not_discountable partnotes);
   if ($form->{"part_payment_id_$i"} ne "") {
     $form->{payment_id} = $form->{"part_payment_id_$i"};
   }
@@ -878,6 +889,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
@@ -886,6 +900,8 @@ sub display_form {
     exit;
   }
 
+  Common::webdav_folder($form) if ($webdav);
+
   #   if (   $form->{print_and_post}
   #       && $form->{second_run}
   #       && ($form->{action} eq "display_form")) {
@@ -1177,6 +1193,10 @@ sub order {
   $form->{cp_id} *= 1;
 
   require "$form->{path}/$form->{script}";
+  my $script = $form->{"script"};
+  $script =~ s|.*/||;
+  $script =~ s|.pl$||;
+  $locale = new Locale($language, $script);
 
   map { $form->{"select$_"} = "" } ($form->{vc}, currency);
 
@@ -1280,8 +1300,10 @@ sub e_mail {
   }
   if ($myconfig{role} eq 'admin') {
     $bcc = qq|
- 	  <th align=right nowrap=true>| . $locale->text('Bcc') . qq|</th>
-	  <td><input name=bcc size=30 value="$form->{bcc}"></td>
+    <tr>
+      <th align="right" nowrap="true">| . $locale->text('Bcc') . qq|</th>
+      <td><input name="bcc" size="30" value="| . Q($form->{bcc}) . qq|"></td>
+    </tr>
 |;
   }
 
@@ -1301,44 +1323,105 @@ sub e_mail {
   $form->{oldmedia} = $form->{media};
   $form->{media}    = "email";
 
+  my %formname_translations =
+    (
+     "bin_list" => $locale->text('Bin List'),
+     "credit_note" => $locale->text('Credit Note'),
+     "invoice" => $locale->text('Invoice'),
+     "packing_list" => $locale->text('Packing List'),
+     "pick_list" => $locale->text('Pick List'),
+     "proforma" => $locale->text('Proforma Invoice'),
+     "purchase_order" => $locale->text('Purchase Order'),
+     "request_quotation" => $locale->text('RFQ'),
+     "sales_order" => $locale->text('Confirmation'),
+     "sales_quotation" => $locale->text('Quotation'),
+     "storno_invoice" => $locale->text('Storno Invoice'),
+     "storno_packing_list" => $locale->text('Storno Packing List'),
+    );
+
+  my $attachment_filename = $formname_translations{$form->{"formname"}};
+  my $prefix;
+
+  if (grep({ $form->{"type"} eq $_ } qw(invoice credit_note))) {
+    $prefix = "inv";
+  } elsif ($form->{"type"} =~ /_quotation$/) {
+    $prefix = "quo";
+  } else {
+    $prefix = "ord";
+  }
+
+  if ($attachment_filename && $form->{"${prefix}number"}) {
+    $attachment_filename .= "_" . $form->{"${prefix}number"} .
+      ($form->{"format"} =~ /pdf/i ? ".pdf" :
+       $form->{"format"} =~ /postscript/i ? ".ps" :
+       $form->{"format"} =~ /opendocument/i ? ".odt" :
+       $form->{"format"} =~ /html/i ? ".html" : "");
+    $attachment_filename =~ s/ /_/g;
+    my %umlaute =
+      (
+       "ä" => "ae", "ö" => "oe", "ü" => "ue",
+       "Ä" => "Ae", "Ö" => "Oe", "Ü" => "Ue",
+       "ß" => "ss"
+      );
+    map({ $attachment_filename =~ s/$_/$umlaute{$_}/g; } keys(%umlaute));
+  } else {
+    $attachment_filename = "";
+  }
+
+  if ($form->{"email"}) {
+    $form->{"fokus"} = "Form.subject";
+  } else {
+    $form->{"fokus"} = "Form.email";
+  }
   $form->header;
 
   print qq|
-<body>
+<body onload="fokus()">
 
-<form method=post action=$form->{script}>
+<form name="Form" method="post" action="$form->{script}">
 
-<table width=100%>
-  <tr class=listtop>
-    <th class=listtop>$title</th>
+<table width="100%">
+  <tr class="listtop">
+    <th class="listtop">$title</th>
   </tr>
   <tr height="5"></tr>
   <tr>
     <td>
-      <table width=100%>
-	<tr>
-	  <th align=right nowrap>| . $locale->text('To') . qq|</th>
-	  <td><input name=email size=30 value="$form->{email}"></td>
-	  <th align=right nowrap>| . $locale->text('Cc') . qq|</th>
-	  <td><input name=cc size=30 value="$form->{cc}"></td>
-	</tr>
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Subject') . qq|</th>
-	  <td><input name=subject size=30 value="$form->{subject}"></td>
-	  $bcc
-	</tr>
+      <table>
+        <tr>
+          <th align="right" nowrap>| . $locale->text('To') . qq|</th>
+          <td><input name="email" size="30" value="| .
+          Q($form->{"email"}) . qq|"></td>
+        </tr>
+        <tr>
+          <th align="right" nowrap>| . $locale->text('Cc') . qq|</th>
+          <td><input name="cc" size="30" value="| .
+          Q($form->{"cc"}) . qq|"></td>
+        </tr>
+        $bcc
+        <tr>
+          <th align="right" nowrap>| . $locale->text('Subject') . qq|</th>
+          <td><input name="subject" size="30" value="| .
+          Q($form->{"subject"}) . qq|"></td>
+        </tr>
+        <tr>
+          <th align="right" nowrap>| . $locale->text('Attachment name') .
+          qq|</th>
+          <td><input name="attachment_filename" size="30" value="| .
+          Q($attachment_filename) . qq|"></td>
       </table>
     </td>
   </tr>
   <tr>
     <td>
-      <table width=100%>
-	<tr>
-	  <th align=left nowrap>| . $locale->text('Message') . qq|</th>
-	</tr>
-	<tr>
-	  <td><textarea name=message rows=15 cols=60 wrap=soft>$form->{message}</textarea></td>
-	</tr>
+      <table>
+        <tr>
+          <th align="left" nowrap>| . $locale->text('Message') . qq|</th>
+        </tr>
+        <tr>
+          <td><textarea name="message" rows="15" cols="60" wrap="soft">| .
+          H($form->{"message"}) . qq|</textarea></td>
+        </tr>
       </table>
     </td>
   </tr>
@@ -1354,21 +1437,21 @@ sub e_mail {
   # save all other variables
   foreach $key (keys %$form) {
     $form->{$key} =~ s/\"/&quot;/g;
-    print qq|<input type=hidden name=$key value="$form->{$key}">\n|;
+    print qq|<input type="hidden" name="$key" value="| . Q($form->{$key}) . qq|">\n|;
   }
 
   print qq|
     </td>
   </tr>
   <tr>
-    <td><hr size=3 noshade></td>
+    <td><hr size="3" noshade></td>
   </tr>
 </table>
 
-<input type=hidden name=nextsub value=send_email>
+<input type="hidden" name="nextsub" value="send_email">
 
 <br>
-<input name=action class=submit type=submit value="|
+<input name="action" class="submit" type="submit" value="|
     . $locale->text('Continue') . qq|">
 </form>
 
@@ -1406,6 +1489,16 @@ sub print_options {
     $myconfig{"copies"} ? $myconfig{"copies"} :
     3;
 
+  $form->{"media"} =
+    $form->{"media"} ? $form->{"media"} :
+    $myconfig{"default_media"} ? $myconfig{"default_media"} :
+    "screen";
+
+  $form->{"printer_id"} =
+    defined($form->{"printer_id"}) ? $form->{"printer_id"} :
+    $myconfig{"default_printer_id"} ? $myconfig{"default_printer_id"} :
+    "";
+
   $form->{PD}{ $form->{formname} } = "selected";
   $form->{DF}{ $form->{format} }   = "selected";
   $form->{OP}{ $form->{media} }    = "selected";
@@ -1467,20 +1560,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}>|
@@ -1539,11 +1618,12 @@ sub print_options {
   }
 
   if (scalar(keys (%{ $form->{printers} })) !=0) {
-
-    $printer_select = qq|<select name=printer_id>
+    my $selected = !$form->{"printer_id"} ? "selected" : "";
+    $printer_select = qq|<select name=printer_id $selected>
                   <option value=""></option>|;
     foreach $item (@{ $form->{printers} }) {
-      $printer_select .= qq|<option value="$item->{id}">$item->{printer_description}</option>|;
+      $selected = $item->{"id"} == $form->{"printer_id"} ? "selected" : "";
+      $printer_select .= qq|<option value="$item->{id}" $selected>$item->{printer_description}</option>|;
     }
   }
 
@@ -1681,8 +1761,7 @@ sub print_form {
   if (($form->{type} eq 'invoice') && ($form->{formname} eq 'proforma') ) {
     $inv                  = "inv";
     $due                  = "due";
-    $form->{"${inv}date"} = $form->{transdate};
-    $form->{"invdate"}    = $form->{transdate};
+    $form->{"${inv}date"} = $form->{invdate};
     $form->{label}        = $locale->text('Proforma Invoice');
     $numberfld            = "sonumber";
     $order                = 0;
@@ -1746,7 +1825,7 @@ sub print_form {
     $inv                  = "quo";
     $due                  = "req";
     $form->{"${inv}date"} = $form->{transdate};
-    $form->{"invdate"} = $form->{transdate};
+    $form->{"invdate"}    = $form->{transdate};
     $form->{label}        = $locale->text('Proforma Invoice');
     $numberfld            = "sqnumber";
     $order                = 1;
@@ -1764,7 +1843,9 @@ sub print_form {
   $form->isblank("email", $locale->text('E-mail address missing!'))
     if ($form->{media} eq 'email');
   $form->isblank("${inv}date",
-                 $locale->text($form->{label} . ' Date missing!'));
+           $locale->text($form->{label}) 
+           . ": "
+           . $locale->text(' Date missing!'));
 
   # $locale->text('Invoice Number missing!')
   # $locale->text('Invoice Date missing!')
@@ -1822,7 +1903,6 @@ sub print_form {
   }
 
   ($form->{employee}) = split /--/, $form->{employee};
-  ($form->{warehouse}, $form->{warehouse_id}) = split /--/, $form->{warehouse};
 
   # create the form variables
   if ($order) {