is_templates: form_footer erste Version

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 3aa93b622d07af7ce72def0e5ef8b7db0c7c465c..a732e4d956058f28626082776df7dbbae7ad55ea 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -173,15 +173,14 @@ sub invoice_links {
   $form->{selectcustomer} = 1;
 
   # departments
   $form->{selectcustomer} = 1;
 
   # departments

-  if ($form->{all_departments}) {
-    $form->{selectdepartment} = "<option>\n";
-    $form->{department}       = "$form->{department}--$form->{department_id}";
-
-    map {
-      $form->{selectdepartment} .=
-        "<option>$_->{description}--$_->{id}</option>\n"
-    } (@{ $form->{all_departments} });
-  }
+#  if ($form->{all_departments}) {
+#    $form->{selectdepartment} = "<option>\n";
+#    $form->{department}       = "$form->{department}--$form->{department_id}";
+#
+#    map {
+#      $form->{selectdepartment} .= "<option>$_->{description}--$_->{id}</option>\n"
+#    } @{ $form->{all_departments} };
+#  }

 
   $form->{employee} = "$form->{employee}--$form->{employee_id}";
 
 
   $form->{employee} = "$form->{employee}--$form->{employee_id}";
 


@@ -191,41 +190,35 @@ sub invoice_links {
 
   foreach my $key (keys %{ $form->{AR_links} }) {
     foreach my $ref (@{ $form->{AR_links}{$key} }) {
 
   foreach my $key (keys %{ $form->{AR_links} }) {
     foreach my $ref (@{ $form->{AR_links}{$key} }) {

-      $form->{"select$key"} .=
-"<option>$ref->{accno}--$ref->{description}</option>\n";
+      $form->{"select$key"} .= "<option>$ref->{accno}--$ref->{description}</option>\n";

     }
 
     if ($key eq "AR_paid") {
       next unless $form->{acc_trans}{$key};
       for my $i (1 .. scalar @{ $form->{acc_trans}{$key} }) {
     }
 
     if ($key eq "AR_paid") {
       next unless $form->{acc_trans}{$key};
       for my $i (1 .. scalar @{ $form->{acc_trans}{$key} }) {

-        $form->{"AR_paid_$i"} =
-          "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
+        $form->{"AR_paid_$i"}      = "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";

 
         # reverse paid
 
         # reverse paid

-        $form->{"paid_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{amount} * -1;
-        $form->{"datepaid_$i"} =
-          $form->{acc_trans}{$key}->[$i - 1]->{transdate};
-        $form->{"forex_$i"} = $form->{"exchangerate_$i"} =
-          $form->{acc_trans}{$key}->[$i - 1]->{exchangerate};
-        $form->{"source_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{source};
-        $form->{"memo_$i"}   = $form->{acc_trans}{$key}->[$i - 1]->{memo};
+        $form->{"paid_$i"}         = $form->{acc_trans}{$key}->[$i - 1]->{amount} * -1;
+        $form->{"datepaid_$i"}     = $form->{acc_trans}{$key}->[$i - 1]->{transdate};
+        $form->{"exchangerate_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{exchangerate};
+        $form->{"forex_$i"}        = $form->{"exchangerate_$i"};
+        $form->{"source_$i"}       = $form->{acc_trans}{$key}->[$i - 1]->{source};
+        $form->{"memo_$i"}         = $form->{acc_trans}{$key}->[$i - 1]->{memo};

 
         $form->{paidaccounts} = $i;
       }
     } else {
 
         $form->{paidaccounts} = $i;
       }
     } else {

-      $form->{$key} =
-        "$form->{acc_trans}{$key}->[0]->{accno}--$form->{acc_trans}{$key}->[0]->{description}";
+      $form->{$key} = "$form->{acc_trans}{$key}->[0]->{accno}--$form->{acc_trans}{$key}->[0]->{description}";

     }
     }

-

   }
 
   $form->{paidaccounts} = 1 unless (exists $form->{paidaccounts});
 
   $form->{AR} = $form->{AR_1} unless $form->{id};
 
   }
 
   $form->{paidaccounts} = 1 unless (exists $form->{paidaccounts});
 
   $form->{AR} = $form->{AR_1} unless $form->{id};
 

-  $form->{locked} =
-    ($form->datetonum($form->{invdate}, \%myconfig) <=
-     $form->datetonum($form->{closedto}, \%myconfig));
+  $form->{locked} = ($form->datetonum($form->{invdate},  \%myconfig)
+                  <= $form->datetonum($form->{closedto}, \%myconfig));

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


@@ -399,22 +392,9 @@ sub form_footer {
   $form->{invtotal} = $form->{invsubtotal};
 
   my ($rows, $introws);
   $form->{invtotal} = $form->{invsubtotal};
 
   my ($rows, $introws);

-  if (($rows = $form->numtextrows($form->{notes}, 26, 8)) < 2) {
-    $rows = 2;
-  }
-  if (($introws = $form->numtextrows($form->{intnotes}, 35, 8)) < 2) {
-    $introws = 2;
-  }
-  $rows = ($rows > $introws) ? $rows : $introws;
-  my $notes = qq|<textarea name="notes" rows="$rows" cols="26" wrap="soft">$form->{notes}</textarea>|;
-  my $intnotes = qq|<textarea name="intnotes" rows="$rows" cols="35" wrap="soft">$form->{intnotes}</textarea>|;
-
-  $form->{taxincluded} = ($form->{taxincluded} ? "checked" : "");
-
-  my $taxincluded = "";
-  if ($form->{taxaccounts}) {
-    $taxincluded = qq| <input name="taxincluded" class="checkbox" type="checkbox" $form->{taxincluded}> <b>| . $locale->text('Tax Included') . qq|</b><br><br>|;
-  }
+  if (($rows    = $form->numtextrows($form->{notes}, 26, 8)) < 2)    { $rows    = 2; }
+  if (($introws = $form->numtextrows($form->{intnotes}, 35, 8)) < 2) { $introws = 2; }
+  $form->{rows} = ($rows > $introws) ? $rows : $introws;

 
   my ($tax, $subtotal);
   if (!$form->{taxincluded}) {
 
   my ($tax, $subtotal);
   if (!$form->{taxincluded}) {


@@ -429,12 +409,11 @@ sub form_footer {
              <tr>
                 <th align="right">$form->{"${item}_description"}&nbsp;| . $form->{"${item}_rate"} * 100 .qq|%</th>
                 <td align="right">$form->{"${item}_total"}</td>
              <tr>
                 <th align="right">$form->{"${item}_description"}&nbsp;| . $form->{"${item}_rate"} * 100 .qq|%</th>
                 <td align="right">$form->{"${item}_total"}</td>

-             </tr>
-|;
+             </tr> |;

       }
     }
 
       }
     }
 

-    $form->{invsubtotal} = $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0);
+#    $form->{invsubtotal} = $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0);

 
     $subtotal = qq|
              <tr>
 
     $subtotal = qq|
              <tr>


@@ -446,6 +425,7 @@ sub form_footer {
   }
 
   if ($form->{taxincluded}) {
   }
 
   if ($form->{taxincluded}) {

+    $form->{taxaccounts_array} = [ split / /, $form->{taxaccounts} ];

     foreach my $item (split / /, $form->{taxaccounts}) {
       if ($form->{"${item}_base"}) {
         $form->{"${item}_total"} = $form->round_amount( ($form->{"${item}_base"} * $form->{"${item}_rate"} / (1 + $form->{"${item}_rate"})), 2);
     foreach my $item (split / /, $form->{taxaccounts}) {
       if ($form->{"${item}_base"}) {
         $form->{"${item}_total"} = $form->round_amount( ($form->{"${item}_base"} * $form->{"${item}_rate"} / (1 + $form->{"${item}_rate"})), 2);


@@ -453,326 +433,325 @@ sub form_footer {
         $form->{"${item}_total"} = $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2);
         $form->{"${item}_netto"} = $form->format_amount(\%myconfig, $form->{"${item}_netto"}, 2);
 
         $form->{"${item}_total"} = $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2);
         $form->{"${item}_netto"} = $form->format_amount(\%myconfig, $form->{"${item}_netto"}, 2);
 

-        $tax .= qq|
-             <tr>
-               <th align="right">Enthaltene $form->{"${item}_description"}&nbsp;|
-                                   . $form->{"${item}_rate"} * 100 .qq|%</th>
-               <td align="right">$form->{"${item}_total"}</td>
-             </tr>
-             <tr>
-               <th align="right">Nettobetrag</th>
-               <td align="right">$form->{"${item}_netto"}</td>
-             </tr>
-|;
+#        $tax .= qq|
+#            <tr>
+#              <th align="right">Enthaltene $form->{"${item}_description"}&nbsp;|
+#                                  . $form->{"${item}_rate"} * 100 .qq|%</th>
+#              <td align="right">$form->{"${item}_total"}</td>
+#            </tr>
+#            <tr>
+#              <th align="right">Nettobetrag</th>
+#              <td align="right">$form->{"${item}_netto"}</td>
+#            </tr>
+#|;

       }
     }
 
   }
 
   $form->{oldinvtotal} = $form->{invtotal};
       }
     }
 
   }
 
   $form->{oldinvtotal} = $form->{invtotal};

-  $form->{invtotal}    = $form->format_amount(\%myconfig, $form->{invtotal}, 2, 0);
+#  $form->{invtotal}    = $form->format_amount(\%myconfig, $form->{invtotal}, 2, 0);

 
 

-  my $follow_ups_block;
+  # unfortunately locales doesn't support extended syntax

   if ($form->{id}) {
     my $follow_ups = FU->follow_ups('trans_id' => $form->{id});
   if ($form->{id}) {
     my $follow_ups = FU->follow_ups('trans_id' => $form->{id});

-

     if (@{ $follow_ups} ) {
     if (@{ $follow_ups} ) {

-      my $num_due       = sum map { $_->{due} * 1 } @{ $follow_ups };
-      $follow_ups_block = qq|
-      <tr>
-        <td colspan="2">| . $locale->text("There are #1 unfinished follow-ups of which #2 are due.", scalar @{ $follow_ups }, $num_due) . qq|</td>
-      </tr>
-|;
-    }
-  }
-
-  print qq|
-  <tr>
-    <td>
-      <table width="100%">
-       <tr valign="bottom">
-         <td>
-           <table>
-             <tr>
-               <th align="left">| . $locale->text('Notes') . qq|</th>
-               <th align="left">| . $locale->text('Internal Notes') . qq|</th>
-                <th align="right">| . $locale->text('Payment Terms') . qq|</th>
-             </tr>
-             <tr valign="top">
-               <td>$notes</td>
-               <td>$intnotes</td>
-                <td><select name="payment_id" onChange="if (this.value) set_duedate(['payment_id__' + this.value, 'invdate__' + invdate.value],['duedate'])">$payment
-                </select></td>
-             </tr>
-        $follow_ups_block
-           </table>
-         </td>
-          <td>
-            <table>
-            <tr>
-              <th  align=left>| . $locale->text('Ertrag') . qq|</th>
-              <td>| .  $form->format_amount(\%myconfig, $form->{marge_total}, 2, 0) . qq|</td>
-            </tr>
-            <tr>
-              <th  align=left>| . $locale->text('Ertrag prozentual') . qq|</th>
-              <td>| .  $form->format_amount(\%myconfig, $form->{marge_percent}, 2, 0) . qq| %</td>
-            </tr>
-            <input type=hidden name="marge_total" value="$form->{"marge_total"}">
-            <input type=hidden name="marge_percent" value="$form->{"marge_percent"}">
-            </table>
-          </td>
-         <td align="right">
-           $taxincluded
-           <table>
-             $subtotal
-             $tax
-             <tr>
-               <th align="right">| . $locale->text('Total') . qq|</th>
-               <td align="right">$form->{invtotal}</td>
-             </tr>
-           </table>
-         </td>
-       </tr>
-      </table>
-    </td>
-  </tr>
-|;
-  my $webdav_list;
-  if ($main::webdav) {
-    $webdav_list = qq|
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
-  <tr>
-    <th class="listtop" align="left">Dokumente im Webdav-Repository</th>
-  </tr>
-    <table width="100%">
-      <td align="left" width="30%"><b>Dateiname</b></td>
-      <td align="left" width="70%"><b>Webdavlink</b></td>
-|;
-    foreach my $file (@{ $form->{WEBDAV} }) {
-      $webdav_list .= qq|
-      <tr>
-        <td align="left">$file->{name}</td>
-        <td align="left"><a href="$file->{link}">$file->{type}</a></td>
-      </tr>
-|;
+      $form->{follow_ups_text} = $locale->text("There are #1 unfinished follow-ups of which #2 are due.",
+                                               scalar @{ $follow_ups },
+                                               sum map { $_->{due} * 1 } @{ $follow_ups });

     }
     }

-    $webdav_list .= qq|
-    </table>
-  </tr>
-|;
-
-    print $webdav_list;

   }
   }

-if ($form->{type} eq "credit_note") {
-  print qq|
-  <tr>
-    <td>
-      <table width="100%">
-       <tr class="listheading">
-         <th colspan="6" class="listheading">|
-    . $locale->text('Payments') . qq|</th>
-       </tr>
-|;
-} else {
-  print qq|
-  <tr>
-    <td>
-      <table width="100%">
-       <tr class="listheading">
-         <th colspan="6" class="listheading">|
-    . $locale->text('Incoming Payments') . qq|</th>
-       </tr>
-|;
-}

 
 

-  my @column_index;
-  if ($form->{currency} eq $form->{defaultcurrency}) {
-    @column_index = qw(datepaid source memo paid AR_paid);
-  } else {
-    @column_index = qw(datepaid source memo paid exchangerate AR_paid);
-  }
-
-  my %column_data;
-  $column_data{datepaid}     = "<th>" . $locale->text('Date') . "</th>";
-  $column_data{paid}         = "<th>" . $locale->text('Amount') . "</th>";
-  $column_data{exchangerate} = "<th>" . $locale->text('Exch') . "</th>";
-  $column_data{AR_paid}      = "<th>" . $locale->text('Account') . "</th>";
-  $column_data{source}       = "<th>" . $locale->text('Source') . "</th>";
-  $column_data{memo}         = "<th>" . $locale->text('Memo') . "</th>";
-
-  print "
-       <tr>
-";
-  map { print "$column_data{$_}\n" } @column_index;
-  print "
-        </tr>
-";
-
-  my @triggers  = ();
-  my $totalpaid = 0;
-
-  $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
-  for my $i (1 .. $form->{paidaccounts}) {

 
 

-    print "
-        <tr>\n";
-
-    $form->{"selectAR_paid_$i"} = $form->{selectAR_paid};
-    $form->{"selectAR_paid_$i"} =~
-      s/option>\Q$form->{"AR_paid_$i"}\E/option selected>$form->{"AR_paid_$i"}/;
-
-    # format amounts
-    $totalpaid += $form->{"paid_$i"};
-    if ($form->{"paid_$i"}) {
-      $form->{"paid_$i"} = $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
-    }
-    $form->{"exchangerate_$i"} = $form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
-
-    if ($form->{"exchangerate_$i"} == 0) {
-      $form->{"exchangerate_$i"} = "";
-    }
-    my $exchangerate = qq|&nbsp;|;
-    if ($form->{currency} ne $form->{defaultcurrency}) {
-      if ($form->{"forex_$i"}) {
-        $exchangerate = qq|<input type="hidden" name="exchangerate_$i" value="$form->{"exchangerate_$i"}">$form->{"exchangerate_$i"}|;
-      } else {
-        $exchangerate = qq|<input name="exchangerate_$i" size="10" value="$form->{"exchangerate_$i"}">|;
-      }
-    }
-
-    $exchangerate .= qq|<input type="hidden" name="forex_$i" value="$form->{"forex_$i"}">|;
-
-    $column_data{"paid_$i"} =
-      qq|<td align="center"><input name="paid_$i" size="11" value="$form->{"paid_$i"}" onBlur=\"check_right_number_format(this)\"></td>|;
-    $column_data{"exchangerate_$i"} = qq|<td align="center">$exchangerate</td>|;
-    $column_data{"AR_paid_$i"}      =
-      qq|<td align="center"><select name="AR_paid_$i">$form->{"selectAR_paid_$i"}</select></td>|;
-    $column_data{"datepaid_$i"} =
-      qq|<td align="center"><input id="datepaid_$i" name="datepaid_$i"  size="11" title="$myconfig{dateformat}" value="$form->{"datepaid_$i"}" onBlur=\"check_right_date_format(this)\">
-         <input type="button" name="datepaid_$i" id="trigger_datepaid_$i" value="?"></td>|;
-    $column_data{"source_$i"} =
-      qq|<td align=center><input name="source_$i" size="11" value="$form->{"source_$i"}"></td>|;
-    $column_data{"memo_$i"} =
-      qq|<td align="center"><input name="memo_$i" size="11" value="$form->{"memo_$i"}"></td>|;
-
-    map { print qq|$column_data{"${_}_$i"}\n| } @column_index;
-    print "
-        </tr>\n";
-    push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
-  }
-
-  my $paid_missing = $form->{oldinvtotal} - $totalpaid;
-
-  print qq|
-    <tr>
-      <td></td>
-      <td></td>
-      <td align="center">| . $locale->text('Total') . qq|</td>
-      <td align="center">| . H($form->format_amount(\%myconfig, $totalpaid, 2)) . qq|</td>
-    </tr>
-    <tr>
-      <td></td>
-      <td></td>
-      <td align="center">| . $locale->text('Missing amount') . qq|</td>
-      <td align="center">| . H($form->format_amount(\%myconfig, $paid_missing, 2)) . qq|</td>
-    </tr>
-|;
-
-  map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } qw(paidaccounts selectAR_paid oldinvtotal));
-  print qq|<input type="hidden" name="oldtotalpaid" value="$totalpaid">
-    </table>
-    </td>
-  </tr>
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
-  <tr>
-    <td>
-|;
-
-  print_options();
-
-  print qq|
-    </td>
-  </tr>
-</table>
-|;
-
-  my $invdate  = $form->datetonum($form->{invdate},  \%myconfig);
-  my $closedto = $form->datetonum($form->{closedto}, \%myconfig);
-
-  if ($form->{id}) {
-    my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ar") && (($totalpaid == 0) || ($totalpaid eq ""));
-
-    print qq|
-    <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="| . $locale->text('Update') . qq|">
-    <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|">
-    <input class="submit" type="submit" name="action" value="| . $locale->text('E-mail') . qq|"> |;
-    print qq|<input class="submit" type="submit" name="action" value="| . $locale->text('Storno') . qq|"> | if ($show_storno);
-    print qq|<input class="submit" type="submit" name="action" value="| . $locale->text('Post Payment') . qq|"> |;
-    print qq|<input class="submit" type="submit" name="action" value="| . $locale->text('Use As Template') . qq|"> |;
-    if ($form->{id} && !($form->{type} eq "credit_note")) {
-      print qq| <input class="submit" type="submit" name="action" value="| . $locale->text('Credit Note') . qq|"> |;
-    }
-    if ($form->{radier}) {
-      print qq| <input class="submit" type="submit" name="action" value="| . $locale->text('Delete') . qq|"> |;
-    }
-
-
-    if ($invdate > $closedto) {
-      print qq| <input class="submit" type="submit" name="action" value="| . $locale->text('Order') . qq|"> |;
-    }
-
-    print qq| <input type="button" class="submit" onclick="follow_up_window()" value="| . $locale->text('Follow-Up') . qq|">|;
-
-  } else {
-    if ($invdate > $closedto) {
-      print qq|
-      <input class="submit" type="submit" name="action" id="update_button" value="| . $locale->text('Update') . qq|">
-      <input class="submit" type="submit" name="action" value="| . $locale->text('Ship to') . qq|">
-      <input class="submit" type="submit" name="action" value="| . $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('Print and Post') . qq|">
-      <input class="submit" type="submit" name="action" value="| . $locale->text('Post') . qq|"> | .
-        NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'), '-class' => 'submit'));
-    }
-  }
-
-  # button for saving history
-  if($form->{id} ne "") {
-    print qq|
-         <input type="button" class="submit" onclick="set_history_window(|
-         . Q($form->{id})
-         . qq|);" name="history" id="history" value="|
-         . $locale->text('history')
-         . qq|"> |;
-  }
-  # /button for saving history
-
-  # mark_as_paid button
-  if($form->{id} ne "") {
-    print qq|<input type="submit" class="submit" name="action" value="| . $locale->text('mark as paid') . qq|">|;
-  }
-  # /mark_as_paid button
-  print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .
-    qq|
-
-<input type="hidden" name="rowcount" value="$form->{rowcount}">
-| .
-$cgi->hidden("-name" => "callback", "-value" => $form->{callback})
-. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
-. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
-. $cgi->hidden('-name' => 'customer_discount', '-value' => [$form->{customer_discount}])
-. qq|
-</form>
-
-</body>
-
- </html>
-|;
+  print $form->parse_html_template('is/form_footer');
+
+#  print qq|
+#  <tr>
+#    <td>
+#      <table width="100%">
+#      <tr valign="bottom">
+#        <td>
+#          <table>
+#            <tr>
+#              <th align="left">| . $locale->text('Notes') . qq|</th>
+#              <th align="left">| . $locale->text('Internal Notes') . qq|</th>
+#                <th align="right">| . $locale->text('Payment Terms') . qq|</th>
+#            </tr>
+#            <tr valign="top">
+#              <td>$notes</td>
+#              <td>$intnotes</td>
+#                <td><select name="payment_id" onChange="if (this.value) set_duedate(['payment_id__' + this.value, 'invdate__' + invdate.value],['duedate'])">$payment
+#                </select></td>
+#            </tr>
+#        $follow_ups_block
+#          </table>
+#        </td>
+#          <td>
+#            <table>
+#            <tr>
+#              <th  align=left>| . $locale->text('Ertrag') . qq|</th>
+#              <td>| .  $form->format_amount(\%myconfig, $form->{marge_total}, 2, 0) . qq|</td>
+#            </tr>
+#            <tr>
+#              <th  align=left>| . $locale->text('Ertrag prozentual') . qq|</th>
+#              <td>| .  $form->format_amount(\%myconfig, $form->{marge_percent}, 2, 0) . qq| %</td>
+#            </tr>
+#            <input type=hidden name="marge_total" value="$form->{"marge_total"}">
+#            <input type=hidden name="marge_percent" value="$form->{"marge_percent"}">
+#            </table>
+#          </td>
+#        <td align="right">
+#          $taxincluded
+#          <table>
+#            $subtotal
+#            $tax
+#            <tr>
+#              <th align="right">| . $locale->text('Total') . qq|</th>
+#              <td align="right">$form->{invtotal}</td>
+#            </tr>
+#          </table>
+#        </td>
+#      </tr>
+#      </table>
+#    </td>
+#  </tr>
+#|;
+#  my $webdav_list;
+#  if ($main::webdav) {
+#    $webdav_list = qq|
+#  <tr>
+#    <td><hr size="3" noshade></td>
+#  </tr>
+#  <tr>
+#    <th class="listtop" align="left">Dokumente im Webdav-Repository</th>
+#  </tr>
+#    <table width="100%">
+#      <td align="left" width="30%"><b>Dateiname</b></td>
+#      <td align="left" width="70%"><b>Webdavlink</b></td>
+#|;
+#    foreach my $file (@{ $form->{WEBDAV} }) {
+#      $webdav_list .= qq|
+#      <tr>
+#        <td align="left">$file->{name}</td>
+#        <td align="left"><a href="$file->{link}">$file->{type}</a></td>
+#      </tr>
+#|;
+#    }
+#    $webdav_list .= qq|
+#    </table>
+#  </tr>
+#|;
+#
+#    print $webdav_list;
+#  }
+#if ($form->{type} eq "credit_note") {
+#  print qq|
+#  <tr>
+#    <td>
+#      <table width="100%">
+#      <tr class="listheading">
+#        <th colspan="6" class="listheading">|
+#    . $locale->text('Payments') . qq|</th>
+#      </tr>
+#|;
+#} else {
+#  print qq|
+#  <tr>
+#    <td>
+#      <table width="100%">
+#      <tr class="listheading">
+#        <th colspan="6" class="listheading">|
+#    . $locale->text('Incoming Payments') . qq|</th>
+#      </tr>
+#|;
+#}
+#
+#  my @column_index;
+#  if ($form->{currency} eq $form->{defaultcurrency}) {
+#    @column_index = qw(datepaid source memo paid AR_paid);
+#  } else {
+#    @column_index = qw(datepaid source memo paid exchangerate AR_paid);
+#  }
+#
+#  my %column_data;
+#  $column_data{datepaid}     = "<th>" . $locale->text('Date') . "</th>";
+#  $column_data{paid}         = "<th>" . $locale->text('Amount') . "</th>";
+#  $column_data{exchangerate} = "<th>" . $locale->text('Exch') . "</th>";
+#  $column_data{AR_paid}      = "<th>" . $locale->text('Account') . "</th>";
+#  $column_data{source}       = "<th>" . $locale->text('Source') . "</th>";
+#  $column_data{memo}         = "<th>" . $locale->text('Memo') . "</th>";
+#
+#  print "
+#      <tr>
+#";
+#  map { print "$column_data{$_}\n" } @column_index;
+#  print "
+#        </tr>
+#";
+#
+#  my @triggers  = ();
+#  my $totalpaid = 0;
+#
+#  $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
+#  for my $i (1 .. $form->{paidaccounts}) {
+#
+#    print "
+#        <tr>\n";
+#
+#    $form->{"selectAR_paid_$i"} = $form->{selectAR_paid};
+#    $form->{"selectAR_paid_$i"} =~
+#      s/option>\Q$form->{"AR_paid_$i"}\E/option selected>$form->{"AR_paid_$i"}/;
+#
+#    # format amounts
+#    $totalpaid += $form->{"paid_$i"};
+#    if ($form->{"paid_$i"}) {
+#      $form->{"paid_$i"} = $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
+#    }
+#    $form->{"exchangerate_$i"} = $form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
+#
+#    if ($form->{"exchangerate_$i"} == 0) {
+#      $form->{"exchangerate_$i"} = "";
+#    }
+#    my $exchangerate = qq|&nbsp;|;
+#    if ($form->{currency} ne $form->{defaultcurrency}) {
+#      if ($form->{"forex_$i"}) {
+#        $exchangerate = qq|<input type="hidden" name="exchangerate_$i" value="$form->{"exchangerate_$i"}">$form->{"exchangerate_$i"}|;
+#      } else {
+#        $exchangerate = qq|<input name="exchangerate_$i" size="10" value="$form->{"exchangerate_$i"}">|;
+#      }
+#    }
+#
+#    $exchangerate .= qq|<input type="hidden" name="forex_$i" value="$form->{"forex_$i"}">|;
+#
+#    $column_data{"paid_$i"} =
+#      qq|<td align="center"><input name="paid_$i" size="11" value="$form->{"paid_$i"}" onBlur=\"check_right_number_format(this)\"></td>|;
+#    $column_data{"exchangerate_$i"} = qq|<td align="center">$exchangerate</td>|;
+#    $column_data{"AR_paid_$i"}      =
+#      qq|<td align="center"><select name="AR_paid_$i">$form->{"selectAR_paid_$i"}</select></td>|;
+#    $column_data{"datepaid_$i"} =
+#      qq|<td align="center"><input id="datepaid_$i" name="datepaid_$i"  size="11" title="$myconfig{dateformat}" value="$form->{"datepaid_$i"}" onBlur=\"check_right_date_format(this)\">
+#         <input type="button" name="datepaid_$i" id="trigger_datepaid_$i" value="?"></td>|;
+#    $column_data{"source_$i"} =
+#      qq|<td align=center><input name="source_$i" size="11" value="$form->{"source_$i"}"></td>|;
+#    $column_data{"memo_$i"} =
+#      qq|<td align="center"><input name="memo_$i" size="11" value="$form->{"memo_$i"}"></td>|;
+#
+#    map { print qq|$column_data{"${_}_$i"}\n| } @column_index;
+#    print "
+#        </tr>\n";
+#    push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
+#  }
+#
+#  my $paid_missing = $form->{oldinvtotal} - $totalpaid;
+#
+#  print qq|
+#    <tr>
+#      <td></td>
+#      <td></td>
+#      <td align="center">| . $locale->text('Total') . qq|</td>
+#      <td align="center">| . H($form->format_amount(\%myconfig, $totalpaid, 2)) . qq|</td>
+#    </tr>
+#    <tr>
+#      <td></td>
+#      <td></td>
+#      <td align="center">| . $locale->text('Missing amount') . qq|</td>
+#      <td align="center">| . H($form->format_amount(\%myconfig, $paid_missing, 2)) . qq|</td>
+#    </tr>
+#|;
+#
+#  map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } qw(paidaccounts selectAR_paid oldinvtotal));
+#  print qq|<input type="hidden" name="oldtotalpaid" value="$totalpaid">
+#    </table>
+#    </td>
+#  </tr>
+#  <tr>
+#    <td><hr size="3" noshade></td>
+#  </tr>
+#  <tr>
+#    <td>
+#|;
+#
+#  print_options();
+#
+#  print qq|
+#    </td>
+#  </tr>
+#</table>
+#|;
+#
+#  my $invdate  = $form->datetonum($form->{invdate},  \%myconfig);
+#  my $closedto = $form->datetonum($form->{closedto}, \%myconfig);
+#
+#  if ($form->{id}) {
+#    my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ar") && (($totalpaid == 0) || ($totalpaid eq ""));
+#
+#    print qq|
+#    <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="| . $locale->text('Update') . qq|">
+#    <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|">
+#    <input class="submit" type="submit" name="action" value="| . $locale->text('E-mail') . qq|"> |;
+#    print qq|<input class="submit" type="submit" name="action" value="| . $locale->text('Storno') . qq|"> | if ($show_storno);
+#    print qq|<input class="submit" type="submit" name="action" value="| . $locale->text('Post Payment') . qq|"> |;
+#    print qq|<input class="submit" type="submit" name="action" value="| . $locale->text('Use As Template') . qq|"> |;
+#    if ($form->{id} && !($form->{type} eq "credit_note")) {
+#      print qq| <input class="submit" type="submit" name="action" value="| . $locale->text('Credit Note') . qq|"> |;
+#    }
+#    if ($form->{radier}) {
+#      print qq| <input class="submit" type="submit" name="action" value="| . $locale->text('Delete') . qq|"> |;
+#    }
+#
+#
+#    if ($invdate > $closedto) {
+#      print qq| <input class="submit" type="submit" name="action" value="| . $locale->text('Order') . qq|"> |;
+#    }
+#
+#    print qq| <input type="button" class="submit" onclick="follow_up_window()" value="| . $locale->text('Follow-Up') . qq|">|;
+#
+#  } else {
+#    if ($invdate > $closedto) {
+#      print qq|
+#      <input class="submit" type="submit" name="action" id="update_button" value="| . $locale->text('Update') . qq|">
+#      <input class="submit" type="submit" name="action" value="| . $locale->text('Ship to') . qq|">
+#      <input class="submit" type="submit" name="action" value="| . $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('Print and Post') . qq|">
+#      <input class="submit" type="submit" name="action" value="| . $locale->text('Post') . qq|"> | .
+#        NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'), '-class' => 'submit'));
+#    }
+#  }
+#
+#  # button for saving history
+#  if($form->{id} ne "") {
+#    print qq|
+#        <input type="button" class="submit" onclick="set_history_window(|
+#        . Q($form->{id})
+#        . qq|);" name="history" id="history" value="|
+#        . $locale->text('history')
+#        . qq|"> |;
+#  }
+#  # /button for saving history
+#
+#  # mark_as_paid button
+#  if($form->{id} ne "") {
+#    print qq|<input type="submit" class="submit" name="action" value="| . $locale->text('mark as paid') . qq|">|;
+#  }
+#  # /mark_as_paid button
+#  print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .
+#    qq|
+#
+#<input type="hidden" name="rowcount" value="$form->{rowcount}">
+#| .
+#$cgi->hidden("-name" => "callback", "-value" => $form->{callback})
+#. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
+#. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
+#. $cgi->hidden('-name' => 'customer_discount', '-value' => [$form->{customer_discount}])
+#. qq|
+#</form>
+#
+#</body>
+#
+# </html>
+#|;

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

