Merge von 599 aus unstable: Funktion fuer Druckvorschau und Drucken+Buchen zu Verkauf...

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index d0e813f573b1520bd8e5fb8e04a782dec60f60ed..2a47a624916e882e6f4705eafa0129c28afde6c9 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -199,7 +199,8 @@ sub display_row {
 
     # undo formatting
     map {
 
     # undo formatting
     map {

-      $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
+      $form->{"${_}_$i"} =
+        $form->parse_amount(\%myconfig, $form->{"${_}_$i"})

     } qw(qty ship discount sellprice);
 
     ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
     } qw(qty ship discount sellprice);
 
     ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);


@@ -643,7 +644,32 @@ sub display_form {
     &{"$form->{display_form}"};
     exit;
   }
     &{"$form->{display_form}"};
     exit;
   }

+  if (   $form->{print_and_post}
+      && $form->{second_run}
+      && ($form->{action} eq "display_form")) {
+    for (keys %$form) { $old_form->{$_} = $form->{$_} }
+    $old_form->{rowcount}++;

 
 

+    #$form->{rowcount}--;
+    #$form->{rowcount}--;
+
+    $form->{print_and_post} = 0;
+
+    &print_form($old_form);
+    exit;
+  }
+
+  $form->{action}   = "";
+  $form->{resubmit} = 0;
+
+  if ($form->{print_and_post} && !$form->{second_run}) {
+    $form->{second_run} = 1;
+    $form->{action}     = "display_form";
+    $form->{rowcount}--;
+
+    $form->{resubmit} = 1;
+
+  }

   &form_header;
 
   $numrows    = ++$form->{rowcount};
   &form_header;
 
   $numrows    = ++$form->{rowcount};


@@ -672,6 +698,10 @@ sub display_form {
 
   &form_footer;
 
 
   &form_footer;
 

+  #   if ($form->{print_and_post}) {
+  #     &display_form;
+  #   }
+

   $lxdebug->leave_sub();
 }
 
   $lxdebug->leave_sub();
 }
 


