From: Sven Schöling <s.schoeling@linet-services.de>
Date: Mon, 9 Jan 2012 16:10:02 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-2.7.0beta1~82^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=eca0862f8bcc69d22d94c41cc9076a008c77056d;hp=17afe903d0cc59b0696ffe4660519725fcf5d4e6;p=kivitendo-erp.git

Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
---

diff --git a/DEBIAN/DEBIAN/md5sum b/DEBIAN/DEBIAN/md5sum
index ff759218a..4cf2bd6c4 100644
--- a/DEBIAN/DEBIAN/md5sum
+++ b/DEBIAN/DEBIAN/md5sum
@@ -1776,8 +1776,6 @@ ca1942a777bb9757e0929f677dcc6f49  var/lib/lx-office-erp/templates/German-invoice
 8bc701c81a0ee89fe4478ddae2ef4827  var/lib/lx-office-erp/templates/French-sales_order.html
 6f81ff6f4639eefe6816e7288374a28b  var/lib/lx-office-erp/templates/German-check.tex
 b064d0f07f8fd71423879e8ffe9d6be5  var/lib/lx-office-erp/templates/Default-invoice.html
-0eab06c10a4c76e73d23218740dd6de1  var/lib/lx-office-erp/xslt/xulmenu.xsl
-2f7fbf7fd0626ab4ffdedcdd8b33ccd0  var/lib/lx-office-erp/xslt/style1.css
 947ddd3cdc8d188dce0d9b0c689f3235  etc/lx-office-erp/lx-erp.conf.default
 ea0d4d87c77d5b69a20bcafc76c987c6  etc/lx-office-erp/lx-office-erp.cherokee
 947ddd3cdc8d188dce0d9b0c689f3235  etc/lx-office-erp/lx-erp.conf
diff --git a/DEBIAN/mk_erp_deb.sh b/DEBIAN/mk_erp_deb.sh
index 1f542db6f..b3d47bc77 100755
--- a/DEBIAN/mk_erp_deb.sh
+++ b/DEBIAN/mk_erp_deb.sh
@@ -52,7 +52,6 @@ cp $SRC/menu.ini usr/lib/lx-office-erp/menu.default
 cp -a $SRC/css var/lib/lx-office-erp
 cp -a $SRC/templates var/lib/lx-office-erp
 cp -a $SRC/users var/lib/lx-office-erp
