X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=7f8f65a54a2fa52138672630e1fbd88f443e7adb;hb=a4f92ff17d2572ec3a0465fe4444c741d80ecc77;hp=eefdefe0d9fdd521cb782e66caf58c0386daa77d;hpb=1b4cbffa1fbae97f0073be74dbe5cf6105f796f8;p=kivitendo-erp.git

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index eefdefe0d..7f8f65a54 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -38,14 +38,14 @@ use SL::IC;
 use CGI::Ajax;
 use CGI;
 
-require "$form->{path}/common.pl";
+require "bin/mozilla/common.pl";
 
 # any custom scripts for this one
-if (-f "$form->{path}/custom_io.pl") {
-  eval { require "$form->{path}/custom_io.pl"; };
+if (-f "bin/mozilla/custom_io.pl") {
+  eval { require "bin/mozilla/custom_io.pl"; };
 }
-if (-f "$form->{path}/$form->{login}_io.pl") {
-  eval { require "$form->{path}/$form->{login}_io.pl"; };
+if (-f "bin/mozilla/$form->{login}_io.pl") {
+  eval { require "bin/mozilla/$form->{login}_io.pl"; };
 }
 
 1;
@@ -368,9 +368,9 @@ sub display_row {
       }
 
       $column_data{sellprice_pg} =
-        qq|<td align="right"><select name="sellprice_pg_$i">$form->{"prices_$i"}</select></td>|;
+      qq|<td align="right"><select name="sellprice_pg_$i">$form->{"prices_$i"}</select></td>|;
       $column_data{sellprice} =
-        qq|<td><input name="sellprice_$i" size="10" value="$price_tmp"></td>|;
+      qq|<td><input name="sellprice_$i" size="10" value="$price_tmp" onBlur=\"check_right_number_format(this)\"></td>|;
     } else {
 
       # for last row and report
@@ -388,10 +388,10 @@ sub display_row {
 
         # for last row
         $column_data{sellprice_pg} = qq|<td align="right">&nbsp;</td>|;
-      }
-
+        }
+        
       $column_data{sellprice} =
-        qq|<td><input name="sellprice_$i" size="10" value="|
+      qq|<td><input name="sellprice_$i" size="10" onBlur=\"check_right_number_format(this)\" value="|
         . $form->format_amount(\%myconfig, $form->{"sellprice_$i"},
                                $decimalplaces)
         . qq|"></td>|;
@@ -427,17 +427,19 @@ sub display_row {
 
     map { print "\n$column_data{$_}" } @column_index;
 
-    print qq|
-        </tr>
-|;
-map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } 
-       ("orderitems_id_$i", "bo_$i", "pricegroup_old_$i", "price_old_$i", "selected_unit_$i", "id_$i", "inventory_accno_$i", "bin_$i",
-          "partsgroup_$i", "partnotes_$i", "income_accno_$i", "expense_accno_$i", "listprice_$i", "assembly_$i", "taxaccounts_$i",
-          "ordnumber_$i", "transdate_$i", "cusordnumber_$i", "longdescription_$i", "basefactor_$i"));
-print qq|
-<input type="hidden" name="price_new_$i" value="|
-      . $form->format_amount(\%myconfig, $form->{"price_new_$i"}) . qq|">
-|;
+    print("</tr>\n" .
+          $cgi->hidden("-name" => "unit_old_$i",
+                       "-value" => $form->{"selected_unit_$i"})
+          . "\n" .
+          $cgi->hidden("-name" => "price_new_$i",
+                       "-value" => $form->format_amount(\%myconfig, $form->{"price_new_$i"}))
+          . "\n");
+    map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_}) . "\n"); }
+        ("orderitems_id_$i", "bo_$i", "pricegroup_old_$i", "price_old_$i",
+         "id_$i", "inventory_accno_$i", "bin_$i", "partsgroup_$i", "partnotes_$i",
+         "income_accno_$i", "expense_accno_$i", "listprice_$i", "assembly_$i",
+         "taxaccounts_$i", "ordnumber_$i", "transdate_$i", "cusordnumber_$i",
+         "longdescription_$i", "basefactor_$i"));
 
 ########################################
     # Eintrag fuer Version 2.2.0 geaendert #