@@ -680,7 +710,7 @@ sub check_form {
 
   my @a     = ();
   my $count = 0;
 
   my @a     = ();
   my $count = 0;

-  my @flds = (
+  my @flds  = (

     qw(id partnumber description qty ship sellprice unit discount inventory_accno income_accno expense_accno listprice taxaccounts bin assembly weight projectnumber project_id oldprojectnumber runningnumber serialnumber partsgroup)
   );
 
     qw(id partnumber description qty ship sellprice unit discount inventory_accno income_accno expense_accno listprice taxaccounts bin assembly weight projectnumber project_id oldprojectnumber runningnumber serialnumber partsgroup)
   );
 


@@ -1323,7 +1353,7 @@ sub print_form {
   # $locale->text('Quotation Date missing!')
 
   # assign number
   # $locale->text('Quotation Date missing!')
 
   # assign number

-  if (!$form->{"${inv}number"}) {
+  if (!$form->{"${inv}number"} && !$form->{preview}) {

     $form->{"${inv}number"} = $form->update_defaults(\%myconfig, $numberfld);
     if ($form->{media} ne 'email') {
       $form->{rowcount}--;
     $form->{"${inv}number"} = $form->update_defaults(\%myconfig, $numberfld);
     if ($form->{media} ne 'email') {
       $form->{rowcount}--;


@@ -1513,6 +1543,8 @@ sub print_form {
       ? $locale->text('sent to printer')
       : $locale->text('emailed to') . " $form->{email}";
     $form->redirect(qq|$form->{label} $form->{"${inv}number"} $msg|);
       ? $locale->text('sent to printer')
       : $locale->text('emailed to') . " $form->{email}";
     $form->redirect(qq|$form->{label} $form->{"${inv}number"} $msg|);

+  } else {
+    &{"$display_form"};

   }
 
   $lxdebug->leave_sub();
   }
 
   $lxdebug->leave_sub();


@@ -1553,6 +1585,7 @@ sub ship_to {
   map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
     qw(exchangerate creditlimit creditremaining);
   $form_id = $form->{id};
   map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
     qw(exchangerate creditlimit creditremaining);
   $form_id = $form->{id};

+

   # get details for name
   &{"$form->{vc}_details"};
   $form->{id} = $form_id;
   # get details for name
   &{"$form->{vc}_details"};
   $form->{id} = $form_id;


@@ -1579,11 +1612,9 @@ sub ship_to {
       <table>
        <tr class=listheading>
          <th class=listheading colspan=2 width=50%>|
       <table>
        <tr class=listheading>
          <th class=listheading colspan=2 width=50%>|

-    . $locale->text('Billing Address')
-    . qq|</th>
+    . $locale->text('Billing Address') . qq|</th>

          <th class=listheading width=50%>|
          <th class=listheading width=50%>|

-    . $locale->text('Shipping Address')
-    . qq|</th>
+    . $locale->text('Shipping Address') . qq|</th>

        </tr>
        <tr height="5"></tr>
        <tr>
        </tr>
        <tr height="5"></tr>
        <tr>

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 4673ccb06b7ce9d75bb0356ec0e823af32e6efdd..4e6a066dbe5c4690375c13161416b374c53719a3 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -315,14 +315,12 @@ sub form_header {
     $button1 = qq|
        <td><input name=invdate id=invdate size=11 title="$myconfig{dateformat}" value=$form->{invdate}></td>
        <td><input type=button name=invdate id="trigger1" value=|
     $button1 = qq|
        <td><input name=invdate id=invdate size=11 title="$myconfig{dateformat}" value=$form->{invdate}></td>
        <td><input type=button name=invdate id="trigger1" value=|

-      . $locale->text('button')
-      . qq|></td>
+      . $locale->text('button') . qq|></td>

        |;
     $button2 = qq|
        <td width="13"><input name=duedate id=duedate size=11 title="$myconfig{dateformat}" value=$form->{duedate}></td>
        <td width="4"><input type=button name=duedate id="trigger2" value=|
        |;
     $button2 = qq|
        <td width="13"><input name=duedate id=duedate size=11 title="$myconfig{dateformat}" value=$form->{duedate}></td>
        <td width="4"><input type=button name=duedate id="trigger2" value=|

-      . $locale->text('button')
-      . qq|></td></td>
+      . $locale->text('button') . qq|></td></td>

      |;
 
     #write Trigger
      |;
 
     #write Trigger


@@ -337,16 +335,21 @@ sub form_header {
     $button2 =
       qq|<td width="13"><input name=duedate size=11 title="$myconfig{dateformat}" value=$form->{duedate}></td>|;
   }
     $button2 =
       qq|<td width="13"><input name=duedate size=11 title="$myconfig{dateformat}" value=$form->{duedate}></td>|;
   }

-
+  if ($form->{resubmit}) {
+    $onload = "document.invoice.submit()";
+  } else {
+    $onload = "fokus()";
+  }

   $form->header;
 
   print qq|
   $form->header;
 
   print qq|

-<body onLoad="fokus()">
+<body onLoad="$onload">

 
 <form method=post name="invoice" action=$form->{script}>
 
 
 <input type=hidden name=id value=$form->{id}>
 
 <form method=post name="invoice" action=$form->{script}>
 
 
 <input type=hidden name=id value=$form->{id}>

+<input type=hidden name=action value=$form->{action}>

 
 <input type=hidden name=type value=$form->{type}>
 <input type=hidden name=media value=$form->{media}>
 
 <input type=hidden name=type value=$form->{type}>
 <input type=hidden name=media value=$form->{media}>


@@ -389,8 +392,7 @@ sub form_header {
                <input type=hidden name=customer_id value=$form->{customer_id}>
                <input type=hidden name=oldcustomer value="$form->{oldcustomer}">
                 <th align=richt nowrap>|
                <input type=hidden name=customer_id value=$form->{customer_id}>
                <input type=hidden name=oldcustomer value="$form->{oldcustomer}">
                 <th align=richt nowrap>|

-    . $locale->text('Contact Person')
-    . qq|</th>
+    . $locale->text('Contact Person') . qq|</th>

                 <td colspan=3>$contact</td>
              </tr>
              <tr>
                 <td colspan=3>$contact</td>
              </tr>
              <tr>


@@ -533,8 +535,7 @@ sub form_footer {
   if ($form->{taxaccounts}) {
     $taxincluded = qq|
                <input name=taxincluded class=checkbox type=checkbox value=1 $form->{taxincluded}> <b>|
   if ($form->{taxaccounts}) {
     $taxincluded = qq|
                <input name=taxincluded class=checkbox type=checkbox value=1 $form->{taxincluded}> <b>|

-      . $locale->text('Tax Included')
-      . qq|</b><br><br>|;
+      . $locale->text('Tax Included') . qq|</b><br><br>|;

   }
 
   if (!$form->{taxincluded}) {
   }
 
   if (!$form->{taxincluded}) {


@@ -673,8 +674,7 @@ sub form_footer {
       <table width=100%>
        <tr class=listheading>
          <th colspan=6 class=listheading>|
       <table width=100%>
        <tr class=listheading>
          <th colspan=6 class=listheading>|

-    . $locale->text('Incoming Payments')
-    . qq|</th>
+    . $locale->text('Incoming Payments') . qq|</th>

        </tr>
 |;
 
        </tr>
 |;
 


@@ -753,7 +753,9 @@ sub form_footer {
 <input type=hidden name=selectAR_paid value="$form->{selectAR_paid}">
 <input type=hidden name=oldinvtotal value=$form->{oldinvtotal}>
 <input type=hidden name=oldtotalpaid value=$totalpaid>
 <input type=hidden name=selectAR_paid value="$form->{selectAR_paid}">
 <input type=hidden name=oldinvtotal value=$form->{oldinvtotal}>
 <input type=hidden name=oldtotalpaid value=$totalpaid>

-      </table>
+<input type=hidden name=print_and_post value=$form->{print_and_post}>
+<input type=hidden name=second_run value=$form->{second_run}>
+    </table>

     </td>
   </tr>
   <tr>
     </td>
   </tr>
   <tr>


@@ -813,9 +815,11 @@ sub form_footer {
       <input class=submit type=submit name=action value="|
         . $locale->text('Ship to') . qq|">
       <input class=submit type=submit name=action value="|
       <input class=submit type=submit name=action value="|
         . $locale->text('Ship to') . qq|">
       <input class=submit type=submit name=action value="|

-        . $locale->text('Print') . qq|">
+        . $locale->text('Preview') . qq|">

       <input class=submit type=submit name=action value="|
         . $locale->text('E-mail') . qq|">
       <input class=submit type=submit name=action value="|
         . $locale->text('E-mail') . qq|">

+      <input class=submit type=submit name=action value="|
+        . $locale->text('Print and Post') . qq|">

       <input class=submit type=submit name=action value="|
         . $locale->text('Post') . qq|">|;
     }
       <input class=submit type=submit name=action value="|
         . $locale->text('Post') . qq|">|;
     }


@@ -1047,15 +1051,45 @@ sub post {
 
   $form->{invnumber} = $form->update_defaults(\%myconfig, "invnumber")
     unless $form->{invnumber};
 
   $form->{invnumber} = $form->update_defaults(\%myconfig, "invnumber")
     unless $form->{invnumber};

-
-  $form->redirect(
+  if ($print_post) {
+    if (!(IS->post_invoice(\%myconfig, \%$form))) {
+      $form->error($locale->text('Cannot post invoice!'));
+    }
+  } else {
+    $form->redirect(

             $form->{label} . " $form->{invnumber} " . $locale->text('posted!'))
             $form->{label} . " $form->{invnumber} " . $locale->text('posted!'))

-    if (IS->post_invoice(\%myconfig, \%$form));
-  $form->error($locale->text('Cannot post invoice!'));
+      if (IS->post_invoice(\%myconfig, \%$form));
+    $form->error($locale->text('Cannot post invoice!'));
+  }

 
   $lxdebug->leave_sub();
 }
 
 
   $lxdebug->leave_sub();
 }
 

+sub print_and_post {
+  $lxdebug->enter_sub();
+
+  $old_form               = new Form;
+  $print_post             = 1;
+  $form->{print_and_post} = 1;
+  &post();
+  &display_form();
+  $lxdebug->leave_sub();
+
+}
+
+sub preview {
+  $lxdebug->enter_sub();
+
+  $form->{preview} = 1;
+  $old_form = new Form;
+  for (keys %$form) { $old_form->{$_} = $form->{$_} }
+  $old_form->{rowcount}++;
+
+  &print_form($old_form);
+  $lxdebug->leave_sub();
+
+}
+

 sub delete {
   $lxdebug->enter_sub();
 
 sub delete {
   $lxdebug->enter_sub();