diff --git a/locale/de/all b/locale/de/all
index 557892970d2607585f9693423d940e7830957c16..4ad45e6e8a965cec492bc0613b5115ee5516d590 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1355,6 +1355,7 @@ $self->{texts} = {
   'Sat. Phone'                  => 'Sat. Tel.',
   'Satz %'                      => 'Satz %',
   'Save'                        => 'Speichern',
   'Sat. Phone'                  => 'Sat. Tel.',
   'Satz %'                      => 'Satz %',
   'Save'                        => 'Speichern',

+  'Save Draft'                  => '',

   'Save account first to insert taxkeys' => 'Einstellungen sind nach
   dem Speichern des Kontos verfügbar...',
   'Save and AP Transaction'     => 'Speichern und Kreditorenbuchung erfassen',
   'Save account first to insert taxkeys' => 'Einstellungen sind nach
   dem Speichern des Kontos verfügbar...',
   'Save and AP Transaction'     => 'Speichern und Kreditorenbuchung erfassen',

diff --git a/locale/de/is b/locale/de/is
index 04bd63b0596c5a3065fe719935d1d79b21218a45..ab2cdf1b68aea95444690770148d3d68e15e589f 100644 (file)
--- a/locale/de/is
+++ b/locale/de/is
@@ -265,7 +265,6 @@ $self->{texts} = {
   'Street'                      => 'Straße',
   'Subject'                     => 'Betreff',
   'Subtotal'                    => 'Zwischensumme',
   'Street'                      => 'Straße',
   'Subject'                     => 'Betreff',
   'Subtotal'                    => 'Zwischensumme',

-  'Tax Included'                => 'Steuer im Preis inbegriffen',

   'The \'tag\' field must only consist of alphanumeric characters or the carachters - _ ( )' => 'Das Feld \'tag\' darf nur aus alphanumerischen Zeichen und den Zeichen - _ ( ) bestehen.',
   'The LDAP server "#1:#2" is unreachable. Please check config/authentication.pl.' => 'Der LDAP-Server "#1:#2" ist nicht erreichbar. Bitte überprüfen Sie die Angaben in config/authentication.pl.',
   'The config file "config/authentication.pl" contained invalid Perl code:' => 'Die Konfigurationsdatei "config/authentication.pl" enthielt ungütigen Perl-Code:',
   'The \'tag\' field must only consist of alphanumeric characters or the carachters - _ ( )' => 'Das Feld \'tag\' darf nur aus alphanumerischen Zeichen und den Zeichen - _ ( ) bestehen.',
   'The LDAP server "#1:#2" is unreachable. Please check config/authentication.pl.' => 'Der LDAP-Server "#1:#2" ist nicht erreichbar. Bitte überprüfen Sie die Angaben in config/authentication.pl.',
   'The config file "config/authentication.pl" contained invalid Perl code:' => 'Die Konfigurationsdatei "config/authentication.pl" enthielt ungütigen Perl-Code:',


@@ -425,6 +424,7 @@ $self->{subs} = {
   'druckvorschau'               => 'preview',
   'drucken'                     => 'print',
   'drucken_und_buchen'          => 'print_and_post',
   'druckvorschau'               => 'preview',
   'drucken'                     => 'print',
   'drucken_und_buchen'          => 'print_and_post',

+  'save_draft'                  => 'save_draft',

   'entwurf_speichern'           => 'save_draft',
   'lieferadresse'               => 'ship_to',
   'Überspringen'                => 'skip',
   'entwurf_speichern'           => 'save_draft',
   'lieferadresse'               => 'ship_to',
   'Überspringen'                => 'skip',

diff --git a/templates/webpages/is/_payments_master.html b/templates/webpages/is/_payments_master.html
new file mode 100644 (file)
index 0000000..09c0812
--- /dev/null
+++ b/templates/webpages/is/_payments_master.html
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+  my @column_index;
+  if ($form->{currency} eq $form->{defaultcurrency}) {
+    @column_index = qw(datepaid source memo paid AR_paid);
+  } else {
+    @column_index = qw(datepaid source memo paid exchangerate AR_paid);
+  }
+
+  my %column_data;
+  $column_data{datepaid}     = "<th>" . $locale->text('Date') . "</th>";
+  $column_data{paid}         = "<th>" . $locale->text('Amount') . "</th>";
+  $column_data{exchangerate} = "<th>" . $locale->text('Exch') . "</th>";
+  $column_data{AR_paid}      = "<th>" . $locale->text('Account') . "</th>";
+  $column_data{source}       = "<th>" . $locale->text('Source') . "</th>";
+  $column_data{memo}         = "<th>" . $locale->text('Memo') . "</th>";
+
+    <tr>
+
+  map { print "$column_data{$_}\n" } @column_index;
+
+        </tr>
+
+  my @triggers  = ();
+  my $totalpaid = 0;
+
+  $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
+
+
+
+  [% FOREACH i = 1 .. paidaccounts %]
+
+        <tr>
+
+
+    $form->{"selectAR_paid_$i"} = $form->{selectAR_paid};
+    $form->{"selectAR_paid_$i"} =~
+      s/option>\Q$form->{"AR_paid_$i"}\E/option selected>$form->{"AR_paid_$i"}/;
+
+    # format amounts
+    $totalpaid += $form->{"paid_$i"};
+    if ($form->{"paid_$i"}) {
+      $form->{"paid_$i"} = $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
+    }
+    $form->{"exchangerate_$i"} = $form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
+
+    if ($form->{"exchangerate_$i"} == 0) {
+      $form->{"exchangerate_$i"} = "";
+    }
+    my $exchangerate = qq|&nbsp;|;
+    if ($form->{currency} ne $form->{defaultcurrency}) {
+      if ($form->{"forex_$i"}) {
+        $exchangerate = qq|<input type="hidden" name="exchangerate_$i" value="$form->{"exchangerate_$i"}">$form->{"exchangerate_$i"}|;
+      } else {
+        $exchangerate = qq|<input name="exchangerate_$i" size="10" value="$form->{"exchangerate_$i"}">|;
+      }
+    }
+
+    $exchangerate .= qq|<input type="hidden" name="forex_$i" value="$form->{"forex_$i"}">|;
+
+    $column_data{"paid_$i"} =
+      qq|<td align="center"><input name="paid_$i" size="11" value="$form->{"paid_$i"}" onBlur=\"check_right_number_format(this)\"></td>|;
+    $column_data{"exchangerate_$i"} = qq|<td align="center">$exchangerate</td>|;
+    $column_data{"AR_paid_$i"}      =
+      qq|<td align="center"><select name="AR_paid_$i">$form->{"selectAR_paid_$i"}</select></td>|;
+    $column_data{"datepaid_$i"} =
+      qq|<td align="center"><input id="datepaid_$i" name="datepaid_$i"  size="11" title="$myconfig{dateformat}" value="$form->{"datepaid_$i"}" onBlur=\"check_right_date_format(this)\">
+         <input type="button" name="datepaid_$i" id="trigger_datepaid_$i" value="?"></td>|;
+    $column_data{"source_$i"} =
+      qq|<td align=center><input name="source_$i" size="11" value="$form->{"source_$i"}"></td>|;
+    $column_data{"memo_$i"} =
+      qq|<td align="center"><input name="memo_$i" size="11" value="$form->{"memo_$i"}"></td>|;
+
+    map { print qq|$column_data{"${_}_$i"}\n| } @column_index;
+    print "
+        </tr>\n";
+    push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
+  }
+
+    <tr>
+      <td></td>
+      <td></td>
+      <td align="center">| . $locale->text('Total') . qq|</td>
+      <td align="center">| . H($form->format_amount(\%myconfig, $totalpaid, 2)) . qq|</td>
+    </tr>
+    <tr>
+      <td></td>
+      <td></td>
+      <td align="center">| . $locale->text('Missing amount') . qq|</td>
+      <td align="center">| . H($form->format_amount(\%myconfig, $paid_missing, 2)) . qq|</td>
+    </tr>
+
+  map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } qw(paidaccounts selectAR_paid oldinvtotal));
+
+  <input type="hidden" name="oldtotalpaid" value="$totalpaid">
+    </table>