@@ -484,7 +486,7 @@ print qq|
         ? 'deliverydate'
         : 'reqdate';    # invoice uses a different term for the same thing.
       print qq|
-        <b>${$reqdate_term}</b>&nbsp;<input name="${reqdate_term}_$i" size="11" value="$form->{"${reqdate_term}_$i"}">
+        <b>${$reqdate_term}</b>&nbsp;<input name="${reqdate_term}_$i" size="11" onBlur="check_right_date_format(this)" value="$form->{"${reqdate_term}_$i"}">
 |;
     }
     my $subtotalchecked = ($form->{"subtotal_$i"}) ? "checked" : "";
@@ -581,7 +583,7 @@ sub select_item {
   $colspan = $#column_index + 1;
 
   print qq|
-<body>
+  <body>
 
 <form method="post" action="$form->{script}">
 
@@ -622,7 +624,7 @@ sub select_item {
     $column_data{partnumber} =
       qq|<td><input name="new_partnumber_$i" type="hidden" value="$ref->{partnumber}">$ref->{partnumber}</td>|;
     $column_data{description} =
-      qq|<td><input name="new_description_$i" type="hidden" value=$ref->{description}>$ref->{description}</td>|;
+      qq|<td><input name="new_description_$i" type="hidden" value="$ref->{description}">$ref->{description}</td>|;
     $column_data{sellprice} =
       qq|<td align="right"><input name="new_sellprice_$i" type="hidden" value="$ref->{sellprice}">|
       . $form->format_amount(\%myconfig, $ref->{sellprice}, 2, "&nbsp;")
@@ -640,18 +642,16 @@ sub select_item {
 
     map { print "\n$column_data{$_}" } @column_index;
 
-    print qq|
-</tr>
-|;
-map({ print($cgi->hidden("-name" => "new_$__$i", "-value" => $ref->{$_})); } 
-        qw(bin listprice inventory_accno income_accno expense_accno unit weight assembly taxaccounts partsgroup 
-           formel logdescription not_discountable part_payment_id partnodes id));
-if ($lizenzen) {
-      print qq|
-<input name="new_lizenzen_$i" type="hidden" value="$ref->{lizenzen}">
-|;
-    }
+    print("</tr>\n");
+
+    my @new_fields =
+      qw(bin listprice inventory_accno income_accno expense_accno unit weight
+         assembly taxaccounts partsgroup formel longdescription not_discountable
+         part_payment_id partnotes id);
+    push(@new_fields, "lizenzen") if ($lizenzen);
 
+    print join "\n", map { $cgi->hidden("-name" => "new_${_}_$i", "-value" => $ref->{$_}) } @new_fields;
+    print "\n";
   }
 
   print qq|
@@ -822,17 +822,10 @@ sub new_item {
     . $locale->text('Service');
 print $cgi->hidden("-name" => "previousform", "-value" => $previousform);
 map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } 
-     ("partnumber_$i", "description_$i", "rowcount", "taxaccounts", "vc", "path", "login", "password"));
-
-#<input type="hidden" name="partnumber" value="$form->{"partnumber_$i"}">
-#<input type="hidden" name="description" value="$form->{"description_$i"}">
-#<input type="hidden" name="rowcount" value="$form->{rowcount}">
-#<input type="hidden" name="taxaccount2" value="$form->{taxaccounts}">
-#<input type="hidden" name="vc" value="$form->{vc}">
-#
-#<input type="hidden" name="path" value="$form->{path}">
-#<input type="hidden" name="login" value="$form->{login}">
-#<input type="hidden" name="password" value="$form->{password}">
+     qw(rowcount vc login password));
+     map({ print($cgi->hidden("-name" => $_, "-value" => $form->{"$__$i"})); }
+     ("partnumber", "description"));
+print $cgi->hidden("-name" => "taxaccount2", "-value" => $form->{taxaccounts});
 
 print qq|
 <input type="hidden" name="nextsub" value="add">