-cp -a $SRC/xslt var/lib/lx-office-erp
 
 cp -a $SRC/doc/* usr/share/doc/lx-office-erp/
 cp -a $SRC/image/* usr/share/lx-office-erp/
diff --git a/SL/Auth.pm b/SL/Auth.pm
index bd4fcd90a..d361a3d07 100644
--- a/SL/Auth.pm
+++ b/SL/Auth.pm
@@ -455,6 +455,9 @@ sub read_user {
     @user_data{qw(id login)}    = @{$ref}{qw(id login)};
   }
 
+  # The XUL/XML backed menu has been removed.
+  $user_data{menustyle} = 'v3' if lc($user_data{menustyle} || '') eq 'xml';
+
   $sth->finish();
 
   $main::lxdebug->leave_sub();
diff --git a/SL/DO.pm b/SL/DO.pm
index 0d2a5ec21..f241cdfb7 100644
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -350,7 +350,7 @@ sub save {
              conv_i($form->{salesman_id}), conv_i($form->{cp_id}),
              $form->{transaction_description},
              $form->{type} =~ /^sales/ ? 't' : 'f',
-             conv_i($form->{taxzone_id}), $form->{taxincluded} ? 't' : 'f', conv_i($form->{terms}), $form->{curr},
+             conv_i($form->{taxzone_id}), $form->{taxincluded} ? 't' : 'f', conv_i($form->{terms}), substr($form->{currency}, 0, 3),
              conv_i($form->{id}));
   do_query($form, $dbh, $query, @values);
 
@@ -601,7 +601,7 @@ sub retrieve {
          d.description AS department, dord.language_id,
          dord.shipto_id,
          dord.globalproject_id, dord.delivered, dord.transaction_description,
-         dord.taxzone_id, dord.taxincluded, dord.terms, dord.curr
+         dord.taxzone_id, dord.taxincluded, dord.terms, dord.curr AS currency
        FROM delivery_orders dord
        JOIN ${vc} cv ON (dord.${vc}_id = cv.id)
        LEFT JOIN employee e ON (dord.employee_id = e.id)
@@ -623,6 +623,9 @@ sub retrieve {
   }
   $sth->finish();
 
+  # remove any trailing whitespace
+  $form->{currency} =~ s/\s*$//;
+
   $form->{donumber_array} =~ s/\s*$//g;
 
   $form->{saved_donumber} = $form->{donumber};
diff --git a/SL/Form.pm b/SL/Form.pm
index 38d87ad01..d0a4157b4 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -311,7 +311,7 @@ sub info {
     <script type="text/javascript">
     <!--
     // If JavaScript is enabled, the whole thing will be reloaded.
-    // The reason is: When one changes his menu setup (HTML / XUL / CSS ...)
+    // The reason is: When one changes his menu setup (HTML / CSS ...)
     // it now loads the correct code into the browser instead of do nothing.
     setTimeout("top.frames.location.href='login.pl'",500);
     //-->
@@ -1094,19 +1094,16 @@ sub parse_template {
 
   # OUT is used for the media, screen, printer, email
   # for postscript we store a copy in a temporary file
-  my $fileid = time;
-  my $prepend_userspath;
-
-  if (!$self->{tmpfile}) {
-    $self->{tmpfile}   = "${fileid}.$self->{IN}";
-    $prepend_userspath = 1;
-  }
-
-  $prepend_userspath = 1 if substr($self->{tmpfile}, 0, length $userspath) eq $userspath;
-
-  $self->{tmpfile} =~ s|.*/||;
-  $self->{tmpfile} =~ s/[^a-zA-Z0-9\._\ \-]//g;
-  $self->{tmpfile} = "$userspath/$self->{tmpfile}" if $prepend_userspath;
+  my ($temp_fh, $suffix);
+  $suffix =  $self->{IN};
+  $suffix =~ s/.*\.//;
+  ($temp_fh, $self->{tmpfile}) = File::Temp::tempfile(
+    'lx-office-printXXXXXX',
+    SUFFIX => '.' . ($suffix || 'tex'),
+    DIR    => $userspath,
+    UNLINK => 1,
+  );
+  close $temp_fh;
 
   if ($template->uses_temp_file() || $self->{media} eq 'email') {
     $out = $self->{OUT};
@@ -1152,7 +1149,7 @@ sub parse_template {
       $mail->{charset} = $::lx_office_conf{system}->{dbcharset} || Common::DEFAULT_CHARSET;
       $mail->{to} = $self->{EMAIL_RECIPIENT} ? $self->{EMAIL_RECIPIENT} : $self->{email};
       $mail->{from}   = qq|"$myconfig->{name}" <$myconfig->{email}>|;
-      $mail->{fileid} = "$fileid.";
+      $mail->{fileid} = time() . '.' . $$ . '.';
       $myconfig->{signature} =~ s/\r//g;
 
       # if we send html or plain text inline
@@ -2860,7 +2857,7 @@ sub create_links {
     if ($self->{"$self->{vc}_id"}) {
 
       # only setup currency
-      ($self->{currency}) = split(/:/, $self->{currencies});
+      ($self->{currency}) = split(/:/, $self->{currencies}) if !$self->{currency};
 
     } else {
 
diff --git a/SL/Template/LaTeX.pm b/SL/Template/LaTeX.pm
index 2df7e8cfb..c6d54d593 100644
--- a/SL/Template/LaTeX.pm
+++ b/SL/Template/LaTeX.pm
@@ -63,47 +63,6 @@ sub parse_foreach {
     $form->{"__odd__"}     = (($i + 1) % 2) == 1;
     $form->{"__counter__"} = $i + 1;
 
-    if (   ref $description_array       eq 'ARRAY'
-        && scalar @{$description_array} == scalar @{$ary}
-        && $self->{"chars_per_line"}    != 0)
-    {
-      my $lines = int(length($description_array->[$i]) / $self->{"chars_per_line"});
-      my $lpp;
-
-      $description_array->[$i] =~ s/(\\newline\s?)*$//;
-      $lines++ while ($description_array->[$i] =~ m/\\newline/g);
-      $lines++;
-
-      if ($current_page == 1) {
-        $lpp = $self->{"lines_on_first_page"};
-      } else {
-        $lpp = $self->{"lines_on_second_page"};
-      }
-
-      # Yes we need a manual page break -- or the user has forced one
-      if (   (($current_line + $lines) > $lpp)
-          || ($description_array->[$i]     =~ /<pagebreak>/)
-          || (   ref $longdescription_array eq 'ARRAY'
-              && $longdescription_array->[$i] =~ /<pagebreak>/)) {
-        my $pb = $self->{"pagebreak_block"};
-
-        # replace the special variables <%sumcarriedforward%>
-        # and <%lastpage%>
-
-        my $psum = $form->format_amount($self->{"myconfig"}, $sum, 2);
-        $pb =~ s/$self->{tag_start_qm}sumcarriedforward$self->{tag_end_qm}/$psum/g;
-        $pb =~ s/$self->{tag_start_qm}lastpage$self->{tag_end_qm}/$current_page/g;
-
-        my $new_text = $self->parse_block($pb, (@indices, $i));
-        return undef unless (defined($new_text));
-        $new_contents .= $new_text;
-
-        $current_page++;
-        $current_line = 0;
-      }
-      $current_line += $lines;
-    }
-
     if (   ref $linetotal_array eq 'ARRAY'
         && $i < scalar(@{$linetotal_array})) {
       $sum += $form->parse_amount($self->{"myconfig"}, $linetotal_array->[$i]);
@@ -336,18 +295,6 @@ sub parse {
 
   my $contents = join("", @lines);
 
-  # detect pagebreak block and its parameters
-  if ($contents =~ /$self->{tag_start_qm}pagebreak\s+(\d+)\s+(\d+)\s+(\d+)\s*$self->{tag_end_qm}(.*?)$self->{tag_start_qm}end(\s*pagebreak)?$self->{tag_end_qm}/s) {
-    $self->{"chars_per_line"} = $1;
-    $self->{"lines_on_first_page"} = $2;
-    $self->{"lines_on_second_page"} = $3;
-    $self->{"pagebreak_block"} = $4;
-
-    substr($contents, length($`), length($&)) = "";
-  }
-
-  $self->{"forced_pagebreaks"} = [];
-
   my $new_contents = $self->parse_block($contents);
   if (!defined($new_contents)) {
     $main::lxdebug->leave_sub();
diff --git a/SL/User.pm b/SL/User.pm
index 18bf0697b..640299d8a 100644
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -177,7 +177,6 @@ sub login {
         $self->{"menustyle"} eq "v3" ? "menuv3.pl" :
         $self->{"menustyle"} eq "neu" ? "menunew.pl" :
         $self->{"menustyle"} eq "js" ? "menujs.pl" :
-        $self->{"menustyle"} eq "xml" ? "menuXML.pl" :
         "menu.pl";
 
       print $form->parse_html_template("dbupgrade/footer", { "menufile" => $menufile });
diff --git a/SL/VK.pm b/SL/VK.pm
index 13c7d7f99..c3a2562fd 100644
--- a/SL/VK.pm
+++ b/SL/VK.pm
@@ -62,6 +62,9 @@ sub invoice_transactions {
   # Stornierte Rechnungen und Stornorechnungen in invoice rausfiltern
   $where .= " AND ar.storno is not true ";
 
+  # Bestandteile von Erzeugnissen herausfiltern
+  $where .= " AND i.assemblyitem is not true ";
+
   my $sortorder = "cus.name,i.parts_id,ar.transdate";
   if ($form->{sortby} eq 'artikelsort') {
     $sortorder = "i.parts_id,cus.name,ar.transdate";
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index f73c17974..18058437f 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -341,7 +341,19 @@ sub display_row {
     $form->{"marge_percent_$i"} = 0;
 
     my $marge_color;
-    my $real_sellprice           = $linetotal;
+    my $real_sellprice;
+    if ( $form->{taxincluded} and $form->{"qty_$i"} * 1  and $form->{$form->{"taxaccounts_$i"} . "_rate"} * 1) {
+      # if we use taxincluded we need to calculate the marge from the net_value
+      # all the marge calculations are based on linetotal which we need to
+      # convert to net first
+
+      # there is no direct form value for the tax_rate of the item, but
+      # form->{taxaccounts_$i} gives the tax account (e.g. 3806) and 3806_rate
+      # gives the tax percentage (e.g. 0.19)
+      $real_sellprice = $linetotal / (1 + $form->{$form->{"taxaccounts_$i"} . "_rate"});
+    } else {
+      $real_sellprice            = $linetotal;
+    };
     my $real_lastcost            = $form->{"lastcost_$i"} * $form->{"qty_$i"} / ( $form->{"marge_price_factor_$i"} || 1 );
     my $marge_percent_warn       = $myconfig{marge_percent_warn} * 1 || 15;
     my $marge_adjust_credit_note = $form->{type} eq 'credit_note' ? -1 : 1;
diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index b550532ed..2ace9a7b4 100644
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -116,7 +116,7 @@ sub invoice_links {
     }
   }
 
-  my ($payment_id, $language_id, $taxzone_id);
+  my ($payment_id, $language_id, $taxzone_id, $currency);
   if ($form->{payment_id}) {
     $payment_id = $form->{payment_id};
   }
@@ -126,6 +126,9 @@ sub invoice_links {
   if ($form->{taxzone_id}) {
     $taxzone_id = $form->{taxzone_id};
   }
+  if ($form->{currency}) {
+    $currency = $form->{currency};
+  }
 
   my $cp_id = $form->{cp_id};
   IR->get_vendor(\%myconfig, \%$form);
@@ -141,6 +144,9 @@ sub invoice_links {
   if ($taxzone_id) {
     $form->{taxzone_id} = $taxzone_id;
   }
+  if ($currency) {
+    $form->{currency} = $currency;
+  }
 
   my @curr = split(/:/, $form->{currencies}); #seems to be missing
   map { $form->{selectcurrency} .= "<option>$_\n" } @curr;
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index b858db1cd..489a6d936 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -146,7 +146,7 @@ sub invoice_links {
 
   my $editing = $form->{id};
 
-  $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes id shipto_id));
+  $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded currency cp_id intnotes id shipto_id));
 
   IS->get_customer(\%myconfig, \%$form);
 
@@ -158,7 +158,7 @@ sub invoice_links {
   $form->restore_vars(qw(id));
 
   IS->retrieve_invoice(\%myconfig, \%$form);
-  $form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id shipto_id));
+  $form->restore_vars(qw(payment_id language_id taxzone_id currency intnotes cp_id shipto_id));
   $form->restore_vars(qw(taxincluded)) if $form->{id};
   $form->restore_vars(qw(salesman_id)) if $editing;
 
diff --git a/bin/mozilla/login.pl b/bin/mozilla/login.pl
index d52a69b49..665cb9193 100644
--- a/bin/mozilla/login.pl
+++ b/bin/mozilla/login.pl
@@ -122,11 +122,11 @@ sub login {
     ::end_of_request();
   }
 
-  my %style_to_script_map = ( 'v3'  => 'v3',
-                              'neu' => 'new',
-                              'v4' => 'v4',
-                              'xml' => 'XML',
-    );
+  my %style_to_script_map = (
+    v3  => 'v3',
+    neu => 'new',
+    v4  => 'v4',
+  );
 
   my $menu_script = $style_to_script_map{$user->{menustyle}} || '';
 
diff --git a/bin/mozilla/menuXML.pl b/bin/mozilla/menuXML.pl
deleted file mode 100644
index 1eed4edeb..000000000
--- a/bin/mozilla/menuXML.pl
+++ /dev/null
@@ -1,155 +0,0 @@
-#=====================================================================
-# LX-Office ERP
-# Copyright (C) 2004
-# Based on SQL-Ledger Version 2.1.9
-# Web http://www.lx-office.org
-#
-######################################################################
-# SQL-Ledger Accounting
-# Copyright (c) 1998-2002
-#
-#  Author: Dieter Simader
-#   Email: dsimader@sql-ledger.org
-#     Web: http://www.sql-ledger.org
-#
-#  Contributors: Christopher Browne
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#######################################################################
-#
-# three frame layout with refractured menu
-#
-# CHANGE LOG:
-#   DS. 2002-03-25  Created
-#  2004-12-14 - New Optik - Marco Welter <mawe@linux-studio.de>
-#  2007-10-14 - XMLified  - Holger Will  <holger@treebuilder.de>
-#######################################################################
-
-use utf8;
-
-use SL::Menu;
-
-use CGI::Carp qw(fatalsToBrowser);
-use Encode;
-use URI;
-
-use strict;
-
-1;
-
-# end of main
-
-sub display {
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  my $charset = $::lx_office_conf{system}->{dbcharset} || 'ISO-8859-1';
-  my $callback            = $form->unescape($form->{callback});
-  $callback               = URI->new($callback)->rel($callback) if $callback;
-  $callback               = "login.pl?action=company_logo"      if $callback =~ /^(\.\/)?$/;
-
-  my $text    = $form->create_http_response('content_type' => 'text/xml',
-                                            'charset'      => $charset)
-    . qq|<?xml version="1.0" encoding="${charset}"?>
-<?xml-stylesheet href="xslt/xulmenu.xsl" type="text/xsl"?>
-<!DOCTYPE doc [
-<!ENTITY szlig "| . $::locale->{iconv_utf8}->convert('ß') . qq|">
-<!ENTITY auml "|  . $::locale->{iconv_utf8}->convert('ä') . qq|">
-<!ENTITY ouml "|  . $::locale->{iconv_utf8}->convert('ö') . qq|">
-<!ENTITY uuml "|  . $::locale->{iconv_utf8}->convert('ü') . qq|">
-]>
-
-<doc>
-<name>$myconfig{name}</name>
-<version>$form->{version}</version>
-<callback>$callback</callback>
-<db>$myconfig{dbname}</db>
-
-<favorites>|;
-
-  my $fav       = $myconfig{favorites};
-  my @favorites = split m/;/, $fav;
-  foreach (@favorites) {
-    $text .= qq|<link name="$_"/>|;
-  }
-
-  $text .= qq|</favorites>\n|
-    . qq|<menu>\n|
-    . acc_menu()
-    . qq|</menu>\n|
-    . qq|</doc>\n|;
-
-  print $text;
-}
-
-
-sub acc_menu {
-  my $form     = $main::form;
-
-  my $mainlevel = $form->{level};
-  $mainlevel =~ s/$mainlevel--//g;
-  my $menu = Menu->new("menu.ini");
-
-  $| = 1;
-
-  return print_menu($menu);
-}
-
-sub print_menu {
-  my ($menu, $parent, $depth) = @_;
-  my $html;
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  die if ($depth * 1 > 5);
-
-  my @menuorder;
-
-  @menuorder = $menu->access_control(\%myconfig, $parent);
-
-  $parent .= "--" if ($parent);
-
-  foreach my $item (@menuorder) {
-    my $menu_item_id = $item;
-    substr($item, 0, length($parent)) = "";
-    next if (($item eq "") || ($item =~ /--/));
-
-    my $menu_item = $menu->{"${parent}${item}"};
-    my $menu_title = $::locale->text($item);
-    my $menu_text = $menu_title;
-
-    my $target = "main_window";
-    $target = $menu_item->{"target"} if ($menu_item->{"target"});
-
-    if ($menu_item->{"submenu"} || !defined($menu_item->{"module"}) ||
-        ($menu_item->{"module"} eq "menu.pl")) {
-
-      my $h = print_menu($menu, "${parent}${item}", $depth * 1 + 1)."\n";
-      if (!$parent) {
-        $html .= qq|<item name='${menu_text}' id='${menu_item_id}'>${h}</item>\n|;
-      } else {
-        $html .= qq|<item name='${menu_text}' id='${menu_item_id}'>${h}</item>\n|;
-      }
-    } else {
-      $html .= qq|<item |;
-      $html .= $menu->menuitem_XML(\%myconfig, $form, "${parent}$item",
-                                  { "title" => $menu_title,
-                                    "target" => $target });
-      $html .= qq| name="${menu_text}" id='${menu_item_id}'/>\n|;
-    }
-  }
-
-  return $html;
-}
diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl
index c455740be..a3c464211 100644
--- a/bin/mozilla/ustva.pl
+++ b/bin/mozilla/ustva.pl
@@ -848,7 +848,6 @@ sub generate_ustva {
       #file suffix
       $file .= '.xml';
       $file =~ s|.*/||;
-      $form->{tmpfile} = "$::lx_office_conf{paths}{userspath}/$file";
 
       $form->{attachment_filename} = $file;
 
@@ -894,11 +893,9 @@ sub generate_ustva {
       # Define serveral filenames
       $form->{IN} = 'taxbird.txb';
 
-      $form->{attachment_filename} = "USTVA-" . $form->{period}
-      . sprintf("%02d", $form->{year} % 100) . ".txb";
+      $form->{attachment_filename} = "USTVA-" . ($form->{period} * 1) . sprintf("%02d", $form->{year} % 100) . ".txb";
 
       $form->{attachment_filename} =~ s|.*/||;
-      $form->{tmpfile} = "$::lx_office_conf{paths}{userspath}/" . $form->{attachment_filename};
 
       # TODO: set Output to UTF-8 or system Preference
       #$form->{"iconv"} = Text::Iconv->new($myconfig{dbcharset}, "UTF-8");
diff --git a/doc/changelog b/doc/changelog
index 7f3443338..841f844c4 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -19,6 +19,10 @@
   Der eingebaute Vorlageneditor zeigt alle *.tex-Dateien an und lässt
   sie bearbeiten.
 
+- Der alte, manuelle Mechanismus "pagebreak-Block", um in
+  LaTeX-Vorlagen Zwischensummen zu berechnen und den Seitenumbruch
+  manuell zu kontrollieren, wurde entfernt.
+
 - Zahlungen bei Debitoren-, Kreditorenbuchungen, Verkaufs- und
   Einkaufsrechnungen lassen sich entweder immer, gar nicht oder
   am selben Tag noch ändern. Dies ist lx_office.conf einstellbar.
@@ -60,6 +64,10 @@
     eingestellt werden, die als Voreinstellung in den Ver- und Einkaufs-
     Masken dient.
 
+  - Das XUL-/XML-Menü, das nur mit Firefox funktionierte, wurde wegen
+    Sicherheitsproblemen und eingestellter Unterstützung für XUL
+    seitens der Firefox-Entwickler entfernt.
+
 
   Liste gefixter Bugs aus dem Bugtracker:
 
@@ -67,6 +75,7 @@
   - Bugfix 1753: Benutzerdefinierte Variable f. Waren: bearbeitbar nicht auswählbar
   - Bugfix 1738:  Entwürfe können nicht gelöscht werden
   - Bugfix 1759: Währung bei Kunden / Lieferanten vorbelegen
+  - Bugfix 1770: Währung / currency überlebt Workflow über Lieferschein nicht
   - Bugfix 1773: SQL Fehler bei Anzeige von Angeboten
 
 
diff --git a/doc/dokumentenvorlagen-und-variablen.html b/doc/dokumentenvorlagen-und-variablen.html
index 2f45393b2..1e0503292 100644
--- a/doc/dokumentenvorlagen-und-variablen.html
+++ b/doc/dokumentenvorlagen-und-variablen.html
@@ -128,9 +128,6 @@ td {
 
     <li><a href="dokumentenvorlagen-und-variablen.html#bloecke_foreach">
       Die <code>foreach</code>-Schleife</a></li>
-
-    <li><a href="dokumentenvorlagen-und-variablen.html#bloecke_pagebreak">
-      Der <code>pagebreak</code>-Block</a></li>
    </ol>
   </li>
 
@@ -865,12 +862,6 @@ td {
     <td><code>subtotal[_nofmt]</code></td>
     <td>Zwischensumme aller Posten ohne Steuern</td>
    </tr>
-   <tr>
-    <td><code>sumcarriedforward</code></td>
-    <td>Zwischensumme aller bisher ausgegebenen Posten. Sollte nur in einem
-     <a href="dokumentenvorlagen-und-variablen.html#bloecke_pagebreak">
-      <code>pagebreak</code></a>-Block verwendet werden.</td>
-   </tr>
    <tr>
     <td><code>total</code></td>
     <td>Restsumme der Rechnung (Summe abz&uuml;glich bereits bezahlter Posten)</td>
@@ -1569,47 +1560,6 @@ td {
   zwischen <code>&lt;%foreach%&gt;</code> und <code>&lt;%end%&gt;</code>
   wiederholt, nicht aber die komplette Zeile, in der er steht.</p>
 
- <h3><a name="bloecke_pagebreak">Der <code>pagebreak</code>-Block</a></h3>
-
- <p class="blue"><code>&lt;%pagebreak ZpZ ZeS ZzS%&gt;<br>
-   ...<br>
-   &lt;%end%&gt;</code></p>
-
- <p>Dieser Block existiert nur in LaTeX-Vorlagen.</p>
-
- <p>Dieser Block legt das Verhalten beim manuellen Einf&uuml;gen eines
-  Seitenumbruchs fest. Normalerweise bricht LaTeX die Seiten selber um. Beim
-  Rechnungsdruck ist das oft nicht gew&uuml;nscht, oder man m&ouml;chte im
-  Falle eines Seitenumbruchs den &Uuml;bertrag etc. mit ausgeben. Deswegen
-  versucht der Parser, manuell Seitenumbr&uuml;che einzuf&uuml;gen,
-  w&auml;hrend er einen <code>foreach</code>-Block auswertet, weil hier die
-  manuellen Seitenumbr&uuml;che erforderlich werden. Daf&uuml;r ben&ouml;tigt
-  der Parser aber drei Informationen:</p>
-
- <p>
-  <ol>
-   <li>Wieviele Zeichen passen bei der Variablen "description" pro Posten
-    in eine Zeile? Das ist der Parameter "ZpZ" (Zeichen pro Zeile).</li>
-   <li>Wieviele Zeilen/Posten passen auf die erste Seite? Das
-    ist der Parameter "ZeS" (Zeilen erste Seite).</li>
-   <li>Wieviele Zeilen/Posten passen auf die zweite und alle nachfolgenden
-    Seiten? Das ist der Parameter "ZzS" (Zeilen zweite Seite).</li>
-  </ol>
- </p>
-
- <p>Diese Parameter sind drei Zahlen, die manuell durch Verwendung von langen
-  Warenbezeichnungen und Rechnungen mit vielen Posten bestimmt werden
-  m&uuml;ssen.</p>
-
- <p>&Uuml;blicherweise wird in diesem Block zuerst die aktuelle Tabelle
-  geschlossen, eventuell Text eingef&uuml;gt (z.B. "Fortsetzung auf der
-  n&auml;chsten Seite"), dann ein Seitenumbruch erzwungen, eventuell Text
-  eingef&uuml;gt (z.B. "&Uuml;bertrag von der vorherigen Seite:
-  &lt;%sumcarriedforward%&gt; EUR") und die Tabelle wieder ge&ouml;ffnet.</p>
-
- <p>Wird kein manueller Seitenumbruch gew&uuml;scht, so kann dieser Block
-  komplett entfallen.</p>
-
  <small><a href="dokumentenvorlagen-und-variablen.html#inhaltsverzeichnis">
    zum Inhaltsverzeichnis</a></small><br>
  <hr>
@@ -1661,11 +1611,9 @@ td {
 
  <p>Eine Besonderheit ist der Befehl <code>&lt;pagebreak&gt;</code>,
   der nur in LaTeX-Vorlagen funktioniert und in anderen Vorlagen
-  einfach gel&ouml;scht wird. Dieser erzwingt unabh&auml;ngig von der
-  im <a
-  href="dokumentenvorlagen-und-variablen.html#bloecke_pagebreak">pagebreak-Block</a>
-  voreingestellten Werte einen Seitenumbruch nach der aktuellen
-  Rechnungsposition. Dementsprechend funktioniert er nur innerhalb von
+  einfach gel&ouml;scht wird. Dieser erzwingt einen Seitenumbruch nach
+  der aktuellen Rechnungsposition. Dementsprechend funktioniert er nur
+  innerhalb von
   <code>&lt;%foreach...%&gt;</code>-Schleifen. Weiterhin ben&ouml;tigt
   er kein Endtag.</p>
 
diff --git a/doc/languages_howto.txt b/doc/languages_howto.txt
index defff690f..15c3b2d62 100644
--- a/doc/languages_howto.txt
+++ b/doc/languages_howto.txt
@@ -133,7 +133,6 @@ writing the following are recognized:
 
   HTML
   URL@HTML
-  XUL
   Template/HTML
   Template/XML
   Template/LaTeX
diff --git a/locale/de/all b/locale/de/all
index 5bfbe3164..81ffffc74 100644
--- a/locale/de/all
+++ b/locale/de/all
@@ -809,7 +809,6 @@ $self->{texts} = {
   'Factor'                      => 'Faktor',
   'Factor missing!'             => 'Der Faktor fehlt.',
   'Falsches Datumsformat!'      => 'Falsches Datumsformat!',
-  'Favorites'                   => 'Favoriten (nur im XUL-Menü)',
   'Fax'                         => 'Fax',
   'Feb'                         => 'Feb',
   'February'                    => 'Februar',
@@ -932,6 +931,7 @@ $self->{texts} = {
   'Include in Report'           => 'In Bericht aufnehmen',
   'Include in drop-down menus'  => 'In Aufklappmenü aufnehmen',
   'Includeable in reports'      => 'In Berichten anzeigbar',
+  'Including'                   => 'Enthaltene',
   'Income Statement'            => 'GuV',
   'Income accno'                => 'Erl&ouml;skonto',
   'Incoming Payments'           => 'Zahlungseingänge',
@@ -1144,6 +1144,7 @@ $self->{texts} = {
   'National'                    => 'Inand',
   'National Expenses'           => 'Aufwand Inland',
   'National Revenues'           => 'Erl&ouml;se Inland',
+  'Net amount'                  => 'Nettobetrag',
   'Netto Terms'                 => 'Zahlungsziel netto',
   'New Buchungsgruppe #1'       => 'Neue Buchungsgruppe #1',
   'New Templates'               => 'Erzeuge Vorlagen, Name',
@@ -1203,7 +1204,6 @@ $self->{texts} = {
   'Not done yet'                => 'Noch nicht fertig',
   'Not obsolete'                => 'Gültig',
   'Note'                        => 'Hinweis',
-  'Note: For Firefox 4 and later the menu XUL menu requires the addon <a href="#1">Remote XUL Manager</a> and the Lx-Office server to be white listed.' => 'Bitte beachten: Ab Firefox 4 benötigt das XUL Menü das Addon <a href="#1">Remote XUL Manager</a>, in dem der Lx-Office Server eingetragen sein muss.',
   'Note: Taxkeys must have a "valid from" date, and will not behave correctly without.' => 'Hinweis: Steuerschlüssel sind fehlerhaft ohne "Gültig ab" Datum',
   'Notes'                       => 'Bemerkungen',
   'Notes (translation for #1)'  => 'Bemerkungen (Übersetzung für #1)',
@@ -1916,7 +1916,6 @@ $self->{texts} = {
   'Top (CSS)'                   => 'Oben (mit CSS)',
   'Top (CSS) new'               => 'Oben (mit CSS, neu)',
   'Top (Javascript)'            => 'Oben (mit Javascript)',
-  'Top (XUL; only for Mozilla Firefox)' => 'Oben + links (XUL, nur Mozilla Firefox)',
   'Top 100'                     => 'Top 100',
   'Top 100 hinzufuegen'         => 'Top 100 hinzufügen',
   'Top Level'                   => 'Hauptartikelbezeichnung',
diff --git a/locale/de/special_chars b/locale/de/special_chars
index 8e8498ba0..c481fe6c9 100644
--- a/locale/de/special_chars
+++ b/locale/de/special_chars
@@ -16,10 +16,6 @@ order=& ä ö ü Ä Ö Ü ß " < >
 order="
 "=&quot;
 
-[XUL]
-order=&
-&=&quot;
-
 [Template/HTML]
 order=< > \n
 <=&lt;
diff --git a/locale/de_DE/all b/locale/de_DE/all
index c164b7e70..365799921 100644
--- a/locale/de_DE/all
+++ b/locale/de_DE/all
@@ -750,7 +750,6 @@ $self->{texts} = {
   'Factor'                      => 'Faktor',
   'Factor missing!'             => 'Der Faktor fehlt.',
   'Falsches Datumsformat!'      => 'Falsches Datumsformat!',
-  'Favorites'                   => 'Favoriten (nur im XUL-Menü)',
   'Fax'                         => 'Fax',
   'Feb'                         => 'Feb',
   'February'                    => 'Februar',
@@ -1772,7 +1771,6 @@ $self->{texts} = {
   'Top (CSS)'                   => 'Oben (mit CSS)',
   'Top (CSS) new'               => 'Oben (mit CSS, neu)',
   'Top (Javascript)'            => 'Oben (mit Javascript)',
-  'Top (XUL; only for Mozilla Firefox)' => 'Oben + links (XUL, nur Mozilla Firefox)',
   'Top 100'                     => 'Top 100',
   'Top 100 hinzufuegen'         => 'Top 100 hinzufügen',
   'Top Level'                   => 'Hauptartikelbezeichnung',
diff --git a/locale/de_DE/special_chars b/locale/de_DE/special_chars
index 48a673350..ceedcd25e 100644
--- a/locale/de_DE/special_chars
+++ b/locale/de_DE/special_chars
@@ -16,10 +16,6 @@ order=& ä ö ü Ä Ö Ü ß " < >
 order="
 "=&quot;
 
-[XUL]
-order=&
-&=&quot;
-
 [Template/HTML]
 order=< > \n
 <=&lt;
diff --git a/locale/en/all b/locale/en/all
index 5f658eda2..4fc79c12a 100644
--- a/locale/en/all
+++ b/locale/en/all
@@ -754,7 +754,6 @@ $self->{texts} = {
   'Factor'                      => '',
   'Factor missing!'             => '',
   'Falsches Datumsformat!'      => '',
-  'Favorites'                   => '',
   'Fax'                         => '',
   'Feb'                         => '',
   'February'                    => '',
@@ -1779,7 +1778,6 @@ $self->{texts} = {
   'Top (CSS)'                   => '',
   'Top (CSS) new'               => '',
   'Top (Javascript)'            => '',
-  'Top (XUL; only for Mozilla Firefox)' => '',
   'Top 100'                     => '',
   'Top 100 hinzufuegen'         => '',
   'Top Level'                   => '',
diff --git a/locale/en/special_chars b/locale/en/special_chars
index eac151ef3..945b2392f 100644
--- a/locale/en/special_chars
+++ b/locale/en/special_chars
@@ -16,10 +16,6 @@ order=& ä ö ü Ä Ö Ü ß " < >
 order="
 "=&quot;
 
-[XUL]
-order=&
-&=&quot;
-
 [Template/HTML]
 order=< > \n
 <=&lt;
diff --git a/locale/fr/all b/locale/fr/all
index e74b8ec5e..ced2ab27c 100644
--- a/locale/fr/all
+++ b/locale/fr/all
@@ -1702,7 +1702,6 @@ $self->{texts} = {
   'Top (CSS)'                   => '',
   'Top (CSS) new'               => '',
   'Top (Javascript)'            => '',
-  'Top (XUL; only for Mozilla Firefox)' => '',
   'Top 100'                     => '',
   'Top 100 hinzufuegen'         => '',
   'Top Level'                   => '',
diff --git a/menuXML.pl b/menuXML.pl
deleted file mode 120000
index 385000d1b..000000000
--- a/menuXML.pl
+++ /dev/null
@@ -1 +0,0 @@
-am.pl
\ No newline at end of file
diff --git a/scripts/mklinks.sh b/scripts/mklinks.sh
index 07c195710..3fab3bd78 100755
--- a/scripts/mklinks.sh
+++ b/scripts/mklinks.sh
@@ -4,7 +4,7 @@ for i in am dispatcher login; do
 	rm $i.pl 2> /dev/null
 	ln -s admin.pl $i.pl
 done
-for i in acctranscorrections amcvar amtemplates ap ar bankaccounts bp ca common cp ct datev dn do fu gl ic ir is menujs menunew menu menuv3 menuv4 menuXML oe pe projects rc rp sepa todo ustva wh vk; do
+for i in acctranscorrections amcvar amtemplates ap ar bankaccounts bp ca common cp ct datev dn do fu gl ic ir is menujs menunew menu menuv3 menuv4 oe pe projects rc rp sepa todo ustva wh vk; do
 	rm $i.pl 2> /dev/null
 	ln -s am.pl $i.pl
 done
diff --git a/sql/Pg-upgrade2-auth/remove_menustyle_xml.sql b/sql/Pg-upgrade2-auth/remove_menustyle_xml.sql
new file mode 100644
index 000000000..f1e3327bb
--- /dev/null
+++ b/sql/Pg-upgrade2-auth/remove_menustyle_xml.sql
@@ -0,0 +1,8 @@
+-- @tag: remove_menustyle_xml
+-- @description: Menütyp "XUL/XML" wurde entfernt; also durch v3 ersetzen
+-- @depends:
+-- @charset: utf-8
+UPDATE auth.user_config
+SET cfg_value = 'v3'
+WHERE ((cfg_key   = 'menustyle')
+  AND  (cfg_value = 'xml'));
diff --git a/templates/print/Default/bin_list.tex b/templates/print/Default/bin_list.tex
index b7cc8cf3a..28b873cda 100644
--- a/templates/print/Default/bin_list.tex
+++ b/templates/print/Default/bin_list.tex
@@ -29,7 +29,7 @@
 \parbox{\textwidth}{
   \parbox[b]{.42\textwidth}{%
     <%company%>
-    
+
     <%address%>
   }\hfill
   \begin{tabular}[b]{rr@{}}
@@ -40,20 +40,6 @@
   \rule[1.5ex]{\textwidth}{0.5pt}
 }
 
- 
-<%pagebreak 90 27 37%>
-\end{tabularx}
-
-\newpage
-
-\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabularx}{\textwidth}{@{}rlXllrrll@{}}
-  \textbf{Pos} & \textbf{Number} & \textbf{Description} & \textbf{Serial Number} & & \textbf{Qty} & \textbf{Recd} & & \textbf{Bin} \\
-<%end pagebreak%>
-
 
 \vspace*{0.5cm}
 
@@ -94,7 +80,7 @@
   <%end warehouse%>
   & \textbf{Shipping Point} & \textbf{Ship via} \\ [0.5em]
   \hline
-  
+
   <%ordnumber%>
   <%if shippingdate%>
   & <%shippingdate%>
@@ -109,9 +95,9 @@
   & <%shippingpoint%> & <%shipvia%> \\
   \hline
 \end{tabularx}
-  
+
 \vspace{1cm}
-  
+
 \begin{tabularx}{\textwidth}{@{}rlXllrrll@{}}
   \textbf{Pos} & \textbf{Number} & \textbf{Description} & \textbf{Serial Number} & & \textbf{Qty} & \textbf{Recd} & & \textbf{Bin} \\
 
diff --git a/templates/print/Default/invoice.tex b/templates/print/Default/invoice.tex
index 7b74fed04..62d479101 100644
--- a/templates/print/Default/invoice.tex
+++ b/templates/print/Default/invoice.tex
@@ -26,7 +26,7 @@
   \parbox{\textwidth}{
     \parbox[b]{12cm}{
       <%company%>
-      
+
       <%address%>}\hfill
     \begin{tabular}[b]{rr@{}}
     Telephone & <%tel%>\\
@@ -36,7 +36,7 @@
     \rule[1.5ex]{\textwidth}{0.5pt}
   }
 }
-    
+
 \fontfamily{cmss}\fontshape{n}\selectfont
 
 \markboth{<%company%>\hfill <%invnumber%>}{\usebox{\hdr}}
@@ -44,29 +44,6 @@
 \pagestyle{myheadings}
 %\thispagestyle{empty}     use this with letterhead paper
 
-<%pagebreak 90 27 37%>
-\end{tabular*}
-
-  \rule{\textwidth}{2pt}
-  
-  \hfill
-  \begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Subtotal} & \textbf{<%sumcarriedforward%>} \\
-  \end{tabularx}
-
-\newpage
-
-\markright{<%company%>\hfill <%invnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrrr@{}}
-  \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
-    \textbf{Unit} & \textbf{Price} & \textbf{Disc} & \textbf{Amount} \\
-  & carried forward from page <%lastpage%> & & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
-
-
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
 \vspace*{0.5cm}
diff --git a/templates/print/Default/pick_list.tex b/templates/print/Default/pick_list.tex
index e30d04c77..e84b67cd8 100644
--- a/templates/print/Default/pick_list.tex
+++ b/templates/print/Default/pick_list.tex
@@ -30,7 +30,7 @@
 \parbox{\textwidth}{
   \parbox[b]{.42\textwidth}{
     <%company%>
-    
+
     <%address%>
   }
   \parbox[b]{.2\textwidth}{
@@ -44,21 +44,6 @@
   \rule[1.5ex]{\textwidth}{0.5pt}
 }
 
- 
-<%pagebreak 90 27 37%>
-\end{tabular*}
-
-\newpage
-
-\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rcll@{}}
-  \textbf{Pos} & \textbf{Number} & \textbf{Description} &
-  \textbf{Qty} & \textbf{Ship} & & \textbf{Bin} \\
-<%end pagebreak%>
-
 
 \vspace*{0.5cm}
 
@@ -71,7 +56,7 @@
 
 \parbox[t]{1cm}{\hfill}
 \parbox[t]{.5\textwidth}{
-  
+
 <%shiptoname%> \\
 <%shiptostreet%> \\
 <%shiptozipcode%> \\
@@ -121,7 +106,7 @@
   & <%shippingpoint%> & <%shipvia%> \\
   \hline
 \end{tabularx}
-  
+
 \vspace{1cm}
 
 \begin{tabular*}{\textwidth}{@{}rlp{\descrwidth}@{\extracolsep\fill}rcll@{}}
diff --git a/templates/print/Default/purchase_order.tex b/templates/print/Default/purchase_order.tex
index bb4c2a810..b4959de9b 100644
--- a/templates/print/Default/purchase_order.tex
+++ b/templates/print/Default/purchase_order.tex
@@ -26,7 +26,7 @@
   \parbox{\textwidth}{
     \parbox[b]{12cm}{
       <%company%>
-      
+
       <%address%>}\hfill
     \begin{tabular}[b]{rr@{}}
     Telephone & <%tel%>\\
@@ -36,7 +36,7 @@
     \rule[1.5ex]{\textwidth}{0.5pt}
   }
 }
-    
+
 \fontfamily{cmss}\fontshape{n}\selectfont
 
 \markboth{<%company%>\hfill <%ordnumber%>}{\usebox{\hdr}}
@@ -44,29 +44,6 @@
 \pagestyle{myheadings}
 %\thispagestyle{empty}     use this with letterhead paper
 
-<%pagebreak 90 27 37%>
-\end{tabular*}
-
-  \rule{\textwidth}{2pt}
-  
-  \hfill
-  \begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Subtotal} & \textbf{<%sumcarriedforward%>} \\
-  \end{tabularx}
-
-\newpage
-
-\markright{<%company%>\hfill <%ordnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrr@{}}
-  \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
-    \textbf{Unit} & \textbf{Price} & \textbf{Amount} \\
-  & carried forward from <%lastpage%> & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
-
-
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
 \vspace*{0.5cm}
diff --git a/templates/print/Default/request_quotation.tex b/templates/print/Default/request_quotation.tex
index 0f50ba17f..d8788b7be 100644
--- a/templates/print/Default/request_quotation.tex
+++ b/templates/print/Default/request_quotation.tex
@@ -39,30 +39,6 @@
   \rule[1.5ex]{\textwidth}{0.5pt}
 }
 
-
-<%pagebreak 90 27 48%>
-\end{tabular*}
-
-  \rule{\textwidth}{2pt}
-
-  \hfill
-  \begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Subtotal} & \textbf{<%sumcarriedforward%>} \\
-  \end{tabularx}
-
-\newpage
-
-\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrr@{}}
-  \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
-    \textbf{Unit} & \textbf{Price} & \textbf{Extended} \\
-  & carried forward from <%lastpage%> & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
-
-
 \vspace*{0.5cm}
 
 \parbox[t]{1cm}{\hfill}
diff --git a/templates/print/Default/sales_order.tex b/templates/print/Default/sales_order.tex
index 1af1b1b33..4e82e91eb 100644
--- a/templates/print/Default/sales_order.tex
+++ b/templates/print/Default/sales_order.tex
@@ -26,7 +26,7 @@
   \parbox{\textwidth}{
     \parbox[b]{12cm}{
       <%company%>
-      
+
       <%address%>}\hfill
     \begin{tabular}[b]{rr@{}}
     Telephone & <%tel%>\\
@@ -36,7 +36,7 @@
     \rule[1.5ex]{\textwidth}{0.5pt}
   }
 }
-    
+
 \fontfamily{cmss}\fontshape{n}\selectfont
 
 \markboth{<%company%>\hfill <%ordnumber%>}{\usebox{\hdr}}
@@ -44,29 +44,6 @@
 \pagestyle{myheadings}
 %\thispagestyle{empty}     use this with letterhead paper
 
-<%pagebreak 90 27 48%>
-\end{tabular*}
-
-  \rule{\textwidth}{2pt}
-  
-  \hfill
-  \begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Subtotal} & \textbf{<%sumcarriedforward%>} \\
-  \end{tabularx}
-
-\newpage
-
-\markright{<%company%>\hfill <%ordnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrrr@{}}
-  \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
-    \textbf{Unit} & \textbf{Price} & \textbf{Disc} & \textbf{Amount} \\
-  & carried forward from <%lastpage%> & & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
-
-
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
 \vspace*{2cm}
diff --git a/templates/print/Default/sales_quotation.tex b/templates/print/Default/sales_quotation.tex
index 416b0e7d7..35d435753 100644
--- a/templates/print/Default/sales_quotation.tex
+++ b/templates/print/Default/sales_quotation.tex
@@ -28,7 +28,7 @@
 \parbox{\textwidth}{
   \parbox[b]{.42\textwidth}{
     <%company%>
-    
+
     <%address%>
   }
   \parbox[b]{.2\textwidth}{
@@ -42,30 +42,6 @@
   \rule[1.5ex]{\textwidth}{0.5pt}
 }
 
-
-<%pagebreak 90 27 48%>
-\end{tabular*}
-
-  \rule{\textwidth}{2pt}
-  
-  \hfill
-  \begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Subtotal} & \textbf{<%sumcarriedforward%>} \\
-  \end{tabularx}
-
-\newpage
-
-\markboth{<%company%>\hfill <%quonumber%>}{<%company%>\hfill <%quonumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrrr@{}}
-  \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
-    \textbf{Unit} & \textbf{Price} & \textbf{Disc} & \textbf{Amount} \\
-  & carried forward from <%lastpage%> & & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
-
-
 \vspace*{0.5cm}
 
 \parbox[t]{1cm}{\hfill}
@@ -113,7 +89,7 @@ Fax: <%customerfax%>
   <%quonumber%> & <%quodate%> & <%reqdate%> & <%employee%> & <%shippingpoint%> & <%shipvia%> \\
   \hline
 \end{tabularx}
-  
+
 \vspace{1cm}
 
 \begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrrr@{}}
diff --git a/templates/print/French/invoice.tex b/templates/print/French/invoice.tex
index 6d546f129..d1208f703 100644
--- a/templates/print/French/invoice.tex
+++ b/templates/print/French/invoice.tex
@@ -27,7 +27,7 @@
   \parbox{\textwidth}{
     \parbox[b]{12cm}{
       <%company%>
-      
+
       <%address%>}\hfill
     \begin{tabular}[b]{rr@{}}
     Téléphone & <%tel%>\\
@@ -37,7 +37,7 @@
     \rule[1.5ex]{\textwidth}{0.5pt}
   }
 }
-    
+
 \fontfamily{cmss}\fontshape{n}\selectfont
 
 \markboth{<%company%>\hfill <%invnumber%>}{\usebox{\hdr}}
@@ -45,29 +45,6 @@
 \pagestyle{myheadings}
 %\thispagestyle{empty}     use this with letterhead paper
 
-<%pagebreak 90 27 48%>
-\end{tabular*}
-
-  \rule{\textwidth}{2pt}
-  
-  \hfill
-  \begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Sous-total} & \textbf{<%sumcarriedforward%>} \\
-  \end{tabularx}
-
-\newpage
-
-\markright{<%company%>\hfill <%invnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrrr@{}}
-  \textbf{Numéro} & \textbf{Description} & \textbf{Qté} &
-    \textbf{Unité} & \textbf{Prix} & \textbf{Remise} & \textbf{Montant} \\
-  & reporté de la page <%lastpage%> & & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
-
-
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
 \vspace*{2cm}
diff --git a/templates/print/French/purchase_order.tex b/templates/print/French/purchase_order.tex
index fabb79fdb..c40b4d894 100644
--- a/templates/print/French/purchase_order.tex
+++ b/templates/print/French/purchase_order.tex
@@ -27,7 +27,7 @@
   \parbox{\textwidth}{
     \parbox[b]{12cm}{
       <%company%>
-      
+
       <%address%>}\hfill
     \begin{tabular}[b]{rr@{}}
     Téléphone & <%tel%>\\
@@ -37,7 +37,7 @@
     \rule[1.5ex]{\textwidth}{0.5pt}
   }
 }
-    
+
 \fontfamily{cmss}\fontshape{n}\selectfont
 
 \markboth{<%company%>\hfill <%ordnumber%>}{\usebox{\hdr}}
@@ -45,29 +45,6 @@
 \pagestyle{myheadings}
 %\thispagestyle{empty}     use this with letterhead paper
 
-<%pagebreak 90 27 48%>
-\end{tabular*}
-
-  \rule{\textwidth}{2pt}
-  
-  \hfill
-  \begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Sous-total} & \textbf{<%sumcarriedforward%>} \\
-  \end{tabularx}
-
-\newpage
-
-\markright{<%company%>\hfill <%ordnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrr@{}}
-  \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
-    \textbf{Unit} & \textbf{Price} & \textbf{Amount} \\
-  & reporté de la page <%lastpage%> & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
-
-
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
 \vspace*{2cm}
diff --git a/templates/print/French/sales_order.tex b/templates/print/French/sales_order.tex
index 50e4a052e..24a779c9d 100644
--- a/templates/print/French/sales_order.tex
+++ b/templates/print/French/sales_order.tex
@@ -27,7 +27,7 @@
   \parbox{\textwidth}{
     \parbox[b]{12cm}{
       <%company%>
-      
+
       <%address%>}\hfill
     \begin{tabular}[b]{rr@{}}
     Téléphone & <%tel%>\\
@@ -37,7 +37,7 @@
     \rule[1.5ex]{\textwidth}{0.5pt}
   }
 }
-    
+
 \fontfamily{cmss}\fontshape{n}\selectfont
 
 \markboth{<%company%>\hfill <%ordnumber%>}{\usebox{\hdr}}
@@ -45,29 +45,6 @@
 \pagestyle{myheadings}
 %\thispagestyle{empty}     use this with letterhead paper
 
-<%pagebreak 90 27 48%>
-\end{tabular*}
-
-  \rule{\textwidth}{2pt}
-  
-  \hfill
-  \begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Sous-total} & \textbf{<%sumcarriedforward%>} \\
-  \end{tabularx}
-
-\newpage
-
-\markright{<%company%>\hfill <%ordnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrrr@{}}
-  \textbf{Numéro} & \textbf{Description} & \textbf{Qté} &
-    \textbf{Unité} & \textbf{Prix} & \textbf{Remise} & \textbf{Montant} \\
-  & reporté de la page <%lastpage%> & & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
-
-
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
 \vspace*{2cm}
diff --git a/templates/print/French/statement.tex b/templates/print/French/statement.tex
index 23ebf781e..3f67d4bab 100644
--- a/templates/print/French/statement.tex
+++ b/templates/print/French/statement.tex
@@ -44,36 +44,13 @@
 \pagestyle{myheadings}
 %\thispagestyle{empty}     use this with letterhead paper
 
-<%pagebreak 90 27 48%>
-\end{tabular*}
-
-  \rule{\textwidth}{2pt}
-
-  \hfill
-  \begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Subtotal} & \textbf{<%sumcarriedforward%>} \\
-  \end{tabularx}
-
-\newpage
-
-\markright{<%company%>\hfill <%statementdate%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}l@{\extracolsep\fill}ccrrrr@{}}
-  \textbf{Invoice \#} & \textbf{Date} & \textbf{Due} &
-  \textbf{Current} & \textbf{30} & \textbf{60} & \textbf{90+} \\
-  carried forward from <%lastpage%> & & & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
-
-
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
 \vspace*{1.5cm}
 
 \parbox[t]{1cm}{\hfill}
 \parbox[t]{10.5cm}{
-  
+
 <%name%>
 
 <%street%>
diff --git a/templates/print/German/bin_list.tex b/templates/print/German/bin_list.tex
index 91e3b9c97..67a78ed8b 100644
--- a/templates/print/German/bin_list.tex
+++ b/templates/print/German/bin_list.tex
@@ -29,7 +29,7 @@
 \parbox{\textwidth}{
   \parbox[b]{.42\textwidth}{%
     <%company%>
-    
+
     <%address%>
   }\hfill
   \begin{tabular}[b]{rr@{}}
@@ -40,20 +40,6 @@
   \rule[1.5ex]{\textwidth}{0.5pt}
 }
 
- 
-<%pagebreak 90 27 37%>
-\end{tabularx}
-
-\newpage
-
-\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabularx}{\textwidth}{@{}rlXllrrll@{}}
-  \textbf{Pos} & \textbf{Nummer} & \textbf{Beschreibung} & \textbf{Seriennummer} & & \textbf{Menge} & \textbf{Erh} & & \textbf{Lagerplatz} \\
-<%end pagebreak%>
-
 
 \vspace*{0.5cm}
 
diff --git a/templates/print/German/credit_note.tex b/templates/print/German/credit_note.tex
index 61cd7f369..69ac965ac 100644
--- a/templates/print/German/credit_note.tex
+++ b/templates/print/German/credit_note.tex
@@ -13,18 +13,6 @@
 
 \fontfamily{cmss}\fontshape{n}\selectfont
 
-<%pagebreak 80 28 37%>
-\end{tabularx}
-
-\newpage
-
-\begin{tabularx}{\textwidth}{lrXrr}
-  \hline
-  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
-  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
-  \hline
-<%end pagebreak%>
-
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
 \vspace*{1.5cm}
@@ -77,7 +65,7 @@ Sehr geehrte Damen und Herren,
     <%sellprice%> \euro & <%linetotal%> \euro \\
     <%if discount_sub%> & Zwischensumme: &  & <%discount_sub%> \euro  & <%end if%>\\
   <%end number%>\hline
-  \multicolumn{4}{l}{Nettobetrag} & <%subtotal%> \euro \\ 
+  \multicolumn{4}{l}{Nettobetrag} & <%subtotal%> \euro \\
   <%foreach tax%>
   \multicolumn{4}{l}{<%taxdescription%>} & <%tax%> \euro \\
   <%end tax%>
diff --git a/templates/print/German/invoice.tex b/templates/print/German/invoice.tex
index 96fe5023b..27487a31b 100644
--- a/templates/print/German/invoice.tex
+++ b/templates/print/German/invoice.tex
@@ -13,18 +13,6 @@
 
 \fontfamily{cmss}\fontshape{n}\selectfont
 
-<%pagebreak 80 28 37%>
-\end{tabularx}
-
-\newpage
-
-\begin{tabularx}{\textwidth}{lrXrr}
-  \hline
-  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
-  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
-  \hline
-<%end pagebreak%>
-
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
 \vspace*{1.5cm}
@@ -80,7 +68,7 @@ folgende Positionen in Rechnung zu stellen.
     <%sellprice%> \euro & <%linetotal%> \euro \\
     <%if discount_sub%> & Zwischensumme: &  & <%discount_sub%> \euro  & <%end if%>\\
   <%end number%>\hline
-  \multicolumn{4}{l}{Nettobetrag} & <%subtotal%> \euro \\ 
+  \multicolumn{4}{l}{Nettobetrag} & <%subtotal%> \euro \\
   <%foreach tax%>
   \multicolumn{4}{l}{<%taxdescription%>} & <%tax%> \euro \\
   <%end tax%>
diff --git a/templates/print/German/pick_list.tex b/templates/print/German/pick_list.tex
index d560e0684..6da629b7f 100644
--- a/templates/print/German/pick_list.tex
+++ b/templates/print/German/pick_list.tex
@@ -30,7 +30,7 @@
 \parbox{\textwidth}{
   \parbox[b]{.42\textwidth}{
     <%company%>
-    
+
     <%address%>
   }\hfill
   \begin{tabular}[b]{rr@{}}
@@ -41,21 +41,6 @@
   \rule[1.5ex]{\textwidth}{0.5pt}
 }
 
- 
-<%pagebreak 90 27 37%>
-\end{tabular*}
-
-\newpage
-
-\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rcll@{}}
-  \textbf{Pos} & \textbf{Nummer} & \textbf{Beschreibung} &
-  \textbf{Menge} & \textbf{Lagerausgang} & & \textbf{Lagerplatz} \\
-<%end pagebreak%>
-
 
 \vspace*{0.5cm}
 
diff --git a/templates/print/German/purchase_order.tex b/templates/print/German/purchase_order.tex
index 715bd1b98..0e0bf395e 100644
--- a/templates/print/German/purchase_order.tex
+++ b/templates/print/German/purchase_order.tex
@@ -11,23 +11,6 @@
 
 \fontfamily{cmss}\fontshape{n}\selectfont
 
-<%pagebreak 80 28 37%>
-\end{tabularx}
-
-\newpage
-
-\begin{tabularx}{\textwidth}{lrXrr}
-  \hline
-  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
-  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
-  \hline
-  <%foreach number%>
-    <%runningnumber%> & <%qty%> <%unit%> & \raggedright <%description%> &
-    <%sellprice%> & <%linetotal%>\\
-  <%end number%>
-
-<%end pagebreak%>
-
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
 \vspace*{1.5cm}
diff --git a/templates/print/German/request_quotation.tex b/templates/print/German/request_quotation.tex
index f17eb629f..d3ba6f531 100644
--- a/templates/print/German/request_quotation.tex
+++ b/templates/print/German/request_quotation.tex
@@ -42,27 +42,6 @@
 }
 
 
-<%pagebreak 90 27 48%>
-\end{tabular*}
-
-  \rule{\textwidth}{2pt}
-
-  \hfill
-  \begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Zwischenzumme} & \textbf{<%sumcarriedforward%>} \\
-  \end{tabularx}
-
-\newpage
-
-\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rl}
-  \textbf{Nummer} & \textbf{Beschreibung} & \textbf{Menge} & \\
-<%end pagebreak%>
-
-
 \vspace*{0.5cm}
 
 \parbox[t]{1cm}{\hfill}
diff --git a/templates/print/German/sales_delivery_order.tex b/templates/print/German/sales_delivery_order.tex
index d2ecab214..c819d7654 100644
--- a/templates/print/German/sales_delivery_order.tex
+++ b/templates/print/German/sales_delivery_order.tex
@@ -13,18 +13,6 @@
 
 \fontfamily{cmss}\fontshape{n}\selectfont
 
-<%pagebreak 80 28 37%>
-\end{tabularx}
-
-\newpage
-
-\begin{tabularx}{\textwidth}{lrXrr}
-  \hline
-  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
-  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
-  \hline
-<%end pagebreak%>
-
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
 \vspace*{1.5cm}
diff --git a/templates/print/German/sales_order.tex b/templates/print/German/sales_order.tex
index f4b43a779..7cc8d8215 100644
--- a/templates/print/German/sales_order.tex
+++ b/templates/print/German/sales_order.tex
@@ -11,22 +11,6 @@
 
 \fontfamily{cmss}\fontshape{n}\selectfont
 
-<%pagebreak 80 28 37%>
-\end{tabularx}
-
-\newpage
-
-\begin{tabularx}{\textwidth}{lrXrr}
-  \hline
-  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
-  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
-  \hline
-  <%foreach number%>
-    <%runningnumber%> & <%qty%> <%unit%> & \raggedright <%description%> &
-    <%sellprice%> & <%linetotal%>\\
-  <%end number%>
-<%end pagebreak%>
-
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
 \vspace*{1.5cm}
diff --git a/templates/print/German/sales_quotation.tex b/templates/print/German/sales_quotation.tex
index 8fdbace74..42c2422fb 100644
--- a/templates/print/German/sales_quotation.tex
+++ b/templates/print/German/sales_quotation.tex
@@ -11,22 +11,6 @@
 
 \fontfamily{cmss}\fontshape{n}\selectfont
 
-<%pagebreak 80 28 37%>
-\end{tabularx}
-
-\newpage
-
-\begin{tabularx}{\textwidth}{lrXrr}
-  \hline
-  \textbf{Pos} & \textbf{Menge} & \textbf{Bezeichnung} &
-  \textbf{E-Preis/\euro} & \textbf{G-Preis/\euro} \\
-  \hline
-  <%foreach number%>
-    <%runningnumber%> & <%qty%> <%unit%> & \raggedright <%description%> &
-    <%sellprice%> & <%linetotal%>\\
-  <%end number%>
-<%end pagebreak%>
-
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
 \vspace*{1.5cm}
diff --git a/templates/print/German/statement.tex b/templates/print/German/statement.tex
index f2d0e496f..5a70b440b 100644
--- a/templates/print/German/statement.tex
+++ b/templates/print/German/statement.tex
@@ -44,36 +44,13 @@
 \pagestyle{myheadings}
 %\thispagestyle{empty}     use this with letterhead paper
 
-<%pagebreak 90 27 48%>
-\end{tabular*}
-
-  \rule{\textwidth}{2pt}
-
-  \hfill
-  \begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Subtotal} & \textbf{<%sumcarriedforward%>} \\
-  \end{tabularx}
-
-\newpage
-
-\markright{<%company%>\hfill <%statementdate%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}l@{\extracolsep\fill}ccrrrr@{}}
-  \textbf{Invoice \#} & \textbf{Date} & \textbf{Due} &
-  \textbf{Current} & \textbf{30} & \textbf{60} & \textbf{90+} \\
-  carried forward from <%lastpage%> & & & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
-
-
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
 \vspace*{1.5cm}
 
 \parbox[t]{1cm}{\hfill}
 \parbox[t]{10.5cm}{
-  
+
 <%name%>
 
 <%street%>
diff --git a/templates/print/RB/Readme.tex b/templates/print/RB/Readme.tex
index c7ac0ca1f..d0f03f2c8 100644
--- a/templates/print/RB/Readme.tex
+++ b/templates/print/RB/Readme.tex
@@ -64,7 +64,7 @@
 %    Eine Hintergrundgrafik oder ein Logo kann in Abhängigkeit vom
 %    Medium (z.B. nur beim Verschicken mit E-Mail) eingebunden
 %    werden. Dies ist im Moment auskommentiert.
-% 
+%
 %    Desweiteren sind (auskommentierte) Beispiele enthalten für eine
 %    Grafik als Briefkopf, nur ein Logo, oder ein komplettes DinA4-PDF
 %    als Briefpapier.
@@ -77,9 +77,7 @@
 % Tabellen:
 %    Als Tabellenumgebung wird longtable verwendet. Diese Umgebung
 %    kann in einer Tabelle umbrechen. Da aber der Umbruch nicht von
-%    Lx-Office kontrolliert wird, kann man kein Übertrag mit
-%    <%sumcarriedforward%> machen (dazu z.B. tabularx und
-%    <%pagebreak ... %> verwenden).
+%    Lx-Office kontrolliert wird, kann man keinen Übertrag machen.
 %    Innerhalb des Langtextes <%longdescription%> wird nicht umgebrochen. Um
 %    dies zu erreichen kann z.B. per renewcommand das "\newline" umdefiniert
 %    werden.
diff --git a/templates/print/RB/bin_list.tex b/templates/print/RB/bin_list.tex
index 91e3b9c97..83c899b8b 100644
--- a/templates/print/RB/bin_list.tex
+++ b/templates/print/RB/bin_list.tex
@@ -29,7 +29,7 @@
 \parbox{\textwidth}{
   \parbox[b]{.42\textwidth}{%
     <%company%>
-    
+
     <%address%>
   }\hfill
   \begin{tabular}[b]{rr@{}}
@@ -40,21 +40,6 @@
   \rule[1.5ex]{\textwidth}{0.5pt}
 }
 
- 
-<%pagebreak 90 27 37%>
-\end{tabularx}
-
-\newpage
-
-\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabularx}{\textwidth}{@{}rlXllrrll@{}}
-  \textbf{Pos} & \textbf{Nummer} & \textbf{Beschreibung} & \textbf{Seriennummer} & & \textbf{Menge} & \textbf{Erh} & & \textbf{Lagerplatz} \\
-<%end pagebreak%>
-
-
 \vspace*{0.5cm}
 
 \parbox[t]{1cm}{\hfill}
diff --git a/templates/print/RB/credit_note.tex b/templates/print/RB/credit_note.tex
index 5eff875cb..fe69e9f3c 100644
--- a/templates/print/RB/credit_note.tex
+++ b/templates/print/RB/credit_note.tex
@@ -74,9 +74,8 @@
 
 %
 % - longtable kann innerhalb der Tabelle umbrechen
-% - da der Umbruch nicht von Lx-Office kontrolliert wird, kann man kein
-%   Übertrag mit <%sumcarriedforward%> machen (dazu z.B. tablularx und
-%   <%pagebreak ... %> verwenden)
+% - da der Umbruch nicht von Lx-Office kontrolliert wird, kann man keinen
+%   Übertrag machen
 % - Innerhalb des Langtextes <%longdescription%> wird nicht umgebrochen.
 %   Falls das gewünscht ist, \\ mit \renewcommand umschreiben (siehe dazu:
 %   http://www.lx-office.org/uploads/media/Lx-Office_Anwendertreffen_LaTeX-Druckvorlagen-31.01.2011_01.pdf)
diff --git a/templates/print/RB/invoice.tex b/templates/print/RB/invoice.tex
index d8e70c31a..bd3fa4581 100644
--- a/templates/print/RB/invoice.tex
+++ b/templates/print/RB/invoice.tex
@@ -75,9 +75,8 @@
 
 %
 % - longtable kann innerhalb der Tabelle umbrechen
-% - da der Umbruch nicht von Lx-Office kontrolliert wird, kann man kein
-%   Übertrag mit <%sumcarriedforward%> machen (dazu z.B. tablularx und
-%   <%pagebreak ... %> verwenden)
+% - da der Umbruch nicht von Lx-Office kontrolliert wird, kann man keinen
+%   Übertrag machen
 % - Innerhalb des Langtextes <%longdescription%> wird nicht umgebrochen.
 %   Falls das gewünscht ist, \\ mit \renewcommand umschreiben (siehe dazu:
 %   http://www.lx-office.org/uploads/media/Lx-Office_Anwendertreffen_LaTeX-Druckvorlagen-31.01.2011_01.pdf)
@@ -117,7 +116,7 @@
           <%runningnumber%> &
           <%number%> &
           \textbf{<%description%>} &
-          \raggedleft <%qty%> <%unit%> & 
+          \raggedleft <%qty%> <%unit%> &
           <%sellprice%> \currency &
           \ifthenelse{\equal{<%p_discount%>}{0}}{}{\sffamily\scriptsize{(-<%p_discount%> \%)}}
           \ourfont{<%linetotal%> \currency} \\*  % kein Umbruch nach der ersten Zeile, damit Beschreibung und Langtext nicht getrennt werden
diff --git a/templates/print/RB/pick_list.tex b/templates/print/RB/pick_list.tex
index d560e0684..800c63ff1 100644
--- a/templates/print/RB/pick_list.tex
+++ b/templates/print/RB/pick_list.tex
@@ -30,7 +30,7 @@
 \parbox{\textwidth}{
   \parbox[b]{.42\textwidth}{
     <%company%>
-    
+
     <%address%>
   }\hfill
   \begin{tabular}[b]{rr@{}}
@@ -41,22 +41,6 @@
   \rule[1.5ex]{\textwidth}{0.5pt}
 }
 
- 
-<%pagebreak 90 27 37%>
-\end{tabular*}
-
-\newpage
-
-\markboth{<%company%>\hfill <%ordnumber%>}{<%company%>\hfill <%ordnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rcll@{}}
-  \textbf{Pos} & \textbf{Nummer} & \textbf{Beschreibung} &
-  \textbf{Menge} & \textbf{Lagerausgang} & & \textbf{Lagerplatz} \\
-<%end pagebreak%>
-
-
 \vspace*{0.5cm}
 
 \parbox[t]{1cm}{\hfill}
diff --git a/templates/print/RB/purchase_delivery_order.tex b/templates/print/RB/purchase_delivery_order.tex
index 15ecbf287..a231b1fee 100644
--- a/templates/print/RB/purchase_delivery_order.tex
+++ b/templates/print/RB/purchase_delivery_order.tex
@@ -50,9 +50,8 @@
 
 %
 % - longtable kann innerhalb der Tabelle umbrechen
-% - da der Umbruch nicht von Lx-Office kontrolliert wird, kann man kein
-%   Übertrag mit <%sumcarriedforward%> machen (dazu z.B. tablularx und
-%   <%pagebreak ... %> verwenden)
+% - da der Umbruch nicht von Lx-Office kontrolliert wird, kann man keinen
+%   Übertrag machen
 % - Innerhalb des Langtextes <%longdescription%> wird nicht umgebrochen.
 %   Falls das gewünscht ist, \\ mit \renewcommand umschreiben (siehe dazu:
 %   http://www.lx-office.org/uploads/media/Lx-Office_Anwendertreffen_LaTeX-Druckvorlagen-31.01.2011_01.pdf)
@@ -92,7 +91,7 @@
           <%if reqdate%> && \scriptsize \lieferdatum: <%reqdate%>\\<%end reqdate%>
           <%if serialnumber%> && \scriptsize \seriennummer: <%serialnumber%>\\<%end serialnumber%>
           <%if ean%> && \scriptsize \ean: <%ean%>\\<%end ean%>
-          <%foreach si_number%><%if si_number%> && \scriptsize \charge: <%si_chargenumber%> <%if si_bestbefore%> \mhd: <%si_bestbefore%><%end if%> <%si_qty%>~<%si_unit%><%end si_chargenumber%>\\<%end si_number%> 
+          <%foreach si_number%><%if si_number%> && \scriptsize \charge: <%si_chargenumber%> <%if si_bestbefore%> \mhd: <%si_bestbefore%><%end if%> <%si_qty%>~<%si_unit%><%end si_chargenumber%>\\<%end si_number%>
 
           \\[-0.8em]
 <%end number%>
diff --git a/templates/print/RB/purchase_order.tex b/templates/print/RB/purchase_order.tex
index a4307d822..d1bc3fdf4 100644
--- a/templates/print/RB/purchase_order.tex
+++ b/templates/print/RB/purchase_order.tex
@@ -61,9 +61,8 @@
 
 %
 % - longtable kann innerhalb der Tabelle umbrechen
-% - da der Umbruch nicht von Lx-Office kontrolliert wird, kann man kein
-%   Übertrag mit <%sumcarriedforward%> machen (dazu z.B. tablularx und
-%   <%pagebreak ... %> verwenden)
+% - da der Umbruch nicht von Lx-Office kontrolliert wird, kann man keinen
+%   Übertrag machen
 % - Innerhalb des Langtextes <%longdescription%> wird nicht umgebrochen.
 %   Falls das gewünscht ist, \\ mit \renewcommand umschreiben (siehe dazu:
 %   http://www.lx-office.org/uploads/media/Lx-Office_Anwendertreffen_LaTeX-Druckvorlagen-31.01.2011_01.pdf)
@@ -101,7 +100,7 @@
 % eigentliche Tabelle
 <%foreach number%>
           <%runningnumber%> &
-          \raggedleft <%qty%> <%unit%> & 
+          \raggedleft <%qty%> <%unit%> &
           \textbf{<%description%>} &
           <%sellprice%> \currency &
           \ifthenelse{\equal{<%p_discount%>}{0}}{}{\sffamily\scriptsize{(-<%p_discount%> \%)}}
diff --git a/templates/print/RB/request_quotation.tex b/templates/print/RB/request_quotation.tex
index ff2a5a305..4cce5b571 100644
--- a/templates/print/RB/request_quotation.tex
+++ b/templates/print/RB/request_quotation.tex
@@ -57,9 +57,8 @@
 
 %
 % - longtable kann innerhalb der Tabelle umbrechen
-% - da der Umbruch nicht von Lx-Office kontrolliert wird, kann man kein
-%   Übertrag mit <%sumcarriedforward%> machen (dazu z.B. tablularx und
-%   <%pagebreak ... %> verwenden)
+% - da der Umbruch nicht von Lx-Office kontrolliert wird, kann man keinen
+%   Übertrag machen
 % - Innerhalb des Langtextes <%longdescription%> wird nicht umgebrochen.
 %   Falls das gewünscht ist, \\ mit \renewcommand umschreiben (siehe dazu:
 %   http://www.lx-office.org/uploads/media/Lx-Office_Anwendertreffen_LaTeX-Druckvorlagen-31.01.2011_01.pdf)
@@ -102,7 +101,7 @@
               \ifthenelse{\equal{<%make%>}{<%name%>}}{&& \artikelnummer: <%model%>\\}{}
             <%end foreach%>
           <%end if%>
-  
+
           \\[-0.8em]
 <%end number%>
 
diff --git a/templates/print/RB/sales_delivery_order.tex b/templates/print/RB/sales_delivery_order.tex
index 86883f75c..2db1b3d03 100644
--- a/templates/print/RB/sales_delivery_order.tex
+++ b/templates/print/RB/sales_delivery_order.tex
@@ -60,9 +60,8 @@
 
 %
 % - longtable kann innerhalb der Tabelle umbrechen
-% - da der Umbruch nicht von Lx-Office kontrolliert wird, kann man kein
-%   Übertrag mit <%sumcarriedforward%> machen (dazu z.B. tablularx und
-%   <%pagebreak ... %> verwenden)
+% - da der Umbruch nicht von Lx-Office kontrolliert wird, kann man keinen
+%   Übertrag machen
 % - Innerhalb des Langtextes <%longdescription%> wird nicht umgebrochen.
 %   Falls das gewünscht ist, \\ mit \renewcommand umschreiben (siehe dazu:
 %   http://www.lx-office.org/uploads/media/Lx-Office_Anwendertreffen_LaTeX-Druckvorlagen-31.01.2011_01.pdf)
@@ -103,8 +102,8 @@
           <%if serialnumber%> && \scriptsize \seriennummer: <%serialnumber%>\\<%end serialnumber%>
           <%if ean%> && \scriptsize \ean: <%ean%>\\<%end ean%>
           <%if projectnumber%> && \scriptsize \projektnummer: <%projectnumber%>\\<%end projectnumber%>
-          <%foreach si_number%><%if si_number%> && \scriptsize \charge: <%si_chargenumber%> <%if si_bestbefore%> \mhd: <%si_bestbefore%><%end if%> <%si_qty%>~<%si_unit%><%end si_chargenumber%>\\<%end si_number%> 
-  
+          <%foreach si_number%><%if si_number%> && \scriptsize \charge: <%si_chargenumber%> <%if si_bestbefore%> \mhd: <%si_bestbefore%><%end if%> <%si_qty%>~<%si_unit%><%end si_chargenumber%>\\<%end si_number%>
+
           \\[-0.8em]
 <%end number%>
 
diff --git a/templates/print/RB/sales_order.tex b/templates/print/RB/sales_order.tex
index 49500ba0f..97f4b11dd 100644
--- a/templates/print/RB/sales_order.tex
+++ b/templates/print/RB/sales_order.tex
@@ -71,9 +71,8 @@
 
 %
 % - longtable kann innerhalb der Tabelle umbrechen
-% - da der Umbruch nicht von Lx-Office kontrolliert wird, kann man kein
-%   Übertrag mit <%sumcarriedforward%> machen (dazu z.B. tablularx und
-%   <%pagebreak ... %> verwenden)
+% - da der Umbruch nicht von Lx-Office kontrolliert wird, kann man keinen
+%   Übertrag machen
 % - Innerhalb des Langtextes <%longdescription%> wird nicht umgebrochen.
 %   Falls das gewünscht ist, \\ mit \renewcommand umschreiben (siehe dazu:
 %   http://www.lx-office.org/uploads/media/Lx-Office_Anwendertreffen_LaTeX-Druckvorlagen-31.01.2011_01.pdf)
@@ -113,7 +112,7 @@
           <%runningnumber%> &
           <%number%> &
           \textbf{<%description%>} &
-          \raggedleft <%qty%> <%unit%> & 
+          \raggedleft <%qty%> <%unit%> &
           <%sellprice%> \currency &
           \ifthenelse{\equal{<%p_discount%>}{0}}{}{\sffamily\scriptsize{(-<%p_discount%> \%)}}
           \ourfont{<%linetotal%> \currency} \\*  % kein Umbruch nach der ersten Zeile, damit Beschreibung und Langtext nicht getrennt werden
diff --git a/templates/print/RB/sales_quotation.tex b/templates/print/RB/sales_quotation.tex
index 630084f27..7481b7f2c 100644
--- a/templates/print/RB/sales_quotation.tex
+++ b/templates/print/RB/sales_quotation.tex
@@ -67,9 +67,8 @@
 
 %
 % - longtable kann innerhalb der Tabelle umbrechen
-% - da der Umbruch nicht von Lx-Office kontrolliert wird, kann man kein
-%   Übertrag mit <%sumcarriedforward%> machen (dazu z.B. tablularx und
-%   <%pagebreak ... %> verwenden)
+% - da der Umbruch nicht von Lx-Office kontrolliert wird, kann man keinen
+%   Übertrag machen
 % - Innerhalb des Langtextes <%longdescription%> wird nicht umgebrochen.
 %   Falls das gewünscht ist, \\ mit \renewcommand umschreiben (siehe dazu:
 %   http://www.lx-office.org/uploads/media/Lx-Office_Anwendertreffen_LaTeX-Druckvorlagen-31.01.2011_01.pdf)
@@ -109,7 +108,7 @@
           <%runningnumber%> &
           <%number%> &
           \textbf{<%description%>} &
-          \raggedleft <%qty%> <%unit%> & 
+          \raggedleft <%qty%> <%unit%> &
           <%sellprice%> \currency &
           \ifthenelse{\equal{<%p_discount%>}{0}}{}{\sffamily\scriptsize{(-<%p_discount%> \%)}}
           \ourfont{<%linetotal%> \currency} \\*  % kein Umbruch nach der ersten Zeile, damit Beschreibung und Langtext nicht getrennt werden
diff --git a/templates/print/RB/statement.tex b/templates/print/RB/statement.tex
index bda48f729..b545a67ca 100644
--- a/templates/print/RB/statement.tex
+++ b/templates/print/RB/statement.tex
@@ -57,9 +57,8 @@
 
 %
 % - longtable kann innerhalb der Tabelle umbrechen
-% - da der Umbruch nicht von Lx-Office kontrolliert wird, kann man kein
-%   Übertrag mit <%sumcarriedforward%> machen (dazu z.B. tablularx und
-%   <%pagebreak ... %> verwenden)
+% - da der Umbruch nicht von Lx-Office kontrolliert wird, kann man keinen
+%   Übertrag machen
 %
 \setlength\LTleft\parindent     % Tabelle beginnt am linken Textrand
 \setlength\LTright{0pt}         % Tabelle endet am rechten Textrand
diff --git a/templates/print/Service/invoice.tex b/templates/print/Service/invoice.tex
index 3ea270332..d81b83703 100644
--- a/templates/print/Service/invoice.tex
+++ b/templates/print/Service/invoice.tex
@@ -26,7 +26,7 @@
   \parbox{\textwidth}{
     \parbox[b]{12cm}{
       <%company%>
-      
+
       <%address%>}\hfill
     \begin{tabular}[b]{rr@{}}
     Telephone & <%tel%>\\
@@ -36,7 +36,7 @@
     \rule[1.5ex]{\textwidth}{0.5pt}
   }
 }
-    
+
 \fontfamily{cmss}\fontshape{n}\selectfont
 
 \markboth{<%company%>\hfill <%invnumber%>}{\usebox{\hdr}}
@@ -44,29 +44,6 @@
 \pagestyle{myheadings}
 %\thispagestyle{empty}     use this with letterhead paper
 
-<%pagebreak 90 27 48%>
-\end{tabular*}
-
-  \rule{\textwidth}{2pt}
-  
-  \hfill
-  \begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Subtotal} & \textbf{<%sumcarriedforward%>} \\
-  \end{tabularx}
-
-\newpage
-
-\markright{<%company%>\hfill <%invnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}p{\descrwidth}@{\extracolsep\fill}rlrr@{}}
-  \textbf{Description} & \textbf{Qt'y} &
-    \textbf{Unit} & \textbf{Price} & \textbf{Amount} \\
-  & carried forward from <%lastpage%> & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
-
-
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
 \vspace*{2cm}
diff --git a/templates/print/Service/purchase_order.tex b/templates/print/Service/purchase_order.tex
index 34e63523a..dd96e4328 100644
--- a/templates/print/Service/purchase_order.tex
+++ b/templates/print/Service/purchase_order.tex
@@ -26,7 +26,7 @@
   \parbox{\textwidth}{
     \parbox[b]{12cm}{
       <%company%>
-      
+
       <%address%>}\hfill
     \begin{tabular}[b]{rr@{}}
     Telephone & <%tel%>\\
@@ -36,7 +36,7 @@
     \rule[1.5ex]{\textwidth}{0.5pt}
   }
 }
-    
+
 \fontfamily{cmss}\fontshape{n}\selectfont
 
 \markboth{<%company%>\hfill <%ordnumber%>}{\usebox{\hdr}}
@@ -44,29 +44,6 @@
 \pagestyle{myheadings}
 %\thispagestyle{empty}     use this with letterhead paper
 
-<%pagebreak 90 27 48%>
-\end{tabular*}
-
-  \rule{\textwidth}{2pt}
-  
-  \hfill
-  \begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Subtotal} & \textbf{<%sumcarriedforward%>} \\
-  \end{tabularx}
-
-\newpage
-
-\markright{<%company%>\hfill <%ordnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrr@{}}
-  \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
-    \textbf{Unit} & \textbf{Price} & \textbf{Amount} \\
-  & carried forward from <%lastpage%> & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
-
-
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
 \vspace*{2cm}
diff --git a/templates/print/Service/sales_order.tex b/templates/print/Service/sales_order.tex
index e036d5341..ff65581d9 100644
--- a/templates/print/Service/sales_order.tex
+++ b/templates/print/Service/sales_order.tex
@@ -26,7 +26,7 @@
   \parbox{\textwidth}{
     \parbox[b]{12cm}{
       <%company%>
-      
+
       <%address%>}\hfill
     \begin{tabular}[b]{rr@{}}
     Telephone & <%tel%>\\
@@ -36,7 +36,7 @@
     \rule[1.5ex]{\textwidth}{0.5pt}
   }
 }
-    
+
 \fontfamily{cmss}\fontshape{n}\selectfont
 
 \markboth{<%company%>\hfill <%ordnumber%>}{\usebox{\hdr}}
@@ -44,29 +44,6 @@
 \pagestyle{myheadings}
 %\thispagestyle{empty}     use this with letterhead paper
 
-<%pagebreak 90 27 48%>
-\end{tabular*}
-
-  \rule{\textwidth}{2pt}
-  
-  \hfill
-  \begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Subtotal} & \textbf{<%sumcarriedforward%>} \\
-  \end{tabularx}
-
-\newpage
-
-\markright{<%company%>\hfill <%ordnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}p{\descrwidth}@{\extracolsep\fill}rlrr@{}}
-  \textbf{Description} & \textbf{Qt'y} &
-    \textbf{Unit} & \textbf{Price} & \textbf{Amount} \\
-  & carried forward from <%lastpage%> & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
-
-
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
 \vspace*{2cm}
diff --git a/templates/print/Service/statement.tex b/templates/print/Service/statement.tex
index 23ebf781e..3f67d4bab 100644
--- a/templates/print/Service/statement.tex
+++ b/templates/print/Service/statement.tex
@@ -44,36 +44,13 @@
 \pagestyle{myheadings}
 %\thispagestyle{empty}     use this with letterhead paper
 
-<%pagebreak 90 27 48%>
-\end{tabular*}
-
-  \rule{\textwidth}{2pt}
-
-  \hfill
-  \begin{tabularx}{7cm}{Xr@{}}
-  \textbf{Subtotal} & \textbf{<%sumcarriedforward%>} \\
-  \end{tabularx}
-
-\newpage
-
-\markright{<%company%>\hfill <%statementdate%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}l@{\extracolsep\fill}ccrrrr@{}}
-  \textbf{Invoice \#} & \textbf{Date} & \textbf{Due} &
-  \textbf{Current} & \textbf{30} & \textbf{60} & \textbf{90+} \\
-  carried forward from <%lastpage%> & & & & & & <%sumcarriedforward%> \\
-<%end pagebreak%>
-
-
 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
 
 \vspace*{1.5cm}
 
 \parbox[t]{1cm}{\hfill}
 \parbox[t]{10.5cm}{
-  
+
 <%name%>
 
 <%street%>
diff --git a/templates/webpages/admin/edit_user.html b/templates/webpages/admin/edit_user.html
index ae2ed8005..dc8ccab97 100644
--- a/templates/webpages/admin/edit_user.html
+++ b/templates/webpages/admin/edit_user.html
@@ -184,7 +184,6 @@
          <option value="v3"[% IF menustyle_v3 %] selected[% END %]>[% 'Top (CSS)' | $T8 %]</option>
          <option value="v4"[% IF menustyle_v4 %] selected[% END %]>[% 'Top (CSS) new' | $T8 %]</option>
          <option value="neu"[% IF menustyle_neu %] selected[% END %]>[% 'Top (Javascript)' | $T8 %]</option>
-         <option value="xml"[% IF menustyle_xml %] selected[% END %]>[% 'Top (XUL; only for Mozilla Firefox)' | $T8 %]</option>
         </select>
        </td>
       </tr>
diff --git a/templates/webpages/am/config.html b/templates/webpages/am/config.html
index ea5b41b22..3c26298ba 100644
--- a/templates/webpages/am/config.html
+++ b/templates/webpages/am/config.html
@@ -133,16 +133,10 @@
         <option value="v3"[% IF myconfig_menustyle == 'v3' %] selected[% END %]>[% 'Top (CSS)' | $T8 %]</option>
         <option value="v4"[% IF myconfig_menustyle == 'v4' %] selected[% END %]>[% 'Top (CSS) new' | $T8 %]</option>
         <option value="neu"[% IF myconfig_menustyle == 'neu' %] selected[% END %]>[% 'Top (Javascript)' | $T8 %]</option>
-        <option value="xml"[% IF myconfig_menustyle == 'xml' %] selected[% END %]>[% 'Top (XUL; only for Mozilla Firefox)' | $T8 %]</option>
        </select>
       </td>
      </tr>
 
-     <tr valign="top">
-      <th align="right">[% 'Favorites' | $T8 %]</th>
-      <td><textarea name="favorites" rows="4" cols="50">[% HTML.escape(myconfig_favorites) %]</textarea></td>
-     </tr>
-
      <tr>
       <th align="right">[% 'Form details (second row)' | $T8 %]</th>
       <td>
@@ -164,8 +158,6 @@
      </tr>
     </table>
 
-    <p>[% LxERP.t8('Note: For Firefox 4 and later the menu XUL menu requires the addon <a href="#1">Remote XUL Manager</a> and the Lx-Office server to be white listed.', 'https://addons.mozilla.org/de/firefox/addon/remote-xul-manager/') %]</p>
-
     <br style="clear: left" />
    </div>
 
diff --git a/templates/webpages/do/form_header.html b/templates/webpages/do/form_header.html
index 393422e0c..a83a2b91e 100644
--- a/templates/webpages/do/form_header.html
+++ b/templates/webpages/do/form_header.html
@@ -64,7 +64,7 @@
   <input type="hidden" name="cc" value="[% HTML.escape(cc) %]">
   <input type="hidden" name="closed" value="[% HTML.escape(closed) %]">
   <input type="hidden" name="convert_from_oe_ids" value="[% HTML.escape(convert_from_oe_ids) %]">
-  <input type="hidden" name="curr" value="[% HTML.escape(curr) %]">
+  <input type="hidden" name="currency" value="[% HTML.escape(currency) %]">
   <input type="hidden" name="customer_klass" value="[% HTML.escape(customer_klass) %]">
   <input type="hidden" name="discount" value="[% HTML.escape(discount) %]">
   <input type="hidden" name="dunning_amount" value="[% HTML.escape(dunning_amount) %]">
diff --git a/templates/webpages/ir/form_footer.html b/templates/webpages/ir/form_footer.html
index 1a414551d..c82f1ab81 100644
--- a/templates/webpages/ir/form_footer.html
+++ b/templates/webpages/ir/form_footer.html
@@ -51,12 +51,12 @@
 [% SET total_ref       = item _ '_total' %]
 [% SET netto_ref       = item _ '_netto' %]
        <tr>
-        <th align="right">Enthaltene [% $description_ref | html %]&nbsp;[% $rate_ref * 100 %]%</th>
+        <th align="right">[% 'Including' | $T8 %] [% $description_ref | html %]&nbsp;[% $rate_ref * 100 %]%</th>
         <td align="right">[% LxERP.format_amount($total_ref, 2) %]</td>
        </tr>
   [%- IF taxincluded %]
        <tr>
-        <th align="right">Nettobetrag</th>
+        <th align="right">[% 'Net amount' | $T8 %]</th>
         <td align="right">[% LxERP.format_amount($netto_ref, 2) %]</td>
        </tr>
   [%- END %]
diff --git a/templates/webpages/is/form_footer.html b/templates/webpages/is/form_footer.html
index a97a4d039..6314c21cd 100644
--- a/templates/webpages/is/form_footer.html
+++ b/templates/webpages/is/form_footer.html
@@ -79,12 +79,12 @@
 [% SET total_ref       = item _ '_total' %]
 [% SET netto_ref       = item _ '_netto' %]
        <tr>
-        <th align="right">Enthaltene [% $description_ref | html %]&nbsp;[% $rate_ref * 100 %]%</th>
+        <th align="right">[% 'Including' | $T8 %] [% $description_ref | html %]&nbsp;[% $rate_ref * 100 %]%</th>
         <td align="right">[% LxERP.format_amount($total_ref, 2) %]</td>
        </tr>
   [%- IF taxincluded %]
        <tr>
-        <th align="right">Nettobetrag</th>
+        <th align="right">[% 'Net amount' | $T8 %]</th>
         <td align="right">[% LxERP.format_amount($netto_ref, 2) %]</td>
        </tr>
   [%- END %]
diff --git a/xslt/style1.css b/xslt/style1.css
deleted file mode 100644
index 21130e564..000000000
--- a/xslt/style1.css
+++ /dev/null
@@ -1,62 +0,0 @@
-/* toolbar style */
-toolbar{
- -moz-appearance:none !important;
- background: url('../image/fade.png');
- border-bottom:1px solid #888;
-}
-
-/* sidebar styles */
-tree{
- -moz-appearance: none !important;
- border:0px solid black;
- padding-top:2px;
- background: white url('../image/fade.png') repeat-x;
-}
-
-#sidebar{
- background-image: url('../image/fade.png');
- max-width:450px;
- width:150px;
- font:12px Arial;
- margin:0px;
- border-right:1px solid #888;
-}
-
-/* menubar styles */
-menubar{
- -moz-appearance:none !important;
- background: url('../image/bg_titel.gif');
- border:0px;
-}
-
-menu, 
-menuitem{
- font:12px Arial;
-}
-
-menu menu{
- -moz-appearance: none !important;
- color:white;
- background: #35a;
-}
-
-menubar menu{
- -moz-appearance: none !important;
- color:white;
-}
-
-menubar menu:hover{
- -moz-appearance:none !important;
- background:#46d;
- color:yellow;
-}
-
-/* are splitter & iframe in use currently? */
-splitter{
- -moz-appearance:none !important;
- background:white url('../image/fade.png') no-repeat !important;
- border:0px;
-}
-iframe{
- border-left:1px solid #888 !important;
-}
diff --git a/xslt/xulmenu.xsl b/xslt/xulmenu.xsl
deleted file mode 100644
index a5c109c01..000000000
--- a/xslt/xulmenu.xsl
+++ /dev/null
@@ -1,353 +0,0 @@
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:html="http://www.w3.org/1999/xhtml"
-    xmlns:svg="http://www.w3.org/2000/svg"
-    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<xsl:output media-type="application/vnd.mozilla.xul+xml"/>
-<xsl:template match="/">
-  <xsl:choose>
-    <xsl:when test="system-property('xsl:vendor')='Transformiix'">
-
-      <xsl:apply-templates/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="html"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="doc" mode="html">
-  <html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-      <meta http-equiv="refresh" content="5;url=menu.pl?action=display"/>
-    </head>
-    <body style="background-color: #eee; color: #333;">
-     <div style="margin-top: 2em; margin-left: auto; margin-right: auto; border: solid 0.1em #f88; width: 30em; background-color:#fff; font-size: 0.8em;font-family: Verdana, Arial, Helvetica; padding: 2em;">
-      <h2>XUL-Men&#252; ist aktiviert</h2>
-      <h3>Nur der Firefox-Browser mag das XUL-Men&#252;.</h3>
-      Wir schalten auf die kompatiblere <a href="menu.pl?action=display">HTML-Variante</a> um.
-      <h3>Only the Firefox-Browser likes the XUL-Menu.</h3>
-      We switch to the <a href="menu.pl?action=display">HTML-Version</a> now.      
-     </div>
-    </body>
-  </html>
-</xsl:template>
-
-<!-- main document structure -->
-<!-- ******************************************************************* -->
-<xsl:template match="doc">
-<xsl:processing-instruction name="xml-stylesheet">href="xslt/style1.css" type="text/css"</xsl:processing-instruction>
-  <xsl:variable name="callback"><xsl:value-of select='/doc/callback'/></xsl:variable>
-  <xsl:variable name="title">
-      LX-Office Version <xsl:value-of select='/doc/version'/>
-      - <xsl:value-of select='/doc/name'/>
-      - <xsl:value-of select='/doc/db'/>
-    </xsl:variable>
-   <!-- <xsl:call-template name="style"/>-->
-  <window title="{$title}">
-  <html:title/>
-    <xsl:call-template name="script"/>
-    <toolbox>
-      <xsl:apply-templates select="menu"/>
-      <xsl:apply-templates select="favorites"/>
-    </toolbox>
-    <hbox flex="1">
-      <vbox id="sidebar" style="overflow:hidden">
-
-        <xsl:apply-templates mode="tree" select="menu"/>
-
-        <xsl:call-template name="ArtikelSuche"/>
-        <!--<iframe src="xslt/trans.xml" flex="1" id="uhr"/>-->
-      </vbox>
-      <splitter state="open" collapse="before" resizeafter="farthest"><grippy/></splitter>
-      <browser id="main_window" type="content" src="{$callback}" flex="1" style="border:0px"/>
-    </hbox>
-  </window>
-</xsl:template>
-<!-- ******************************************************************* -->
-
-
-<!-- the top menu -->
-<!-- ******************************************************************* -->
-<xsl:template match="menu"><menubar id="sample-menubar" flex="1"><xsl:apply-templates/></menubar></xsl:template>
-<!-- ******************************************************************* -->
-
-
-<!-- favorites toolbar -->
-<!-- ******************************************************************* -->
-<xsl:template match="favorites">
-  <toolbar id="favoriten" >
-    <xsl:call-template name="specialbuttons"/>
-    <toolbarseparator/>
-    <xsl:for-each select="link">
-      <xsl:variable name="name" select="@name"/>
-      <xsl:choose>
-        <xsl:when test="/*//item[@id=$name]/item">
-          <toolbarbutton type="menu" label="{$name}" tooltiptext="A simple popup" link="{/*//item[@id=$name]/@link}" oncommand="openLink(event)">
-            <image src="image/icons/24x24/{/*//item[@id=$name]/@id}.png" width="24" height="24" />
-            <menupopup id="file-popup">
-              <xsl:apply-templates select="/*//item[@id=$name]/*"/>
-            </menupopup>
-          </toolbarbutton>
-        </xsl:when>
-        <xsl:otherwise>
-          <toolbarbutton label="{$name}" tooltiptext="A simple popup" link="{/*//item[@id=$name]/@link}" oncommand="openLink(event)" lxid="{/*//item[@id=$name]/@id}">
-            <image src="image/icons/24x24/{/*//item[@id=$name]/@id}.png" width="24" height="24" />
-          </toolbarbutton>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-    <toolbarspring flex="1"/>
-    <xsl:call-template name="searchbox"/>
-
-  </toolbar>
-</xsl:template>
-<!-- ******************************************************************* -->
-
-
-<!-- template for the top menu items
-*********************************************************************************  -->
-<xsl:template match="item">
- <xsl:choose>
-  <xsl:when test="item">
-   <menu id="{@name}_menu" label="{@name}" class="menu-iconic" image="image/icons/16x16/{@id}.png">
-    <menupopup id="file-popup">
-     <xsl:apply-templates/>
-    </menupopup>
-   </menu>
-  </xsl:when>
-  <xsl:otherwise>
-   <menuitem target="{@target}" link="{@link}" label="{@name}" oncommand="openLink(event)" class="menuitem-iconic" image="image/icons/16x16/{@id}.png" lxid="{@id}" onclick="openLinkNewTab(event)"/>
-  </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-<!-- ***************************************************************************  -->
-
-
-<!-- templates for the treeview
-**********************************************************************************   -->
-<xsl:template match="menu" mode="tree">
-<toolbar>
-<label value="Hauptmen&#252;"/>
-</toolbar>
-  <tree flex="1" onselect="openTreeLink(event)" style="margin:0px;" hidecolumnpicker="true">
-    <treecols>
-        <treecol hideheader="true" id="menuepunkt"  primary="true" flex="1" />
-    </treecols>
-    <treechildren>
-      <xsl:apply-templates mode="tree"/>
-    </treechildren>
-  </tree>
-</xsl:template>
-
-<xsl:template match="item" mode="tree">
-  <xsl:choose>
-    <xsl:when test="item">
-        <treeitem container="true" open="false">
-          <treerow>
-            <treecell label="{@name}" src="image/icons/16x16/{@id}.png"/>
-          </treerow>
-          <treechildren>
-            <xsl:apply-templates mode="tree"/>
-          </treechildren>
-        </treeitem>
-    </xsl:when>
-    <xsl:otherwise>
-    <treeitem link="{@link}">
-      <treerow>
-        <treecell label="{@name}" src="image/icons/16x16/{@id}.png"/>
-      </treerow>
-    </treeitem>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-<!-- ***************************************************************************  -->
-
-
-<!-- template fuer die uhr
-********************************************************************************  -->
-<xsl:template name="uhr">
-
-</xsl:template>
-<!-- ***************************************************************************  -->
-
-
-<!-- scripts
-********************************************************************************  -->
-<xsl:template name="script">
-  <html:script type="text/ecmascript">
-
-  function openLink(event)
-    {
-    var path=event.target.getAttribute("link")
-    if(event.target.getAttribute("target")=="_top")
-      {
-        window.location=path
-      }
-      else
-      {
-        var bf=document.getElementById("main_window")
-        bf.setAttribute("src",path)
-      }
-    }
-
-  function openLinkNewTab(event)
-    {
-    if(event.button!=1) return
-    var path=event.target.getAttribute("link")
-    if(event.target.getAttribute("target")=="_top")
-      {
-        window.location=path
-      }
-      else
-      {
-window.open(path,"_new","")
-
-      }
-    }
-
-
-  function openLinkNewWindow(event)
-    {
-      var path=event.target.getAttribute("link")
-      window.open(path,"_blank","")
-    }
-
-  function openTreeLink(event)
-    {
-      var tree=event.target
-      var selIndex=tree.currentIndex
-      var item=tree.view.getItemAtIndex(selIndex)
-      var link=item.getAttribute("link")
-      if(link) document.getElementById("main_window").setAttribute("src",link)
-    }
-
-  function updateClock()
-    {
-      var d= new Date()
-      var sec=d.getSeconds()
-      var min=d.getMinutes()
-      var std=(d.getHours() % 12 ) + min/60
-      document.getElementById("std").setAttribute("transform","rotate("+std*30+",20,20)")
-      document.getElementById("min").setAttribute("transform","rotate("+min*6+",20,20)")
-      document.getElementById("sec").setAttribute("transform","rotate("+sec*6+",20,20)")
-    }
-
-  function PrintW()
-    {
-      document.getElementById("main_window").contentWindow.print()
-    }
-
-  function doSearch(){
-  var t=document.getElementById("searchboxtext").value
-  document.getElementById("desc").value=t
-  document.getElementById("sb").click()
-
-  }
-  function checkEnter(event){
-  if(event.keyCode==13) doSearch()
-  }
-  //setInterval("updateClock()",1000)
-  function MyGoBack(){
-document.getElementById("main_window").contentWindow.history.back()
-}
-  function MyGoForward(){
-document.getElementById("main_window").contentWindow.history.forward()
-}
-  </html:script>
-</xsl:template>
-<!-- ***************************************************************************  -->
-
-<!-- special buttons ( logout , print, open new window )
-The tooltips, like tooltiptext="Neues Fenster", do not appear in my Firefox/Prism browsers. Why?
-https://developer.mozilla.org/en/XUL_Tutorial/Popup_Menus
-https://developer.mozilla.org/en/XUL/Attribute/tooltiptext
-****************************************************************************  -->
-<xsl:template name="specialbuttons">
-    <toolbarbutton image="image/icons/24x24/Batch Printing.png" oncommand="PrintW(event)" tooltiptext="Drucken"/>
-    <toolbarbutton image="image/icons/24x24/Neues Fenster.png" tooltiptext="Neues Fenster" link="menuXML.pl?action=display" target="_top" oncommand="openLinkNewWindow(event)"/>
-    <toolbarbutton image="image/icons/24x24/Program--Logout.png" link="{/*//item[@id='Program--Logout']/@link}" target="_top" oncommand="openLink(event)" tooltiptext="Abmelden"/>
-  <toolbarseparator/>
-    <toolbarbutton image="image/icons/24x24/leftarrow_24.png" tooltiptext="Schritt zurück" oncommand="MyGoBack()"/>
-    <toolbarbutton image="image/icons/24x24/rightarrow_24.png" tooltiptext="Schritt vor" oncommand="MyGoForward()"/>
-</xsl:template>
-<!-- ***************************************************************************  -->
-
-
-<!-- searchbox
-****************************************************************************  -->
-<xsl:template name="searchbox">
-<vbox style="padding-top:2px">
-  <hbox>
-    <textbox style="font-size:11px;margin-right:0px" width="200px" id="searchboxtext" onkeypress="checkEnter(event)"/> 
-    <toolbarbutton type="toolbar" width="20" height="20" style="padding:5px !important" image="image/icons/16x16/CRM--Schnellsuche.png" flex="0" oncommand="doSearch()"/>
-</hbox>
-
-</vbox>
-</xsl:template>
-<!-- ***************************************************************************  -->
-
-
-<!-- hidden form for article search
-****************************************************************************  -->
-<xsl:template name="ArtikelSuche">
-  <form id="aform" method="post" action="ic.pl" xmlns="http://www.w3.org/1999/xhtml" target="main_window" style="font-family:arial;font-size:12px;display:none">
-  <input name="partnumber" size="20"/>
-  <input name="description" flex="1" id="desc"/>
-  <input name="partsgroup" size="20"/>
-  <input name="make" size="20"/>
-  <input class="submit" type="submit" name="action" value="Weiter" id="sb"/>
-  <div style="display:none" >
-  <input class="submit" type="submit" name="action" value="Top 100"/>
-    <input type="hidden" name="serialnumber" size="20"/>
-    <input type="hidden" name="ean" size="20"/>
-    <input type="hidden" name="searchitems" value="part"/>
-    <input type="hidden" name="title" value="Waren"/>
-    <input type="hidden" name="revers" value="0"/>
-    <input type="hidden" name="lastsort" value=""/>
-    <input type="hidden" name="model" size="20"/>
-    <input type="hidden" name="drawing" size="20"/>
-    <input type="hidden" name="microfiche" size="20"/>
-    <input  name="itemstatus" class="radio" type="radio" value="active" checked="true"/>
-    <input name="itemstatus" class="radio" type="radio" value="onhand"/>
-    <input  name="itemstatus" class="radio" type="radio" value="short"/>
-    <input  name="itemstatus" class="radio" type="radio" value="obsolete"/>
-    <input  name="itemstatus" class="radio" type="radio" value="orphaned"/>
-    <input  name="bought" class="checkbox" type="checkbox" value="1"/>
-    <input  name="sold" class="checkbox" type="checkbox" value="1"/>
-    <input  name="onorder" class="checkbox" type="checkbox" value="1"/>
-    <input  name="ordered" class="checkbox" type="checkbox" value="1"/>
-    <input  name="rfq" class="checkbox" type="checkbox" value="1"/>Anfrage
-    <input  name="quoted" class="checkbox" type="checkbox" value="1"/>Angeboten
-    <input type="hidden" name="transdatefrom" id="transdatefrom" size="11" title="dd.mm.yy"/>
-    <input  type="button" name="transdatefrom" id="trigger1" value="?"/>
-    <input name="transdateto" id="transdateto" size="11" title="dd.mm.yy"/>
-    <input type="button" name="transdateto" id="trigger2" value="?"/>
-    <input name="l_partnumber" class="checkbox" type="checkbox" value="Y" checked="true"/>Artikelnummer
-    <input name="l_description" class="checkbox" type="checkbox" value="Y" checked="true"/>Artikelbeschreibung
-    <input name="l_serialnumber" class="checkbox" type="checkbox" value="Y"/>Seriennummer
-    <input name="l_unit" class="checkbox" type="checkbox" value="Y" checked="true"/>Maszeinheit
-    <input name="l_listprice" class="checkbox" type="checkbox" value="Y"/>Listenpreis
-    <input name="l_sellprice" class="checkbox" type="checkbox" value="Y" checked="true"/>Verkaufspreis
-    <input name="l_lastcost" class="checkbox" type="checkbox" value="Y" checked="true"/>Einkaufspreis
-    <input name="l_linetotal" class="checkbox" type="checkbox" value="Y" checked="true"/>Zeilensumme
-    <input name="l_priceupdate" class="checkbox" type="checkbox" value="Y"/>Erneuert am
-    <input name="l_bin" class="checkbox" type="checkbox" value="Y"/>Lagerplatz
-    <input name="l_rop" class="checkbox" type="checkbox" value="Y"/>Mindestlagerbestand
-    <input name="l_weight" class="checkbox" type="checkbox" value="Y"/>Gewicht
-    <input name="l_image" class="checkbox" type="checkbox" value="Y"/>Grafik
-    <input name="l_drawing" class="checkbox" type="checkbox" value="Y"/>Zeichnung
-    <input name="l_microfiche" class="checkbox" type="checkbox" value="Y"/>Mikrofilm
-    <input name="l_partsgroup" class="checkbox" type="checkbox" value="Y"/>Warengruppe
-    <input name="l_subtotal" class="checkbox" type="checkbox" value="Y"/>Zwischensumme
-    <input name="l_soldtotal" class="checkbox" type="checkbox" value="Y"/>Verkaufte Anzahl
-    <input name="l_deliverydate" class="checkbox" type="checkbox" value="Y"/>Lieferdatum
-    <input type="hidden" name="nextsub" value="generate_report"/>
-    <input type="hidden" name="revers" value="0"/>
-    <input type="hidden" name="lastsort" value=""/>
-    <input type="hidden" name="sort" value="description"/>
-    <input type="hidden" name="ndxs_counter" value="0"/>
-  </div>
-  </form>
-</xsl:template>
-<!-- ***************************************************************************  -->
-</xsl:stylesheet>