X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=6fc89608e494c49e2e2ebb5d1618a20a8ace596b;hb=644c68bae03521cec693800af0a19b9ab4e0ed9c;hp=6987c713661540f6c504791cd5e4cbabe14366f9;hpb=a1e47d425a58b8342992daab4907591506949f07;p=kivitendo-erp.git

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 6987c7136..6fc89608e 100644
--- 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->{"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')
@@ -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;
@@ -1180,6 +1192,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);
 
@@ -1275,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;
@@ -1325,7 +1341,7 @@ sub e_mail {
   my $attachment_filename = $formname_translations{$form->{"formname"}};
   my $prefix;
 
-  if ($form->{"type"} =~ /invoice/) {
+  if (grep({ $form->{"type"} eq $_ } qw(invoice credit_note))) {
     $prefix = "inv";
   } elsif ($form->{"type"} =~ /_quotation$/) {
     $prefix = "quo";
@@ -1458,241 +1474,109 @@ sub send_email {
   $lxdebug->leave_sub();
 }
 
+# generate the printing options displayed at the bottom of oe and is forms.
+# this function will attempt to guess what type of form is displayed, and will generate according options
+#
+# about the coding: 
+# this version builds the arrays of options pretty directly. if you have trouble understanding how,
+# the opthash function builds hashrefs which are then pieced together for the template arrays.
+# unneeded options are "undef"ed out, and then grepped out. 
+#
+# the inline options is untested, but intended to be used later in metatemplating
 sub print_options {
-  $lxdebug->enter_sub();
-  $form->{sendmode} = "attachment";
-
-  $form->{"format"} =
-    $form->{"format"} ? $form->{"format"} :
-    $myconfig{"template_format"} ? $myconfig{"template_format"} :
-    "pdf";
+  $lxdebug->enter_sub() and my ($inline) = @_;
 
-  $form->{"copies"} =
-    $form->{"copies"} ? $form->{"copies"} :
-    $myconfig{"copies"} ? $myconfig{"copies"} :
-    3;
+  # names 3 parameters and returns a hashref, for use in templates
+  sub opthash { +{ value => shift, selected => shift, oname => shift } }
+  (@FORMNAME, @FORMNAME, @LANGUAGE_ID, @FORMAT, @SENDMODE, @MEDIA, @PRINTER_ID, @SELECTS) = ();
 
-  $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"} :
-    "";
+  # note: "||"-selection is only correct for values where "0" is _not_ a correct entry
+  $form->{sendmode}   = "attachment";
+  $form->{format}     = $form->{format} || $myconfig{template_format} || "pdf";
+  $form->{copies}     = $form->{copies} || $myconfig{copies} || 3;
+  $form->{media}      = $form->{media} || $myconfig{default_media} || "screen";
+  $form->{printer_id} = $form->{printer_id} || $myconfig{default_printer_id} || "";
 
   $form->{PD}{ $form->{formname} } = "selected";
   $form->{DF}{ $form->{format} }   = "selected";
   $form->{OP}{ $form->{media} }    = "selected";
-  $form->{SM}{ $form->{sendmode} } = "selected";
-
-  if ($form->{type} eq 'purchase_order') {
-    $type = qq|<select name=formname>
-	    <option value=purchase_order $form->{PD}{purchase_order}>|
-      . $locale->text('Purchase Order') . qq|
-	    <option value=bin_list $form->{PD}{bin_list}>|
-      . $locale->text('Bin List');
-  }
-
-  if ($form->{type} eq 'credit_note') {
-    $type = qq|<select name=formname>
-	    <option value=credit_note $form->{PD}{credit_note}>|
-      . $locale->text('Credit Note');
-  }
-
-  if ($form->{type} eq 'sales_order') {
-    $type = qq|<select name=formname>
-	    <option value=sales_order $form->{PD}{sales_order}>|
-      . $locale->text('Confirmation') . qq|
-      <option value=proforma $form->{PD}{proforma}>|
-      . $locale->text('Proforma Invoice') . qq|
-	    <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} =~ /_quotation$/) {
-    $type = qq|<select name=formname>
-	    <option value="$`_quotation" $form->{PD}{"$`_quotation"}>|
-      . $locale->text('Quotation');
-  }
-
-  if ($form->{type} eq 'invoice') {
-    $type = qq|<select name=formname>
-	    <option value=invoice $form->{PD}{invoice}>|
-      . $locale->text('Invoice') . qq|
-      <option value=proforma $form->{PD}{proforma}>|
-      . $locale->text('Proforma Invoice') . qq|
-      <option value=packing_list $form->{PD}{packing_list}>|
-      . $locale->text('Packing List');
-  }
-
-  if ($form->{type} eq 'invoice' && $form->{storno}) {
-    $type = qq|<select name=formname>
-	    <option value=storno_invoice $form->{PD}{storno_invoice}>|
-      . $locale->text('Storno Invoice') . qq|
-      <option value=storno_packing_list $form->{PD}{storno_packing_list}>|
-      . $locale->text('Storno Packing List');
-  }
-
-  if ($form->{type} eq 'credit_note') {
-    $type = qq|<select name=formname>
-	    <option value=credit_note $form->{PD}{credit_note}>|
-      . $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');
-  }
+  $form->{SM}{ $form->{formname} } = "selected";
+
+  push @FORMNAME, grep $_,
+    ($form->{type} eq 'purchase_order') ? (
+      opthash("purchase_order", $form->{PD}{purchase_order}, $locale->text('Purchase Order')),
+      opthash("bin_list", $form->{PD}{bin_list}, $locale->text('Bin List')) 
+    ) : undef,
+    ($form->{type} eq 'credit_note') ?
+      opthash("credit_note", $form->{PD}{credit_note}, $locale->text('Credit Note')) : undef,
+    ($form->{type} eq 'sales_order') ? (
+      opthash("sales_order", $form->{PD}{sales_order}, $locale->text('Confirmation')),
+      opthash("proforma", $form->{PD}{proforma}, $locale->text('Proforma Invoice')),
+      opthash("pick_list", $form->{PD}{pick_list}, $locale->text('Pick List')),
+      opthash("packing_list", $form->{PD}{packing_list}, $locale->text('Packing List')) 
+    ) : undef,
+    ($form->{type} =~ /_quotation$/) ?
+      opthash("$`_quotation", $form->{PD}{"$`_quotation"}, $locale->text('Quotation')) : undef,
+    ($form->{type} eq 'invoice') ? (
+      opthash("invoice", $form->{PD}{invoice}, $locale->text('Invoice')),
+      opthash("proforma", $form->{PD}{proforma}, $locale->text('Proforma Invoice')),
+      opthash("packing_list", $form->{PD}{packing_list}, $locale->text('Packing List'))
+    ) : undef,
+    ($form->{type} eq 'invoice' && $form->{storno}) ? (
+      opthash("storno_invoice", $form->{PD}{storno_invoice}, $locale->text('Storno Invoice')),
+      opthash("storno_packing_list", $form->{PD}{storno_packing_list}, $locale->text('Storno Packing List')) 
+    ) : undef,
+    ($form->{type} eq 'credit_note') ?
+      opthash("credit_note", $form->{PD}{credit_note}, $locale->text('Credit Note')) : undef;
+
+  push @SENDMODE, 
+    opthash("attachment", $form->{SM}{attachment}, $locale->text('Attachment')),
+    opthash("inline", $form->{SM}{inline}, $locale->text('In-line'))
+      if ($form->{media} eq 'email');
+
+  push @MEDIA, grep $_,
+      opthash("screen", $form->{OP}{screen}, $locale->text('Screen')),
+    (scalar keys %{ $form->{printers} } && $latex_templates) ?
+      opthash("printer", $form->{OP}{printer}, $locale->text('Printer')) : undef,
+    ($latex_templates) ? 
+      opthash("queue", $form->{OP}{queue}, $locale->text('Queue')) : undef
+        if ($form->{media} ne 'email');
+
+  push @FORMAT, grep $_,
+    ($opendocument_templates && $openofficeorg_writer_bin && $xvfb_bin && (-x $openofficeorg_writer_bin) && (-x $xvfb_bin)) ?
+      opthash("opendocument_pdf", $form->{DF}{"opendocument_pdf"}, $locale->text("PDF (OpenDocument/OASIS)")) : undef,
+    ($latex_templates) ? (
+      opthash("pdf", $form->{DF}{pdf}, $locale->text('PDF')),
+      opthash("postscript", $form->{DF}{postscript}, $locale->text('Postscript'))
+    ) : undef,
+      opthash("html", $form->{DF}{html}, "HTML"),
+    ($opendocument_templates) ?
+      opthash("opendocument", $form->{DF}{opendocument}, $locale->text("OpenDocument/OASIS")) : undef;
+
+  push @LANGUAGE_ID, 
+    map { opthash($_->{id}, ($_->{id} eq $form->{language} ? 'selected' : ''), $_->{description}) } +{}, @{ $form->{languages} }
+      if (ref $form->{languages} eq 'ARRAY');
+
+  push @PRINTER_ID, 
+    map { opthash($_->{id}, ($_->{id} eq $form->{printer_id} ? 'selected' : ''), $_->{description}) } +{}, @{ $form->{printers} }
+      if (ref $form->{printers} eq 'ARRAY');
+
+  @SELECTS = map { sname => lc $_, DATA => \@$_, show => scalar @$_ }, qw(FORMNAME LANGUAGE_ID FORMAT SENDMODE MEDIA PRINTER_ID);
+
+  %template_vars = (
+    display_copies       => scalar keys %{ $form->{printers} } && $latex_templates && $form->{media} ne 'email',
+    display_remove_draft => (!$form->{id} && $form->{draft_id}),
+    groupitems_checked   => $form->{groupitems} ? "checked" : '',
+    remove_draft_checked => $form->{remove_draft} ? "checked" : ''
+  );
 
-  if ($form->{type} eq 'receive_order') {
-    $type = qq|<select name=formname>
-	    <option value=bin_list $form->{PD}{bin_list}>|
-      . $locale->text('Bin List');
-  }
+  my $print_options = $form->parse_html_template("generic/print_options", { SELECTS  => \@SELECTS, %template_vars } );
 
-  if ($form->{media} eq 'email') {
-    $media = qq|<select name=sendmode>
-	    <option value=attachment $form->{SM}{attachment}>|
-      . $locale->text('Attachment') . qq|
-	    <option value=inline $form->{SM}{inline}>| . $locale->text('In-line');
+  if ($inline) {
+    $lxdebug->leave_sub() and return $print_options;
   } else {
-    $media = qq|<select name=media>
-	    <option value=screen $form->{OP}{screen}>| . $locale->text('Screen');
-    if (scalar(keys (%{ $form->{printers} })) !=0 && $latex_templates) {
-      $media .= qq|
-            <option value=printer $form->{OP}{printer}>|
-        . $locale->text('Printer');
-    }
-    if ($latex_templates) {
-      $media .= qq|
-            <option value=queue $form->{OP}{queue}>| . $locale->text('Queue');
-    }
-  }
-
-  $format = qq|<select name=format>|;
-  if ($opendocument_templates && $openofficeorg_writer_bin &&
-      $xvfb_bin && (-x $openofficeorg_writer_bin) && (-x $xvfb_bin)) {
-    $format .= qq|<option value=opendocument_pdf | .
-      $form->{DF}{"opendocument_pdf"} . qq|>| .
-      $locale->text("PDF (OpenDocument/OASIS)") . qq|</option>|;
-  }
-
-  if ($latex_templates) {
-    $format .= qq|<option value=pdf $form->{DF}{pdf}>| .
-      $locale->text('PDF') . qq|</option>|;
-  }
-
-  $format .= qq|<option value=html $form->{DF}{html}>HTML</option>|;
-
-  if ($latex_templates) {
-    $format .= qq|<option value=postscript $form->{DF}{postscript}>| .
-      $locale->text('Postscript') . qq|</option>|;
-  }
-
-  if ($opendocument_templates) {
-    $format .= qq|<option value=opendocument $form->{DF}{opendocument}>| .
-      $locale->text("OpenDocument/OASIS") . qq|</option>|;
-  }
-  $format .= qq|</select>|;
-
-  if (scalar(keys (%{ $form->{languages} })) !=0) {
-    $language_select = qq|<select name=language_id>
-		<option value=""></option>}|;
-    foreach $item (@{ $form->{languages} }) {
-      if ($form->{language_id} eq $item->{id}) {
-        $language_select .= qq|<option value="$item->{id}" selected>$item->{description}</option>|;
-      } else {
-        $language_select .= qq|<option value="$item->{id}">$item->{description}</option>|;
-      }
-    }
-  }
-
-  if (scalar(keys (%{ $form->{printers} })) !=0) {
-    my $selected = !$form->{"printer_id"} ? "selected" : "";
-    $printer_select = qq|<select name=printer_id $selected>
-                  <option value=""></option>|;
-    foreach $item (@{ $form->{printers} }) {
-      $selected = $item->{"id"} == $form->{"printer_id"} ? "selected" : "";
-      $printer_select .= qq|<option value="$item->{id}" $selected>$item->{printer_description}</option>|;
-    }
-  }
-
-
-
-  print qq|
-<table width=100% cellspacing=0 cellpadding=0>
-  <tr>
-    <td>
-      <table>
-	<tr>
-	  <td>$type</select></td>|;
-  if (scalar(keys (%{ $form->{languages} })) !=0) {
-  print qq|
-          <td>${language_select}</select></td>|;
-  }
-  print qq|
-	  <td>$format</select></td>
-	  <td>$media</select></td>|;
-  if (scalar(keys (%{ $form->{printers} })) !=0) {
-  print qq|
-	  <td>$printer_select</select></td>
-|;
-  }
-
-  if (scalar(keys (%{ $form->{printers} })) !=0 && $latex_templates && $form->{media} ne 'email') {
-    print qq|
-	  <td>| . $locale->text('Copies') . qq|
-	  <input name=copies size=2 value=$form->{copies}></td>
-|;
-  }
-
-  $form->{groupitems} = "checked" if $form->{groupitems};
-
-  print qq|
-          <td>| . $locale->text('Group Items') . qq|</td>
-          <td><input name=groupitems type=checkbox class=checkbox $form->{groupitems}></td>
-        </tr>
-      </table>
-    </td>
-    <td align=right>
-      <table>
-        <tr>
-|;
-
-  if ($form->{printed} =~ /$form->{formname}/) {
-    print qq|
-	  <th>\|| . $locale->text('Printed') . qq|\|</th>
-|;
+    print $print_options; $lxdebug->leave_sub();
   }
-
-  if ($form->{emailed} =~ /$form->{formname}/) {
-    print qq|
-	  <th>\|| . $locale->text('E-mailed') . qq|\|</th>
-|;
-  }
-
-  if ($form->{queued} =~ /$form->{formname}/) {
-    print qq|
-	  <th>\|| . $locale->text('Queued') . qq|\|</th>
-|;
-  }
-
-  print qq|
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-|;
-
-  $lxdebug->leave_sub();
 }
 
 sub print {
@@ -1758,8 +1642,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;
@@ -1855,7 +1738,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') {
 
@@ -1868,6 +1752,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;
     }
   }
@@ -1880,6 +1770,7 @@ sub print_form {
 
   $language_saved = $form->{language_id};
   $payment_id_saved = $form->{payment_id};
+  $salesman_id_saved = $form->{salesman_id};
 
   &{"$form->{vc}_details"}();
 
@@ -1901,7 +1792,6 @@ sub print_form {
   }
 
   ($form->{employee}) = split /--/, $form->{employee};
-  ($form->{warehouse}, $form->{warehouse_id}) = split /--/, $form->{warehouse};
 
   # create the form variables
   if ($order) {
@@ -1910,6 +1800,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);
   }
@@ -2044,6 +1936,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} = "";
@@ -2331,7 +2241,6 @@ sub relink_accounts {
   $lxdebug->leave_sub();
 }
 
-
 sub set_duedate {
   $lxdebug->enter_sub();