@@ -861,7 +854,7 @@ sub display_form {
 
   # if we have a display_form
   if ($form->{display_form}) {
-    &{"$form->{display_form}"};
+    call_sub($form->{"display_form"});
     exit;
   }
 
@@ -1157,7 +1150,7 @@ sub order {
 
   $form->{cp_id} *= 1;
 
-  require "$form->{path}/$form->{script}";
+  require "bin/mozilla/$form->{script}";
   my $script = $form->{"script"};
   $script =~ s|.*/||;
   $script =~ s|.pl$||;
@@ -1221,7 +1214,7 @@ sub quotation {
 
   $form->{rowcount}--;
 
-  require "$form->{path}/$form->{script}";
+  require "bin/mozilla/$form->{script}";
 
   map { $form->{"select$_"} = "" } ($form->{vc}, currency);
 
@@ -1263,166 +1256,36 @@ sub edit_e_mail {
     $form->{print_and_post} = 0;
     $form->{resubmit}       = 0;
   }
-  if ($myconfig{role} eq 'admin') {
-    $bcc = qq|
-    <tr>
-      <th align="right" nowrap="true">| . $locale->text('Bcc') . qq|</th>
-      <td><input name="bcc" size="30" value="| . Q($form->{bcc}) . qq|"></td>
-    </tr>
-|;
-  }
 
-  if ($form->{formname} =~ /(pick|packing|bin)_list/) {
-    $form->{email} = $form->{shiptoemail} if $form->{shiptoemail};
-  }
+  $form->{email} = $form->{shiptoemail} if $form->{shiptoemail} && $form->{formname} =~ /(pick|packing|bin)_list/;
 
   if ($form->{"cp_id"} && !$form->{"email"}) {
     CT->get_contact(\%myconfig, $form);
     $form->{"email"} = $form->{"cp_email"};
   }
 
-  $name = $form->{ $form->{vc} };
-  $name =~ s/--.*//g;
-  $title = $locale->text('E-mail') . " $name";
+  $form->{ $form->{vc} } =~ /--/;
+  $title = $locale->text('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 = "";
-  }
+  my $attachment_filename = $form->generate_attachment_filename();
 
-  if ($form->{"email"}) {
-    $form->{"fokus"} = "Form.subject";
-  } else {
-    $form->{"fokus"} = "Form.email";
-  }
+  $form->{"fokus"} = $form->{"email"} ? "Form.subject" : "Form.email";
   $form->header;
 
-  print qq|
-<body onload="fokus()">
-
-<form name="Form" method="post" action="$form->{script}">
-
-<table width="100%">
-  <tr class="listtop">
-    <th class="listtop">$title</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <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>
-        <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>
-  <tr>
-    <td>
-|;
-
-  &print_options;
-
-  map { delete $form->{$_} }
-    qw(action email cc bcc subject message formname sendmode format header override);
-
-  # save all other variables
-  foreach $key (keys %$form) {
-    $form->{$key} =~ s/\"/&quot;/g;
-    print qq|<input type="hidden" name="$key" value="| . Q($form->{$key}) . qq|">\n|;
-  }
-
-  print qq|
-    </td>
-  </tr>
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
-</table>
-
-<input type="hidden" name="nextsub" value="send_email">
+  my (@dont_hide_key_list, %dont_hide_key, @hidden_keys);
+  @dont_hide_key_list = qw(action email cc bcc subject message formname sendmode format header override);
+  @dont_hide_key{@dont_hide_key_list} = (1) x @dont_hide_key_list;
+  @hidden_keys = grep { !$dont_hide_key{$_} } grep { !ref $form->{$_} } keys %$form;
 
-<br>
-<input name="action" class="submit" type="submit" value="|
-    . $locale->text('Continue') . qq|">
-</form>
-
-</body>
-</html>
-|;
+  print $form->parse_html_template('generic/edit_email', 
+                                  { title           => $title,
+                                    a_filename      => $attachment_filename,
+                                    _print_options_ => print_options({ 'inline' => 1 }),
+                                    HIDDEN          => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ],
+                                    SHOW_BCC        => $myconfig{role} eq 'admin' });
 
   $lxdebug->leave_sub();
 }
@@ -1432,7 +1295,7 @@ sub send_email {
 
   my $callback = $form->{script} . "?action=edit";
   map({ $callback .= "\&${_}=" . E($form->{$_}); }
-      qw(login password path type id));
+      qw(login password type id));
 
   print_form("return");
 
@@ -1452,7 +1315,11 @@ sub send_email {
 #
 # the inline options is untested, but intended to be used later in metatemplating
 sub print_options {
-  $lxdebug->enter_sub() and my ($inline) = @_;
+  $lxdebug->enter_sub();
+
+  my ($options) = @_;
+
+  $options ||= { };
 
   # names 3 parameters and returns a hashref, for use in templates
   sub opthash { +{ value => shift, selected => shift, oname => shift } }
@@ -1505,9 +1372,9 @@ sub print_options {
 
   push @MEDIA, grep $_,
       opthash("screen", $form->{OP}{screen}, $locale->text('Screen')),
-    (scalar keys %{ $form->{printers} } && $latex_templates) ?
+    (scalar @{ $form->{printers} } && $latex_templates) ?
       opthash("printer", $form->{OP}{printer}, $locale->text('Printer')) : undef,
-    ($latex_templates) ? 
+    ($latex_templates && !$options{no_queue}) ?
       opthash("queue", $form->{OP}{queue}, $locale->text('Queue')) : undef
         if ($form->{media} ne 'email');
 
@@ -1528,20 +1395,25 @@ sub print_options {
 
   push @PRINTER_ID, 
     map { opthash($_->{id}, ($_->{id} eq $form->{printer_id} ? 'selected' : ''), $_->{printer_description}) } +{}, @{ $form->{printers} }
-      if (ref $form->{printers} eq 'ARRAY');
+      if ((ref $form->{printers} eq 'ARRAY') && scalar @{ $form->{printers } });
 
   @SELECTS = map { sname => lc $_, DATA => \@$_, show => scalar @$_ }, qw(FORMNAME LANGUAGE_ID FORMAT SENDMODE MEDIA PRINTER_ID);
 
+  my %dont_display_groupitems = (
+    'dunning' => 1,
+    );
+
   %template_vars = (
-    display_copies       => scalar keys %{ $form->{printers} } && $latex_templates && $form->{media} ne 'email',
+    display_copies       => scalar @{ $form->{printers} } && $latex_templates && $form->{media} ne 'email',
     display_remove_draft => (!$form->{id} && $form->{draft_id}),
+    display_groupitems   => !$dont_display_groupitems{$form->{type}},
     groupitems_checked   => $form->{groupitems} ? "checked" : '',
     remove_draft_checked => $form->{remove_draft} ? "checked" : ''
   );
 
   my $print_options = $form->parse_html_template("generic/print_options", { SELECTS  => \@SELECTS, %template_vars } );
 
-  if ($inline) {
+  if ($options{inline}) {
     $lxdebug->leave_sub() and return $print_options;
   } else {
     print $print_options; $lxdebug->leave_sub();
@@ -1720,9 +1592,10 @@ sub print_form {
 
       $form->{rowcount}--;
 
-      &{"$display_form"};
+      call_sub($display_form);
       # saving the history
   	  if(!exists $form->{addition}) {
+        $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; 
   	    $form->{addition} = "PRINTED";
   	    $form->save_history($form->dbconnect(\%myconfig));
       }
@@ -1742,7 +1615,7 @@ sub print_form {
   $salesman_id_saved = $form->{salesman_id};
   $cp_id_saved = $form->{cp_id};
 
-  &{"$form->{vc}_details"}();
+  call_sub("$form->{vc}_details");
 
   $form->{language_id} = $language_saved;
   $form->{payment_id} = $payment_id_saved;
@@ -1809,6 +1682,8 @@ sub print_form {
 
   $form->{templates} = "$myconfig{templates}";
 
+  delete $form->{printer_command};
+
   $form->{language} = $form->get_template_language(\%myconfig);
   $form->{printer_code} = $form->get_printer_code(\%myconfig);
 
@@ -1838,13 +1713,16 @@ sub print_form {
   reformat_numbers($output_numberformat, 2,
                    qw(invtotal ordtotal quototal subtotal linetotal
                       listprice sellprice netprice discount
-                      tax taxbase),
+                      tax taxbase total paid),
                    grep({ /^linetotal_\d+$/ ||
                             /^listprice_\d+$/ ||
                             /^sellprice_\d+$/ ||
                             /^netprice_\d+$/ ||
                             /^taxbase_\d+$/ ||
                             /^discount_\d+$/ ||
+                            /^paid_\d+$/ ||
+                            /^subtotal_\d+$/ ||
+                            /^total_\d+$/ ||
                             /^tax_\d+$/
                         } keys(%{$form})));
 
@@ -1873,6 +1751,8 @@ sub print_form {
     $form->{"IN"} =~ s/html$/odt/;
   }
 
+  delete $form->{OUT};
+
   if ($form->{media} eq 'printer') {
     $form->{OUT} = "| $form->{printer_command} &>/dev/null";
     $form->{printed} .= " $form->{formname}";
@@ -1884,15 +1764,13 @@ sub print_form {
     $form->{subject} = qq|$form->{label} $form->{"${inv}number"}|
       unless $form->{subject};
 
-    $form->{OUT} = "$sendmail";
-
     $form->{emailed} .= " $form->{formname}";
     $form->{emailed} =~ s/^ //;
   }
   $emailed = $form->{emailed};
 
   if ($form->{media} eq 'queue') {
-    %queued = split / /, $form->{queued};
+    %queued = map { s|.*/|| } split / /, $form->{queued};
 
     if ($filename = $queued{ $form->{formname} }) {
       $form->{queued} =~ s/$form->{formname} $filename//;
@@ -1915,6 +1793,7 @@ sub print_form {
 
 # saving the history
   if(!exists $form->{addition}) {
+    $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
     if($form->{media} =~ /printer/) {
     	$form->{addition} = "PRINTED";
     }
@@ -1971,7 +1850,7 @@ sub print_form {
         } qw(paid exchangerate);
       }
 
-      &{"$display_form"};
+      call_sub($display_form);
       exit;
     }
 
@@ -1982,7 +1861,7 @@ sub print_form {
     $form->redirect(qq|$form->{label} $form->{"${inv}number"} $msg|);
   }
   if ($form->{printing}) {
-   &{"$display_form"};
+   call_sub($display_form);
    exit; 
   }
 
@@ -2036,7 +1915,7 @@ sub ship_to {
         contact email phone fax));
 
   # get details for name
-  &{"$form->{vc}_details"}(@addr_vars);
+  call_sub("$form->{vc}_details", @addr_vars);
 
   $number =
     ($form->{vc} eq 'customer')
@@ -2113,7 +1992,7 @@ sub ship_to {
 	<tr>
 	  <th align="right" nowrap>| . $locale->text('Contact') . qq|</th>
 	  <td>$form->{contact}</td>
-	  <td><input name="shiptocontac"t size="35" value="$form->{shiptocontact}"></td>
+	  <td><input name="shiptocontact" size="35" value="$form->{shiptocontact}"></td>
 	</tr>
 	<tr>
 	  <th align="right" nowrap>| . $locale->text('Phone') . qq|</th>
@@ -2134,7 +2013,7 @@ sub ship_to {
     </td>
   </tr>
 </table>
-| . $cgi->hidden("-name" => "nexsub", "-value" => $nextsub);
+| . $cgi->hidden("-name" => "nextsub", "-value" => $nextsub);
 ;
 
 
@@ -2196,7 +2075,7 @@ sub new_license {
   map { $form->{$_} = $form->escape($form->{$_}, 1) }
     qw(partnumber description);
   $form->{callback} =
-    qq|$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&customer=$customer&partnumber=$form->{partnumber}&description=$form->{description}&previousform="$previousform"&initial=1|;
+    qq|$form->{script}?login=$form->{login}&password=$form->{password}&action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&customer=$customer&partnumber=$form->{partnumber}&description=$form->{description}&previousform="$previousform"&initial=1|;
   $form->redirect;
 
   $lxdebug->leave_sub();