X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=bd248030db783ba519368aa44bfb356513e8b158;hb=055a6bf2aa1a2ce48d02ea57ed066a813f5c9434;hp=fab0a1ad609fe1afeb050031fe29718c88323cb8;hpb=af85349024c0d1fc6db899cd84708c7fb6dfb7f4;p=kivitendo-erp.git

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index fab0a1ad6..bd248030d 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -33,7 +33,10 @@
 #
 #######################################################################
 
+use SL::CT;
 use SL::IC;
+use CGI::Ajax;
+use CGI;
 
 require "$form->{path}/common.pl";
 
@@ -87,6 +90,7 @@ use Data::Dumper;
 sub display_row {
   $lxdebug->enter_sub();
   my $numrows = shift;
+
   if ($lizenzen && $form->{vc} eq "customer") {
     if ($form->{type} =~ /sales_order/) {
       @column_index = (runningnumber, partnumber, description, ship, qty);
@@ -194,9 +198,20 @@ sub display_row {
     . qq|</th>|;
 ############## ENDE Neueintrag ##################
 
+  $myconfig{"show_form_details"} = 1
+    unless (defined($myconfig{"show_form_details"}));
+  $form->{"show_details"} = $myconfig{"show_form_details"}
+    unless (defined($form->{"show_details"}));
+  $form->{"show_details"} = $form->{"show_details"} ? 1 : 0;
+  my $show_details_new = 1 - $form->{"show_details"};
+  my $show_details_checked = $form->{"show_details"} ? "checked" : "";
+
   print qq|
   <tr>
     <td>
+      <input type="hidden" name="show_details" value="$form->{show_details}">
+      <input type="checkbox" id="cb_show_details" onclick="show_form_details($show_details_new);" $show_details_checked>
+      <label for="cb_show_details">| . $locale->text("Show details") . qq|</label><br>
       <table width=100%>
 	<tr class=listheading>|;
 
@@ -435,9 +450,13 @@ sub display_row {
     # Eintrag fuer Version 2.2.0 geaendert #
     # neue Optik im Rechnungsformular      #
 ########################################
+
+    my $row_style_attr =
+      'style="display:none;"' if (!$form->{"show_details"});
+
     # print second row
     print qq|
-        <tr  class=listrow$j>
+        <tr  class=listrow$j $row_style_attr>
 	  <td colspan=$colspan>
 |;
     if ($lizenzen && $form->{type} eq "invoice" && $form->{vc} eq "customer") {
@@ -548,7 +567,7 @@ sub set_pricegroup {
 
 sub select_item {
   $lxdebug->enter_sub();
-  @column_index = qw(ndx partnumber description onhand sellprice);
+  @column_index = qw(ndx partnumber description onhand unit sellprice);
 
   $column_data{ndx}        = qq|<th>&nbsp;</th>|;
   $column_data{partnumber} =
@@ -559,7 +578,8 @@ sub select_item {
     qq|<th class=listheading>| . $locale->text('Price') . qq|</th>|;
   $column_data{onhand} =
     qq|<th class=listheading>| . $locale->text('Qty') . qq|</th>|;
-
+  $column_data{unit} =
+    qq|<th class=listheading>| . $locale->text('Unit') . qq|</th>|;
   # list items with radio button on a form
   $form->header;
 
@@ -617,7 +637,8 @@ sub select_item {
       qq|<td align=right><input name="new_onhand_$i" type=hidden value=$ref->{onhand}>|
       . $form->format_amount(\%myconfig, $ref->{onhand}, '', "&nbsp;")
       . qq|</td>|;
-
+    $column_data{unit} =
+      qq|<td>$ref->{unit}</td>|;
     $j++;
     $j %= 2;
     print qq|
@@ -1167,6 +1188,13 @@ sub order {
                     \%myconfig, $form->{currency}, $form->{transdate}, $buysell
                     )));
 
+  for $i (1 .. $form->{rowcount}) {
+    map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig,
+                                                     $form->{"${_}_${i}"})
+            if ($form->{"${_}_${i}"}) }
+        qw(ship qty sellprice listprice basefactor));
+  }
+
   &prepare_order;
   &display_form;
 
@@ -1220,6 +1248,13 @@ sub quotation {
                     \%myconfig, $form->{currency}, $form->{transdate}, $buysell
                     )));
 
+  for $i (1 .. $form->{rowcount}) {
+    map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig,
+                                                     $form->{"${_}_${i}"})
+            if ($form->{"${_}_${i}"}) }
+        qw(ship qty sellprice listprice basefactor));
+  }
+
   &prepare_order;
   &display_form;
 
@@ -1247,6 +1282,11 @@ sub e_mail {
     $form->{email} = $form->{shiptoemail} if $form->{shiptoemail};
   }
 
+  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";
@@ -1348,7 +1388,16 @@ sub send_email {
 sub print_options {
   $lxdebug->enter_sub();
   $form->{sendmode} = "attachment";
-  $form->{copies}   = 3 unless $form->{copies};
+
+  $form->{"format"} =
+    $form->{"format"} ? $form->{"format"} :
+    $myconfig{"template_format"} ? $myconfig{"template_format"} :
+    "pdf";
+
+  $form->{"copies"} =
+    $form->{"copies"} ? $form->{"copies"} :
+    $myconfig{"copies"} ? $myconfig{"copies"} :
+    3;
 
   $form->{PD}{ $form->{formname} } = "selected";
   $form->{DF}{ $form->{format} }   = "selected";
@@ -1459,7 +1508,7 @@ sub print_options {
 
   $format .= qq|<option value=html $form->{DF}{html}>HTML</option>|;
 
-  if ($latex) {
+  if ($latex_templates) {
     $format .= qq|<option value=postscript $form->{DF}{postscript}>| .
       $locale->text('Postscript') . qq|</option>|;
   }
@@ -1803,8 +1852,6 @@ sub print_form {
 
   $form->{notes} =~ s/^\s+//g;
 
-  map({ $form->{$_} =~ s/\\n/\n/g; } qw(company address));
-
   $form->{templates} = "$myconfig{templates}";
 
   $form->{language} = $form->get_template_language(\%myconfig);
@@ -2189,3 +2236,18 @@ sub relink_accounts {
 
   $lxdebug->leave_sub();
 }
+
+
+sub set_duedate {
+  $lxdebug->enter_sub();
+
+  $form->get_duedate(\%myconfig);
+
+  my $q = new CGI;
+  $result = "$form->{duedate}";
+  print $q->header();
+  print $result;
+  $lxdebug->leave_sub();
+
+}
+