diff --git a/templates/webpages/is/form_footer_de.html b/templates/webpages/is/form_footer_de.html
new file mode 100644 (file)
index 0000000..eeae756
--- /dev/null
+++ b/templates/webpages/is/form_footer_de.html
@@ -0,0 +1,194 @@
+[%- USE HTML %]
+[%- USE LxERP %]
+  <tr>
+   <td>
+    <table width="100%">
+     <tr valign="bottom">
+      <td>
+       <table>
+        <tr>
+         <th align="left">Bemerkungen</th>
+         <th align="left">interne Bemerkungen</th>
+         <th align="right">Zahlungskonditionen</th>
+        </tr>
+        <tr valign="top">
+         <td>
+          <textarea name="notes" rows="[% rows %]" cols="26" wrap="soft">[% notes %]</textarea>
+         </td>
+         <td>
+          <textarea name="intnotes" rows="[% rows %]" cols="35" wrap="soft">[% intnotes %]</textarea>
+         </td>
+         <td>
+          <select id='payment_id' name="payment_id">
+
+           $payment
+
+          </select>
+          <script type='text/javascript'>$('#payment_id').onchange(function(){
+            if (this.value) set_duedate(['payment_id__' + this.value, 'invdate__' + invdate.value],['duedate'])})
+          </script>
+         </td>
+        </tr>
+        <tr>
+          <td colspan="2">[% follow_up_text %]</td>
+        </tr>
+
+       </table>
+      </td>
+      <td>
+       <table>
+        <tr>
+         <th  align=left>Ertrag</th>
+         <td>[% LxERP.format_amount(marge_total, 2, 0) %]</td>
+        </tr>
+        <tr>
+         <th  align=left>Ertrag prozentual</th>
+         <td>[% LxERP.format_amount(marge_percent, 2, 0) %] %</td>
+        </tr>
+        <input type=hidden name="marge_total" value="[% marge_total %]">
+        <input type=hidden name="marge_percent" value="[% marge_percent %]">
+       </table>
+      </td>
+      <td align="right">
+  [%- IF taxaccounts %]
+       <input name="taxincluded" class="checkbox" type="checkbox" [% IF taxincluded %]checked[% END %]>
+       <b>Steuer im Preis inbegriffen</b>
+       <br>
+       <br>
+  [%- END %]
+       <table>
+
+        $subtotal
+
+[%# tax %]
+[% FOREACH item = taxaccounts_array %]
+[% SET description_ref = item _ 'description' %]
+[% SET rate_ref        = item _ 'rate' %]
+[% SET total_ref       = item _ 'total' %]
+[% SET netto_ref       = item _ 'netto' %]
+       <tr>
+        <th align="right">Enthaltene [% $description_ref %]&nbsp;[% $rate_ref * 100 %]%</th>
+        <td align="right">[% $total_ref %]</td>
+       </tr>
+       <tr>
+        <th align="right">Nettobetrag</th>
+        <td align="right">[% $netto_ref %]</td>
+       </tr>
+[%- END %]
+
+        <tr>
+         <th align="right">Summe</th>
+         <td align="right">[% invtotal %]</td>
+        </tr>
+       </table>
+      </td>
+     </tr>
+    </table>
+   </td>
+  </tr>
+
+[%- IF webdav %]
+  <tr>
+   <td><hr size="3" noshade></td>
+  </tr>
+  <tr>
+   <th class="listtop" align="left">Dokumente im Webdav-Repository</th>
+  </tr>
+   <table width="100%">
+    <tr>
+     <td align="left" width="30%"><b>Dateiname</b></td>
+     <td align="left" width="70%"><b>Webdavlink</b></td>
+    </tr>
+ [%- FOREACH file = WEBDAV %]
+    <tr>
+     <td align="left">[% file.name %]</td>
+     <td align="left"><a href="[% file.link %]">[% file.type %]</a></td>
+    </tr>
+ [%- END %]
+   </table>
+  </tr>
+[% END %]
+
+
+  <tr>
+   <td>
+    <table width="100%">
+     <tr class="listheading">
+[% IF is_credit_note %]
+      <th colspan="6" class="listheading">Zahlungsausgänge</th>
+[% ELSE %]
+      <th colspan="6" class="listheading">Zahlungseingänge</th>
+[%- END %]
+     </tr>
+
+
+[%# INCLUDE _payments %]
+
+
+    </td>
+  </tr>
+  <tr>
+    <td><hr size="3" noshade></td>
+  </tr>
+  <tr>
+    <td>
+  [% print_options %]
+    </td>
+  </tr>
+</table>
+
+  [% IF id %]
+
+    <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="Erneuern">
+    <input class="submit" type="submit" name="action" value="Lieferadresse">
+    <input class="submit" type="submit" name="action" value="Drucken">
+    <input class="submit" type="submit" name="action" value="eMail">
+[% IF  show_storno %]
+    <input class="submit" type="submit" name="action" value="Storno">
+[% END %]
+    <input class="submit" type="submit" name="action" value="Zahlung buchen">
+    <input class="submit" type="submit" name="action" value="Als Vorlage verwenden">
+
+[% IF id && is_credit_note %]
+    <input class="submit" type="submit" name="action" value="Gutschrift">
+[% END %]
+[% IF show_delete %]
+    <input class="submit" type="submit" name="action" value="Löschen">
+[% END %]
+
+  [%- IF invdate > closedto %]
+       <input class="submit" type="submit" name="action" value="Auftrag">
+  [%- END %]
+
+    <input type="button" class="submit" onclick="follow_up_window()" value="Wiedervorlage">
+
+ [% ELSE # no id %]
+   [% IF invdate > closedto %]
+      <input class="submit" type="submit" name="action" id="update_button" value="Erneuern">
+      <input class="submit" type="submit" name="action" value="Lieferadresse">
+      <input class="submit" type="submit" name="action" value="Druckvorschau">
+      <input class="submit" type="submit" name="action" value="eMail">
+      <input class="submit" type="submit" name="action" value="Drucken und Buchen">
+      <input class="submit" type="submit" name="action" value="Buchen">
+      <input class="submit" type="submit" name="action" value="Save Draft">
+   [%- END %]
+ [% END # id %]
+
+  [% IF id %]
+      [%#- button for saving history %]
+      <input type="button" class="submit" onclick="set_history_window([% id | html %]);" name="history" id="history" value="Historie">
+
+      <input type="submit" class="submit" name="action" value="als bezahlt markieren">
+  [% END %]
+
+<input type="hidden" name="rowcount" value="[% rowcount %]">
+<input type="hidden" name="callback" value="[% callback %]">
+<input type="hidden" name="draft_id" value="[% draft_id %]">
+<input type="hidden" name="draft_description" value="[% draft_description %]">
+<input type="hidden" name="customer_discount" value="[% customer_discount %]">
+
+</form>
+
+</body>
+
+</html>

diff --git a/templates/webpages/is/form_footer_master.html b/templates/webpages/is/form_footer_master.html
new file mode 100644 (file)
index 0000000..cc18108
--- /dev/null
+++ b/templates/webpages/is/form_footer_master.html
@@ -0,0 +1,194 @@
+[%- USE HTML %]
+[%- USE LxERP %]
+  <tr>
+   <td>
+    <table width="100%">
+     <tr valign="bottom">
+      <td>
+       <table>
+        <tr>
+         <th align="left"><translate>Notes</translate></th>
+         <th align="left"><translate>Internal Notes</translate></th>
+         <th align="right"><translate>Payment Terms</translate></th>
+        </tr>
+        <tr valign="top">
+         <td>
+          <textarea name="notes" rows="[% rows %]" cols="26" wrap="soft">[% notes %]</textarea>
+         </td>
+         <td>
+          <textarea name="intnotes" rows="[% rows %]" cols="35" wrap="soft">[% intnotes %]</textarea>
+         </td>
+         <td>
+          <select id='payment_id' name="payment_id">
+
+           $payment
+
+          </select>
+          <script type='text/javascript'>$('#payment_id').onchange(function(){
+            if (this.value) set_duedate(['payment_id__' + this.value, 'invdate__' + invdate.value],['duedate'])})
+          </script>
+         </td>
+        </tr>
+        <tr>
+          <td colspan="2">[% follow_up_text %]</td>
+        </tr>
+
+       </table>
+      </td>
+      <td>
+       <table>
+        <tr>
+         <th  align=left><translate>Ertrag</translate></th>
+         <td>[% LxERP.format_amount(marge_total, 2, 0) %]</td>
+        </tr>
+        <tr>
+         <th  align=left><translate>Ertrag prozentual</translate></th>
+         <td>[% LxERP.format_amount(marge_percent, 2, 0) %] %</td>
+        </tr>
+        <input type=hidden name="marge_total" value="[% marge_total %]">
+        <input type=hidden name="marge_percent" value="[% marge_percent %]">
+       </table>
+      </td>
+      <td align="right">
+  [%- IF taxaccounts %]
+       <input name="taxincluded" class="checkbox" type="checkbox" [% IF taxincluded %]checked[% END %]>
+       <b><translate>Tax Included</translate></b>
+       <br>
+       <br>
+  [%- END %]
+       <table>
+
+        $subtotal
+
+[%# tax %]
+[% FOREACH item = taxaccounts_array %]
+[% SET description_ref = item _ 'description' %]
+[% SET rate_ref        = item _ 'rate' %]
+[% SET total_ref       = item _ 'total' %]
+[% SET netto_ref       = item _ 'netto' %]
+       <tr>
+        <th align="right">Enthaltene [% $description_ref %]&nbsp;[% $rate_ref * 100 %]%</th>
+        <td align="right">[% $total_ref %]</td>
+       </tr>
+       <tr>
+        <th align="right">Nettobetrag</th>
+        <td align="right">[% $netto_ref %]</td>
+       </tr>
+[%- END %]
+
+        <tr>
+         <th align="right"><translate>Total</translate></th>
+         <td align="right">[% invtotal %]</td>
+        </tr>
+       </table>
+      </td>
+     </tr>
+    </table>
+   </td>
+  </tr>
+
+[%- IF webdav %]
+  <tr>
+   <td><hr size="3" noshade></td>
+  </tr>
+  <tr>
+   <th class="listtop" align="left">Dokumente im Webdav-Repository</th>
+  </tr>
+   <table width="100%">
+    <tr>
+     <td align="left" width="30%"><b>Dateiname</b></td>
+     <td align="left" width="70%"><b>Webdavlink</b></td>
+    </tr>
+ [%- FOREACH file = WEBDAV %]
+    <tr>
+     <td align="left">[% file.name %]</td>
+     <td align="left"><a href="[% file.link %]">[% file.type %]</a></td>
+    </tr>
+ [%- END %]
+   </table>
+  </tr>
+[% END %]
+
+
+  <tr>
+   <td>
+    <table width="100%">
+     <tr class="listheading">
+[% IF is_credit_note %]
+      <th colspan="6" class="listheading"><translate>Payments</translate></th>
+[% ELSE %]
+      <th colspan="6" class="listheading"><translate>Incoming Payments</translate></th>
+[%- END %]
+     </tr>
+
+
+[%# INCLUDE _payments %]
+
+
+    </td>
+  </tr>
+  <tr>
+    <td><hr size="3" noshade></td>
+  </tr>
+  <tr>
+    <td>
+  [% print_options %]
+    </td>
+  </tr>
+</table>
+
+  [% IF id %]
+
+    <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="<translate>Update</translate>">
+    <input class="submit" type="submit" name="action" value="<translate>Ship to</translate>">
+    <input class="submit" type="submit" name="action" value="<translate>Print</translate>">
+    <input class="submit" type="submit" name="action" value="<translate>E-mail</translate>">
+[% IF  show_storno %]
+    <input class="submit" type="submit" name="action" value="<translate>Storno</translate>">
+[% END %]
+    <input class="submit" type="submit" name="action" value="<translate>Post Payment</translate>">
+    <input class="submit" type="submit" name="action" value="<translate>Use As Template</translate>">
+
+[% IF id && is_credit_note %]
+    <input class="submit" type="submit" name="action" value="<translate>Credit Note</translate>">
+[% END %]
+[% IF show_delete %]
+    <input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
+[% END %]
+
+  [%- IF invdate > closedto %]
+       <input class="submit" type="submit" name="action" value="<translate>Order</translate>">
+  [%- END %]
+
+    <input type="button" class="submit" onclick="follow_up_window()" value="<translate>Follow-Up</translate>">
+
+ [% ELSE # no id %]
+   [% IF invdate > closedto %]
+      <input class="submit" type="submit" name="action" id="update_button" value="<translate>Update</translate>">
+      <input class="submit" type="submit" name="action" value="<translate>Ship to</translate>">
+      <input class="submit" type="submit" name="action" value="<translate>Preview</translate>">
+      <input class="submit" type="submit" name="action" value="<translate>E-mail</translate>">
+      <input class="submit" type="submit" name="action" value="<translate>Print and Post</translate>">
+      <input class="submit" type="submit" name="action" value="<translate>Post</translate>">
+      <input class="submit" type="submit" name="action" value="<translate>Save Draft</translate>">
+   [%- END %]
+ [% END # id %]
+
+  [% IF id %]
+      [%#- button for saving history %]
+      <input type="button" class="submit" onclick="set_history_window([% id | html %]);" name="history" id="history" value="<translate>history</translate>">
+
+      <input type="submit" class="submit" name="action" value="<translate>mark as paid</translate>">
+  [% END %]
+
+<input type="hidden" name="rowcount" value="[% rowcount %]">
+<input type="hidden" name="callback" value="[% callback %]">
+<input type="hidden" name="draft_id" value="[% draft_id %]">
+<input type="hidden" name="draft_description" value="[% draft_description %]">
+<input type="hidden" name="customer_discount" value="[% customer_discount %]">
+
+</form>
+
+</body>
+
+</html>

diff --git a/templates/webpages/oe/form_footer_de.html b/templates/webpages/oe/form_footer_de.html
index 0247b59c64c07117d4f7cc258ef3bbda406ad27f..b2aa6f7c01d0a82983e22f73c1fb71b81db87179 100644 (file)
--- a/templates/webpages/oe/form_footer_de.html
+++ b/templates/webpages/oe/form_footer_de.html
@@ -91,7 +91,7 @@
       <td align="left" width="30%"><b>Dateiname</b></td>
       <td align="left" width="70%"><b>Webdavlink</b></td>
      </tr>
       <td align="left" width="30%"><b>Dateiname</b></td>
       <td align="left" width="70%"><b>Webdavlink</b></td>
      </tr>

- [%- FOREACH file=WEBDAV %]
+ [%- FOREACH file = WEBDAV %]

       <tr>
         <td align="left">[% HTML.escape(file.name) %]</td>
         <td align="left"><a href="[% file.link %]">[% HTML.escape(file.type) %]</a></td>
       <tr>
         <td align="left">[% HTML.escape(file.name) %]</td>
         <td align="left"><a href="[% file.link %]">[% HTML.escape(file.type) %]</a></td>

diff --git a/templates/webpages/oe/form_footer_master.html b/templates/webpages/oe/form_footer_master.html
index c77c993d219a02fe0270d7cdea89a2d05f34a00f..9de0939191ddef0803675336ed2b52adfc292c0e 100644 (file)
--- a/templates/webpages/oe/form_footer_master.html
+++ b/templates/webpages/oe/form_footer_master.html
@@ -91,7 +91,7 @@
       <td align="left" width="30%"><b>Dateiname</b></td>
       <td align="left" width="70%"><b>Webdavlink</b></td>
      </tr>
       <td align="left" width="30%"><b>Dateiname</b></td>
       <td align="left" width="70%"><b>Webdavlink</b></td>
      </tr>

- [%- FOREACH file=WEBDAV %]
+ [%- FOREACH file = WEBDAV %]

       <tr>
         <td align="left">[% HTML.escape(file.name) %]</td>
         <td align="left"><a href="[% file.link %]">[% HTML.escape(file.type) %]</a></td>
       <tr>
         <td align="left">[% HTML.escape(file.name) %]</td>
         <td align="left"><a href="[% file.link %]">[% HTML.escape(file.type) %]</a></td>